@adaptabletools/adaptable 23.0.20 → 23.0.21

package/src/agGrid/AdaptableFilterHandler.js

@@ -3,6 +3,7 @@ export class AdaptableFilterHandler {
     colId;
     filterDisplayValuesResult;
     previousFilterDisplayValuesResult;
+    rememberedInFilterValues = new Map();
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
     }
@@ -44,6 +45,7 @@ export class AdaptableFilterHandler {
         return this.fetchFilterDisplayValues(options);
     }
     async fetchFilterDisplayValues(options) {
+        this.rememberSelectedLazyInFilterValues(undefined);
         return this.adaptableApi.gridApi.internalApi
             .getDistinctFilterDisplayValuesForColumn({
             columnId: this.colId,
@@ -55,10 +57,51 @@ export class AdaptableFilterHandler {
             limit: options.limit,
         })
             .then((result) => {
+            this.rememberSelectedLazyInFilterValues(result);
             this.filterDisplayValuesResult = result;
             return result;
         });
     }
+    rememberSelectedLazyInFilterValues(result) {
+        if (!this.adaptableApi.optionsApi.getFilterOptions().customInFilterValues) {
+            return;
+        }
+        const paginatedResult = result ?? this.getLastCachedFilterDisplayValues();
+        if (paginatedResult?.hasMore === undefined) {
+            return;
+        }
+        const columnFilter = this.adaptableApi.filterApi.columnFilterApi.getColumnFilterForColumn(this.colId);
+        const selectedInputs = new Set((columnFilter?.Predicates ?? [])
+            .filter((predicate) => predicate.PredicateId === 'In' || predicate.PredicateId === 'NotIn')
+            .flatMap((predicate) => (Array.isArray(predicate.Inputs) ? predicate.Inputs : [])));
+        for (const value of this.rememberedInFilterValues.keys()) {
+            if (!selectedInputs.has(value)) {
+                this.rememberedInFilterValues.delete(value);
+            }
+        }
+        if (!selectedInputs.size) {
+            return;
+        }
+        const visit = (values) => {
+            if (!values) {
+                return;
+            }
+            for (const item of values) {
+                if (selectedInputs.has(item.value)) {
+                    this.rememberedInFilterValues.set(item.value, item);
+                }
+                visit(item.children);
+            }
+        };
+        visit(this.getLastCachedFilterDisplayValues()?.values);
+        visit(result?.values);
+    }
+    getRememberedLazyInFilterValues() {
+        return Array.from(this.rememberedInFilterValues.values());
+    }
+    getRememberedLazyInFilterValue(value) {
+        return this.rememberedInFilterValues.get(value);
+    }
     onNewRowsLoaded() {
         this.resetFilterDisplayValues();
     }
@@ -83,5 +126,6 @@ export class AdaptableFilterHandler {
     destroy() {
         this.filterDisplayValuesResult = undefined;
         this.previousFilterDisplayValuesResult = undefined;
+        this.rememberedInFilterValues.clear();
     }
 }

package/src/components/Combobox/comboboxUtils.d.ts

@@ -57,6 +57,12 @@ export type ComboboxCommonProps<T extends ComboboxItemType> = {
      * is cleared on close and every open starts from the full list.
      */
     persistFilterOnReopen?: boolean;
+    /**
+     * Extra items used only to resolve selected values that are not in `items`
+     * (e.g. selected In Filter values hidden by the current search page).
+     * Not shown in the dropdown list.
+     */
+    lookupItems?: T[];
     /**
      * Custom filter function, or `null` to disable built-in filtering
      * (e.g. when options are already filtered server-side).

package/src/components/Combobox/comboboxUtils.js

@@ -17,7 +17,7 @@ export function valueToItem(stringValue, lookup) {
 export function valueToItems(stringValues, lookup) {
     if (stringValues == null)
         return undefined;
-    return stringValues.map((v) => lookup.get(v)).filter(Boolean);
+    return stringValues.map((v) => lookup.get(v) ?? { value: v, label: String(v ?? '') });
 }
 export function toStringValue(item) {
     return item?.value ?? null;

package/src/components/Combobox/index.js

@@ -196,9 +196,18 @@ const useGetAllItems = (props) => {
             ?
                 [].concat(props.items)
             : props.items;
+    const lookupItems = props.lookupItems;
     const itemByValue = useMemo(() => {
-        return new Map(allItems.map((item) => [item.value, item]));
-    }, [allItems]);
+        const map = new Map(allItems.map((item) => [item.value, item]));
+        if (lookupItems) {
+            for (const item of lookupItems) {
+                if (!map.has(item.value)) {
+                    map.set(item.value, item);
+                }
+            }
+        }
+        return map;
+    }, [allItems, lookupItems]);
     const creatableInput = useCreatable(props, allItems, itemByValue);
     const { inputValue, onInputValueChange } = useMenulistFilterInput(props, {
         inputValue: creatableInput.inputValue,

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1786537581701 || Date.now(),
-    VERSION: "23.0.20" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1787139899825 || Date.now(),
+    VERSION: "23.0.21" || '--current-version--',
 };