@firestitch/filter 9.9.1 → 9.9.3

package/fesm5/firestitch-filter.js

@@ -1,7 +1,7 @@
 import { __extends, __assign, __decorate, __metadata, __spread, __param, __values, __read } from 'tslib';
 import { Injectable, Optional, Inject, Component, ChangeDetectionStrategy, InjectionToken, ChangeDetectorRef, HostListener, Input, Injector, Directive, EventEmitter, NgZone, Output, ContentChild, TemplateRef, ViewChild, ElementRef, HostBinding, ViewEncapsulation, KeyValueDiffers, Pipe, Self, NgModule } from '@angular/core';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
-import { BehaviorSubject, Subject, isObservable, forkJoin, of, fromEvent, combineLatest, merge, timer } from 'rxjs';
+import { BehaviorSubject, Subject, isObservable, forkJoin, combineLatest, of, fromEvent, merge, timer } from 'rxjs';
 import { tap, finalize, take, takeUntil, debounceTime, filter as filter$1, distinctUntilChanged, switchMap, skip, map, mapTo, startWith, delay } from 'rxjs/operators';
 import { isFunction, clone, isObject, isString, toString, pickBy } from 'lodash-es';
 import { Alias, Model } from 'tsmodels';
@@ -308,6 +308,7 @@ var BaseItem = /** @class */ (function () {
     });
     BaseItem.prototype.loadDefaultValue = function () {
         var _this = this;
+        this._pendingDefaultValue = true;
         return this.defaultValueFn()
             .pipe(tap(function (value) {
             _this.defaultValue = value;
@@ -380,7 +381,6 @@ var BaseItem = /** @class */ (function () {
         this.label = item.label;
         this.chipLabel = item.chipLabel;
         if (typeof item.default === 'function') {
-            this._pendingDefaultValue = true;
             this.defaultValueFn = item.default;
         }
         else {
@@ -1683,7 +1683,7 @@ var FsFilterItemsStore = /** @class */ (function () {
         var _this = this;
         var pendingItems = this.items
             .filter(function (item) {
-            return item.hasPendingDefaultValue
+            return item.defaultValueFn
                 && (item.persistedValue === null || item.persistedValue === undefined);
         });
         if (pendingItems.length > 0) {
@@ -2461,8 +2461,10 @@ var ExternalParamsController = /** @class */ (function () {
         this._initSavedFilters();
         this._pending$.next(true);
         if (this._savedFilters.enabled) {
-            this._savedFilters
-                .load()
+            combineLatest([
+                this._itemsStore.ready$,
+                this._savedFilters.load(),
+            ])
                 .pipe(takeUntil(this._destroy$))
                 .subscribe(function () {
                 _this._savedFilters.updateActiveFilter();
@@ -2472,8 +2474,12 @@ var ExternalParamsController = /** @class */ (function () {
             });
         }
         else {
-            this._initItemsValues();
-            this._pending$.next(false);
+            this._itemsStore.ready$
+                .pipe(takeUntil(this._destroy$))
+                .subscribe(function () {
+                _this._initItemsValues();
+                _this._pending$.next(false);
+            });
         }
         this._listenItemsChange();
     };