@adaptabletools/adaptable-cjs 20.0.0-canary.22 → 20.0.0-canary.24

package/src/agGrid/AgGridAdapter.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgGridAdapter = void 0;
 const tslib_1 = require("tslib");
 const ag_grid_enterprise_1 = require("ag-grid-enterprise");
-const AdaptableColumn_1 = require("../PredefinedConfig/Common/AdaptableColumn");
+const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
-const Uuid_1 = require("../PredefinedConfig/Uuid");
+const Uuid_1 = require("../AdaptableState/Uuid");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const agGridModules_1 = require("./agGridModules");
@@ -172,39 +172,17 @@ class AgGridAdapter {
         return this.agGridOptionsService.getUserGridOptionsProperty(propertyName);
     }
     updateColumnFilterActiveState() {
+        const filteredCols = new Set();
         const columnFilters = this.adaptableApi.filterApi.columnFilterApi.getActiveColumnFilters();
-        const activeFilters = columnFilters?.filter?.((columnFilter) => this.adaptableApi.filterApi.columnFilterApi.isColumnFilterActive(columnFilter));
-        const isFilterActive = ArrayExtensions_1.default.IsNotNullOrEmpty(activeFilters);
-        const columnsWithActiveFilters = {};
-        if (isFilterActive) {
-            // used in particular at init time to show the filter icon correctly
-            for (const colFilter of activeFilters) {
-                // AG Grid exposes the Column interface, but we need the AG Column class
-                const agGridCol = this.getAgGridApi().getColumn(colFilter.ColumnId);
-                if (agGridCol) {
-                    columnsWithActiveFilters[agGridCol.getColId()] = true;
-                    if (!agGridCol.isFilterActive()) {
-                        // FIXME AFL: changed from fn call; is this enough?
-                        agGridCol.filterActive = true;
-                    }
-                }
-            }
-        }
-        const agFilterModel = this.getAgGridApi().getFilterModel();
-        // AG Grid exposes the Column interface, but we need the AG Column class
-        (this.getAgGridApi().getColumns() || []).forEach((col) => {
-            /**
-             * When AG Grid filters are used active state should not be removed for all columns.
-             * Need to check if the column has a filter model.
-             */
-            const isColumnInFilterModel = agFilterModel && agFilterModel[col.getColId()];
-            if (!isColumnInFilterModel &&
-                !columnsWithActiveFilters[col.getColId()] &&
-                col.isFilterActive()) {
-                // FIXME AFL: changed from fn call; is this enough?
-                col.filterActive = false;
+        columnFilters?.forEach?.((columnFilter) => {
+            if (this.adaptableApi.filterApi.columnFilterApi.isColumnFilterActive(columnFilter)) {
+                filteredCols.add(columnFilter.ColumnId);
             }
         });
+        const agGridApi = this.getAgGridApi();
+        (agGridApi.getColumns() || []).forEach((col) => {
+            col.filterActive = filteredCols.has(col.getColId());
+        });
     }
     getColumnDefinitionsInclSpecialColumns(agGridColDefs) {
         const allColDefs = this.enhanceColDefsWithSpecialColumns(agGridColDefs ?? this.getAgGridApi().getColumnDefs());

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { ColumnSetupInfo } from '../PredefinedConfig/Common/ColumnSetupInfo';
+import { ColumnSetupInfo } from '../AdaptableState/Common/ColumnSetupInfo';
 import { ColDef, ColGroupDef, Column, GridOptions } from 'ag-grid-enterprise';
-import { AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumnDataType } from '../AdaptableState/Common/AdaptableColumn';
 import { AdaptableVariant } from '../AdaptableInterfaces/IAdaptable';
 export declare function getEditorForColumnDataType(columnDataType: AdaptableColumnDataType, variant: AdaptableVariant): ColDef['cellEditor'];
 export declare class AgGridColumnAdapter {
@@ -23,7 +23,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnCellEditor;
     private setupColumnCellRenderer;
     private setupColumnTooltipValueGetter;
-    private setupColumnQuickFilerText;
+    private setupColumnQuickFilterText;
     private setupColumnAllowedAggFuncs;
     private setupColumnType;
     private setupColumnCellDataType;

package/src/agGrid/AgGridColumnAdapter.js

@@ -7,7 +7,7 @@ const FilterWrapper_1 = require("./FilterWrapper");
 const FloatingFilterWrapper_1 = require("./FloatingFilterWrapper");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
-const AdaptableColumn_1 = require("../PredefinedConfig/Common/AdaptableColumn");
+const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const PercentBarRenderer_1 = require("./cellRenderers/PercentBarRenderer");
@@ -140,7 +140,7 @@ class AgGridColumnAdapter {
             this.setupColumnComparator(colSetupInfo);
             this.setupColumnCellEditor(colSetupInfo);
             this.setupColumnHeader(colSetupInfo);
-            this.setupColumnQuickFilerText(colSetupInfo);
+            this.setupColumnQuickFilterText(colSetupInfo);
             this.setupColumnAllowedAggFuncs(colSetupInfo);
             this.setupColumnType(colSetupInfo);
             this.setupColumnCellDataType(colSetupInfo);
@@ -162,7 +162,7 @@ class AgGridColumnAdapter {
                 if (!gridCell.column) {
                     return null;
                 }
-                // if a Visual Data export is in progress, we are interested only in the Excel Style Class
+                // if a VisualExcel report format export is in progress, we are interested only in the Excel Style Class
                 if (this.adaptableApi.exportApi.internalApi.isVisualDataExportInProgress()) {
                     const userDefinedCellClass = typeof userCellClass === 'function' ? userCellClass(params) : userCellClass;
                     const cellClassKey = AgGridExportAdapter_1.AgGridExportAdapter.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
@@ -330,7 +330,7 @@ class AgGridColumnAdapter {
             }
         });
     }
-    setupColumnQuickFilerText({ col, abColumn }) {
+    setupColumnQuickFilterText({ col, abColumn }) {
         this.setColDefProperty(col, 'getQuickFilterText', (userGetQuickFilterText) => {
             if (userGetQuickFilterText) {
                 return userGetQuickFilterText;

package/src/agGrid/AgGridExportAdapter.d.ts

@@ -1,8 +1,8 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { Report, ReportFormatType } from '../PredefinedConfig/ExportState';
+import { Report, ReportFormatType } from '../AdaptableState/ExportState';
 import { CsvExportParams, ExcelExportParams, ExcelStyle } from 'ag-grid-enterprise';
 import { ExportDestinationType, ExportResultData } from '../AdaptableOptions/ExportOptions';
-import { Layout } from '../PredefinedConfig/LayoutState';
+import { Layout } from '../AdaptableState/LayoutState';
 export interface ExportConfig {
     report: Report;
     format: ReportFormatType;

package/src/agGrid/AgGridExportAdapter.js

@@ -8,7 +8,7 @@ const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const FormatHelper_1 = require("../Utilities/Helpers/FormatHelper");
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
-const Uuid_1 = require("../PredefinedConfig/Uuid");
+const Uuid_1 = require("../AdaptableState/Uuid");
 const udsv_1 = require("udsv");
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 class AgGridExportAdapter {

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { DefaultMenuItem, GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, MenuItemDef } from 'ag-grid-enterprise';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { AdaptableMenuItem } from '../AdaptableState/Common/Menu';
 export declare class AgGridMenuAdapter {
     private _adaptableInstance;
     constructor(_adaptableInstance: AdaptableAgGrid);

package/src/agGrid/AgGridThemeAdapter.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { AgGridThemeMode } from './AgGridAdapter';
-import { AdaptableTheme } from '../PredefinedConfig/ThemeState';
+import { AdaptableTheme } from '../AdaptableState/ThemeState';
 export declare class AgGridThemeAdapter {
     private _adaptableInstance;
     private agGridThemeMode;

package/src/agGrid/FilterWrapper.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterWrapperFactory = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const react_1 = require("react");
 const AdaptableColumnFilter_1 = require("../View/Components/ColumnFilter/AdaptableColumnFilter");
 const renderWithAdaptableContext_1 = require("../View/renderWithAdaptableContext");
 const FilterWrapperFactory = (adaptable) => {
@@ -13,9 +12,7 @@ const FilterWrapperFactory = (adaptable) => {
             return false;
         }
         //make the small filter icon to appear when there is a filter
-        return (adaptable.api.filterApi.columnFilterApi
-            .getColumnFilters()
-            .findIndex((x) => x.ColumnId == colId) > -1);
+        return adaptable.api.filterApi.columnFilterApi.isColumnFilterActiveForColumn(colId);
     }
     function getFilterProps(colId, hidePopup) {
         let column = adaptable.api.columnApi.getColumnWithColumnId(colId);
@@ -30,35 +27,62 @@ const FilterWrapperFactory = (adaptable) => {
         return 'filter_' + colId + '_' + adaptable.adaptableOptions.adaptableId;
     }
     if (adaptable.variant === 'react') {
-        return (0, react_1.forwardRef)(function ReactFilterWrapper(props, ref) {
-            const [filterProps, setFilterProps] = (0, react_1.useState)(null);
-            const colId = props.column.getId();
-            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
-            const afterGuidAttached = React.useCallback((params) => {
-                const hidePopup = params?.hidePopup ?? null;
-                const filterProps = getFilterProps(colId, !!hidePopup);
-                setFilterProps(filterProps);
-            }, [colId]);
-            React.useEffect(() => {
-                afterGuidAttached();
-            }, []);
-            (0, react_1.useImperativeHandle)(ref, () => {
-                return {
-                    isFilterActive: () => isFilterActive(colId),
-                    // left here for backward compatibility
-                    afterGuidAttached,
-                    getModel: () => { },
-                    setModel: () => { },
-                    //we do not filter here.... we filter using the doesExternalFilterPass. Not sure there is a difference....
-                    doesFilterPass: () => true,
-                };
-            });
-            if (!column || !filterProps) {
-                return null;
-            }
-            return (0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement("div", { id: getContainerId(colId) },
-                React.createElement(AdaptableColumnFilter_1.AdaptableColumnFilter, { wrapperProps: { p: 2 }, columnId: filterProps.Column.columnId })), adaptable);
-        });
+        // We used to have the implementation below. However, for updating the filtered/not filtered state of the column
+        // we have to call the onModelChange function, and also provide the doesFilterPass function.
+        // starting with version 33 of AG Grid, the doesFilterPass has to be passed to the `useGridFilter` hook
+        // which needs to be imported from 'ag-grid-react' - see https://www.ag-grid.com/react-data-grid/component-filter/#implementing-a-filter-component
+        // but since Adaptable cannot depend on 'ag-grid-react' directly, we can't use a React component anymore
+        // so we simply return the same implementation as the vanilla version
+        // and comment out the implementation below
+        //
+        // return forwardRef(function ReactFilterWrapper(
+        //   props: {
+        //     column: Column;
+        //     onModelChange: (model: any) => void;
+        //   },
+        //   ref
+        // ) {
+        //   const [filterProps, setFilterProps] = useState<ColumnFilterProps | null>(null);
+        //   const colId = props.column.getId();
+        //   const column: AdaptableColumn | undefined =
+        //     adaptable.api.columnApi.getColumnWithColumnId(colId);
+        //   const afterGuidAttached = React.useCallback(
+        //     (params?: { hidePopup?: Function }) => {
+        //       const hidePopup = params?.hidePopup ?? null;
+        //       const filterProps = getFilterProps(colId, !!hidePopup);
+        //       setFilterProps(filterProps);
+        //     },
+        //     [colId]
+        //   );
+        //   const notifyModel = getNotifyModel(colId, props.onModelChange);
+        //   React.useEffect(() => {
+        //     afterGuidAttached();
+        //   }, []);
+        //   useImperativeHandle(ref, () => {
+        //     return {
+        //       isFilterActive: () => isFilterActive(colId),
+        //       // left here for backward compatibility
+        //       afterGuidAttached,
+        //       // getModel: () => {},
+        //       // setModel: () => {},
+        //       //we do not filter here.... we filter using the doesExternalFilterPass. Not sure there is a difference....
+        //       doesFilterPass: () => true,
+        //     };
+        //   });
+        //   if (!column || !filterProps) {
+        //     return null;
+        //   }
+        //   return renderWithAdaptableContext(
+        //     <div id={getContainerId(colId)}>
+        //       <AdaptableColumnFilter
+        //         wrapperProps={{ p: 2 }}
+        //         columnId={filterProps.Column.columnId}
+        //         onChange={notifyModel}
+        //       />
+        //     </div>,
+        //     adaptable
+        //   );
+        // });
     }
     return class FilterWrapper {
         init(params) {
@@ -86,11 +110,16 @@ const FilterWrapperFactory = (adaptable) => {
         afterGuiAttached(params) {
             //we always unmount first so the autofocus from the form works... in other grids we unmount when hidden
             this.unmountReactRoot?.();
-            let column = adaptable.api.columnApi.getColumnWithColumnId(this.column.getColId());
+            const columnId = this.column.getColId();
+            let column = adaptable.api.columnApi.getColumnWithColumnId(columnId);
+            // for whatever reason, it works without this
+            // const notifyModel = getNotifyModel(colId, this.params.filterChangedCallback);
             if (column) {
                 this.unmountReactRoot = adaptable.renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(AdaptableColumnFilter_1.AdaptableColumnFilter, {
-                    columnId: this.column.getColId(),
+                    columnId,
                     wrapperProps: { p: 2 },
+                    // for whatever reason, it works without this
+                    // onChange: notifyModel,
                 }), adaptable), 
                 // AdaptableColumnFilter(filterProps),
                 this.filterContainer);

package/src/agGrid/FloatingFilterWrapper.js

@@ -6,6 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const renderWithAdaptableContext_1 = require("../View/renderWithAdaptableContext");
 const AdaptableFloatingFilter_1 = require("../View/Components/ColumnFilter/AdaptableFloatingFilter");
+const getAgGridFilterNotifyModelFn_1 = require("./getAgGridFilterNotifyModelFn");
 const filterContainerStyle = {
     overflow: 'hidden',
     minWidth: '0',
@@ -28,6 +29,9 @@ const FloatingFilterWrapperFactory = (adaptable) => {
         };
         return columnFilterProps;
     }
+    function getNotifyModel(colId, onModelChange) {
+        return (0, getAgGridFilterNotifyModelFn_1.getAgGridFilterNotifyModelFn)(adaptableApi, colId, onModelChange);
+    }
     function patchParentElement(filterContainer) {
         if (filterContainer) {
             // todo: consider theme
@@ -58,17 +62,19 @@ const FloatingFilterWrapperFactory = (adaptable) => {
     if (adaptable.variant === 'react') {
         return (0, react_1.forwardRef)(function ReactFloatingFilterWrapper(props, ref) {
             const colId = props.column.getId();
+            const { onModelChange } = props;
             const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
             (0, react_1.useImperativeHandle)(ref, () => {
                 return {
                     onParentModelChanged() { },
                 };
             });
+            const notifyModel = getNotifyModel(colId, onModelChange);
             if (!column) {
                 return null;
             }
             return (0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement("div", { ref: patchParentElement, id: getContainerId(colId), style: filterContainerStyle },
-                React.createElement(AdaptableFloatingFilter_1.AdaptableFloatingFilter, { ...getFilterProps(colId) })), adaptable);
+                React.createElement(AdaptableFloatingFilter_1.AdaptableFloatingFilter, { ...getFilterProps(colId), onChange: notifyModel, onClear: notifyModel })), adaptable);
         });
     }
     return class FloatingFilterWrapper {
@@ -86,10 +92,15 @@ const FloatingFilterWrapperFactory = (adaptable) => {
                 //@ts-ignore
                 this.filterContainer.style[key] = filterContainerStyle[key];
             });
+            const notifyModel = getNotifyModel(colId, params.filterParams.filterChangedCallback);
             const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
             if (column) {
                 const filterProps = getFilterProps(colId);
-                this.unmountReactRoot = adaptable.renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(AdaptableFloatingFilter_1.AdaptableFloatingFilter, filterProps), adaptable), this.filterContainer);
+                this.unmountReactRoot = adaptable.renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(AdaptableFloatingFilter_1.AdaptableFloatingFilter, {
+                    ...filterProps,
+                    onChange: notifyModel,
+                    onClear: notifyModel,
+                }), adaptable), this.filterContainer);
             }
         }
         getGui() {

package/src/agGrid/agGridDataTypeDefinitions.d.ts

@@ -1,5 +1,5 @@
 import { GridOptions } from 'ag-grid-enterprise';
-import { AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumnDataType } from '../AdaptableState/Common/AdaptableColumn';
 export declare const TEXT_ARRAY_DATA_TYPE: AdaptableColumnDataType;
 export declare const NUMBER_ARRAY_DATA_TYPE: AdaptableColumnDataType;
 export declare const TUPLE_ARRAY_DATA_TYPE: AdaptableColumnDataType;

package/src/agGrid/cellRenderers/BadgeRenderer.d.ts

@@ -1,4 +1,4 @@
-import { BadgeStyle } from '../../PredefinedConfig/StyledColumnState';
+import { BadgeStyle } from '../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 export declare const getBadgeRendererForColumn: (badgeStyle: BadgeStyle, abColumn: AdaptableColumn, api: AdaptableApi) => any;

package/src/agGrid/cellRenderers/PercentBarRenderer.d.ts

@@ -1,4 +1,4 @@
-import { StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 export declare const getPercentBarRendererForColumn: (styledColumn: StyledColumn, abColumn: AdaptableColumn, api: AdaptableApi) => any;

package/src/agGrid/getAgGridFilterNotifyModelFn.d.ts

@@ -0,0 +1,2 @@
+import { AdaptableApi } from '../types';
+export declare function getAgGridFilterNotifyModelFn(adaptableApi: AdaptableApi, colId: string, onModelChange: (model: any) => void): () => void;

package/src/agGrid/getAgGridFilterNotifyModelFn.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAgGridFilterNotifyModelFn = void 0;
+function getAgGridFilterNotifyModelFn(adaptableApi, colId, onModelChange) {
+    const notifyModel = () => {
+        const isActive = adaptableApi.filterApi.columnFilterApi.isColumnFilterActiveForColumn(colId);
+        // call it with non null to indicate that the filter is active
+        // call it with null to indicate that the filter is not active
+        // as per the AG Grid documentation
+        onModelChange(isActive ? true : null);
+    };
+    return notifyModel;
+}
+exports.getAgGridFilterNotifyModelFn = getAgGridFilterNotifyModelFn;

package/src/components/AdaptableFormComponent/AdaptableFormComponent.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { AdaptableFormData, AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
+import { AdaptableFormData, AdaptableForm } from '../../AdaptableState/Common/AdaptableForm';
 import { SimpleButtonProps } from '../SimpleButton';
 import { BaseContext } from '../../types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 interface AdaptableFormComponentProps {
     formDef: AdaptableForm<BaseContext>;
     data: AdaptableFormData;

package/src/components/Dashboard/DashboardManager.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { DashboardTab } from '../../PredefinedConfig/DashboardState';
-import { AdaptableDashboardToolbar } from '../../PredefinedConfig/Common/Types';
+import { DashboardTab } from '../../AdaptableState/DashboardState';
+import { AdaptableDashboardToolbar } from '../../AdaptableState/Common/Types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 export interface DashboardToolbar {
     Id: AdaptableDashboardToolbar | string;

package/src/components/Dashboard/DashboardToolbar.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
-import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
 export type DashboardToolbarProps = {
     className?: string;
     title: string;

package/src/components/ExpressionEditor/EditorInput.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 interface EditorInputProps {
     type: 'boolean' | 'scalar' | 'aggregatedScalar' | 'cumulativeAggregatedScalar' | 'quantileAggregatedScalar';
     module: AdaptableModule;

package/src/components/ExpressionEditor/EditorInputWithWhereClause.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 interface EditorInputWithWhereClauseProps {
     type: 'observable' | 'aggregatedBoolean';
     module: AdaptableModule;

package/src/components/Icon/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableElementIcon, AdaptableCustomIcon, AdaptableIcon, AdaptableSystemIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableElementIcon, AdaptableCustomIcon, AdaptableIcon, AdaptableSystemIcon } from '../../AdaptableState/Common/AdaptableIcon';
 export interface IconComponentProps {
     icon: AdaptableIcon;
     iconClassName?: string;

package/src/components/Select/Select.js

@@ -202,20 +202,36 @@ const Select = function (props) {
             const { setValue, getValue, focusedOption, options, selectProps } = props;
             const { filterOption, inputValue, options: selectOptions, isLoading } = selectProps;
             const filterFunction = React.useCallback(({ data }) => filterOption({ data, label: `${data.label}`, value: data.value }, inputValue), [filterOption, inputValue]);
+            const hasFilter = inputValue !== '';
+            const filteredOptionsValues = new Set();
+            const filteredOptions = !hasFilter
+                ? options
+                : options.filter((data) => {
+                    const included = filterOption({ data, label: `${data.label}`, value: data.value }, inputValue);
+                    if (included) {
+                        filteredOptionsValues.add(data.value);
+                    }
+                    return included;
+                });
             const focusedOptionIndex = options
                 .filter((option) => filterFunction({ data: option }))
                 .indexOf(focusedOption);
+            const valueStr = getValue()
+                .map((option) => option.value)
+                .join(',');
             const selectedRows = (0, react_1.useMemo)(() => {
                 const selectedRows = [];
+                // we build the Infinite Table selection
                 getValue().forEach((option) => {
-                    selectedRows.push(option.value);
+                    // if there are no filters, include everything that is in the value
+                    // but if there is a filter (which will be smaller than the current value)
+                    // only include the current options that match the filter
+                    if (!hasFilter || filteredOptionsValues.has(option.value)) {
+                        selectedRows.push(option.value);
+                    }
                 });
                 return selectedRows;
-            }, [
-                getValue()
-                    .map((option) => option.value)
-                    .join(','),
-            ]);
+            }, [valueStr, inputValue, hasFilter]);
             const rowSelection = React.useMemo(() => {
                 return isMulti
                     ? {
@@ -228,24 +244,74 @@ const Select = function (props) {
             const onRowSelectionChange = React.useCallback((selectionParams) => {
                 let selection = [];
                 const { selectedRows, defaultSelection, deselectedRows } = selectionParams;
-                if (defaultSelection === true && deselectedRows.length === 0) {
-                    // all selected
-                    selection = options.map((option) => {
-                        return { value: option.value };
-                    });
-                }
-                else if (defaultSelection === false && selectedRows.length === 0) {
-                    // none selected
-                    selection = [];
+                if (hasFilter) {
+                    if (defaultSelection === true && deselectedRows.length === 0) {
+                        // all selected
+                        const currentValue = getValue();
+                        const includedKeys = new Set();
+                        // add all the options that are in the current value
+                        selection = currentValue.map((option) => {
+                            includedKeys.add(option.value);
+                            return option;
+                        });
+                        // also add all the options that match the filter
+                        filteredOptions.forEach((option) => {
+                            // make sure you don't add the same option twice
+                            if (!includedKeys.has(option.value)) {
+                                selection.push({ value: option.value });
+                            }
+                        });
+                    }
+                    else if (defaultSelection === false && selectedRows.length === 0) {
+                        // we need to clear the selection
+                        // but we have a filter, so we need to clear only those options that are included in the filter
+                        // and leave the rest
+                        const currentValue = getValue();
+                        selection = currentValue.filter((row) => !filteredOptionsValues.has(row.value));
+                    }
+                    else {
+                        // some selected
+                        const currentValue = getValue();
+                        const includedKeys = new Set();
+                        // start with an empty selection
+                        selection = [];
+                        // add those in the value that are not in the filter
+                        selection = currentValue.filter((row) => {
+                            const res = !filteredOptionsValues.has(row.value);
+                            if (res) {
+                                includedKeys.add(row.value);
+                            }
+                            return res;
+                        });
+                        // and now also add those in the filter that are actually selected
+                        selectedRows.forEach((row) => {
+                            if (!includedKeys.has(row)) {
+                                selection.push({ value: row });
+                            }
+                        });
+                    }
                 }
                 else {
-                    selection = selectedRows.map((row) => {
-                        return { value: row };
-                    });
+                    if (defaultSelection === true && deselectedRows.length === 0) {
+                        // all selected
+                        selection = options.map((option) => {
+                            return { value: option.value };
+                        });
+                    }
+                    else if (defaultSelection === false && selectedRows.length === 0) {
+                        // none selected
+                        selection = [];
+                    }
+                    else {
+                        // some selected
+                        selection = selectedRows.map((row) => {
+                            return { value: row };
+                        });
+                    }
                 }
                 //@ts-ignore
                 setValue(selection, 'select-option');
-            }, [setValue]);
+            }, [setValue, filterOption, inputValue, hasFilter, filteredOptions, rowSelection, valueStr]);
             const onSingleRowSelectionChange = React.useCallback((value) => {
                 if (value == undefined && rowSelection != undefined) {
                     return;
@@ -263,9 +329,11 @@ const Select = function (props) {
             }, []);
             return (React.createElement(infinite_react_1.DataSource, { 
                 // @ts-ignore
-                data: props.options, primaryKey: "value", selectionMode: isMulti ? 'multi-row' : 'single-row', 
+                // data={props.options}
+                // @ts-ignore
+                data: filteredOptions, primaryKey: "value", selectionMode: isMulti ? 'multi-row' : 'single-row', 
                 // @ts-ignore
-                onRowSelectionChange: isLoading ? null : isMulti ? onRowSelectionChange : onSingleRowSelectionChange, rowSelection: rowSelection, filterFunction: filterFunction, isRowDisabled: isRowDisabled },
+                onRowSelectionChange: isLoading ? null : isMulti ? onRowSelectionChange : onSingleRowSelectionChange, rowSelection: rowSelection, isRowDisabled: isRowDisabled },
                 React.createElement(infinite_react_1.InfiniteTable, { header: isMulti && showHeaderSelectionCheckbox ? true : false, rowClassName: rowClassName, showZebraRows: false, onCellClick: isLoading ? null : onCellClick, keyboardNavigation: isLoading ? false : 'row', activeRowIndex: focusedOptionIndex, keyboardSelection: true, rowHeight: ROW_HEIGHT, columns: isMulti ? INFINITE_COLUMNS_WITH_CHECKBOX : INFINITE_COLUMNS_WITH_RADIO, domProps: INFINITE_DOM_PROPS })));
         };
     }, [isMulti, showHeaderSelectionCheckbox]);
@@ -288,7 +356,12 @@ const Select = function (props) {
         // This needed so the menu is not clipped by overflow: hidden
         menuPortalTarget: props.menuPortalTarget === undefined ? document.body : null, isClearable: props.isClearable, closeMenuOnSelect: props.closeMenuOnSelect, onChange: (option) => {
             if (isMulti) {
-                props.onChange(option.map((x) => x?.value));
+                const value = option.map((x) => x?.value);
+                props.onChange(value);
+                // ensure element keeps focus
+                requestAnimationFrame(() => {
+                    ref.current?.focus();
+                });
             }
             else {
                 props.onChange(option?.value);

package/src/components/SimpleButton/index.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { ButtonProps } from 'rebass';
 import { ReactNode } from 'react';
-import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
-import { AdaptableIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
+import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
+import { AdaptableIcon } from '../../AdaptableState/Common/AdaptableIcon';
 export declare const baseClassName = "ab-SimpleButton";
 export interface SimpleButtonProps extends Omit<ButtonProps, 'ref'> {
     tooltip?: string;