feat(filter-panel): ensure behavior works in modal and desktop (#7405)

carbon-design-system · Feb 1, 2022 · 366f0fb · 366f0fb
1 parent 0c5e99c
commit 366f0fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/web-components/src/components/filter-panel/filter-group-item.ts b/packages/web-components/src/components/filter-panel/filter-group-item.ts
@@ -13,6 +13,7 @@ import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/setti
 import BXAccordionItem from 'carbon-web-components/es/components/accordion/accordion-item';
 import styles from './filter-panel.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
+import DDSFilterPanelComposite from './filter-panel-composite';
 
 const { stablePrefix: ddsPrefix } = ddsSettings;
 const { prefix } = settings;
@@ -137,13 +138,18 @@ class DDSFilterGroupItem extends StableSelectorMixin(BXAccordionItem) {
    */
   protected _getCachedViewAllValue(): boolean {
     const { titleText } = this;
+    let result: boolean = false;
+
+    const filterPanel = this.closest('dds-filter-panel');
+    if (filterPanel) {
+      // Indicates this is composite's duplicated content.
+      const shadowRoot = filterPanel?.parentNode as ShadowRoot;
+      const cache = (shadowRoot.host as DDSFilterPanelComposite)._filterGroupsAllRevealed;
+      const match = cache.find(entry => entry.id === titleText);
+      result = match ? match.value : false;
+    }
 
-    const cache = (((this.closest('dds-filter-panel')?.parentNode as ShadowRoot).host as HTMLElement) as any)
-      ._filterGroupsAllRevealed;
-
-    const match = cache.find(entry => entry.id === titleText);
-
-    return match ? match.value : false;
+    return result;
   }
 
   protected firstUpdated(): void {
@@ -169,7 +175,7 @@ class DDSFilterGroupItem extends StableSelectorMixin(BXAccordionItem) {
         if (prevAllRevealed === undefined) {
           this._handleAllRevealed(this._getCachedViewAllValue());
         } else {
-          this._handleAllRevealed(!prevAllRevealed);
+          this._handleAllRevealed(this.allRevealed);
         }
       }
     }

diff --git a/packages/web-components/src/components/filter-panel/filter-panel-composite.ts b/packages/web-components/src/components/filter-panel/filter-panel-composite.ts
@@ -123,10 +123,8 @@ class DDSFilterPanelComposite extends HostListenerMixin(StableSelectorMixin(LitE
     });
 
     if (match !== -1) {
-      // console.log('DEBUG: composite: Match found, setting cache to', event.detail.value);
       this._filterGroupsAllRevealed[match].value = event.detail.value;
     } else {
-      // console.log('DEBUG: composite: No match, setting cache to', event.detail.value);
       this._filterGroupsAllRevealed.push(event.detail);
     }
   };