@fundamental-ngx/platform 0.62.3-rc.0 → 0.62.3-rc.2

package/fesm2022/fundamental-ngx-platform-smart-filter-bar.mjs

@@ -528,7 +528,7 @@ class SmartFilterBarOptionsDataProvider extends ArrayTableDataProvider {
     }
     /** @hidden */
     _getVisibleAndActiveItems() {
-        return this.items.filter((i) => i.visible || i.active);
+        return this.items.filter((i) => i.visible && i.active);
     }
     /** @hidden */
     _getMandatoryItems() {
@@ -557,6 +557,10 @@ class SmartFilterBarSettingsDialogComponent {
         };
         /** @hidden */
         this._selectedFilters = [];
+        /** @hidden */
+        this._currentViewItems = [];
+        /** @hidden */
+        this._isRestoringSelection = false;
         /**
          * @hidden
          * An RxJS Subject that will kill the data stream upon component’s destruction (for unsubscribing)
@@ -582,11 +586,16 @@ class SmartFilterBarSettingsDialogComponent {
             .open()
             .pipe(observeOn(asyncScheduler), takeUntilDestroyed(this._destroyRef))
             .subscribe((items) => {
+            this._currentViewItems = items;
+            this._isRestoringSelection = true;
             items.forEach((field, index) => {
-                if (field.visible) {
+                const shouldBeSelected = this._selectedFilters.includes(field.name);
+                const isCurrentlySelected = Boolean(this.table._tableRowsVisible[index]?.checked);
+                if (shouldBeSelected !== isCurrentlySelected) {
                     this.table.toggleSelectableRow(index);
                 }
             });
+            this._isRestoringSelection = false;
         });
     }
     /**
@@ -610,6 +619,7 @@ class SmartFilterBarSettingsDialogComponent {
             key: c.key,
             name: c.name
         }));
+        this._selectedFilters = this._availableFields.filter((f) => f.visible).map((f) => f.name);
         this.source = new TableDataSource(new SmartFilterBarOptionsDataProvider(this._availableFields));
     }
     /** @hidden */
@@ -622,7 +632,14 @@ class SmartFilterBarSettingsDialogComponent {
     }
     /** @hidden */
     _onRowSelectionChange(event) {
-        this._selectedFilters = event.selection.map((c) => c.name);
+        if (this._isRestoringSelection) {
+            return;
+        }
+        const currentViewNames = new Set(this._currentViewItems.map((i) => i.name));
+        this._selectedFilters = [
+            ...this._selectedFilters.filter((name) => !currentViewNames.has(name)),
+            ...event.selection.map((c) => c.name)
+        ];
         this.isResetAvailable$.set(true);
     }
     /** @hidden */
@@ -630,6 +647,7 @@ class SmartFilterBarSettingsDialogComponent {
         if (!this.table) {
             return;
         }
+        this._isRestoringSelection = true;
         this.source.dataProvider.filter(event.payload);
         this.source.fetch(this.table.getTableState());
     }