@adaptabletools/adaptable-cjs 20.1.4 → 20.1.6

package/src/Api/Implementation/LayoutHelpers.js

@@ -15,11 +15,11 @@ const layoutStateToLayoutModel = (layout) => {
     return (0, exports.tableLayoutToTableLayoutModel)(layout);
 };
 exports.layoutStateToLayoutModel = layoutStateToLayoutModel;
-const layoutModelToLayoutState = (layoutModel, defaults) => {
+const layoutModelToLayoutState = (layoutModel) => {
     if ((0, isPivotLayoutModel_1.isPivotLayoutModel)(layoutModel)) {
-        return (0, exports.pivotLayoutModelToPivotLayout)(layoutModel, defaults);
+        return (0, exports.pivotLayoutModelToPivotLayout)(layoutModel);
     }
-    return (0, exports.tableLayoutModelToTableLayout)(layoutModel, defaults);
+    return (0, exports.tableLayoutModelToTableLayout)(layoutModel);
 };
 exports.layoutModelToLayoutState = layoutModelToLayoutState;
 function cleanupAdaptableObjectPrimitives(layout) {
@@ -53,56 +53,16 @@ const normalizeLayout = (layout, options) => {
 };
 exports.normalizeLayout = normalizeLayout;
 const normalizeTableLayout = (tableLayout, options) => {
-    const Source = tableLayout.Source;
-    const Uuid = tableLayout.Uuid;
-    const AdaptableVersion = tableLayout.AdaptableVersion;
-    const ColumnFilters = tableLayout.ColumnFilters;
-    const GridFilter = tableLayout.GridFilter;
     let model = (0, exports.tableLayoutToTableLayoutModel)(tableLayout);
     model = (0, normalizeLayoutModel_1.normalizeTableLayoutModel)(model, options);
-    tableLayout = (0, exports.tableLayoutModelToTableLayout)(model, tableLayout);
-    if (Source) {
-        tableLayout.Source = Source;
-    }
-    if (Uuid) {
-        tableLayout.Uuid = Uuid;
-    }
-    if (AdaptableVersion) {
-        tableLayout.AdaptableVersion = AdaptableVersion;
-    }
-    if (ColumnFilters) {
-        tableLayout.ColumnFilters = ColumnFilters;
-    }
-    if (GridFilter) {
-        tableLayout.GridFilter = GridFilter;
-    }
+    tableLayout = (0, exports.tableLayoutModelToTableLayout)(model);
     return tableLayout;
 };
 exports.normalizeTableLayout = normalizeTableLayout;
 const normalizePivotLayout = (pivotLayout) => {
-    const Source = pivotLayout.Source;
-    const Uuid = pivotLayout.Uuid;
-    const AdaptableVersion = pivotLayout.AdaptableVersion;
-    const ColumnFilters = pivotLayout.ColumnFilters;
-    const GridFilter = pivotLayout.GridFilter;
     let model = (0, exports.pivotLayoutToPivotLayoutModel)(pivotLayout);
     model = (0, normalizeLayoutModel_1.normalizePivotLayoutModel)(model);
-    pivotLayout = (0, exports.pivotLayoutModelToPivotLayout)(model, pivotLayout);
-    if (Source) {
-        pivotLayout.Source = Source;
-    }
-    if (Uuid) {
-        pivotLayout.Uuid = Uuid;
-    }
-    if (AdaptableVersion) {
-        pivotLayout.AdaptableVersion = AdaptableVersion;
-    }
-    if (ColumnFilters) {
-        pivotLayout.ColumnFilters = ColumnFilters;
-    }
-    if (GridFilter) {
-        pivotLayout.GridFilter = GridFilter;
-    }
+    pivotLayout = (0, exports.pivotLayoutModelToPivotLayout)(model);
     return pivotLayout;
 };
 exports.normalizePivotLayout = normalizePivotLayout;
@@ -133,15 +93,6 @@ exports.checkForDuplicateColumns = checkForDuplicateColumns;
 const tableLayoutToTableLayoutModel = (tableLayout) => {
     tableLayout = structuredClone(tableLayout);
     cleanupAdaptableObjectPrimitives(tableLayout);
-    if (tableLayout.RowGroupValues) {
-        // @ts-ignore
-        delete tableLayout.RowGroupValues.Source;
-        // @ts-ignore
-        delete tableLayout.RowGroupValues.Uuid;
-        // @ts-ignore
-        delete tableLayout.RowGroupValues.AdaptableVersion;
-    }
-    delete tableLayout.ColumnHeaders;
     const TableAggregationColumns = (tableLayout.TableAggregationColumns || []).map(({ ColumnId, AggFunc }) => {
         return {
             ColumnId,
@@ -149,12 +100,12 @@ const tableLayoutToTableLayoutModel = (tableLayout) => {
         };
     });
     const result = (0, simplifyLayoutModel_1.simplifyTableLayoutModel)({
+        Ignore_Name: tableLayout.Name,
         SuppressAggFuncInHeader: tableLayout.SuppressAggFuncInHeader,
         TableColumns: tableLayout.TableColumns,
         ColumnWidths: tableLayout.ColumnWidths,
         ColumnVisibility: tableLayout.ColumnVisibility,
         ColumnSorts: tableLayout.ColumnSorts,
-        // ColumnHeaders: tableLayout.ColumnHeaders,
         RowGroupedColumns: tableLayout.RowGroupedColumns,
         ColumnPinning: tableLayout.ColumnPinning,
         RowGroupValues: tableLayout.RowGroupValues
@@ -175,10 +126,34 @@ const tableLayoutToTableLayoutModel = (tableLayout) => {
         result.RowGroupDisplayType = tableLayout.RowGroupDisplayType;
     }
     if (tableLayout.ColumnFilters) {
-        result.ColumnFilters = tableLayout.ColumnFilters;
+        result.Ignore_ColumnFilters = tableLayout.ColumnFilters;
     }
     if (tableLayout.GridFilter) {
-        result.GridFilter = tableLayout.GridFilter;
+        result.Ignore_GridFilter = tableLayout.GridFilter;
+    }
+    if (tableLayout.ColumnHeaders) {
+        result.Ignore_ColumnHeaders = tableLayout.ColumnHeaders;
+    }
+    if (tableLayout.AutoSizeColumns != null) {
+        result.Ignore_AutoSizeColumns = tableLayout.AutoSizeColumns;
+    }
+    if (tableLayout.IsReadOnly != null) {
+        result.Ignore_IsReadOnly = tableLayout.IsReadOnly;
+    }
+    if (tableLayout.Tags) {
+        result.Ignore_Tags = tableLayout.Tags;
+    }
+    if (tableLayout.Source) {
+        result.Ignore_Source = tableLayout.Source;
+    }
+    if (tableLayout.AdaptableVersion) {
+        result.Ignore_AdaptableVersion = tableLayout.AdaptableVersion;
+    }
+    if (tableLayout.Uuid) {
+        result.Ignore_Uuid = tableLayout.Uuid;
+    }
+    if (tableLayout.RowSummaries != null) {
+        result.Ignore_RowSummaries = tableLayout.RowSummaries;
     }
     return result;
 };
@@ -186,8 +161,8 @@ exports.tableLayoutToTableLayoutModel = tableLayoutToTableLayoutModel;
 const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
     pivotLayout = structuredClone(pivotLayout);
     cleanupAdaptableObjectPrimitives(pivotLayout);
-    delete pivotLayout.ColumnHeaders;
     const result = (0, simplifyLayoutModel_1.simplifyPivotLayoutModel)({
+        Ignore_Name: pivotLayout.Name,
         SuppressAggFuncInHeader: pivotLayout.SuppressAggFuncInHeader,
         ColumnWidths: pivotLayout.ColumnWidths,
         ColumnVisibility: pivotLayout.ColumnVisibility,
@@ -219,10 +194,31 @@ const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
             : undefined,
     });
     if (pivotLayout.ColumnFilters) {
-        result.ColumnFilters = pivotLayout.ColumnFilters;
+        result.Ignore_ColumnFilters = pivotLayout.ColumnFilters;
     }
     if (pivotLayout.GridFilter) {
-        result.GridFilter = pivotLayout.GridFilter;
+        result.Ignore_GridFilter = pivotLayout.GridFilter;
+    }
+    if (pivotLayout.ColumnHeaders) {
+        result.Ignore_ColumnHeaders = pivotLayout.ColumnHeaders;
+    }
+    if (pivotLayout.IsReadOnly != null) {
+        result.Ignore_IsReadOnly = pivotLayout.IsReadOnly;
+    }
+    if (pivotLayout.Tags) {
+        result.Ignore_Tags = pivotLayout.Tags;
+    }
+    if (pivotLayout.AutoSizeColumns != null) {
+        result.Ignore_AutoSizeColumns = pivotLayout.AutoSizeColumns;
+    }
+    if (pivotLayout.Source) {
+        result.Ignore_Source = pivotLayout.Source;
+    }
+    if (pivotLayout.AdaptableVersion) {
+        result.Ignore_AdaptableVersion = pivotLayout.AdaptableVersion;
+    }
+    if (pivotLayout.Uuid) {
+        result.Ignore_Uuid = pivotLayout.Uuid;
     }
     return result;
 };
@@ -233,14 +229,47 @@ function toAggFunc(aggFunc) {
     }
     return { aggFunc };
 }
-const tableLayoutModelToTableLayout = (layoutModel, defaults) => {
+const tableLayoutModelToTableLayout = (layoutModel) => {
     const tableLayout = {
-        ...defaults,
+        Name: layoutModel.Ignore_Name,
         TableColumns: layoutModel.TableColumns,
         ColumnWidths: layoutModel.ColumnWidths,
         ColumnVisibility: layoutModel.ColumnVisibility,
         ColumnSorts: layoutModel.ColumnSorts,
     };
+    if (layoutModel.SuppressAggFuncInHeader) {
+        tableLayout.SuppressAggFuncInHeader = layoutModel.SuppressAggFuncInHeader;
+    }
+    if (layoutModel.Ignore_GridFilter) {
+        tableLayout.GridFilter = layoutModel.Ignore_GridFilter;
+    }
+    if (layoutModel.Ignore_ColumnFilters) {
+        tableLayout.ColumnFilters = layoutModel.Ignore_ColumnFilters;
+    }
+    if (layoutModel.Ignore_ColumnHeaders) {
+        tableLayout.ColumnHeaders = layoutModel.Ignore_ColumnHeaders;
+    }
+    if (layoutModel.Ignore_AutoSizeColumns != null) {
+        tableLayout.AutoSizeColumns = layoutModel.Ignore_AutoSizeColumns;
+    }
+    if (layoutModel.Ignore_RowSummaries) {
+        tableLayout.RowSummaries = layoutModel.Ignore_RowSummaries;
+    }
+    if (layoutModel.Ignore_IsReadOnly != null) {
+        tableLayout.IsReadOnly = layoutModel.Ignore_IsReadOnly;
+    }
+    if (layoutModel.Ignore_Tags) {
+        tableLayout.Tags = layoutModel.Ignore_Tags;
+    }
+    if (layoutModel.Ignore_Source) {
+        tableLayout.Source = layoutModel.Ignore_Source;
+    }
+    if (layoutModel.Ignore_AdaptableVersion) {
+        tableLayout.AdaptableVersion = layoutModel.Ignore_AdaptableVersion;
+    }
+    if (layoutModel.Ignore_Uuid) {
+        tableLayout.Uuid = layoutModel.Ignore_Uuid;
+    }
     if (layoutModel.RowGroupDisplayType) {
         tableLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType;
     }
@@ -287,12 +316,6 @@ const tableLayoutModelToTableLayout = (layoutModel, defaults) => {
     else {
         delete tableLayout.GrandTotalRow;
     }
-    if (layoutModel.ColumnFilters) {
-        tableLayout.ColumnFilters = layoutModel.ColumnFilters;
-    }
-    if (layoutModel.GridFilter) {
-        tableLayout.GridFilter = layoutModel.GridFilter;
-    }
     cleanupAdaptableObjectPrimitives(tableLayout);
     return tableLayout;
 };
@@ -307,9 +330,9 @@ function toAggregationColumnValue(columnAggregationModel) {
         }
         : columnAggregationModel.aggFunc;
 }
-const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
+const pivotLayoutModelToPivotLayout = (layoutModel) => {
     const pivotLayout = {
-        ...defaults,
+        Name: layoutModel.Ignore_Name,
         PivotColumns: layoutModel.PivotColumns,
         TableColumns: layoutModel.TableColumns,
         ColumnWidths: layoutModel.ColumnWidths,
@@ -318,6 +341,36 @@ const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
         ColumnPinning: layoutModel.ColumnPinning,
         PivotExpandLevel: layoutModel.PivotExpandLevel,
     };
+    if (layoutModel.SuppressAggFuncInHeader) {
+        pivotLayout.SuppressAggFuncInHeader = layoutModel.SuppressAggFuncInHeader;
+    }
+    if (layoutModel.Ignore_GridFilter) {
+        pivotLayout.GridFilter = layoutModel.Ignore_GridFilter;
+    }
+    if (layoutModel.Ignore_ColumnFilters) {
+        pivotLayout.ColumnFilters = layoutModel.Ignore_ColumnFilters;
+    }
+    if (layoutModel.Ignore_ColumnHeaders) {
+        pivotLayout.ColumnHeaders = layoutModel.Ignore_ColumnHeaders;
+    }
+    if (layoutModel.Ignore_AutoSizeColumns != null) {
+        pivotLayout.AutoSizeColumns = layoutModel.Ignore_AutoSizeColumns;
+    }
+    if (layoutModel.Ignore_IsReadOnly != null) {
+        pivotLayout.IsReadOnly = layoutModel.Ignore_IsReadOnly;
+    }
+    if (layoutModel.Ignore_Tags) {
+        pivotLayout.Tags = layoutModel.Ignore_Tags;
+    }
+    if (layoutModel.Ignore_Source) {
+        pivotLayout.Source = layoutModel.Ignore_Source;
+    }
+    if (layoutModel.Ignore_AdaptableVersion) {
+        pivotLayout.AdaptableVersion = layoutModel.Ignore_AdaptableVersion;
+    }
+    if (layoutModel.Ignore_Uuid) {
+        pivotLayout.Uuid = layoutModel.Ignore_Uuid;
+    }
     if (layoutModel.PivotGroupedColumns) {
         pivotLayout.PivotGroupedColumns = layoutModel.PivotGroupedColumns;
     }
@@ -338,19 +391,19 @@ const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
     else {
         delete pivotLayout.RowGroupValues;
     }
-    if (layoutModel.GrandTotalRow) {
+    if (layoutModel.GrandTotalRow != null) {
         pivotLayout.GrandTotalRow = layoutModel.GrandTotalRow;
     }
     else {
         delete pivotLayout.GrandTotalRow;
     }
-    if (layoutModel.PivotGrandTotal) {
+    if (layoutModel.PivotGrandTotal != null) {
         pivotLayout.PivotGrandTotal = layoutModel.PivotGrandTotal;
     }
     else {
         delete pivotLayout.PivotGrandTotal;
     }
-    if (layoutModel.PivotColumnTotal) {
+    if (layoutModel.PivotColumnTotal != null) {
         pivotLayout.PivotColumnTotal = layoutModel.PivotColumnTotal;
     }
     else {
@@ -366,12 +419,6 @@ const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
     else {
         delete pivotLayout.PivotAggregationColumns;
     }
-    if (layoutModel.ColumnFilters) {
-        pivotLayout.ColumnFilters = layoutModel.ColumnFilters;
-    }
-    if (layoutModel.GridFilter) {
-        pivotLayout.GridFilter = layoutModel.GridFilter;
-    }
     return pivotLayout;
 };
 exports.pivotLayoutModelToPivotLayout = pivotLayoutModelToPivotLayout;

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

@@ -17,7 +17,7 @@ import { FreeTextColumnState } from '../../AdaptableState/FreeTextColumnState';
 import { ToolPanelState } from '../../AdaptableState/ToolPanelState';
 import { StateApi } from '../StateApi';
 import { AdaptableModule, AdaptableStateKey } from '../../AdaptableState/Common/Types';
-import { AdaptableOptions, AdaptableFilterState, AdaptableSortState, FlashingCellState, InitialState, NamedQueryState, ScheduleState, StatusBarState, StyledColumnState } from '../../types';
+import { AdaptableFilterState, AdaptableSortState, FlashingCellState, InitialState, NamedQueryState, ScheduleState, StatusBarState, StyledColumnState } from '../../types';
 import { PredefinedConfig } from '../../AdaptableState/InitialState';
 import { ChartingState } from '../../AdaptableState/ChartingState';
 import { NoteState } from '../../AdaptableState/NoteState';
@@ -35,7 +35,6 @@ export declare class StateApiImpl extends ApiBase implements StateApi {
     loadUserState(state: InitialState): void;
     getAdaptableFilterState(): AdaptableFilterState;
     getAdaptableSortState(): AdaptableSortState;
-    getAdaptableOptions(): Readonly<AdaptableOptions>;
     setAdaptableStateKey(adaptableStateKey: string, config?: {
         initialState?: InitialState;
         flushCurrentState?: boolean;

package/src/Api/Implementation/StateApiImpl.js

@@ -113,13 +113,11 @@ class StateApiImpl extends ApiBase_1.ApiBase {
     getAdaptableSortState() {
         const adaptableSortState = {
             columnSorts: this.getGridApi().getColumnSorts(),
-            customSorts: this.getCustomSortApi().getActiveCustomSorts(),
+            customSorts: this.getCustomSortApi().getLiveCustomSorts(),
+            customSortComparers: this.getCustomSortApi().getLiveCustomSortComparers(),
         };
         return adaptableSortState;
     }
-    getAdaptableOptions() {
-        return undefined;
-    }
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
             this.getAdaptableInternalApi().executeWithProgressIndicator(config?.progressIndicatorLabel ?? `Initialising...`, () => {

package/src/Api/Internal/EventInternalApi.d.ts

@@ -11,7 +11,7 @@ export declare class EventInternalApi extends ApiBase {
     fireDashboardChangedEvent(trigger: string, oldDashboardState: DashboardState, newDashboardState: DashboardState): void;
     fireAlertFiredEvent(alertToFire: AdaptableAlert): void;
     fireThemeChangedEvent(theme: AdaptableTheme, trigger: 'ThemeSelected' | 'ThemeEdited'): void;
-    fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
+    fireLayoutChangedEvent(trigger: string, oldState: LayoutState, newState: LayoutState): void;
     fireScheduleTriggeredEvent(schedule: BaseSchedule): void;
     fireDataSetSelectedEvent(dataSet: DataSet): void;
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo: SystemStatusMessageInfo): void;

package/src/Api/Internal/EventInternalApi.js

@@ -7,12 +7,14 @@ const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 class EventInternalApi extends ApiBase_1.ApiBase {
     fireGridSortedEvent() {
         if (this.isAdapTableReady()) {
-            const adaptableSortState = this.getStateApi().getAdaptableSortState();
-            const gridSortedInfo = {
-                adaptableSortState,
-                ...this.getAdaptableInternalApi().buildBaseContext(),
-            };
-            this.getEventApi().emit('GridSorted', gridSortedInfo);
+            setTimeout(() => {
+                const adaptableSortState = this.getStateApi().getAdaptableSortState();
+                const gridSortedInfo = {
+                    adaptableSortState,
+                    ...this.getAdaptableInternalApi().buildBaseContext(),
+                };
+                this.getEventApi().emit('GridSorted', gridSortedInfo);
+            }, 50);
         }
     }
     fireCellChangedEvent(cellDataChangedInfo) {
@@ -86,13 +88,13 @@ class EventInternalApi extends ApiBase_1.ApiBase {
         };
         this.getEventApi().emit('ThemeChanged', themeChangedInfo);
     }
-    fireLayoutChangedEvent(trigger, oldSate, newState) {
-        if ((0, isEqual_1.default)(oldSate, newState)) {
+    fireLayoutChangedEvent(trigger, oldState, newState) {
+        if ((0, isEqual_1.default)(oldState, newState)) {
             return;
         }
         const layoutChangedInfo = {
             actionName: trigger,
-            oldLayoutState: oldSate,
+            oldLayoutState: oldState,
             newLayoutState: newState,
             ...this.getAdaptableInternalApi().buildBaseContext(),
         };

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -234,9 +234,32 @@ const LayoutReducer = (state = initialState, action) => {
         }
         case exports.LAYOUT_SAVE: {
             const actionLayout = action.layout;
+            let found = false;
+            let Layouts = state.Layouts.map((abObject) => {
+                if (found) {
+                    // if already found, keep things as they were
+                    return abObject;
+                }
+                found = abObject.Uuid === actionLayout.Uuid;
+                return found ? actionLayout : abObject;
+            });
+            if (!found) {
+                // let's try to find by name
+                Layouts = state.Layouts.map((abObject) => {
+                    if (found) {
+                        // if already found, keep things as they were
+                        return abObject;
+                    }
+                    found = abObject.Name === actionLayout.Name;
+                    return found ? actionLayout : abObject;
+                });
+            }
+            if (!found) {
+                Layouts = [...state.Layouts, actionLayout];
+            }
             return {
                 ...state,
-                Layouts: state.Layouts.map((abObject) => abObject.Uuid === actionLayout.Uuid ? actionLayout : abObject),
+                Layouts,
             };
         }
         case exports.LAYOUT_DELETE: {

package/src/Redux/Store/AdaptableStore.js

@@ -909,7 +909,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_COLUMN_SET_CAPTION) {
                         // tell AdapTable the Layout has been selected
                         if (newLayout) {
-                            adaptable.setLayout(newLayout);
+                            adaptable.updateLayoutInManagerAfterStoreHasChanged(newLayout);
                         }
                     }
                     // when changing current layout via the api, the layout should update
@@ -920,7 +920,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // objects may have changed, but have the same contents
                             // this prevents pivot layout from infinite set-layout
                             !adaptable.api.layoutApi.internalApi.areLayoutsEqual(previousLayout, savingLayout)) {
-                            adaptable.setLayout(savingLayout);
+                            adaptable.updateLayoutInManagerAfterStoreHasChanged(savingLayout);
                         }
                     }
                     return returnAction;
@@ -944,8 +944,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const shouldTriggerColumnFiltering = adaptable.api.filterApi.columnFilterApi.internalApi.shouldNewColumnFilterTriggerColumnFiltering(action);
                     const oldLayoutState = middlewareAPI.getState().Layout;
                     returnAction = next(action);
-                    if (shouldTriggerColumnFiltering &&
-                        action.type !== LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {
+                    // we need to update the current layout model
+                    // in the layout manager, so that onLayoutChange
+                    // it will come back with the correct fields
+                    adaptable.silentUpdateCurrentLayoutModel();
+                    if (shouldTriggerColumnFiltering) {
                         setTimeout(() => {
                             adaptable.applyFiltering();
                         }, 50);

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -33,7 +33,7 @@ const ColumnValuesSelect = (props) => {
             minWidth: `var(--ab-cmp-select-column-menu-${column.columnId}__min-width, var(--ab-cmp-select-column-menu__min-width, 160px))`,
         };
     }, [column.columnId]);
-    const component = (React.createElement(Select_1.Select, { isMulti: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, menuStyle: menuStyle, ...props.selectProps, options: options, value: value, isLoading: props.isLoading, onChange: props.onChange }));
+    const component = (React.createElement(Select_1.Select, { key: "select", isMulti: true, resizable: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, menuStyle: menuStyle, ...props.selectProps, options: options, value: value, isLoading: props.isLoading, onChange: props.onChange }));
     return (React.createElement("div", { className: (0, join_1.default)(baseClassName, props.isLoading && `${baseClassName}--loading`, !value.length && `${baseClassName}--empty`), onKeyDownCapture: (e) => {
             const event = e.nativeEvent || e;
             event.stopPropagation = () => {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -29,6 +29,7 @@ import { RowFormService } from '../Utilities/Services/RowFormService';
 import { GridCellWithCount } from '../AdaptableState/Selection/GridCell';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
+import { PivotLayoutModel, TableLayoutModel } from '../layout-manager/src/LayoutManagerModel';
 import { AgGridThemeAdapter } from './AgGridThemeAdapter';
 export type AdaptableLifecycleState = 'initial' | 'preprocessOptions' | 'initAdaptableState' | 'setupAgGrid' | 'initAgGrid' | 'agGridReady' | 'available' | 'ready' | 'preDestroyed';
 type RenderAgGridFrameworkComponentResult = false | GridApi;
@@ -99,19 +100,12 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private agGridListenerKeydown;
     private agGridListenerMouseEnter;
     private agGridListenerMouseLeave;
-    private listenerGlobalColumnEventsThatTriggerStateChange;
-    private listenerGlobalColumnEventsThatTriggerAutoLayoutSave;
-    private listenerGlobalRowGroupEventsThatTriggerAutoLayoutSave;
     private listenerGlobalSetRowSelection;
     private listenerCellEditingStarted;
     private listenerFirstDataRendered;
     private listenerPivotChanged;
-    private listenerColumnRowGroupChanged;
-    private listenerColumnResized;
     private listenerCellSelectionChanged;
     private listenerSortChanged;
-    private listenerModelUpdated;
-    private filteredOutPrimaryKeys;
     private layoutManager;
     private columnMinMaxValuesCache;
     renderReactRoot: RenderReactRootFn;
@@ -123,7 +117,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private adaptableStatusPanelKeys;
     _PRIVATE_adaptableJSXElement: React.JSX.Element;
     private _prevLayout;
-    private __prevLayoutForOnChange;
+    private __prevLayoutForRefresh;
     constructor(config?: {
         getAgGridColumnApiModuleReference?: () => Module;
     });
@@ -148,6 +142,8 @@ export declare class AdaptableAgGrid implements IAdaptable {
     normalizeAdaptableState(state: AdaptableState, agGridOptions: NormalizeAdaptableStateOptions): AdaptableState;
     private normaliseLayoutState;
     private normaliseToolPanelState;
+    private getCurrentLayoutModel;
+    silentUpdateCurrentLayoutModel(layoutModel?: TableLayoutModel | PivotLayoutModel): void;
     applyFiltering(): void;
     showQuickFilter(): void;
     hideQuickFilter(): void;
@@ -186,6 +182,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private deriveAdaptableColumnStateFromAgGrid;
     private checkShouldClearExistingFiltersOrSearches;
     getGridCellFromRowNode(rowNode: IRowNode, columnId: string): GridCell | undefined;
+    isRowNodeAvailableAfterFiltering(rowNode: IRowNode): boolean;
     /**
      * Use (lazy evaluated) getters to avoid unnecessary calculations and memoization to avoid recalculating the same values
      */
@@ -260,7 +257,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     }): Promise<GridCell[]>;
     getDistinctGridCellsForColumn(column: AdaptableColumn): GridCellWithCount[];
     private getGridCellsForCustomColumnValues;
-    private isPrimaryKeyVisible;
     private addDistinctColumnValue;
     private getUniqueGridCells;
     getGridCellsForColumn(columnId: string, onlyVisibleRows?: boolean): GridCell[] | undefined;
@@ -322,7 +318,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     isQuickFilterAvailable(): boolean;
     private hasFloatingFilterOnAtLeastOneColumn;
     getChartRef(chartId: string): ChartRef;
-    setLayout(layout?: Layout): void;
+    updateLayoutInManagerAfterStoreHasChanged(layout?: Layout): void;
     private getActiveAdaptableAggFuncForCol;
     private onRowDataChanged;
     private onCellDataChanged;
@@ -344,6 +340,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private isRowGroupDifferentInLayout;
     private hasPivotTotalsInLayout;
     private onLayoutChange;
+    private refreshAdaptableAfterLayoutChange;
     private validateColumnDefTypes;
 }
 export {};