@fundamental-ngx/core 0.61.3 → 0.61.5

package/fesm2022/fundamental-ngx-core-multi-combobox.mjs

@@ -13,7 +13,7 @@ import * as i2 from '@fundamental-ngx/cdk/forms';
 import { isSelectItem, CvaControl, CvaDirective, isOptionItem, isSelectableOptionItem } from '@fundamental-ngx/cdk/forms';
 import { ListFocusItem, FD_LIST_COMPONENT, ListComponent, ListGroupHeaderDirective, ListTitleDirective, ListItemComponent, ListSecondaryDirective } from '@fundamental-ngx/core/list';
 import { ContentDensityObserver, contentDensityObserverProviders } from '@fundamental-ngx/core/content-density';
-import { Subscription, startWith, skip, timer, isObservable, Subject } from 'rxjs';
+import { skip, timer, Subscription, isObservable, Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { PopoverComponent, PopoverControlComponent, PopoverBodyComponent } from '@fundamental-ngx/core/popover';
 import { shallowEqual } from 'fast-equals';
@@ -294,10 +294,11 @@ class BaseMultiCombobox {
         this._rangeSelector = new RangeSelector();
         /**
          * Flag indicating whether the data source has changed.
-         * Set to true when a new data source is assigned, triggering a refresh of suggestions.
+         * Guard flag: true while waiting for a new data source's first real data emission.
+         * Prevents the provider's initial empty emission from being treated as "no results."
          * @hidden
          */
-        this._dataSourceChanged = false;
+        this._dataSourceChanged = true;
         /**
          * Signal reference to the popover component.
          * Used for controlling popover visibility and position.
@@ -548,41 +549,34 @@ class BaseMultiCombobox {
      * Prepares the data stream and subscribes to it.
      */
     _openDataStream(matchingStrategy) {
-        const dataSourceProvider = this.dataSourceDirective.dataSourceProvider;
-        if (!dataSourceProvider) {
+        if (!this.dataSourceDirective.dataSourceProvider) {
             throw new Error(`[dataSource] source did not match an array, Observable, or DataSource`);
         }
-        dataSourceProvider.limitless = this.limitless();
-        dataSourceProvider.dataProvider.setLookupKey(this.lookupKey());
-        const matchingBy = {
-            firstBy: this._displayFn
-        };
-        if (this.secondaryKey()) {
-            matchingBy.secondaryBy = this._secondaryFn;
-        }
-        dataSourceProvider.dataProvider.setMatchingBy(matchingBy);
-        dataSourceProvider.dataProvider.setMatchingStrategy(matchingStrategy);
+        this._matchingStrategy = matchingStrategy;
+        this._configureDataSourceProvider(matchingStrategy);
         // initial data fetch
-        const map = new Map();
-        map.set('query', '*');
-        if (!this.limitless()) {
-            map.set('limit', this._mapLimit);
-        }
-        else {
-            dataSourceProvider.dataProvider['defaultLimit'] = Number.MAX_SAFE_INTEGER;
-        }
-        dataSourceProvider.match(map);
-        this._dsSubscription = new Subscription();
-        this._dsSubscription.add(this.dataSourceDirective.dataSourceProvider?.dataRequested.subscribe((value) => this.dataRequested.emit(value)));
-        this._dsSubscription.add(this.dataSourceDirective.dataSourceProvider?.dataReceived.subscribe((value) => this.dataReceived.emit(value)));
-        this.dataSourceDirective.dataSourceChanged
-            .pipe(startWith(true), takeUntilDestroyed(this._destroyRef))
-            .subscribe(() => {
+        this._fetchInitialData();
+        this._subscribeToDsEvents();
+        this.dataSourceDirective.dataSourceChanged.pipe(takeUntilDestroyed(this._destroyRef)).subscribe(() => {
             this._dataSourceChanged = true;
+            this._subscribeToDsEvents();
+            this._configureDataSourceProvider(this._matchingStrategy);
+            this._fetchInitialData();
         });
         this.dataSourceDirective.dataChanged$.pipe(skip(0), takeUntilDestroyed(this._destroyRef)).subscribe((data) => {
             if (data.length === 0) {
-                this._processingEmptyData();
+                if (this._dataSourceChanged) {
+                    // Data source transition: skip the invalid-entry handling (_processingEmptyData)
+                    // because the new provider's BehaviorSubject starts with [] before match('*') populates it.
+                    // But still clear stale suggestions and reset the flag.
+                    this._dataSourceChanged = false;
+                    this._suggestions.set([]);
+                    this._flatSuggestions.set([]);
+                    this._fullFlatSuggestions.set([]);
+                }
+                else {
+                    this._processingEmptyData();
+                }
                 return;
             }
             this._previousInputText = this.inputText();
@@ -642,6 +636,56 @@ class BaseMultiCombobox {
         this._timerSub$ = timer(this.invalidEntryDisplayTime()).subscribe(() => this._unsetInvalidEntry());
         this._cd.detectChanges();
     }
+    /**
+     * @hidden
+     * Configures the data source provider with matching settings.
+     */
+    _configureDataSourceProvider(matchingStrategy) {
+        const dataSourceProvider = this.dataSourceDirective.dataSourceProvider;
+        if (!dataSourceProvider) {
+            return;
+        }
+        dataSourceProvider.limitless = this.limitless();
+        dataSourceProvider.dataProvider.setLookupKey(this.lookupKey());
+        const matchingBy = {
+            firstBy: this._displayFn
+        };
+        if (this.secondaryKey()) {
+            matchingBy.secondaryBy = this._secondaryFn;
+        }
+        dataSourceProvider.dataProvider.setMatchingBy(matchingBy);
+        dataSourceProvider.dataProvider.setMatchingStrategy(matchingStrategy);
+    }
+    /**
+     * @hidden
+     * Triggers the initial data fetch on the current data source provider.
+     */
+    _fetchInitialData() {
+        const dataSourceProvider = this.dataSourceDirective.dataSourceProvider;
+        if (!dataSourceProvider) {
+            return;
+        }
+        const map = new Map();
+        map.set('query', '*');
+        if (!this.limitless()) {
+            map.set('limit', this._mapLimit);
+        }
+        else {
+            dataSourceProvider.dataProvider['defaultLimit'] = Number.MAX_SAFE_INTEGER;
+        }
+        dataSourceProvider.match(map);
+    }
+    /**
+     * @hidden
+     * Subscribes to dataRequested/dataReceived events from the current data source provider.
+     * Unsubscribes from previous provider's events first.
+     */
+    _subscribeToDsEvents() {
+        this._dsSubscription?.unsubscribe();
+        this._dsSubscription = new Subscription();
+        this._dsSubscription.add(this.dataSourceDirective.dataSourceProvider?.dataRequested.subscribe((value) => this.dataRequested.emit(value)));
+        this._dsSubscription.add(this.dataSourceDirective.dataSourceProvider?.dataReceived.subscribe((value) => this.dataReceived.emit(value)));
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.0", ngImport: i0, type: BaseMultiCombobox, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.2.0", version: "21.1.0", type: BaseMultiCombobox, isStandalone: true, viewQueries: [{ propertyName: "popover", first: true, predicate: PopoverComponent, descendants: true, isSignal: true }], ngImport: i0 }); }
 }