@firestitch/filter 13.0.1 → 13.0.3

package/fesm2020/firestitch-filter.mjs

@@ -59,16 +59,6 @@ import * as i1$6 from '@angular/cdk/overlay';
 import { OverlayConfig } from '@angular/cdk/overlay';
 import * as i1$7 from '@angular/cdk/layout';
 
-const QUERY_PARAM_DELIMITER = ':';
-
-function filterToQueryParam(value, name) {
-    return `${encodeURIComponent(value)}${QUERY_PARAM_DELIMITER}${encodeURIComponent(name)}`;
-}
-function filterFromQueryParam(param) {
-    const parts = param.split(QUERY_PARAM_DELIMITER);
-    return [decodeURIComponent(parts[0]), decodeURIComponent(parts[1])];
-}
-
 function objectsAreEquals(obj1, obj2) {
     const oldKeys = Object.keys(obj1);
     const currKeys = Object.keys(obj2);
@@ -129,6 +119,7 @@ class BaseItem {
         this._filter = _filter;
         this._pendingValues = false;
         this._pendingDefaultValue = false;
+        this._initializedValues = false;
         this._loading$ = new BehaviorSubject(false);
         this._value$ = new BehaviorSubject(null);
         this._valueChange$ = new Subject();
@@ -141,7 +132,6 @@ class BaseItem {
     get filter() {
         return this._filter;
     }
-    ///
     get isTypeAutocomplete() {
         return this.type === ItemType.AutoComplete;
     }
@@ -175,7 +165,6 @@ class BaseItem {
     get isTypeKeyword() {
         return this.type === ItemType.Keyword;
     }
-    ////
     get isChipVisible() {
         return !!this.model;
     }
@@ -229,7 +218,7 @@ class BaseItem {
         this._loading$.next(value);
     }
     get _initialized() {
-        return !this._pendingDefaultValue && !this._pendingValues;
+        return !this._pendingDefaultValue && !this._pendingValues && this._initializedValues;
     }
     valueChanged() {
         this._value$.next(this.value);
@@ -266,7 +255,7 @@ class BaseItem {
         }));
     }
     initValues(persistedValue) {
-        // this._initialized = false;
+        this._initializedValues = false;
         this.persistedValue = persistedValue;
         this._initDefaultModel();
         const isAutocomplete = this.type === ItemType.AutoComplete || this.type === ItemType.AutoCompleteChips;
@@ -277,14 +266,13 @@ class BaseItem {
             }
             else {
                 this.values = valuesResult;
-                // Move to some other place
                 this._init();
-                // this._initialized = true;
+                this._initializedValues = true;
             }
         }
         else {
             this._init();
-            // this._initialized = true;
+            this._initializedValues = true;
         }
     }
     loadAsyncValues(reload = true) {
@@ -298,7 +286,7 @@ class BaseItem {
                 this.loading = false;
                 this._init();
                 this._validateModel();
-                // this._initialized = true;
+                this._initializedValues = true;
             });
         }
     }
@@ -478,8 +466,19 @@ class MultipleSelectItem extends BaseSelectItem {
     }
 }
 
+const QUERY_PARAM_DELIMITER = ':';
+
+function filterToQueryParam(value, name) {
+    return `${encodeURIComponent(value)}${QUERY_PARAM_DELIMITER}${encodeURIComponent(name)}`;
+}
+function filterFromQueryParam(param) {
+    const parts = param.split(QUERY_PARAM_DELIMITER);
+    return [decodeURIComponent(parts[0]), decodeURIComponent(parts[1])];
+}
+
 function buildQueryParams(flattenedParams, items) {
-    items.forEach(filterItem => {
+    items
+        .forEach((filterItem) => {
         if (filterItem instanceof MultipleSelectItem && filterItem.isolate) {
             if (filterItem.multiple && filterItem.value) {
                 const isolated = list(filterItem.values, 'value').sort();
@@ -1913,23 +1912,9 @@ class QueryParamsController {
         }
     }
     writeStateToQueryParams(params) {
-        if (!this._enabled) {
-            return;
+        if (this._enabled) {
+            this._replaceState(params);
         }
-        this._location.replaceState(this._router.createUrlTree([], {
-            relativeTo: this._route,
-            queryParams: params,
-            queryParamsHandling: 'merge',
-            preserveFragment: true,
-        }).toString());
-        // Trying replacing the URL without triggering an Angular navigation change
-        // // Update query
-        // this._router.navigate([], {
-        //   replaceUrl: true,
-        //   relativeTo: this._route,
-        //   queryParams: params,
-        //   queryParamsHandling: 'merge',
-        // }).then(() => {});
     }
     /**
      * Parse query and update filter values
@@ -1942,6 +1927,15 @@ class QueryParamsController {
         ].filter((item) => !!item);
         this._fetchedParams = restoreItems(this._route.snapshot.queryParams, items, this._paramsCase);
     }
+    _replaceState(data) {
+        const url = new URL(window.location.href);
+        Object.keys(data)
+            .filter((name) => data[name] !== undefined && data[name] !== null)
+            .forEach((name) => {
+            url.searchParams.set(name, data[name]);
+        });
+        history.replaceState({}, null, url.search);
+    }
 }
 QueryParamsController.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: QueryParamsController, deps: [{ token: i1$1.Router }, { token: i1$1.ActivatedRoute }, { token: i3.Location }, { token: FsFilterItemsStore }], target: i0.ɵɵFactoryTarget.Injectable });
 QueryParamsController.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: QueryParamsController });