fix: catch both slug and ai-label in event handlers

carbon-design-system · Oct 22, 2024 · c37c2a6 · c37c2a6
1 parent 3176eb1
commit c37c2a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/web-components/src/components/multi-select/multi-select.ts b/packages/web-components/src/components/multi-select/multi-select.ts
@@ -134,7 +134,7 @@ class CDSMultiSelect extends CDSDropdown {
     } else if (
       !(event.target as HTMLElement)?.matches(
         (this.constructor as typeof CDSMultiSelect).aiLabelItem
-      ) ||
+      ) &&
       // remove reference to slug in v12
       !(event.target as HTMLElement)?.matches(
         (this.constructor as typeof CDSMultiSelect).slugItem

diff --git a/packages/web-components/src/components/radio-button/radio-button.ts b/packages/web-components/src/components/radio-button/radio-button.ts
@@ -132,7 +132,7 @@ class CDSRadioButton extends HostListenerMixin(FocusMixin(LitElement)) {
     if (
       !(event.target as HTMLElement).matches(
         (this.constructor as typeof CDSRadioButton)?.aiLabelItem
-      ) ||
+      ) &&
       !(event.target as HTMLElement).matches(
         (this.constructor as typeof CDSRadioButton)?.slugItem
       )
@@ -180,7 +180,7 @@ class CDSRadioButton extends HostListenerMixin(FocusMixin(LitElement)) {
     if (
       !(event.target as HTMLElement).matches(
         (this.constructor as typeof CDSRadioButton)?.aiLabelItem
-      ) ||
+      ) &&
       !(event.target as HTMLElement).matches(
         (this.constructor as typeof CDSRadioButton)?.slugItem
       )

diff --git a/packages/web-components/src/components/tile/selectable-tile.ts b/packages/web-components/src/components/tile/selectable-tile.ts
@@ -119,10 +119,10 @@ class CDSSelectableTile extends HostListenerMixin(FocusMixin(LitElement)) {
       (key === 'Enter' &&
         !(event.target as HTMLElement)?.matches(
           (this.constructor as typeof CDSSelectableTile).aiLabelItem
-        )) ||
-      !(event.target as HTMLElement)?.matches(
-        (this.constructor as typeof CDSSelectableTile).slugItem
-      )
+        ) &&
+        !(event.target as HTMLElement)?.matches(
+          (this.constructor as typeof CDSSelectableTile).slugItem
+        ))
     ) {
       this.selected = !this.selected;
     }