子组件不存在时，点击报错。涉及组件：collapse, menu, navigation-bar, navigation-rail, ra…

…dio-group, segmented-button-group, tabs
zdhxiong · Nov 25, 2023 · 2747185 · 2747185
1 parent f0b1581
commit 2747185
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/packages/mdui/src/components/collapse/collapse.ts b/packages/mdui/src/components/collapse/collapse.ts
@@ -170,10 +170,11 @@ export class Collapse extends LitElement {
       return;
     }
 
-    // collapse-item 被禁用，忽略
     const target = event.target as HTMLElement;
-    const item = target.closest('mdui-collapse-item') as CollapseItem;
-    if (item.disabled) {
+    const item = target.closest('mdui-collapse-item') as CollapseItem | null;
+
+    // collapse-item 被禁用，忽略
+    if (!item || item.disabled) {
       return;
     }
 

diff --git a/packages/mdui/src/components/menu/menu.ts b/packages/mdui/src/components/menu/menu.ts
@@ -461,9 +461,9 @@ export class Menu extends LitElement {
     }
 
     const target = event.target as HTMLElement;
-    const item = target.closest('mdui-menu-item') as MenuItem;
+    const item = target.closest('mdui-menu-item') as MenuItem | null;
 
-    if (item?.disabled) {
+    if (!item || item.disabled) {
       return;
     }
 

diff --git a/packages/mdui/src/components/navigation-bar/navigation-bar.ts b/packages/mdui/src/components/navigation-bar/navigation-bar.ts
@@ -196,7 +196,11 @@ export class NavigationBar extends ScrollBehaviorMixin(LayoutItemBase) {
     const target = event.target as HTMLElement;
     const item = target.closest(
       'mdui-navigation-bar-item',
-    ) as NavigationBarItem;
+    ) as NavigationBarItem | null;
+
+    if (!item) {
+      return;
+    }
 
     this.activeKey = item.key;
     this.isInitial = false;

diff --git a/packages/mdui/src/components/navigation-rail/navigation-rail.ts b/packages/mdui/src/components/navigation-rail/navigation-rail.ts
@@ -270,7 +270,11 @@ export class NavigationRail extends LayoutItemBase {
     const target = event.target as HTMLElement;
     const item = target.closest(
       'mdui-navigation-rail-item',
-    ) as NavigationRailItem;
+    ) as NavigationRailItem | null;
+
+    if (!item) {
+      return;
+    }
 
     this.activeKey = item.key;
     this.isInitial = false;

diff --git a/packages/mdui/src/components/radio/radio-group.ts b/packages/mdui/src/components/radio/radio-group.ts
@@ -262,9 +262,7 @@ export class RadioGroup extends LitElement implements FormControl {
     await this.definedController.whenDefined();
 
     const target = event.target as HTMLElement;
-    const item = isNodeName(target, 'mdui-radio')
-      ? (target as Radio)
-      : ($(target).closest('mdui-radio')[0] as Radio | undefined);
+    const item = target.closest('mdui-radio') as Radio | null;
 
     if (!item || item.disabled) {
       return;

diff --git a/packages/mdui/src/components/segmented-button/segmented-button-group.ts b/packages/mdui/src/components/segmented-button/segmented-button-group.ts
@@ -410,9 +410,11 @@ export class SegmentedButtonGroup extends LitElement implements FormControl {
     await this.definedController.whenDefined();
 
     const target = event.target as HTMLElement;
-    const item = target.closest('mdui-segmented-button') as SegmentedButton;
+    const item = target.closest(
+      'mdui-segmented-button',
+    ) as SegmentedButton | null;
 
-    if (item.disabled) {
+    if (!item || item.disabled) {
       return;
     }
 

diff --git a/packages/mdui/src/components/tabs/tabs.ts b/packages/mdui/src/components/tabs/tabs.ts
@@ -219,7 +219,11 @@ export class Tabs extends LitElement {
     await this.definedController.whenDefined();
 
     const target = event.target as HTMLElement;
-    const tab = target.closest('mdui-tab') as Tab;
+    const tab = target.closest('mdui-tab') as Tab | null;
+
+    if (!tab) {
+      return;
+    }
 
     this.activeKey = tab.key;
     this.isInitial = false;