@adaptabletools/adaptable-cjs 20.2.1 → 20.2.3

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -26,6 +26,7 @@ const ReorderDraggable_1 = require("../../../Components/ReorderDraggable");
 const AdaptableFormControlTextClear_1 = require("../../../Components/Forms/AdaptableFormControlTextClear");
 const sortColumnIdsByOrder_1 = require("../../../../layout-manager/src/sortColumnIdsByOrder");
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../../components/HelpBlock"));
+const GeneralConstants_1 = require("../../../../Utilities/Constants/GeneralConstants");
 const PropertyOrderText = (props) => (React.createElement(rebass_1.Text, { fontWeight: 600, fontSize: 2 }, props.children));
 const columnTypes = {
     default: {
@@ -200,6 +201,7 @@ const ColumnsSection = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const [searchInputValue, setSearchInputValue] = React.useState('');
+    let hasSelectionColumn = false;
     const allColumns = adaptable.api.columnApi
         .getUIAvailableColumns()
         .filter((col) => {
@@ -209,7 +211,23 @@ const ColumnsSection = (props) => {
         return !col.isGeneratedRowGroupColumn;
     })
         // if the current Layout is a PivotLayout, then we also filter out current Pivot Result Columns
-        .filter((col) => !col.isGeneratedPivotResultColumn);
+        .filter((col) => !col.isGeneratedPivotResultColumn)
+        // also we need to filter out selection column
+        .filter((col) => {
+        const result = !col.isGeneratedSelectionColumn;
+        if (!result) {
+            hasSelectionColumn = true;
+        }
+        return result;
+    });
+    const onChange = (data) => {
+        if (hasSelectionColumn &&
+            Array.isArray(data.TableColumns) &&
+            !data.TableColumns.includes(GeneralConstants_1.AG_GRID_SELECTION_COLUMN)) {
+            data.TableColumns.unshift(GeneralConstants_1.AG_GRID_SELECTION_COLUMN);
+        }
+        props.onChange(data);
+    };
     // however, changes in RowGroupedColumns done in the previous step
     // are reflected into the layout, so we use the latest layout.RowGroupedColumns
     // to create new columns
@@ -266,7 +284,7 @@ const ColumnsSection = (props) => {
                 ColumnVisibility[colId] = false;
             }
         });
-        props.onChange({
+        onChange({
             ...layout,
             TableColumns: columnIds,
             ColumnVisibility,
@@ -305,14 +323,14 @@ const ColumnsSection = (props) => {
                 return shouldInclude;
             });
         }
-        props.onChange({
+        onChange({
             ...layout,
             TableColumns: TableColumns,
             ColumnVisibility,
         });
     };
     const handlePinChange = (columnId, pinning) => {
-        props.onChange({
+        onChange({
             ...layout,
             ColumnPinning: {
                 ...layout.ColumnPinning,
@@ -321,7 +339,7 @@ const ColumnsSection = (props) => {
         });
     };
     const handleColumnNameChange = (columnId, headerName) => {
-        props.onChange({
+        onChange({
             ...layout,
             ColumnHeaders: {
                 ...layout.ColumnHeaders,
@@ -330,7 +348,7 @@ const ColumnsSection = (props) => {
         });
     };
     const handleColumnWidthChange = (columnId, width) => {
-        props.onChange({
+        onChange({
             ...layout,
             ColumnWidths: {
                 ...layout.ColumnWidths,
@@ -339,7 +357,8 @@ const ColumnsSection = (props) => {
         });
     };
     const visibleIds = layout.TableColumns.filter((colId) => {
-        return layout.ColumnVisibility?.[colId] !== false;
+        return (layout.ColumnVisibility?.[colId] !== false &&
+            adaptable.api.columnApi.isSelectionColumn(colId) === false);
     });
     const toLabel = (colId) => adaptable.api.columnApi.getFriendlyNameForColumnId(colId, layout);
     const toIdentifier = (colId) => colId;
@@ -378,7 +397,7 @@ const ColumnsSection = (props) => {
                 noSelectionLabel: `No Columns Selected`,
                 onChange: handleColumnsChange,
                 onSelectAll: () => {
-                    props.onChange({
+                    onChange({
                         ...layout,
                         ColumnVisibility: {},
                         TableColumns: ColumnOrderAllColumns.map((col) => col.columnId),

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -44,8 +44,8 @@ const RowGroupBehaviorSection = (props) => {
                 }
                 onChange(newLayout);
             } },
-            React.createElement(TypeRadio_1.TypeRadio, { value: "always-collapsed", text: "All Collapsed", description: "Always open Layout with all Grouped Rows collapsed" }),
-            React.createElement(TypeRadio_1.TypeRadio, { value: "always-expanded", text: "All Expanded", description: "Always open Layout with all Grouped Rows expanded" }),
+            React.createElement(TypeRadio_1.TypeRadio, { value: "always-collapsed", text: "All Collapsed", description: "Layout opens with all Grouped Rows always collapsed" }),
+            React.createElement(TypeRadio_1.TypeRadio, { value: "always-expanded", text: "All Expanded", description: "Layout opens with all Grouped Rows always expanded" }),
             React.createElement(TypeRadio_1.TypeRadio, { value: "expanded", text: "Mostly Expanded", description: "Layout opens with all Grouped rows expanded, other than those collapsed when Layout last displayed" }),
             React.createElement(TypeRadio_1.TypeRadio, { value: "collapsed", text: "Mostly Collapsed", description: "Layout opens with all Grouped rows collapsed, other than those expanded when Layout last displayed" }))));
 };

package/src/View/QuickSearch/QuickSearchPopup.d.ts

@@ -6,7 +6,7 @@ interface QuickSearchPopupProps extends ModuleViewPopupProps<any> {
     QuickSearchText: string;
     QuickSearchStyle: AdaptableStyle;
     onRunQuickSearch: (quickSearchText: string) => QuickSearchRedux.QuickSearchRunAction;
-    onSetStyle: (style: AdaptableStyle) => QuickSearchRedux.QuickSearchSetStyleAction;
+    onSetMatchingCellStyle: (style: AdaptableStyle) => QuickSearchRedux.QuickSearchSetMatchingCellStyleAction;
 }
 export declare const QuickSearchPopup: import("react-redux").ConnectedComponent<(props: QuickSearchPopupProps) => React.JSX.Element, {
     [x: string]: any;

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -15,6 +15,7 @@ const CheckBox_1 = require("../../components/CheckBox");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
 const QuickSearchInput_1 = require("./QuickSearchInput");
+const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const [state, setState] = (0, react_1.useState)({
@@ -23,7 +24,7 @@ const QuickSearchPopupComponent = (props) => {
     });
     const onUpdateStyle = (style) => {
         setState({ ...state, EditedStyle: style });
-        props.onSetStyle(style);
+        props.onSetMatchingCellStyle(style);
     };
     const onQuickSearchBehaviourChange = (checked) => {
         setState({ ...state, RunQueryAfterQuickSearch: checked });
@@ -37,21 +38,23 @@ const QuickSearchPopupComponent = (props) => {
         React.createElement(Panel_1.default, { header: props.api.internalApi.getCorrectEnglishVariant('Behaviour'), style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginLeft: 2, marginRight: 2 },
             ' ',
             React.createElement(rebass_1.Flex, { flexDirection: "column" },
+                React.createElement(HelpBlock_1.default, { fontSize: 2, marginTop: 2, marginBottom: 2 }, "Filters the Grid to only show rows with matching cells; use with care as can cause performance issues"),
+                ' ',
                 React.createElement(FormLayout_1.default, { columns: [1, 2] },
                     React.createElement(FormLayout_1.FormRow, null,
                         React.createElement(CheckBox_1.CheckBox, { "data-name": "filter-quick-search-results", value: "existing", marginLeft: 1, marginRight: 3, checked: state.RunQueryAfterQuickSearch, disabled: StringExtensions_1.default.IsNotNullOrEmpty(searchText), onChange: onQuickSearchBehaviourChange }, "Filter using Quick Search Results"))))),
-        React.createElement(StyleComponent_1.StyleComponent, { style: { height: '100%' }, api: props.api, Style: props.QuickSearchStyle, UpdateStyle: onUpdateStyle })));
+        React.createElement(StyleComponent_1.StyleComponent, { style: { height: '100%' }, headerText: 'Cell Matching Style', api: props.api, Style: props.QuickSearchStyle, UpdateStyle: onUpdateStyle })));
 };
 function mapStateToProps(state, ownProps) {
     return {
         QuickSearchText: state.QuickSearch.QuickSearchText,
-        QuickSearchStyle: state.QuickSearch.Style,
+        QuickSearchStyle: state.QuickSearch.CellMatchStyle ?? {},
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
         onRunQuickSearch: (quickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(quickSearchText)),
-        onSetStyle: (style) => dispatch(QuickSearchRedux.QuickSearchSetStyle(style)),
+        onSetMatchingCellStyle: (style) => dispatch(QuickSearchRedux.QuickSearchSetCellMatchingStyle(style)),
     };
 }
 exports.QuickSearchPopup = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(QuickSearchPopupComponent);

package/src/agGrid/AdaptableAgGrid.js

@@ -453,7 +453,7 @@ class AdaptableAgGrid {
             this.updateColumnModelAndRefreshGrid();
         }
         const layoutModelForApply = (0, LayoutHelpers_1.layoutStateToLayoutModel)(currentLayout);
-        this.layoutManager.applyRowGroupValues(layoutModelForApply.RowGroupValues);
+        this.layoutManager.applyRowGroupValues(layoutModelForApply.RowGroupValues, layoutModelForApply.RowGroupedColumns);
         this.layoutManager.applyColumnGroupCollapseExpandState(layoutModelForApply);
         this.autoSizeLayoutIfNeeded();
         this.ModuleService.createModuleUIItems();
@@ -2018,7 +2018,7 @@ You need to define at least one Layout!`);
             layout = this.api.layoutApi.getCurrentLayout();
         }
         const layoutModel = (0, LayoutHelpers_1.layoutStateToLayoutModel)(layout);
-        this.layoutManager.applyRowGroupValues(layoutModel.RowGroupValues);
+        this.layoutManager.applyRowGroupValues(layoutModel.RowGroupValues, layoutModel.RowGroupedColumns);
     }
     isGroupRowNode(rowNode) {
         if (!rowNode) {
@@ -3111,12 +3111,23 @@ You need to define at least one Layout!`);
         (0, LayoutHelpers_1.checkForDuplicateColumns)(layout);
         const isLayoutSwitch = this._prevLayout && layout.Name != this._prevLayout.Name;
         let shouldUpdateExpandState = isLayoutSwitch;
-        if (!isLayoutSwitch &&
-            this._prevLayout &&
-            layout.RowGroupValues?.RowGroupDefaultBehavior &&
-            this._prevLayout?.RowGroupValues?.RowGroupDefaultBehavior !=
-                layout.RowGroupValues?.RowGroupDefaultBehavior) {
-            shouldUpdateExpandState = true;
+        if (!isLayoutSwitch && this._prevLayout) {
+            if (layout.RowGroupValues?.RowGroupDefaultBehavior &&
+                this._prevLayout?.RowGroupValues?.RowGroupDefaultBehavior !=
+                    layout.RowGroupValues?.RowGroupDefaultBehavior) {
+                shouldUpdateExpandState = true;
+            }
+            else {
+                const prevLayoutExceptionGroupKeys = (0, LayoutHelpers_1.getLayoutRowGroupValuesExceptionGroupKeys)(this._prevLayout)
+                    .flat()
+                    .join(',');
+                const currentLayoutExceptionGroupKeys = (0, LayoutHelpers_1.getLayoutRowGroupValuesExceptionGroupKeys)(layout)
+                    .flat()
+                    .join(',');
+                if (prevLayoutExceptionGroupKeys !== currentLayoutExceptionGroupKeys) {
+                    shouldUpdateExpandState = true;
+                }
+            }
         }
         this._prevLayout = layout;
         const perfSetLayout = this.logger.beginPerf(`setLayout(${layout.Name})`);

package/src/agGrid/AgGridAdapter.js

@@ -429,6 +429,7 @@ class AgGridAdapter {
         const isFdc3MainActionColumn = this.adaptableApi.fdc3Api.internalApi.isFdc3MainActionColumn(colId);
         let friendlyName;
         const isGeneratedRowGroupColumn = columnApi.isAutoRowGroupColumn(ColumnId);
+        const isGeneratedSelectionColumn = columnApi.isSelectionColumn(ColumnId);
         const isGeneratedPivotResultColumn = columnApi.isPivotResultColumn(ColumnId) && !agGridColumn.isPrimary();
         const colExists = columnApi.doesColumnExist(ColumnId) ||
             isGeneratedRowGroupColumn ||
@@ -468,7 +469,7 @@ class AgGridAdapter {
             colDef.lockVisible === true &&
             colDef.suppressColumnsToolPanel === true &&
             colDef.suppressFiltersToolPanel === true;
-        const isGenerated = isGeneratedRowGroupColumn || isGeneratedPivotResultColumn;
+        const isGenerated = isGeneratedRowGroupColumn || isGeneratedPivotResultColumn || isGeneratedSelectionColumn;
         const abColumn = {
             Uuid: (0, Uuid_1.createUuid)(),
             isTreeColumn,
@@ -495,6 +496,7 @@ class AgGridAdapter {
             hideable: this.isColumnHideable(colDef),
             isGrouped: isGenerated ? false : this.isColumnRowGrouped(colDef),
             isGeneratedRowGroupColumn,
+            isGeneratedSelectionColumn,
             isGeneratedPivotResultColumn,
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
@@ -680,6 +682,9 @@ class AgGridAdapter {
             this.adaptableApi.columnApi.isAutoRowGroupColumn(colDef.colId)) {
             return false;
         }
+        if (this.adaptableApi.columnApi.isSelectionColumn(colDef.colId)) {
+            return false;
+        }
         if (colDef.lockVisible != null && colDef.lockVisible == true) {
             return false;
         }

package/src/agGrid/AgGridColumnAdapter.js

@@ -93,12 +93,16 @@ class AgGridColumnAdapter {
     }
     shouldSkipColumn(colId) {
         /**
-         * This skips columns like `ag-Grid-SelectionColumn` and possibly other columns
-         * that ag grid will implement in the future
+         * This skips special columns that ag grid will likely implement in the future
          *
-         * BUT DOES NOT SKIP GROUP COLUMNS!!!
+         * BUT DOES NOT SKIP GROUP COLUMNS or SELECTION COLUMNS!!!
+         *
+         * It's probably here for historical reasons - previously it used to skip the selection column
+         * but now it's not skipping it anymore
          */
-        return colId.startsWith('ag-Grid-') && !this.adaptableApi.columnApi.isAutoRowGroupColumn(colId);
+        return (colId.startsWith('ag-Grid-') &&
+            !this.adaptableApi.columnApi.isAutoRowGroupColumn(colId) &&
+            !this.adaptableApi.columnApi.isSelectionColumn(colId));
     }
     setupColumns() {
         const pivotMode = this.agGridApi.isPivotMode();
@@ -158,10 +162,8 @@ class AgGridColumnAdapter {
     setupColumnCellClass({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellClass', (userCellClass) => {
             const formatColumns = this.adaptableApi.formatColumnApi.internalApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
-            const quickSearchStyleClassName = this.adaptableApi.quickSearchApi.getQuickSearchStyle().ClassName;
             const quickSearchTextMatchStyle = this.getQuickSearchTextMatchStyle();
             const quickSearchCurrentTextMatchStyle = this.getQuickSearchCurrentTextMatchStyle();
-            const hasQuickSearchStyleClassName = StringExtensions_1.default.IsNotNullOrEmpty(quickSearchStyleClassName);
             const cellClass = (params) => {
                 const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, abColumn.columnId);
                 if (!gridCell.column) {
@@ -188,7 +190,7 @@ class AgGridColumnAdapter {
                     !hasStyledColumn && formatColumns.length
                         ? this.getFormatColumnCellClass(formatColumns, abColumn, params)
                         : null,
-                    isQuickSearchActive && hasQuickSearchStyleClassName ? quickSearchStyleClassName : null,
+                    //  isQuickSearchActive && hasQuickSearchStyleClassName ? quickSearchStyleClassName : null,
                     isQuickSearchActive && (quickSearchTextMatchStyle || quickSearchCurrentTextMatchStyle)
                         ? 'ab-QuickSearchFind'
                         : null,
@@ -853,7 +855,7 @@ class AgGridColumnAdapter {
         return classNames;
     }
     getQuickSearchCellStyle() {
-        const quickSearchStyle = this.adaptableApi.quickSearchApi.getQuickSearchStyle();
+        const quickSearchStyle = this.adaptableApi.quickSearchApi.getQuickSearchCellMatchStyle();
         if (!quickSearchStyle || StringExtensions_1.default.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
             return undefined;
         }

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1750416454142 || Date.now(),
-    VERSION: "20.2.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1750939331799 || Date.now(),
+    VERSION: "20.2.3" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -1,3 +1,4 @@
+import { XOR } from '../../Utilities/Extensions/TypeExtensions';
 /**
  * Defines how a Column is sorted
  */
@@ -64,15 +65,27 @@ export interface BaseLayoutModel {
      */
     RowGroupValues?: {
         RowGroupDisplay: 'always-expanded';
-    } | {
+    } | ({
         RowGroupDisplay: 'expanded';
+    } & XOR<{
         Values: any[][];
-    } | {
+    }, {
+        GroupKeys: {
+            RowGroupedColumns: string[];
+            Values?: any[][];
+        }[];
+    }>) | {
         RowGroupDisplay: 'always-collapsed';
-    } | {
+    } | ({
         RowGroupDisplay: 'collapsed';
+    } & XOR<{
         Values: any[][];
-    };
+    }, {
+        GroupKeys: {
+            RowGroupedColumns: string[];
+            Values?: any[][];
+        }[];
+    }>);
     /**
      * Behaviour for Expanding / Collapsing Column Groups
      */

package/src/layout-manager/src/index.d.ts

@@ -62,7 +62,7 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     private applyLayout;
     private applyTableLayout;
     private getRowGroupNodePathsAs;
-    applyRowGroupValues(RowGroupValues: TableLayoutModel['RowGroupValues']): void;
+    applyRowGroupValues(RowGroupValues: TableLayoutModel['RowGroupValues'], rowGroupedColumns: string[]): void;
     private computeColumnStateForPivotLayout;
     private computePivotAggregations;
     private computeColumnStateForTableLayout;

package/src/layout-manager/src/index.js

@@ -235,7 +235,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             // but we want to suspend the listener
             // as it would re-trigger another change
             const unsupress = this.suspendAgGridListener();
-            this.applyRowGroupValues(layout.RowGroupValues);
+            this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
             unsupress();
         }
         if ((!prevLayout?.RowGroupedColumns || !prevLayout?.RowGroupedColumns.length) &&
@@ -247,7 +247,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             // but we want to suspend the listener
             // as it would re-trigger another change
             const unsupress = this.suspendAgGridListener();
-            this.applyRowGroupValues(layout.RowGroupValues);
+            this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
             unsupress();
         }
         if (!shouldSkipTriggerChange) {
@@ -334,9 +334,8 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         return this.gridApi.getGridOption('treeData');
     }
     getUndecidedLayoutModelFromGrid(columnState) {
-        let TableColumns = columnState
-            .map((c) => c.colId)
-            .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
+        let TableColumns = columnState.map((c) => c.colId);
+        // .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
         let ColumnWidths = {};
         let ColumnSorts = [];
         let RowGroupedColumns = [];
@@ -499,10 +498,26 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                         : this.getRowGroupNodePathsAs({
                             expanded: true,
                         });
-                    RowGroupValues = {
-                        RowGroupDisplay: 'collapsed',
-                        Values: ExpandedValues,
-                    };
+                    if (Array.isArray(currentRowGroupValues.GroupKeys)) {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'collapsed',
+                            GroupKeys: currentRowGroupValues.GroupKeys.map((item) => {
+                                if ((item.RowGroupedColumns || []).join(',') === (RowGroupedColumns || []).join(',')) {
+                                    return {
+                                        RowGroupedColumns: item.RowGroupedColumns,
+                                        Values: ExpandedValues,
+                                    };
+                                }
+                                return item;
+                            }),
+                        };
+                    }
+                    else {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'collapsed',
+                            Values: ExpandedValues,
+                        };
+                    }
                 }
                 else if (currentRowGroupValues.RowGroupDisplay === 'expanded') {
                     const CollapsedValues = isGroupingNew
@@ -510,10 +525,26 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                         : this.getRowGroupNodePathsAs({
                             expanded: false,
                         });
-                    RowGroupValues = {
-                        RowGroupDisplay: 'expanded',
-                        Values: CollapsedValues,
-                    };
+                    if (Array.isArray(currentRowGroupValues.GroupKeys)) {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'expanded',
+                            GroupKeys: currentRowGroupValues.GroupKeys.map((item) => {
+                                if ((item.RowGroupedColumns || []).join(',') === (RowGroupedColumns || []).join(',')) {
+                                    return {
+                                        RowGroupedColumns: item.RowGroupedColumns,
+                                        Values: CollapsedValues,
+                                    };
+                                }
+                                return item;
+                            }),
+                        };
+                    }
+                    else {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'expanded',
+                            Values: CollapsedValues,
+                        };
+                    }
                 }
             }
         }
@@ -900,7 +931,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             this.gridApi.applyColumnState(this.computeColumnStateForTableLayout(layout));
             // but also let's not forget to apply the row group values
             if (hasGroupedColumns && layout.RowGroupValues && !options?.skipApplyRowGroupsExpandedState) {
-                this.applyRowGroupValues(layout.RowGroupValues);
+                this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
             }
             this.applyColumnGroupCollapseExpandState(layout);
         });
@@ -924,7 +955,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         });
         return result;
     }
-    applyRowGroupValues(RowGroupValues) {
+    applyRowGroupValues(RowGroupValues, rowGroupedColumns) {
         if (!RowGroupValues) {
             return;
         }
@@ -937,9 +968,21 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             return;
         }
         const defaultExpanded = RowGroupValues.RowGroupDisplay === 'expanded';
-        if (RowGroupValues.Values) {
+        let currentRowGroupedValues = RowGroupValues.Values;
+        if (RowGroupValues.GroupKeys) {
+            const matchingRowGroupColumnValues = RowGroupValues.GroupKeys.find((item) => {
+                return (item.RowGroupedColumns || []).join(',') === (rowGroupedColumns || []).join(',');
+            });
+            if (matchingRowGroupColumnValues) {
+                currentRowGroupedValues = matchingRowGroupColumnValues.Values;
+            }
+            else {
+                currentRowGroupedValues = [];
+            }
+        }
+        if (currentRowGroupedValues) {
             const deepMap = new infinite_react_1.DeepMap();
-            RowGroupValues.Values.forEach((rowGroupValue) => {
+            currentRowGroupedValues.forEach((rowGroupValue) => {
                 deepMap.set(rowGroupValue, true);
             });
             this.gridApi.forEachNode((node) => {
@@ -1231,7 +1274,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const hasGroupedColumns = layout.PivotGroupedColumns && layout.PivotGroupedColumns.length;
         // but also let's not forget to apply the row group values
         if (hasGroupedColumns && layout.RowGroupValues && !options?.skipApplyRowGroupsExpandedState) {
-            this.applyRowGroupValues(layout.RowGroupValues);
+            this.applyRowGroupValues(layout.RowGroupValues, layout.PivotGroupedColumns);
         }
     }
     applyPivotTotals(layout) {

package/src/metamodel/adaptable.metamodel.d.ts

@@ -2005,6 +2005,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    ColumnGroupValues: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    ColumnGroupValuesWithExceptionKeys: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ColumnMenuContext: {
         name: string;
         kind: string;
@@ -3064,6 +3074,17 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    ExportConfig: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        }[];
+    };
     ExportDataFormatContext: {
         name: string;
         kind: string;
@@ -4708,19 +4729,12 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref?: undefined;
-        } | {
+        props: {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref: string;
-        })[];
+        }[];
     };
     RaiseIntentConfig: {
         name: string;