@xh/hoist 73.0.0-SNAPSHOT.1746638889909 → 73.0.0-SNAPSHOT.1746647244798

package/build/types/desktop/cmp/grid/impl/filter/headerfilter/values/ValuesTabModel.d.ts

@@ -27,7 +27,8 @@ export declare class ValuesTabModel extends HoistModel {
     reset(): void;
     setRecsChecked(isChecked: boolean, values: any[]): void;
     toggleAllRecsChecked(): void;
-    setPendingValues(): void;
+    filterTextReaction(): void;
+    combineCurrentFiltersToggleReaction(): void;
     private getFilter;
     private doSyncWithFilter;
     private syncGrid;

package/desktop/cmp/grid/impl/filter/headerfilter/values/ValuesTab.ts

@@ -55,6 +55,7 @@ const body = hoistCmp.factory<ValuesTabModel>(({model}) => {
 const storeFilterSelect = hoistCmp.factory<ValuesTabModel>(({model}) => {
     const {gridModel, allVisibleRecsChecked, filterText, headerFilterModel} = model,
         {store} = gridModel;
+
     return vbox({
         className: 'store-filter-header',
         items: [
@@ -68,7 +69,11 @@ const storeFilterSelect = hoistCmp.factory<ValuesTabModel>(({model}) => {
                 span(`(Select All${filterText ? ' Search Results' : ''})`)
             ),
             hframe({
-                omit: !filterText || store.empty || headerFilterModel.commitOnChange,
+                omit:
+                    !filterText ||
+                    !model.columnFilters.length ||
+                    store.empty ||
+                    headerFilterModel.commitOnChange,
                 items: [
                     checkbox({bind: 'combineCurrentFilters'}),
                     span(`Add current selection to filter`)

package/desktop/cmp/grid/impl/filter/headerfilter/values/ValuesTabModel.ts

@@ -94,9 +94,13 @@ export class ValuesTabModel extends HoistModel {
                 fireImmediately: true
             },
             {
-                track: () => [this.filterText, this.combineCurrentFilters],
-                run: () => this.setPendingValues(),
+                track: () => this.filterText,
+                run: () => this.filterTextReaction(),
                 debounce: 300
+            },
+            {
+                track: () => this.combineCurrentFilters,
+                run: () => this.combineCurrentFiltersToggleReaction()
             }
         );
     }
@@ -129,10 +133,10 @@ export class ValuesTabModel extends HoistModel {
     // Implementation
     //-------------------
     @action
-    setPendingValues() {
+    filterTextReaction() {
         if (!this.filterText) {
+            this.combineCurrentFilters = false;
             this.doSyncWithFilter();
-            this.syncGrid();
             return;
         }
 
@@ -151,6 +155,19 @@ export class ValuesTabModel extends HoistModel {
         );
     }
 
+    @action combineCurrentFiltersToggleReaction() {
+        if (!this.filterText) return;
+
+        const {records} = this.gridModel.store,
+            currentFilterValues = flatten(map(this.columnFilters, 'value')),
+            checkedRecs = records.filter(it => it.get('isChecked')),
+            values = map(checkedRecs, it => it.get('value'));
+
+        this.pendingValues = uniq(
+            this.combineCurrentFilters ? [...currentFilterValues, ...values] : values
+        );
+    }
+
     private getFilter() {
         const {gridFilterModel, pendingValues, values, valueCount, field} = this,
             included = pendingValues.map(it => gridFilterModel.fromDisplayValue(it)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1746638889909",
+  "version": "73.0.0-SNAPSHOT.1746647244798",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",