@adaptabletools/adaptable 21.0.5 → 21.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "21.0.5",
+  "version": "21.0.7",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/DateInputOptions.d.ts

@@ -11,7 +11,7 @@ export interface DateInputOptions {
     /**
      * Format string for formatting date input field
      *
-     * @defaultValue 'yyyy-MM-dd'
+     * @defaultValue 'yyyy-MM-dd' (ISO 8601 format)
      */
     dateFormat?: string;
     /**

package/src/Api/Implementation/LayoutHelpers.js

@@ -28,6 +28,23 @@ export const layoutModelToLayoutState = (layoutModel) => {
 function cleanupAdaptableObjectPrimitives(layout) {
     const l = layout;
     for (const key in l) {
+        if (key === 'ColumnFilters') {
+            // we don't want to cleanup ColumnFilters
+            // as we rely on the Uuids for identifying the filters
+            if (Array.isArray(l[key])) {
+                l[key].forEach((item) => {
+                    if (typeof item === 'object') {
+                        // but we do want to cleanup further down - eg: predicates in the filter
+                        for (const k in item) {
+                            if (typeof item[k] === 'object') {
+                                removeAdaptableObjectPrimitivesInlineDeep(item[k]);
+                            }
+                        }
+                    }
+                });
+            }
+            continue;
+        }
         if (typeof l[key] === 'object') {
             removeAdaptableObjectPrimitivesInlineDeep(l[key]);
         }
@@ -355,9 +372,9 @@ export const tableLayoutModelToTableLayout = (layoutModel) => {
     if (layoutModel.Ignore_Metadata) {
         tableLayout.Metadata = layoutModel.Ignore_Metadata;
     }
-    if (layoutModel.RowGroupDisplayType) {
-        tableLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType;
-    }
+    // if (layoutModel.RowGroupDisplayType) {
+    tableLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType ?? 'single';
+    // }
     if (layoutModel.RowGroupedColumns) {
         tableLayout.RowGroupedColumns = layoutModel.RowGroupedColumns;
     }
@@ -511,9 +528,9 @@ export const pivotLayoutModelToPivotLayout = (layoutModel) => {
             pivotLayout.ColumnGroupValues.ExceptionGroupKeys = layoutModel.ColumnGroupValues.Values;
         }
     }
-    if (layoutModel.RowGroupDisplayType) {
-        pivotLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType;
-    }
+    // if (layoutModel.RowGroupDisplayType) {
+    pivotLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType ?? 'single';
+    // }
     return pivotLayout;
 };
 export const isPivotLayout = (layout) => Array.isArray(layout.PivotColumns);

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

@@ -123,4 +123,5 @@ export declare class AdaptableInternalApi extends ApiBase {
     findAdaptableObjectsByLookupCriteria<T extends AdaptableObjectWithScope>({ scope, tag, ids }: AdaptableObjectLookupCriteria, specificAdaptableObjects: T[]): T[];
     buildBaseContext(): BaseContext;
     setCellSummaryInfo(cellSummaryInfo: CellSummmaryInfo): void;
+    parseDateValue(dateValue: string | Date | number): Date | undefined;
 }

package/src/Api/Internal/AdaptableInternalApi.js

@@ -5,6 +5,7 @@ import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { ADAPTABLE_ID } from '../../Utilities/Constants/GeneralConstants';
 import { waitForCondition } from '../../Utilities/waitForCondition';
 import { isAdaptableCustomIcon, isAdaptableSystemIcon } from '../../components/Icon';
+import { parseDateValue } from '../../Utilities/Helpers/DateHelper';
 export class AdaptableInternalApi extends ApiBase {
     getInternalState() {
         return this.getAdaptableState().Internal;
@@ -439,4 +440,12 @@ export class AdaptableInternalApi extends ApiBase {
     setCellSummaryInfo(cellSummaryInfo) {
         this.dispatchAction(InternalRedux.SetCellSummaryInfo(cellSummaryInfo));
     }
+    parseDateValue(dateValue) {
+        const dateFormat = this.getUserInterfaceOptions().dateInputOptions.dateFormat;
+        if (dateFormat === 'yyyy-MM-dd') {
+            // if the format is ISO, we don't pass it so that we use the date-fns `parseISO` which is more robust
+            return parseDateValue(dateValue);
+        }
+        return parseDateValue(dateValue, dateFormat);
+    }
 }

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

@@ -1,7 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { ColDef, Column, HeaderValueGetterParams, IRowNode } from 'ag-grid-enterprise';
-import { CustomSort } from '../../AdaptableState/CustomSortState';
-import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
+import { ColDef, Column, HeaderValueGetterParams } from 'ag-grid-enterprise';
 import { AdaptableColumn, AdaptableColumnDataType } from '../../types';
 export declare function getAutoRowGroupColumnIdFor(columnId: string): string;
 export declare class ColumnInternalApi extends ApiBase {
@@ -29,7 +27,6 @@ export declare class ColumnInternalApi extends ApiBase {
      * @param columnId columnId to look up
      */
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
-    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: IRowNode, nodeB?: IRowNode, isInverted?: boolean) => number | undefined;
     isSpecialColumn(columnId: string, column?: AdaptableColumn): boolean;
     getColumnHeaderName(params: HeaderValueGetterParams): string;
     private buildColumnHeaderContext;

package/src/Api/Internal/ColumnInternalApi.js

@@ -64,18 +64,6 @@ export class ColumnInternalApi extends ApiBase {
     getAgGridColumnForAdaptableColumn(columnId) {
         return this._adaptable.getAgGridColumnForColumnId(columnId);
     }
-    getActiveColumnComparator(columnId, customSort, customSortComparer) {
-        if ((!customSort || customSort?.IsSuspended) && !customSortComparer) {
-            // defaults to AG-Grid column definition comparator if no CustomSort is defined&active
-            const colDefComparator = this._adaptable.agGridColumnAdapter.getUserColDefProperty(columnId, 'comparator');
-            return colDefComparator;
-        }
-        // CustomSort Comparer function takes precedence over CustomSort SortedValues
-        const comparerFunction = customSortComparer
-            ? customSortComparer.comparer
-            : this.getCustomSortApi().internalApi.getDefaultCustomSortComparer(customSort.ColumnId, customSort.SortedValues);
-        return comparerFunction;
-    }
     isSpecialColumn(columnId, column = null) {
         if (column) {
             return column.isCalculatedColumn || column.isFreeTextColumn || column.isActionColumn;

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

@@ -14,6 +14,7 @@ export declare class ExportInternalApi extends ApiBase {
     setExportInProgress(reportName: ReportNameType, reportFormat: ReportFormatType, exportDestination: ExportDestinationType): void;
     setExportComplete(): void;
     isVisualDataExportInProgress(): boolean;
+    isExcelExportInProgress(): boolean;
     createSystemReport(systemReportName: SystemReportName): Report;
     isSystemReport(reportName: ReportNameType): boolean;
     isSystemDestination(destination: ExportDestinationType): boolean;

package/src/Api/Internal/ExportInternalApi.js

@@ -82,6 +82,9 @@ export class ExportInternalApi extends ApiBase {
     isVisualDataExportInProgress() {
         return this.getAdaptableState().Internal.Export.inProgress?.reportFormat === 'VisualExcel';
     }
+    isExcelExportInProgress() {
+        return this.getAdaptableState().Internal.Export.inProgress?.reportFormat === 'Excel';
+    }
     createSystemReport(systemReportName) {
         switch (systemReportName) {
             case ALL_DATA_REPORT:

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

@@ -8,4 +8,3 @@ export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
 export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
 export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;
-export declare const parseFilterInputDate: (stringDate: string) => Date;

package/src/Utilities/Helpers/DateHelper.js

@@ -23,6 +23,9 @@ export const parseToISO = (date, dateFormat) => {
     const dateInstance = parseDateValue(date, dateFormat);
     return isValidDate(dateInstance) ? dateToISO(dateInstance) : '';
 };
+// !!!
+// AFL: ideally we should NEVER call directly this method, but use the AdaptableInternalApi.parseDateValue() instead
+// we should refactor this with the first opportunity
 export const parseDateValue = (dateValue, dateFormat) => {
     if (dateValue == undefined || (typeof dateValue === 'string' && dateValue.trim() === '')) {
         return undefined;
@@ -30,27 +33,36 @@ export const parseDateValue = (dateValue, dateFormat) => {
     if (dateValue instanceof Date) {
         return !isNaN(dateValue.getTime()) ? dateValue : undefined;
     }
-    let dateInstance;
-    if (typeof dateValue === 'number') {
-        dateInstance = new Date(dateValue);
-    }
-    else {
-        // typeof dateValue === 'string'
-        if (dateFormat) {
-            dateInstance = parse(dateValue, dateFormat, new Date());
+    try {
+        let dateInstance;
+        if (typeof dateValue === 'number') {
+            dateInstance = new Date(dateValue);
         }
         else {
-            dateInstance = parseISO(dateValue);
+            // typeof dateValue === 'string'
+            if (dateFormat) {
+                dateInstance = parse(dateValue, dateFormat, new Date());
+            }
+            else {
+                dateInstance = parseISO(dateValue);
+            }
+            if (!isValidDate(dateInstance)) {
+                // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
+                dateInstance = new Date(Date.parse(dateValue));
+            }
         }
         if (!isValidDate(dateInstance)) {
-            // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
-            dateInstance = new Date(Date.parse(dateValue));
+            AdaptableLogger.consoleWarnBase(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
+            dateInstance = undefined;
         }
+        return dateInstance;
     }
-    if (!isValidDate(dateInstance)) {
-        AdaptableLogger.consoleWarnBase(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
-        dateInstance = undefined;
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorStack = error instanceof Error ? error.stack : undefined;
+        AdaptableLogger.consoleErrorBase(`Error parsing date value "${dateValue}": ${errorMessage}`, {
+            stack: errorStack,
+            originalError: error,
+        });
     }
-    return dateInstance;
 };
-export const parseFilterInputDate = (stringDate) => new Date(stringDate);

package/src/View/Filter/FilterViewPanel.js

@@ -31,7 +31,7 @@ class FilterViewPanelComponent extends React.Component {
                 ArrayExtensions.IsNotNullOrEmpty(this.props.ColumnFilters) && (React.createElement(AdaptablePopover, { popupPadding: 0, className: `ab-${elementType}__Filter__info`, headerText: "", bodyText: [React.createElement(ActiveFiltersPanel, null)], useButton: true, showEvent: 'focus', hideEvent: "blur", popoverMinWidth: 400 })),
                 React.createElement(ButtonClear, { "aria-label": 'Clear Filters', className: `ab-${elementType}__Filter__clear`, marginLeft: 1, marginBottom: 0, marginRight: 1, onClick: () => this.onClearFilters(), tooltip: "Clear Filters", disabled: this.props.ColumnFilters.length == 0, showText: this.props.viewType === 'ToolPanel' }, this.props.viewType === 'ToolPanel' && 'Clear'),
                 React.createElement(SimpleButton, { "aria-label": isAtLeastOneFilterActive ? 'Suspend All Filters' : 'Resume All Filters', className: join(`ab-${elementType}__Filter__suspend-button`, isAtLeastOneFilterActive && `ab-${elementType}__Filter__suspend-all`, !isAtLeastOneFilterActive && `ab-${elementType}__Filter__un-suspend-all`), disabled: !isAtLeastOneFilter, onClick: handleSuspendUnsuspendAll, tone: isAtLeastOneFilterActive ? 'neutral' : 'success', variant: "text", icon: isAtLeastOneFilterActive ? 'pause' : 'play', accessLevel: this.props.accessLevel })),
-            React.createElement(Flex, { alignItems: "center" }, this.props.api.filterApi.columnFilterApi.isQuickFilterAvailable() && (React.createElement(CheckBox, { className: `ab-${elementType}__Filter__active-check`, disabled: this.props.accessLevel === 'ReadOnly' ||
+            React.createElement(Flex, { alignItems: "center" }, this.props.api.filterApi.columnFilterApi.isQuickFilterAvailable() && (React.createElement(CheckBox, { "data-name": "quick-filter-toggle", className: `ab-${elementType}__Filter__active-check`, disabled: this.props.accessLevel === 'ReadOnly' ||
                     this.props.api.layoutApi.isCurrentLayoutPivot(), marginTop: 0, marginBottom: 0, fontSize: 2, padding: 1, checked: this.props.IsQuickFilterVisible, onChange: (checked) => {
                     checked ? this.props.onShowQuickFilterBar() : this.props.onHideQuickFilterBar();
                 } }, "Filter Bar")))));

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

@@ -22,7 +22,7 @@ import { ReorderDraggable } from '../../../Components/ReorderDraggable';
 import { AdaptableFormControlTextClear } from '../../../Components/Forms/AdaptableFormControlTextClear';
 import { sortColumnIdsByOrder } from '../../../../layout-manager/src/sortColumnIdsByOrder';
 import HelpBlock from '../../../../components/HelpBlock';
-import { AG_GRID_SELECTION_COLUMN } from '../../../../Utilities/Constants/GeneralConstants';
+import { AG_GRID_GROUPED_COLUMN, AG_GRID_SELECTION_COLUMN, } from '../../../../Utilities/Constants/GeneralConstants';
 import { isPivotLayout } from '../../../../Utilities/isPivotLayout';
 const PropertyOrderText = (props) => (React.createElement(Text, { fontWeight: 600, fontSize: 2 }, props.children));
 const columnTypes = {
@@ -261,7 +261,8 @@ export const ColumnsSection = (props) => {
             });
         }
     }
-    if (adaptable.api.gridApi.isTreeDataGrid()) {
+    if (adaptable.api.gridApi.isTreeDataGrid() &&
+        !allColumns.find((col) => col.columnId === AG_GRID_GROUPED_COLUMN)) {
         allColumns.unshift(generateAutoTreeSingleColumn());
     }
     const colIdToCol = allColumns.reduce((acc, col) => {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -200,7 +200,9 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getDisplayValueFromRawValue(rowNode: IRowNode, columnId: string, rawValue: any): string | undefined;
     private getCleanValue;
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
+    private __updateColumnModelAndRefreshGrid_already_called;
     updateColumnModelAndRefreshGrid(): void;
+    _updateColumnModelAndRefreshGridNow(): void;
     redrawBody(): void;
     refreshHeader(): void;
     redrawRows(rowNodes?: IRowNode[]): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -179,6 +179,7 @@ export class AdaptableAgGrid {
             }
             return this.emitter.onIncludeFired(eventName, callback);
         };
+        this.__updateColumnModelAndRefreshGrid_already_called = false;
         this.lifecycleState = 'initial';
         this.emitter = new Emitter();
         this.agGridOptionsService = new AgGridOptionsService(this);
@@ -712,18 +713,30 @@ You need to define at least one Layout!`);
                 };
             }
             return (params) => {
+                // might be a summary row
+                if (params.data?.[ROW_SUMMARY_ROW_ID]) {
+                    return params.data[ROW_SUMMARY_ROW_ID];
+                }
+                if (params.level > 0) {
+                    const parentKeys = params.parentKeys ?? [];
+                    const values = Object.values(params.data);
+                    let hash = 0;
+                    for (let i = 0; i < values.length; i++) {
+                        const str = String(values[i] ?? '');
+                        for (let j = 0; j < str.length; j++) {
+                            hash = ((hash << 5) - hash + str.charCodeAt(j)) | 0;
+                        }
+                    }
+                    const id = [...parentKeys, Math.abs(hash)].join('/');
+                    return id;
+                }
                 if (params.data?.[primaryKey]) {
                     const primaryKeyValue = params.data[primaryKey];
                     return typeof primaryKeyValue === 'number'
                         ? `${primaryKeyValue}`
                         : params.data[primaryKey];
                 }
-                // might be a summary row
-                if (params.data?.[ROW_SUMMARY_ROW_ID]) {
-                    return params.data[ROW_SUMMARY_ROW_ID];
-                }
-                // AFL 2024.08.17 - no idea why is this here and when it's used
-                //  might be a group row
+                // fallback
                 const parentKeys = params.parentKeys ?? [];
                 const values = Object.values(params.data);
                 if (values.length) {
@@ -1072,6 +1085,20 @@ You need to define at least one Layout!`);
                     color: '#aaaaaa',
                     pattern: 'Solid',
                 },
+            }, 
+            // see #EXCEL_EXPORT_DATA_TYPES
+            {
+                id: 'stringExcelType',
+                dataType: 'String',
+            }, {
+                id: 'booleanExcelType',
+                dataType: 'Boolean',
+            }, {
+                id: 'dateExcelType',
+                dataType: 'DateTime',
+            }, {
+                id: 'numberExcelType',
+                dataType: 'Number',
             });
             this.agGridExportAdapter.originalExcelStyles = excelStyles;
             this.agGridExportAdapter.DANGER_excelStyles = this.agGridExportAdapter.originalExcelStyles;
@@ -1865,6 +1892,20 @@ You need to define at least one Layout!`);
         return rawValue;
     }
     updateColumnModelAndRefreshGrid() {
+        if (this.__updateColumnModelAndRefreshGrid_already_called) {
+            return;
+        }
+        try {
+            this._updateColumnModelAndRefreshGridNow();
+            this.__updateColumnModelAndRefreshGrid_already_called = true;
+        }
+        finally {
+            queueMicrotask(() => {
+                this.__updateColumnModelAndRefreshGrid_already_called = false;
+            });
+        }
+    }
+    _updateColumnModelAndRefreshGridNow() {
         this.logger.info(`Updating Column Model and Refreshing Grid.`);
         this.deriveAdaptableColumnStateFromAgGrid();
         this.agGridColumnAdapter.setupColumns();
@@ -3168,11 +3209,6 @@ You need to define at least one Layout!`);
         return this.agGridModulesAdapter.isAgGridModuleRegistered('CsvExportModule');
     }
     isQuickFilterAvailable() {
-        if (this.api.layoutApi.isCurrentLayoutPivot() &&
-            this.adaptableOptions.filterOptions.useAdaptableFiltering) {
-            // hide completely the quick filter if pivot is enabled
-            return false;
-        }
         return this.hasFloatingFilterOnAtLeastOneColumn(this.agGridAdapter.getAgGridApi().getColumnDefs());
     }
     hasFloatingFilterOnAtLeastOneColumn(columnDefs) {
@@ -3551,8 +3587,8 @@ You need to define at least one Layout!`);
     isRowGroupDifferentInLayout(one, other) {
         const prevRowGroupedColumns = one.RowGroupedColumns || one.PivotGroupedColumns || [];
         const currentRowGroupedColumns = other.RowGroupedColumns || other.PivotGroupedColumns || [];
-        const prevRowGroupDisplayType = one.RowGroupDisplayType;
-        const currentRowGroupDisplayType = other.RowGroupDisplayType;
+        const prevRowGroupDisplayType = one.RowGroupDisplayType ?? 'single';
+        const currentRowGroupDisplayType = other.RowGroupDisplayType ?? 'single';
         if (prevRowGroupDisplayType !== currentRowGroupDisplayType) {
             return true;
         }

package/src/agGrid/AgGridColumnAdapter.js

@@ -169,11 +169,27 @@ export class AgGridColumnAdapter {
                 if (!gridCell.column) {
                     return null;
                 }
-                // if a VisualExcel report format export is in progress, we are interested only in the Excel Style Class
-                if (this.adaptableApi.exportApi.internalApi.isVisualDataExportInProgress()) {
+                const isExcelExport = this.adaptableApi.exportApi.internalApi.isExcelExportInProgress();
+                const isVisualDataExport = this.adaptableApi.exportApi.internalApi.isVisualDataExportInProgress();
+                if (isExcelExport || isVisualDataExport) {
+                    const excelStyleClasses = [];
                     const userDefinedCellClass = typeof userCellClass === 'function' ? userCellClass(params) : userCellClass;
-                    const cellClassKey = AgGridExportAdapter.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
-                    return this.adaptableInstance.agGridExportAdapter.getExcelStyleIdForCellClassKey(cellClassKey);
+                    if (userDefinedCellClass) {
+                        if (Array.isArray(userDefinedCellClass)) {
+                            excelStyleClasses.push(...userDefinedCellClass.filter(Boolean));
+                        }
+                        else {
+                            excelStyleClasses.push(userDefinedCellClass);
+                        }
+                    }
+                    if (isVisualDataExport) {
+                        const cellClassKey = AgGridExportAdapter.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
+                        const customCellClass = this.adaptableInstance.agGridExportAdapter.getExcelStyleIdForCellClassKey(cellClassKey);
+                        if (customCellClass) {
+                            excelStyleClasses.push(customCellClass);
+                        }
+                    }
+                    return excelStyleClasses.length ? excelStyleClasses : null;
                 }
                 const isQuickSearchActive = this.isQuickSearchActive(gridCell);
                 const editableClassName = this.getEditableCellClass(gridCell, params);
@@ -612,7 +628,7 @@ export class AgGridColumnAdapter {
         const isFloatingFilterDisabled = !colDef.filter ||
             !colDef.floatingFilter ||
             !this.adaptableOptions.filterOptions.useAdaptableFiltering ||
-            !this.adaptableOptions.filterOptions.columnFilterOptions.showQuickFilter;
+            !this.adaptableApi.filterApi.columnFilterApi.isQuickFilterVisible();
         if (this.adaptableApi.columnApi.isAutoRowGroupColumn(col.getColId())) {
             this.setColDefProperty(col, 'floatingFilter', (original_floatingFilter) => {
                 // the floating filter for the group column is "inherited" from the base column
@@ -803,10 +819,47 @@ export class AgGridColumnAdapter {
     }
     setupColumnComparator({ col, colId, abColumn }) {
         const customSort = this.adaptableApi.customSortApi.getCustomSortForColumn(colId);
-        const columnSortComparer = this.adaptableApi.customSortApi.internalApi.getCustomSortComparer(abColumn.columnId);
+        const customSortComparer = this.adaptableApi.customSortApi.internalApi.getCustomSortComparer(abColumn.columnId);
+        const memoizedDateValues = new Map();
+        const getDateValue = (rawDateValue) => {
+            if (memoizedDateValues.has(rawDateValue)) {
+                return memoizedDateValues.get(rawDateValue);
+            }
+            const dateValue = this.adaptableApi.internalApi.parseDateValue(rawDateValue);
+            memoizedDateValues.set(rawDateValue, dateValue);
+            return dateValue;
+        };
         const comparatorGetter = (propName) => {
-            return () => {
-                return this.adaptableApi.columnApi.internalApi.getActiveColumnComparator(colId, customSort, columnSortComparer);
+            return (userPropertyValue) => {
+                // CustomSort Comparer function takes precedence over CustomSort SortedValues
+                if (customSortComparer) {
+                    return customSortComparer.comparer;
+                }
+                if (customSort && !customSort.IsSuspended) {
+                    return this.adaptableApi.customSortApi.internalApi.getDefaultCustomSortComparer(customSort.ColumnId, customSort.SortedValues);
+                }
+                if (userPropertyValue) {
+                    return userPropertyValue;
+                }
+                // for DATE columns we have to use the normalised values (Date objects) to compare
+                if (abColumn.dataType === 'date') {
+                    return (valueA, valueB) => {
+                        const dateA = getDateValue(valueA);
+                        const dateB = getDateValue(valueB);
+                        if (dateA && dateB) {
+                            return dateA.getTime() - dateB.getTime();
+                        }
+                        else if (dateA) {
+                            return 1; // consider non-null dates as greater than null/undefined
+                        }
+                        else if (dateB) {
+                            return -1; // consider non-null dates as greater than null/undefined
+                        }
+                        else {
+                            return 0; // both are null/undefined, considered equal
+                        }
+                    };
+                }
             };
         };
         this.setColDefProperty(col, 'comparator', comparatorGetter('comparator'));

package/src/agGrid/AgGridExportAdapter.js

@@ -602,6 +602,23 @@ export class AgGridExportAdapter {
                 this.registerExcelStyle(finalCellExcelStyle, cellClassId);
             });
         }, forAllVisibleRowNodesDoConfig);
+        // see #EXCEL_EXPORT_DATA_TYPES
+        this.excelStylesCache['stringExcelType'] = {
+            id: 'stringExcelType',
+            dataType: 'String',
+        };
+        this.excelStylesCache['booleanExcelType'] = {
+            id: 'booleanExcelType',
+            dataType: 'Boolean',
+        };
+        this.excelStylesCache['dateExcelType'] = {
+            id: 'dateExcelType',
+            dataType: 'DateTime',
+        };
+        this.excelStylesCache['numberExcelType'] = {
+            id: 'numberExcelType',
+            dataType: 'Number',
+        };
         return Object.values(this.excelStylesCache);
     }
     registerExcelStyle(excelStyle, cellClassKey) {

package/src/agGrid/AgGridModulesAdapter.js

@@ -16,7 +16,20 @@ export class AgGridModulesAdapter {
         return this.adaptableInstance.agGridAdapter.getAgGridApi();
     }
     isAgGridModuleRegistered(moduleName) {
-        return this.agGridApi.isModuleRegistered(moduleName);
+        let isModuleRegistered = this.agGridApi.isModuleRegistered(moduleName);
+        if (!isModuleRegistered) {
+            // SSRM module comes with its own implementations of Pivot, MasterDetail and TreeData
+            // #ssrm_pivot_module
+            const serverSideDependencies = [
+                'PivotModule',
+                'MasterDetailModule',
+                'TreeDataModule',
+            ];
+            if (serverSideDependencies.includes(moduleName)) {
+                isModuleRegistered = this.agGridApi.isModuleRegistered('ServerSideRowModelModule');
+            }
+        }
+        return isModuleRegistered;
     }
     getAgGridRegisteredModules() {
         const registeredModules = [];

package/src/components/Select/Select.js

@@ -279,10 +279,10 @@ export const Select = function (props) {
                                 // ignore the event if the focus is still inside the menu
                                 return;
                             }
-                            setTimeout(() => {
+                            requestAnimationFrame(() => {
                                 // wee need to wait for the single value selection to complete before closing
                                 closeSelectMenu();
-                            }, 100);
+                            });
                         },
                         onMouseDown: (event) => {
                             if (!props.isMulti) {

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1759139175072 || Date.now(),
-    VERSION: "21.0.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1760446037964 || Date.now(),
+    VERSION: "21.0.7" || '--current-version--',
 };

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

@@ -342,9 +342,15 @@ export class LayoutManager extends LMEmitter {
         let ColumnSizing = layout.ColumnSizing || {};
         //let's also include the column widths of the pivotResult columns
         pivotResultColumns.forEach((col) => {
-            ColumnSizing[col.getColId()] = {
-                Width: col.getActualWidth(),
-            };
+            const colId = col.getColId();
+            const Width = col.getActualWidth();
+            const initialWidth = this.initialColumnWidths[colId] ?? DEFAULT_COLUMN_WIDTH;
+            // but if the width is the initial/default width, don't include it in the ColumnSizing
+            if (Width !== initialWidth) {
+                ColumnSizing[colId] = {
+                    Width,
+                };
+            }
         });
         if (!Object.keys(ColumnSizing).length) {
             ColumnSizing = undefined;
@@ -1707,6 +1713,10 @@ export class LayoutManager extends LMEmitter {
         }
     }
     isInPivotMode() {
-        return this.gridApi.isModuleRegistered('PivotModule') && this.gridApi.isPivotMode();
+        // SSRM comes with its own pivot module implementation
+        // see #ssrm_pivot_module
+        const isModuleRegistered = this.gridApi.isModuleRegistered('PivotModule') ||
+            this.gridApi.isModuleRegistered('ServerSideRowModelModule');
+        return isModuleRegistered && this.gridApi.isPivotMode();
     }
 }