@adaptabletools/adaptable-cjs 20.0.11 → 20.0.13

package/src/Strategy/StyledColumnModule.d.ts

@@ -13,7 +13,7 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(styledColumn: StyledColumn): string[];
     hasNamedQueryReferences(): boolean;
-    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
     private getGlyphForStyledColumn;
     getTeamSharingAction(): TeamSharingImportInfo<StyledColumn>;
     toView(styledColumn: StyledColumn): AdaptableObjectView;

package/src/Strategy/SystemStatusModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class SystemStatusModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar" | "separator">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
     createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     getViewProperties(): AdaptableModuleView;
 }

package/src/Utilities/Helpers/AdaptableHelper.d.ts

@@ -4,6 +4,7 @@ import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
 export declare function addUuidsToInitialState(initialState: InitialState): InitialState;
 export declare function getAccessLevelForObject(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
 export declare function addAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
+export declare function removeAdaptableObjectPrimitivesInlineDeep(target: any): any;
 export declare function removeAdaptableObjectPrimitivesInline(target: any): any;
 export declare function removeAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
 export declare function isAdaptableObject(object: unknown): object is AdaptableObject;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableHelper = exports.isAdaptableObject = exports.removeAdaptableObjectPrimitives = exports.removeAdaptableObjectPrimitivesInline = exports.addAdaptableObjectPrimitives = exports.getAccessLevelForObject = exports.addUuidsToInitialState = void 0;
+exports.AdaptableHelper = exports.isAdaptableObject = exports.removeAdaptableObjectPrimitives = exports.removeAdaptableObjectPrimitivesInline = exports.removeAdaptableObjectPrimitivesInlineDeep = exports.addAdaptableObjectPrimitives = exports.getAccessLevelForObject = exports.addUuidsToInitialState = void 0;
 const tslib_1 = require("tslib");
 const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash/cloneDeepWith"));
 const isPlainObject_1 = tslib_1.__importDefault(require("lodash/isPlainObject"));
@@ -50,8 +50,35 @@ function addAdaptableObjectPrimitives(adaptableObject) {
     return adaptableObject;
 }
 exports.addAdaptableObjectPrimitives = addAdaptableObjectPrimitives;
+function removeAdaptableObjectPrimitivesInlineDeep(target) {
+    if (!target) {
+        return target;
+    }
+    if (Array.isArray(target)) {
+        target.forEach(removeAdaptableObjectPrimitivesInlineDeep);
+        return target;
+    }
+    if (typeof target !== 'object') {
+        return target;
+    }
+    delete target.Source;
+    delete target.Uuid;
+    delete target.AdaptableVersion;
+    for (const key in target) {
+        removeAdaptableObjectPrimitivesInlineDeep(target[key]);
+    }
+    return target;
+}
+exports.removeAdaptableObjectPrimitivesInlineDeep = removeAdaptableObjectPrimitivesInlineDeep;
 function removeAdaptableObjectPrimitivesInline(target) {
-    if (!target || typeof target !== 'object') {
+    if (!target) {
+        return target;
+    }
+    if (Array.isArray(target)) {
+        target.forEach(removeAdaptableObjectPrimitivesInline);
+        return target;
+    }
+    if (typeof target !== 'object') {
         return target;
     }
     delete target.Source;

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

@@ -128,7 +128,7 @@ const PivotColumnRow = (props) => {
                         }
                         return {
                             ...aggCol,
-                            TotalColumn: updatedTotalColumn,
+                            Total: updatedTotalColumn,
                         };
                     }
                     return aggCol;
@@ -138,18 +138,18 @@ const PivotColumnRow = (props) => {
         };
     });
     const currentAggCol = props.layout.PivotAggregationColumns?.find((aggCol) => aggCol.ColumnId === props.column.columnId);
-    const currentTotal = currentAggCol?.TotalColumn
-        ? currentAggCol.TotalColumn === true || currentAggCol.TotalColumn === 'before'
+    const currentTotal = currentAggCol?.Total
+        ? currentAggCol.Total === true || currentAggCol.Total === 'before'
             ? 'Before'
-            : currentAggCol.TotalColumn === 'after'
+            : currentAggCol.Total === 'after'
                 ? 'After'
-                : Array.isArray(currentAggCol.TotalColumn)
+                : Array.isArray(currentAggCol.Total)
                     ? 'Pivot Specific'
                     : 'Off'
         : 'Off';
-    const hasPivotSpecificTotals = Array.isArray(currentAggCol?.TotalColumn);
-    const pivotSpecificTotals = Array.isArray(currentAggCol?.TotalColumn)
-        ? currentAggCol.TotalColumn
+    const hasPivotSpecificTotals = Array.isArray(currentAggCol?.Total);
+    const pivotSpecificTotals = Array.isArray(currentAggCol?.Total)
+        ? currentAggCol.Total
         : props.layout.PivotColumns?.map((pivotColId) => ({
             PivotColumnId: pivotColId,
             ShowTotal: false,
@@ -163,7 +163,7 @@ const PivotColumnRow = (props) => {
                     }
                     return total;
                 });
-                return { ...aggCol, TotalColumn: updatedTotals };
+                return { ...aggCol, Total: updatedTotals };
             }
             return aggCol;
         });
@@ -183,7 +183,7 @@ const PivotColumnRow = (props) => {
                     ' ',
                     React.createElement(DropdownButton_1.default, { columns: ['label'], items: numericColumnsOptions, ml: 2 }, weightName))),
                 aggValue && (React.createElement(rebass_1.Flex, { backgroundColor: "primary", ml: 3, alignItems: "center" },
-                    React.createElement(rebass_1.Text, null, "Total Column"),
+                    React.createElement(rebass_1.Text, null, "Total"),
                     ' ',
                     React.createElement(DropdownButton_1.default, { columns: ['label'], items: totalOptions, ml: 2 }, currentTotal)))),
             hasPivotSpecificTotals && (React.createElement(rebass_1.Flex, { ml: 2, pl: 2, flexWrap: "wrap", flex: "1 1 auto", alignItems: "center", style: {
@@ -257,7 +257,7 @@ const PivotAggregationsSection = (props) => {
                 ColumnId: colId,
                 AggFunc: currentAggColumns.find((x) => x.ColumnId === colId)?.AggFunc ??
                     adaptable.api.columnApi.getDefaultAggFunc(colId),
-                TotalColumn: currentAggColumns.find((x) => x.ColumnId === colId)?.TotalColumn,
+                TotalColumn: currentAggColumns.find((x) => x.ColumnId === colId)?.Total,
             };
         });
         props.onChange({
@@ -266,9 +266,9 @@ const PivotAggregationsSection = (props) => {
         });
     }, [layout]);
     const handleAggregationChange = React.useCallback((pivotAggregationColumns) => {
-        if (pivotAggregationColumns.some((aggCol) => aggCol.TotalColumn !== false || aggCol.TotalColumn !== null)) {
+        if (pivotAggregationColumns.some((aggCol) => aggCol.Total !== false || aggCol.Total !== null)) {
             // if any Aggregation Column has a Total Column, we need to disable the Pivot Group Total Column
-            delete layout['PivotGroupTotalColumn'];
+            delete layout['PivotColumnTotal'];
         }
         props.onChange({
             ...layout,
@@ -302,7 +302,7 @@ const PivotAggregationsSection = (props) => {
             SuppressAggFuncInHeader: checked,
         });
     };
-    const checkIfPivotGroupTotalColumnEnabled = () => {
+    const checkIfPivotColumnTotalEnabled = () => {
         // check that all AggregationColumns have identical AggFuncs
         const aggregationColumns = layout.PivotAggregationColumns;
         if (!aggregationColumns || aggregationColumns.length === 0) {
@@ -313,13 +313,13 @@ const PivotAggregationsSection = (props) => {
             return 'Requires identical aggregation on all columns';
         }
         // check that no Aggregation Total Column is enabled
-        const hasAggregationTotalColumn = aggregationColumns.some((aggCol) => aggCol.TotalColumn !== false && aggCol.TotalColumn != null);
+        const hasAggregationTotalColumn = aggregationColumns.some((aggCol) => aggCol.Total !== false && aggCol.Total != null);
         if (hasAggregationTotalColumn) {
             return 'Can only be enabled when no Aggregation Total Column is present';
         }
         return true;
     };
-    const isPivotGroupTotalColumnEnabled = checkIfPivotGroupTotalColumnEnabled();
+    const isPivotColumnTotalEnabled = checkIfPivotColumnTotalEnabled();
     return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
         React.createElement(Tabs_1.Tabs.Tab, null, "Column Aggregations"),
         React.createElement(Tabs_1.Tabs.Content, null,
@@ -339,29 +339,29 @@ const PivotAggregationsSection = (props) => {
                                     GrandTotalRow: value,
                                 });
                             }, isClearable: true })),
-                    React.createElement(FormLayout_1.FormRow, { label: 'Grand Total Column' },
+                    React.createElement(FormLayout_1.FormRow, { label: 'Pivot Grand Total' },
                         React.createElement(Select_1.Select, { style: { width: 120 }, options: ['before', 'after'].map((position) => {
                                 return {
                                     label: StringExtensions_1.default.CapitaliseFirstLetter(position),
                                     value: position,
                                 };
-                            }), placeholder: "Off", value: layout.GrandTotalColumn, onChange: (value) => {
+                            }), placeholder: "Off", value: layout.PivotGrandTotal, onChange: (value) => {
                                 props.onChange({
                                     ...layout,
-                                    GrandTotalColumn: value,
+                                    PivotGrandTotal: value,
                                 });
                             }, isClearable: true })),
-                    React.createElement(FormLayout_1.FormRow, { label: 'Pivot Group Total Column' }, isPivotGroupTotalColumnEnabled === true ? (React.createElement(Select_1.Select, { style: { width: 120 }, options: ['before', 'after'].map((position) => {
+                    React.createElement(FormLayout_1.FormRow, { label: 'Pivot Column Total' }, isPivotColumnTotalEnabled === true ? (React.createElement(Select_1.Select, { style: { width: 120 }, options: ['before', 'after'].map((position) => {
                             return {
                                 label: StringExtensions_1.default.CapitaliseFirstLetter(position),
                                 value: position,
                             };
-                        }), placeholder: "Off", value: layout.PivotGroupTotalColumn, onChange: (value) => {
+                        }), placeholder: "Off", value: layout.PivotColumnTotal, onChange: (value) => {
                             props.onChange({
                                 ...layout,
-                                PivotGroupTotalColumn: value,
+                                PivotColumnTotal: value,
                             });
-                        }, isClearable: true })) : (React.createElement(rebass_1.Text, { marginLeft: 1, style: { fontStyle: 'italic' } }, isPivotGroupTotalColumnEnabled))))),
+                        }, isClearable: true })) : (React.createElement(rebass_1.Text, { marginLeft: 1, style: { fontStyle: 'italic' } }, isPivotColumnTotalEnabled))))),
             React.createElement(ValueSelector_1.ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: Utilities_1.columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (column) => (React.createElement(PivotColumnRow, { onChangeAggFunction: handleAggregationChange, layout: layout, column: column, aggregationColumnsMap: aggregationColumnsMap, numberColumns: numberColumns })), options: sortedAggregableColumns, value: (layout.PivotAggregationColumns || []).map((col) => col.ColumnId), allowReorder: true, xSelectedLabel: () => {
                     return `Active aggregations:`;
                 }, onChange: handleColumnsSelectionChange }))));

package/src/agGrid/AdaptableAgGrid.js

@@ -1080,6 +1080,10 @@ You need to define at least one Layout!`);
                 [AdaptableColumn_1.FREE_TEXT_COLUMN_TYPE]: {},
                 [AdaptableColumn_1.ACTION_COLUMN_TYPE]: {},
                 [AdaptableColumn_1.FDC3_COLUMN_TYPE]: {},
+                [AdaptableColumn_1.PIVOT_ANY_TOTAL_COLUMN_TYPE]: {},
+                [AdaptableColumn_1.PIVOT_GRAND_TOTAL_COLUMN_TYPE]: {},
+                [AdaptableColumn_1.PIVOT_COLUMN_TOTAL_COLUMN_TYPE]: {},
+                [AdaptableColumn_1.PIVOT_AGGREGATION_TOTAL_COLUMN_TYPE]: {},
             };
             const patchedColumnTypes = Object.assign({}, providedColumnTypes, adaptableSpecialColumnTypes);
             const customColumnTypes = this.api.columnApi.getColumnTypes() ?? [];
@@ -3338,14 +3342,14 @@ You need to define at least one Layout!`);
             if (!(0, LayoutHelpers_1.isPivotLayout)(layout)) {
                 return false;
             }
-            if (layout.GrandTotalColumn) {
+            if (layout.PivotGrandTotal) {
                 return true;
             }
-            if (layout.PivotGroupTotalColumn) {
+            if (layout.PivotColumnTotal) {
                 return true;
             }
             if (layout.PivotAggregationColumns) {
-                return layout.PivotAggregationColumns.some((col) => !!col.TotalColumn);
+                return layout.PivotAggregationColumns.some((col) => !!col.Total);
             }
         };
         return hasPivotTotals(one) || hasPivotTotals(other);

package/src/agGrid/AgGridAdapter.js

@@ -11,7 +11,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const agGridModules_1 = require("./agGridModules");
 const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
 const ColumnApiImpl_1 = require("../Api/Implementation/ColumnApiImpl");
-const isPivotGroupTotalColumn_1 = require("../layout-manager/src/isPivotGroupTotalColumn");
+const isPivotColumnTotal_1 = require("../layout-manager/src/isPivotColumnTotal");
 const isPivotAggTotalColumn_1 = require("../layout-manager/src/isPivotAggTotalColumn");
 // AG GRID obfuscates its internals, this is (currently) the best way to get hold of its internal services
 const DANGER_AG_GRID_BEANS_MAP = {};
@@ -614,8 +614,8 @@ class AgGridAdapter {
         return this.adaptableApi.actionColumnApi.getActionColumnForColumnId(colDef.colId) != null;
     }
     isPivotTotalColumn(colDef) {
-        return ((0, ColumnApiImpl_1.isPivotGrandTotalColumn)(colDef.colId) ||
-            (0, isPivotGroupTotalColumn_1.isPivotGroupTotalColumn)(colDef.colId) ||
+        return ((0, ColumnApiImpl_1.isPivotGrandTotal)(colDef.colId) ||
+            (0, isPivotColumnTotal_1.isPivotColumnTotal)(colDef.colId) ||
             (0, isPivotAggTotalColumn_1.isPivotAggTotalColumn)(colDef));
     }
     isColumnFilterable(colDef) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -207,14 +207,32 @@ class AgGridColumnAdapter {
             const quickSearchStyle = this.getQuickSearchCellStyle();
             const hasQuickSearchStyle = quickSearchStyle != undefined;
             const cellStyle = (params) => {
-                const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, abColumn.columnId);
+                const columnId = params.column.getColId();
+                const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, columnId);
                 if (!gridCell || !gridCell.column) {
                     return {};
                 }
                 const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(gridCell, params);
-                const userDefined = typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle;
+                let baseStyles = {};
+                // this is required because otherwise, when AG Grid filters, it refershed the pivotResultColDef and the base styles get lost
+                // if pivot result col: inherit styles from base column
+                if (this.adaptableApi.columnApi.isPivotResultColumn(columnId)) {
+                    const baseColumn = params.column.getColDef()?.pivotValueColumn;
+                    if (baseColumn) {
+                        const baseColDefCellStyle = baseColumn?.getColDef()?.cellStyle;
+                        const baseColParams = { ...params, column: baseColumn };
+                        baseStyles =
+                            typeof baseColDefCellStyle === 'function'
+                                ? baseColDefCellStyle(baseColParams)
+                                : baseColDefCellStyle;
+                    }
+                }
+                else {
+                    // inherit styles from user provided colDef property
+                    baseStyles = typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle;
+                }
                 const result = {
-                    ...userDefined,
+                    ...baseStyles,
                     ...this.getReadOnlyCellStyle(gridCell, params),
                     ...this.getEditableCellStyle(gridCell, params),
                     ...this.getEditedCellStyle(gridCell, params),

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: 1746021672088 || Date.now(),
-    VERSION: "20.0.11" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1746196695957 || Date.now(),
+    VERSION: "20.0.13" || '--current-version--',
 };

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

@@ -72,7 +72,7 @@ export type AggregationColumnsModelItem = {
 };
 export type AggregationColumnsModel = AggregationColumnsModelItem[];
 export type PivotAggregationColumnsModel = (AggregationColumnsModelItem & {
-    TotalColumn?: boolean | 'before' | 'after' | {
+    Total?: boolean | 'before' | 'after' | {
         PivotColumnId: string;
         ShowTotal?: boolean | 'before' | 'after';
     }[];
@@ -116,10 +116,10 @@ export interface PivotLayoutModel extends BaseLayoutModel {
     /**
      * Display Total of all Pivot Columns before or after the Pivot Columns
      */
-    GrandTotalColumn?: 'before' | 'after' | boolean;
+    PivotGrandTotal?: 'before' | 'after' | boolean;
     /**
      * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
      */
-    PivotGroupTotalColumn?: 'before' | 'after' | boolean;
+    PivotColumnTotal?: 'before' | 'after' | boolean;
 }
 export type LayoutModel = TableLayoutModel | PivotLayoutModel;

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

@@ -1,6 +1,10 @@
 import { ColumnState, GridApi, GridOptions, GridState } from 'ag-grid-enterprise';
 import { PivotLayoutModel, TableLayoutModel } from './LayoutManagerModel';
 import { LMEmitter } from './LMEmitter';
+export declare const PIVOT_ANY_TOTAL_COL_TYPE = "pivotAnyTotal";
+export declare const PIVOT_GRAND_TOTAL_COL_TYPE = "pivotGrandTotal";
+export declare const PIVOT_COLUMN_TOTAL_COL_TYPE = "pivotColumnTotal";
+export declare const PIVOT_AGGREGATION_TOTAL_COL_TYPE = "pivotAggregationTotal";
 export type LayoutManagerOptions = {
     gridApi: GridApi;
     debugId: string;
@@ -74,7 +78,7 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     private withSuppressColumnAnimation;
     private patchColDefType;
     private setupPivotTotals;
-    private patchPivotTotalColumn;
+    private patchPivotAggregationTotal;
     private getPivotTotalColumnConfig;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutManager = void 0;
+exports.LayoutManager = exports.PIVOT_AGGREGATION_TOTAL_COL_TYPE = exports.PIVOT_COLUMN_TOTAL_COL_TYPE = exports.PIVOT_GRAND_TOTAL_COL_TYPE = exports.PIVOT_ANY_TOTAL_COL_TYPE = void 0;
 const infinite_react_1 = require("@infinite-table/infinite-react");
 const isPivotLayoutModel_1 = require("./isPivotLayoutModel");
 const LMEmitter_1 = require("./LMEmitter");
@@ -10,8 +10,12 @@ const simplifyLayoutModel_1 = require("./simplifyLayoutModel");
 const sortColumnIdsByOrder_1 = require("./sortColumnIdsByOrder");
 const destructurePivotColumnId_1 = require("./destructurePivotColumnId");
 const isPivotAggTotalColumn_1 = require("./isPivotAggTotalColumn");
-const isPivotGrandTotalColumn_1 = require("./isPivotGrandTotalColumn");
-const isPivotGroupTotalColumn_1 = require("./isPivotGroupTotalColumn");
+const isPivotGrandTotal_1 = require("./isPivotGrandTotal");
+const isPivotColumnTotal_1 = require("./isPivotColumnTotal");
+exports.PIVOT_ANY_TOTAL_COL_TYPE = 'pivotAnyTotal';
+exports.PIVOT_GRAND_TOTAL_COL_TYPE = 'pivotGrandTotal';
+exports.PIVOT_COLUMN_TOTAL_COL_TYPE = 'pivotColumnTotal';
+exports.PIVOT_AGGREGATION_TOTAL_COL_TYPE = 'pivotAggregationTotal';
 function flattenColDefs(colDefs) {
     const res = [];
     const iteration = (c) => {
@@ -227,7 +231,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         // emit an event that the layout has changed from the grid
         this.emitSync('gridLayoutChanged', layout);
         const log = this.debugger.extend('gridLayoutChanged');
-        log('current grid layout:', JSON.stringify(layout, null, 2), '\nprev layout:\n', prevLayout ? JSON.stringify(prevLayout, null, 2) : 'no prev layout');
+        log('current grid layout:', JSON.stringify(layout, null, 2), '\nprev layout:\n', prevLayout ? JSON.stringify(prevLayout, null, 2) : 'no prev layout', '\nchanges from prev to current:\n', (0, isLayoutEqual_1.getChanges)(prevLayout, layout));
     }
     onChange(fn) {
         return this.on('gridLayoutChanged', fn);
@@ -267,13 +271,13 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         if (layout.SuppressAggFuncInHeader) {
             pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
         }
-        const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
-        if (grandTotalColumn) {
-            pivotLayout.GrandTotalColumn = grandTotalColumn;
+        const pivotGrandTotal = this.gridApi.getGridOption('pivotRowTotals');
+        if (pivotGrandTotal) {
+            pivotLayout.PivotGrandTotal = pivotGrandTotal;
         }
-        const pivotGroupTotalColumn = this.gridApi.getGridOption('pivotColumnGroupTotals');
-        if (pivotGroupTotalColumn) {
-            pivotLayout.PivotGroupTotalColumn = pivotGroupTotalColumn;
+        const pivotColumnTotal = this.gridApi.getGridOption('pivotColumnGroupTotals');
+        if (pivotColumnTotal) {
+            pivotLayout.PivotColumnTotal = pivotColumnTotal;
         }
         return (0, simplifyLayoutModel_1.simplifyPivotLayoutModel)(pivotLayout);
     }
@@ -1051,29 +1055,29 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
          */
         // is common to both Table and Pivot and is applied in applyLayout()
         /**
-         * GrandTotalColumn
+         * PivotGrandTotal
          */
-        if (layout.GrandTotalColumn) {
-            const grandTotalColumn = layout.GrandTotalColumn === true || layout.GrandTotalColumn === 'before'
+        if (layout.PivotGrandTotal) {
+            const pivotGrandTotal = layout.PivotGrandTotal === true || layout.PivotGrandTotal === 'before'
                 ? 'before'
-                : layout.GrandTotalColumn === 'after'
+                : layout.PivotGrandTotal === 'after'
                     ? 'after'
                     : null;
-            this.gridApi.setGridOption('pivotRowTotals', grandTotalColumn);
+            this.gridApi.setGridOption('pivotRowTotals', pivotGrandTotal);
         }
         else {
             this.gridApi.setGridOption('pivotRowTotals', null);
         }
         /**
-         * PivotGroupTotalColumn
+         * PivotColumnTotal
          */
-        if (layout.PivotGroupTotalColumn) {
-            const pivotGroupTotalColumn = layout.PivotGroupTotalColumn === true || layout.PivotGroupTotalColumn === 'before'
+        if (layout.PivotColumnTotal) {
+            const pivotColumnTotal = layout.PivotColumnTotal === true || layout.PivotColumnTotal === 'before'
                 ? 'before'
-                : layout.PivotGroupTotalColumn === 'after'
+                : layout.PivotColumnTotal === 'after'
                     ? 'after'
                     : null;
-            this.gridApi.setGridOption('pivotColumnGroupTotals', pivotGroupTotalColumn);
+            this.gridApi.setGridOption('pivotColumnGroupTotals', pivotColumnTotal);
         }
         else {
             this.gridApi.setGridOption('pivotColumnGroupTotals', null);
@@ -1129,11 +1133,11 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(this.currentLayout)) {
                 return;
             }
-            if ((0, isPivotGrandTotalColumn_1.isPivotGrandTotalColumn)(colDef)) {
-                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGrandTotalColumn']);
+            if ((0, isPivotGrandTotal_1.isPivotGrandTotal)(colDef)) {
+                this.patchColDefType(colDef, [exports.PIVOT_ANY_TOTAL_COL_TYPE, exports.PIVOT_GRAND_TOTAL_COL_TYPE]);
             }
-            if ((0, isPivotGroupTotalColumn_1.isPivotGroupTotalColumn)(colDef.colId)) {
-                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGroupTotalColumn']);
+            if ((0, isPivotColumnTotal_1.isPivotColumnTotal)(colDef.colId)) {
+                this.patchColDefType(colDef, [exports.PIVOT_ANY_TOTAL_COL_TYPE, exports.PIVOT_COLUMN_TOTAL_COL_TYPE]);
             }
         });
         const _original_processPivotResultColGroupDef = this.gridApi.getGridOption('processPivotResultColGroupDef');
@@ -1142,28 +1146,28 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(this.currentLayout)) {
                 return;
             }
-            this.patchPivotTotalColumn(colGroupDef);
+            this.patchPivotAggregationTotal(colGroupDef);
         });
     }
-    patchPivotTotalColumn(colGroupDef) {
-        const hasPivotTotalCols = (pivotLayout) => {
-            return pivotLayout.PivotAggregationColumns?.some((aggCol) => !!aggCol.TotalColumn);
+    patchPivotAggregationTotal(colGroupDef) {
+        const hasPivotAggTotals = (pivotLayout) => {
+            return pivotLayout.PivotAggregationColumns?.some((aggCol) => !!aggCol.Total);
         };
-        if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(this.currentLayout) || !hasPivotTotalCols(this.currentLayout)) {
+        if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(this.currentLayout) || !hasPivotAggTotals(this.currentLayout)) {
             return;
         }
-        const pivotRowTotalColDefsBefore = [];
-        const pivotRowTotalColDefsAfter = [];
-        const pivotTotalColDefsBefore = [];
-        const pivotTotalColDefsAfter = [];
+        const pivotGrandTotalsBefore = [];
+        const pivotGrandTotalsAfter = [];
+        const pivotAggTotalsBefore = [];
+        const pivotAggTotalsAfter = [];
         const normalColDefs = [];
         colGroupDef.children.forEach((colDef) => {
-            if ((0, isPivotGrandTotalColumn_1.isPivotGrandTotalColumn)(colDef)) {
+            if ((0, isPivotGrandTotal_1.isPivotGrandTotal)(colDef)) {
                 if (this.gridApi.getGridOption('pivotRowTotals') === 'after') {
-                    pivotRowTotalColDefsAfter.push(colDef);
+                    pivotGrandTotalsAfter.push(colDef);
                 }
                 else {
-                    pivotRowTotalColDefsBefore.push(colDef);
+                    pivotGrandTotalsBefore.push(colDef);
                 }
                 return;
             }
@@ -1172,7 +1176,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                     this.warn(`Pivot total column ${colDef.colId} is not prefixed with 'pivot_', skipping...`);
                     return;
                 }
-                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotAggregationTotalColumn']);
+                this.patchColDefType(colDef, [exports.PIVOT_ANY_TOTAL_COL_TYPE, exports.PIVOT_AGGREGATION_TOTAL_COL_TYPE]);
                 // we do this for all total cols, but we will hide the ones that are not visible
                 colDef.columnGroupShow = undefined;
                 const totalColConfig = this.getPivotTotalColumnConfig(colDef, this.currentLayout);
@@ -1181,10 +1185,10 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                 }
                 else {
                     if (totalColConfig.position === 'after') {
-                        pivotTotalColDefsAfter.push(colDef);
+                        pivotAggTotalsAfter.push(colDef);
                     }
                     else {
-                        pivotTotalColDefsBefore.push(colDef);
+                        pivotAggTotalsBefore.push(colDef);
                     }
                 }
             }
@@ -1193,11 +1197,11 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             }
         });
         colGroupDef.children = [
-            ...pivotRowTotalColDefsBefore,
-            ...pivotTotalColDefsBefore,
+            ...pivotGrandTotalsBefore,
+            ...pivotAggTotalsBefore,
             ...normalColDefs,
-            ...pivotTotalColDefsAfter,
-            ...pivotRowTotalColDefsAfter,
+            ...pivotAggTotalsAfter,
+            ...pivotGrandTotalsAfter,
         ];
     }
     getPivotTotalColumnConfig(colDef, currentPivotLayout) {
@@ -1217,7 +1221,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             this.warn(`Pivot Totals: could NOT find aggregation(value) column with id ${aggregationColumnId}`);
             return defaultHiddenConfig;
         }
-        const layoutPivotTotalColumn = layoutAggCol.TotalColumn;
+        const layoutPivotTotalColumn = layoutAggCol.Total;
         if (!layoutPivotTotalColumn) {
             return defaultHiddenConfig;
         }

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

@@ -1,4 +1,12 @@
 import { PivotLayoutModel, TableLayoutModel } from './LayoutManagerModel';
+declare const logger: import("@infinite-table/infinite-react").DebugLogger;
+export declare const getChanges: (l1: any, l2: any) => {
+    key: string;
+    value1: any;
+    value2: any;
+}[];
+export declare const logChanges: (l1: any, l2: any, log?: typeof logger) => void;
 export declare function isTableLayoutEqual(l1: TableLayoutModel, l2: TableLayoutModel): boolean;
 export declare function isPivotLayoutEqual(l1: PivotLayoutModel, l2: PivotLayoutModel): boolean;
 export declare function isLayoutEqual(l1: TableLayoutModel | PivotLayoutModel, l2: TableLayoutModel | PivotLayoutModel): boolean;
+export {};