@brightspace-ui-labs/facet-filter-sort 6.2.1 → 6.3.0

package/components/filter-dropdown/filter-dropdown-category.js

@@ -3,12 +3,9 @@ import '@brightspace-ui/core/components/inputs/input-search.js';
 import '@brightspace-ui/core/components/menu/menu.js';
 import { css, html, LitElement } from 'lit';
 import { FilterLocalizeMixin } from '../localize-mixin.js';
-import { getFlag } from '@brightspace-ui/core/helpers/flags.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { TabPanelMixin } from '@brightspace-ui/core/components/tabs/tab-panel-mixin.js';
 
-const useTabsNewStructure = getFlag('GAUD-7146-tabs-new-structure', false);
-
 /**
  * A component wrapping grouped filters
  * @slot - Contains the filters (e.g., d2l-labs-filter-dropdown-option) that are in the category
@@ -106,11 +103,9 @@ class LabsFilterDropdownCategory extends FilterLocalizeMixin(TabPanelMixin(LitEl
 			this.__onSelect(e);
 		});
 
-		if (!useTabsNewStructure) {
-			this.addEventListener('d2l-tab-panel-selected', () => {
-				this._dispatchSelected();
-			});
-		}
+		this.addEventListener('d2l-tab-panel-selected', () => {
+			this._dispatchSelected();
+		});
 	}
 
 	render() {

package/components/filter-dropdown/filter-dropdown.js

@@ -9,7 +9,7 @@ import { getFlag } from '@brightspace-ui/core/helpers/flags.js';
 import { LocalizeBehavior } from '../localize-behavior.js';
 import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
 
-const useTabsNewStructure = getFlag('GAUD-7146-tabs-new-structure', false);
+const useTabsNewStructure = getFlag('GAUD-7146-tabs-new-structure', true);
 
 /**
  * A component containing filter options and emitting selection events
@@ -157,12 +157,7 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 
 	attached() {
 		this.addEventListener('d2l-dropdown-close', this._handleDropdownClose);
-
-		if (this._useNewStructure) {
-			this.addEventListener('d2l-tab-selected', this._handleTabSelected);
-		} else {
-			this.addEventListener('d2l-tab-panel-selected', this._stopTabPanelSelectedEvent);
-		}
+		this.addEventListener('d2l-tab-panel-selected', this._stopTabPanelSelectedEvent);
 	}
 
 	clearFilters() {
@@ -183,9 +178,9 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 
 	detached() {
 		this.removeEventListener('d2l-dropdown-close', this._handleDropdownClose);
+		this.removeEventListener('d2l-tab-panel-selected', this._stopTabPanelSelectedEvent);
 
 		if (this._useNewStructure) {
-			this.removeEventListener('d2l-tab-selected', this._handleTabSelected);
 			const categories = this.querySelectorAll('d2l-labs-filter-dropdown-category');
 			categories.forEach(cat => {
 				if (cat.__tabInfoObserver) {
@@ -193,8 +188,6 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 					delete cat.__tabInfoObserver;
 				}
 			});
-		} else {
-			this.removeEventListener('d2l-tab-panel-selected', this._stopTabPanelSelectedEvent);
 		}
 	}
 
@@ -270,19 +263,6 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 		this._hasFooter = e.target.assignedNodes().length !== 0;
 	}
 
-	_handleTabSelected(e) {
-		e.stopPropagation();
-		if (!this._useNewStructure) return;
-
-		// Find the corresponding category and dispatch the selection event
-		const tabId = e.target.id;
-		const category = this.querySelector(`d2l-labs-filter-dropdown-category[key="${tabId}"]`);
-
-		if (category) {
-			category._dispatchSelected();
-		}
-	}
-
 	_localizeOrAlt(altText, ...args) {
 		if (!this.localize || !this.resources) return;
 		return altText ? altText : this.localize(...args);

package/package.json

@@ -37,7 +37,7 @@
     "lit-analyzer": "^1",
     "stylelint": "^15"
   },
-  "version": "6.2.1",
+  "version": "6.3.0",
   "dependencies": {
     "@brightspace-ui/core": "^3",
     "@brightspace-ui/localize-behavior": "^2",