@adaptabletools/adaptable 23.0.8-canary.0 → 23.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "23.0.8-canary.0",
+  "version": "23.0.9",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/Api/ColumnApi.d.ts

@@ -330,6 +330,13 @@ export interface ColumnApi {
      * @param columnId Column to use
      */
     getAGGridColDefForColumnId(columnId: string): ColDef | ColGroupDef;
+    /**
+     * Returns the AdapTable Column that maps to a given AG Grid ColDef
+     *
+     * The ColDef is matched to a Column by `colId` (falling back to `field`), mirroring how AG Grid derives a Column's `colId`
+     * @param colDef AG Grid ColDef to look up
+     */
+    getColumnForColDef(colDef: ColDef): AdaptableColumn | undefined;
     /**
      * Returns the AG Grid Column for a given ColumnId
      * @param columnId Column to use

package/src/Api/Implementation/ColumnApiImpl.d.ts

@@ -89,6 +89,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getRowGroupedColumns(): AdaptableColumn[];
     setColumnCaption(columnId: string, caption: string): void;
     getAGGridColDefForColumnId(columnId: string): ColDef | ColGroupDef;
+    getColumnForColDef(colDef: ColDef): AdaptableColumn | undefined;
     getAGGridColumnForColumnId(columnId: string): Column;
     hasColumnType(columnIdentifier: string | ColDef, columnType: string): boolean;
     getColumnSummaryForColumnId(columnId: string): AdaptableColumnSummary;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -522,6 +522,16 @@ export class ColumnApiImpl extends ApiBase {
     getAGGridColDefForColumnId(columnId) {
         return this.getAgGridApi().getColumnDef(columnId);
     }
+    getColumnForColDef(colDef) {
+        if (!colDef) {
+            return undefined;
+        }
+        const candidateColumnId = colDef.colId ?? colDef.field;
+        if (candidateColumnId == undefined) {
+            return undefined;
+        }
+        return this.getColumnWithColumnId(candidateColumnId, false);
+    }
     getAGGridColumnForColumnId(columnId) {
         return this.getAgGridApi().getColumn(columnId);
     }

package/src/components/Combobox/index.js

@@ -104,6 +104,10 @@ const AdaptableCombobox_Root = (props) => {
             eventDetails.cancel?.();
             return;
         }
+        if (props.searchable === 'menulist' && eventDetails?.reason === 'input-clear' && props.open) {
+            eventDetails.cancel?.();
+            return;
+        }
         props.onInputValueChange?.(next);
     };
     let comboboxItems = props.groups ?? props.items;
@@ -122,6 +126,21 @@ const AdaptableCombobox_Root = (props) => {
     }
     return (_jsx(Combobox, { ...props, items: comboboxItems, isItemEqualToValue: isItemEqualToValue, itemToStringLabel: getItemTextLabel, value: internalValue, defaultValue: internalDefaultValue, onValueChange: handleValueChange, onInputValueChange: handleInputValueChange, "aria-label": props.ariaLabel || props['aria-label'], "data-name": props['data-name'], disabled: props.disabled, open: props.open, onOpenChange: props.onOpenChange, multiple: props.multiple, filter: props.filter, autoHighlight: true, children: props.children }));
 };
+const useMenulistFilterInput = (props, creatableInput) => {
+    const isMenulistFilter = props.searchable === 'menulist' && !props.isCreatable;
+    const [filterValue, setFilterValue] = React.useState(props.inputValue ?? props.defaultInputValue ?? '');
+    if (!isMenulistFilter) {
+        return creatableInput;
+    }
+    const inputValue = props.inputValue !== undefined ? props.inputValue : filterValue;
+    const onInputValueChange = (value) => {
+        if (props.inputValue === undefined) {
+            setFilterValue(value);
+        }
+        props.onInputValueChange?.(value);
+    };
+    return { inputValue, onInputValueChange };
+};
 const useGetAllItems = (props) => {
     const allItems = props.groups
         ? props.groups.flatMap((g) => g.items)
@@ -132,7 +151,12 @@ const useGetAllItems = (props) => {
     const itemByValue = useMemo(() => {
         return new Map(allItems.map((item) => [item.value, item]));
     }, [allItems]);
-    const { inputValue, onInputValueChange, onValueChange, value } = useCreatable(props, allItems, itemByValue);
+    const creatableInput = useCreatable(props, allItems, itemByValue);
+    const { inputValue, onInputValueChange } = useMenulistFilterInput(props, {
+        inputValue: creatableInput.inputValue,
+        onInputValueChange: creatableInput.onInputValueChange,
+    });
+    const { onValueChange, value } = creatableInput;
     return {
         value,
         itemByValue,

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: 1783187213468 || Date.now(),
-    VERSION: "23.0.8-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1783674285163 || Date.now(),
+    VERSION: "23.0.9" || '--current-version--',
 };