@fluid-topics/ft-search-bar 1.1.107 → 1.1.111

package/build/ft-search-bar.d.ts

@@ -41,7 +41,7 @@ export declare class FtSearchBar extends FtLitElement implements FtSearchBarProp
     priors?: Array<FtSearchPrior>;
     searchRequestSerializer: (request: FtSearchRequest) => string;
     focusOnDisplay: boolean;
-    private searchFilters;
+    private metadataFilters;
     private sizeCategory;
     displayFacets: boolean;
     mobileMenuOpen: boolean;
@@ -106,6 +106,10 @@ export declare class FtSearchBar extends FtLitElement implements FtSearchBarProp
     disconnectedCallback(): void;
     private updateSize;
     setFilter(key: string, selectedValues: Array<string>): void;
+    private compareUnknownFilters;
+    private compareValueFilters;
+    private compareDateFilters;
+    private compareRangeFilters;
     private compareFilters;
     private compareRequests;
     private setFiltersFromPreset;

package/build/ft-search-bar.js

@@ -81,7 +81,7 @@ class FtSearchBar extends FtLitElement {
         this.priors = [];
         this.searchRequestSerializer = (request) => serializeRequest(this.baseUrl, request);
         this.focusOnDisplay = false;
-        this.searchFilters = [];
+        this.metadataFilters = [];
         this.sizeCategory = FtSizeCategory.M;
         this.displayFacets = false;
         this.mobileMenuOpen = false;
@@ -124,13 +124,29 @@ class FtSearchBar extends FtLitElement {
                 this.displayFacets = this.displayFacets && e.composedPath().some(element => element === this.floatingContainer);
             }
         };
-        this.compareFilters = (a, b) => a.key === b.key
-            && a.negative == b.negative
+        this.compareUnknownFilters = (a, b) => {
+            if (a.valueFilter && b.valueFilter) {
+                return this.compareValueFilters(a.valueFilter, b.valueFilter);
+            }
+            if (a.dateFilter && b.dateFilter) {
+                return this.compareDateFilters(a.dateFilter, b.dateFilter);
+            }
+            if (a.rangeFilter && b.rangeFilter) {
+                return this.compareRangeFilters(a.rangeFilter, b.rangeFilter);
+            }
+            return false;
+        };
+        this.compareValueFilters = (a, b) => a.negative == b.negative
             && a.values.length === b.values.length
             && a.values.every(value => b.values.includes(value));
+        this.compareDateFilters = (a, b) => a.type === b.type;
+        this.compareRangeFilters = (a, b) => a.from === b.from
+            && a.to === b.to;
+        this.compareFilters = (a, b) => a.key === b.key
+            && this.compareUnknownFilters(a, b);
         this.compareRequests = (a, b) => (a.contentLocale == null || b.contentLocale == null || a.contentLocale === b.contentLocale)
-            && a.filters.length === b.filters.length
-            && a.filters.every(fa => b.filters.some(fb => this.compareFilters(fa, fb)));
+            && a.metadataFilters.length === b.metadataFilters.length
+            && a.metadataFilters.every(fa => b.metadataFilters.some(fb => this.compareFilters(fa, fb)));
         this.enableFocusReactionCallback = () => this.enableFocusReaction();
     }
     isMobileMenuOpen() {
@@ -143,13 +159,13 @@ class FtSearchBar extends FtLitElement {
             query: this.query,
             facets: this.facetsRequest,
             priors: this.hasPriors ? this.priors : undefined,
-            filters: this.searchFilters,
+            metadataFilters: this.metadataFilters,
             paging: { perPage: 0, page: 1 },
             sort: [],
         };
     }
     get facetsRequest() {
-        const fromFilters = this.searchFilters.filter(f => f.values.length > 0 && !this.displayedFilters.includes(f.key))
+        const fromFilters = this.metadataFilters.filter(f => { var _a, _b; return ((_b = (_a = f.valueFilter) === null || _a === void 0 ? void 0 : _a.values.length) !== null && _b !== void 0 ? _b : 0) > 0 && !this.displayedFilters.includes(f.key); })
             .map(f => ({ id: f.key }));
         return [...this.displayedFilters.map(id => ({ id })), ...fromFilters];
     }
@@ -157,7 +173,7 @@ class FtSearchBar extends FtLitElement {
         return {
             contentLocale: this.contentLocale,
             input: this.query,
-            filters: this.searchFilters,
+            metadataFilters: this.metadataFilters,
             sort: []
         };
     }
@@ -197,7 +213,7 @@ class FtSearchBar extends FtLitElement {
     }
     clear() {
         this.query = "";
-        this.searchFilters = [];
+        this.metadataFilters = [];
         if (this.input) {
             this.input.value = "";
         }
@@ -336,7 +352,7 @@ class FtSearchBar extends FtLitElement {
         `;
     }
     renderDesktopClearFilters() {
-        return this.searchFilters.length > 0 ? html `
+        return this.metadataFilters.length > 0 ? html `
             <ft-button part="facets-actions"
                        @click=${this.clearFilters}>
                 ${this.labelResolver.resolve("clearFilters")}
@@ -423,7 +439,11 @@ class FtSearchBar extends FtLitElement {
             this.initRecentSearches();
         }
         if (props.has("presets")) {
-            ((_b = this.presets) !== null && _b !== void 0 ? _b : []).forEach(preset => preset.filters.forEach(filter => filter.values = filter.values.map(v => unquote(v))));
+            ((_b = this.presets) !== null && _b !== void 0 ? _b : []).forEach(preset => preset.metadataFilters.forEach(filter => {
+                if (filter.valueFilter) {
+                    filter.valueFilter.values = filter.valueFilter.values.map(v => unquote(v));
+                }
+            }));
         }
         if (props.has("presets") || props.has("selectedPreset")) {
             const currentPreset = ((_c = this.presets) !== null && _c !== void 0 ? _c : []).find(p => p.name === this.selectedPreset);
@@ -434,7 +454,7 @@ class FtSearchBar extends FtLitElement {
         if (props.has("contentLocale") && this.contentLocale != null) {
             this.knownFacetLabels = new Map();
         }
-        if (["contentLocale", "searchFilters"].some(p => props.has(p))) {
+        if (["contentLocale", "metadataFilters"].some(p => props.has(p))) {
             this.selectedPreset = (_e = ((_d = this.presets) !== null && _d !== void 0 ? _d : []).find(p => this.compareRequests(p, this.request))) === null || _e === void 0 ? void 0 : _e.name;
         }
         if (["baseUrl", "apiIntegrationIdentifier"].some(p => props.has(p))) {
@@ -444,13 +464,13 @@ class FtSearchBar extends FtLitElement {
         if (props.has("api") && this.api) {
             this.initSearchData();
         }
-        if (["uiLocale", "contentLocale", "searchFilters", "displayedFilters"].some(p => props.has(p))) {
+        if (["uiLocale", "contentLocale", "metadataFilters", "displayedFilters"].some(p => props.has(p))) {
             this.updateFacets();
         }
-        if (["query", "uiLocale", "contentLocale", "searchFilters", "displayedFilters", "api"].some(p => props.has(p))) {
+        if (["query", "uiLocale", "contentLocale", "metadataFilters", "displayedFilters", "api"].some(p => props.has(p))) {
             this.suggestManager.update();
         }
-        if (["query", "uiLocale", "contentLocale", "searchFilters"].some(p => props.has(p))) {
+        if (["query", "uiLocale", "contentLocale", "metadataFilters"].some(p => props.has(p))) {
             this.dispatchStateChangeEvent();
         }
     }
@@ -581,7 +601,7 @@ class FtSearchBar extends FtLitElement {
         this.sizeCategory = e.detail.category;
     }
     setFilter(key, selectedValues) {
-        let newFilters = this.searchFilters.filter(f => f.key !== key);
+        let newFilters = this.metadataFilters.filter(f => !f.valueFilter || f.key !== key);
         this.facets.forEach(facet => {
             if (facet.key === key) {
                 flatDeep(facet.rootNodes, n => n.childNodes).forEach(n => n.selected = selectedValues.includes(n.value));
@@ -590,11 +610,13 @@ class FtSearchBar extends FtLitElement {
         if (selectedValues.length) {
             newFilters.push({
                 key: key,
-                negative: false,
-                values: selectedValues
+                valueFilter: {
+                    negative: false,
+                    values: selectedValues
+                }
             });
         }
-        this.searchFilters = newFilters;
+        this.metadataFilters = newFilters;
         this.scrollToFacet = key;
     }
     setFiltersFromPreset(request) {
@@ -602,12 +624,12 @@ class FtSearchBar extends FtLitElement {
             if (request.contentLocale != null) {
                 this.contentLocale = request.contentLocale;
             }
-            this.searchFilters = request.filters;
+            this.metadataFilters = request.metadataFilters;
         }
     }
     clearFilters() {
         this.facets.forEach(facet => flatDeep(facet.rootNodes, n => n.childNodes).forEach(n => n.selected = false));
-        this.searchFilters = [];
+        this.metadataFilters = [];
         const firstFacet = this.facets[0];
         this.scrollToFacet = firstFacet === null || firstFacet === void 0 ? void 0 : firstFacet.key;
     }
@@ -719,7 +741,7 @@ __decorate([
 ], FtSearchBar.prototype, "focusOnDisplay", void 0);
 __decorate([
     state()
-], FtSearchBar.prototype, "searchFilters", void 0);
+], FtSearchBar.prototype, "metadataFilters", void 0);
 __decorate([
     state()
 ], FtSearchBar.prototype, "sizeCategory", void 0);