@adaptabletools/adaptable 11.0.0-canary.3 → 11.0.0-canary.7

package/src/agGrid/Adaptable.js

@@ -291,7 +291,7 @@ class Adaptable {
     // the 'old' constructor which takes an Adaptable adaptable object
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         if (!_staticInit) {
             LoggingHelper_1.ConsoleLogWarning(`
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -340,7 +340,8 @@ class Adaptable {
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
         if (!this.getDefaultGroupOrderComparator(this.gridOptions) &&
             this.adaptableOptions.generalOptions.autoOrderGroupedColumns) {
-            this.gridOptions.defaultGroupOrderComparator = this.agGridHelper.runAdaptableGroupComparerFunction();
+            this.gridOptions.defaultGroupOrderComparator =
+                this.agGridHelper.runAdaptableGroupComparerFunction();
         }
         // we prefer the grid to be NOT instantiated so that we can do it
         // perhaps in future we will force instantiation only?
@@ -375,7 +376,6 @@ class Adaptable {
             abColDefDate: (_d = this.gridOptions.columnTypes.abColDefDate) !== null && _d !== void 0 ? _d : {},
             abColDefObject: (_e = this.gridOptions.columnTypes.abColDefObject) !== null && _e !== void 0 ? _e : {},
             abColDefCustom: (_f = this.gridOptions.columnTypes.abColDefCustom) !== null && _f !== void 0 ? _f : {},
-            abColDefNumberArray: (_g = this.gridOptions.columnTypes.abColDefNumberArray) !== null && _g !== void 0 ? _g : {},
         });
         if (this.gridOptions.columnTypes.abColDefNumber.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefNumber.cellEditor = AdaptableNumberEditor_1.AdaptableNumberEditor;
@@ -427,8 +427,16 @@ class Adaptable {
                 ReactDOM.render(AdaptableView_1.AdaptableApp({ Adaptable: this }), this.abContainerElement);
             }
             // create debounce methods that take a time based on user settings
-            this.throttleFilterOnEditDataChange = throttle_1.default(this.gridOptions.api.onFilterChanged, this.adaptableOptions.filterOptions.filterActionOnUserDataChange.throttleDelay);
-            this.throttleFilterOnTickingDataChange = throttle_1.default(this.gridOptions.api.onFilterChanged, this.adaptableOptions.filterOptions.filterActionOnExternalDataChange.throttleDelay);
+            this.throttleFilterOnEditDataChange = throttle_1.default(
+            // the extra function is to make sure we have a reference to ag-grid-api
+            () => this.gridOptions.api.onFilterChanged(), this.adaptableOptions.filterOptions.filterActionOnUserDataChange.throttleDelay, {
+                trailing: true,
+                leading: false,
+            });
+            this.throttleFilterOnTickingDataChange = throttle_1.default(() => this.gridOptions.api.onFilterChanged(), this.adaptableOptions.filterOptions.filterActionOnExternalDataChange.throttleDelay, {
+                trailing: true,
+                leading: false,
+            });
             return this.api;
         });
     }
@@ -513,7 +521,7 @@ class Adaptable {
             this.gridOptions.columnDefs.forEach(assignColId);
         }
         if ((_a = this.adaptableOptions.generalOptions) === null || _a === void 0 ? void 0 : _a.hideEmptyGroupRows) {
-            LoggingHelper_1.LogAdaptableWarning(`DEPRECATED: 'GeneralOptions.hideEmptyGroupRows' is deprecated and will no longer be evaluated!`);
+            LoggingHelper_1.ConsoleLogWarning(`DEPRECATED: 'GeneralOptions.hideEmptyGroupRows' is deprecated and will no longer be evaluated!`);
             // disabled due to showstopper starting with AG Grid v26
             // the internal implementation of AG Grids GroupCellRenderer has changed A LOT!
             // this.gridOptions.components = this.gridOptions.components || {};
@@ -729,12 +737,12 @@ class Adaptable {
         const groupsCount = {};
         const colsToGroups = columnGroupChildren.reduce((acc, columnGroup) => {
             var _a, _b, _c;
-            if (!((_b = (_a = columnGroup.getOriginalColumnGroup) === null || _a === void 0 ? void 0 : _a.call(columnGroup)) === null || _b === void 0 ? void 0 : _b.getColGroupDef())) {
+            if (!((_b = (_a = columnGroup.getProvidedColumnGroup) === null || _a === void 0 ? void 0 : _a.call(columnGroup)) === null || _b === void 0 ? void 0 : _b.getColGroupDef())) {
                 return acc;
             }
             const ColumnGroupId = columnGroup.getGroupId();
-            const AllowGroupSplit = !columnGroup.getOriginalColumnGroup().getColGroupDef().marryChildren;
-            const FriendlyName = (_c = columnGroup.getOriginalColumnGroup().getColGroupDef().headerName) !== null && _c !== void 0 ? _c : ColumnGroupId;
+            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef().marryChildren;
+            const FriendlyName = (_c = columnGroup.getProvidedColumnGroup().getColGroupDef().headerName) !== null && _c !== void 0 ? _c : ColumnGroupId;
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {
                 const group = {
@@ -1105,7 +1113,10 @@ class Adaptable {
     }
     setColumnOrder(VisibleColumnList) {
         const newColumnState = this.getSortedColumnStateForVisibleColumns(VisibleColumnList);
-        this.gridOptions.columnApi.applyColumnState({ state: newColumnState, applyOrder: true });
+        this.gridOptions.columnApi.applyColumnState({
+            state: newColumnState,
+            applyOrder: true,
+        });
         this.updateColumnsIntoStore();
     }
     persistLayout(layout) {
@@ -1259,7 +1270,10 @@ class Adaptable {
             if (shouldUpdatePivoted) {
                 this.gridOptions.columnApi.setPivotMode(pivoted);
             }
-            this.gridOptions.columnApi.applyColumnState({ state: newColState, applyOrder: true });
+            this.gridOptions.columnApi.applyColumnState({
+                state: newColState,
+                applyOrder: true,
+            });
             this.api.gridApi.setColumnSorts(layout.ColumnSorts);
             this.gridOptions.columnApi.setPivotColumns(layout.PivotColumns || []);
             // aggrid 25.1.0 introduced a bug such that a layout that has a grouped column, if the column has enableRowGroup: true but not rowGroup: true
@@ -1425,7 +1439,10 @@ class Adaptable {
                 }
             });
         }
-        const selectedCellInfo = { columns: columns, gridCells: selectedCells };
+        const selectedCellInfo = {
+            columns: columns,
+            gridCells: selectedCells,
+        };
         this.api.internalApi.setSelectedCells(selectedCellInfo);
         this._emit('CellsSelected');
         this.agGridHelper.fireSelectionChangedEvent();
@@ -1675,18 +1692,15 @@ class Adaptable {
         let returnValue;
         if (this.useRowNodeLookUp) {
             const rowNode = this.gridOptions.api.getRowNode(id);
-            const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
-            if (gridCell) {
-                returnValue = gridCell.displayValue;
-            }
+            return this.getDisplayValueFromRowNode(rowNode, columnId);
         }
         else {
             let foundRow = false;
             this.gridOptions.api.getModel().forEachNode((rowNode) => {
                 if (!foundRow) {
-                    const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
-                    if (gridCell && id == gridCell.primaryKeyValue) {
-                        returnValue = gridCell.displayValue;
+                    const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(rowNode);
+                    if (id == primaryKeyValue) {
+                        returnValue = this.getDisplayValueFromRowNode(rowNode, columnId);
                     }
                     foundRow = true;
                 }
@@ -1712,15 +1726,14 @@ class Adaptable {
             rowNode: rowNode,
         };
     }
-    getDisplayValueFromRowNode(row, columnId) {
-        const gridCell = this.getGridCellFromRowNode(row, columnId);
-        return gridCell ? gridCell.displayValue : undefined;
-    }
-    // same as getDisplayValueFromRawValue(), but without evaluating cell renderers (only valueGetters & valueFormatters)
-    getFormattedValueFromRawValue(rawValue, columnId) {
-        return this.getDisplayValueFromRawValue(columnId, rawValue, true);
+    getDisplayValueFromRowNode(rowNode, columnId) {
+        if (rowNode == null) {
+            return undefined;
+        }
+        const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
+        return this.getDisplayValueFromRawValue(columnId, rawValue);
     }
-    getDisplayValueFromRawValue(columnId, rawValue, skipCellRenderers = false) {
+    getDisplayValueFromRawValue(columnId, rawValue) {
         const abColumn = this.api.columnApi.getColumnFromId(columnId);
         const isRenderedColumn = this.api.columnApi.isFormatNumericStyleColumn(abColumn);
         if (isRenderedColumn) {
@@ -1738,14 +1751,17 @@ class Adaptable {
         if (colDef) {
             if (typeof colDef.valueFormatter == 'function') {
                 const formattedValue = this.getFormattedValue(rawValue, columnId, colDef, colDef.valueFormatter);
-                if (colDef.cellRenderer && !skipCellRenderers) {
-                    return this.agGridHelper.getRenderedValue(colDef, formattedValue);
-                }
+                // Never use cellRenderer:
+                // - when a string, you never know if it is HTML or a normal string
+                // - when an object, cannot be used
+                // if (colDef.cellRenderer && !skipCellRenderers) {
+                //   return this.agGridHelper.getRenderedValue(colDef, formattedValue);
+                // }
                 return formattedValue || '';
             }
-            if (colDef.cellRenderer && !skipCellRenderers) {
-                return this.agGridHelper.getRenderedValue(colDef, rawValue);
-            }
+            // if (colDef.cellRenderer && !skipCellRenderers) {
+            // return this.agGridHelper.getRenderedValue(colDef, rawValue);
+            // }
         }
         return this.agGridHelper.getCleanValue(rawValue);
     }
@@ -1783,9 +1799,10 @@ class Adaptable {
         if (dataType === 'Boolean') {
             return typeof rawValue !== 'boolean' ? Boolean(rawValue) : returnValue;
         }
-        if (dataType === 'Date') {
-            return rawValue instanceof Date ? returnValue : new Date(rawValue);
-        }
+        // Do not normalize dates to Date type
+        // - breaks when rendering in filter-form
+        // - breaks quick-search; the Date is transformed to string;
+        // -- an incorrect comparison is made (new Date().toString).incudes('query)
         return returnValue;
     }
     getRawValueFromRowNode(rowNode, columnId) {
@@ -1806,6 +1823,9 @@ class Adaptable {
             });
         }
     }
+    getRowNodeByIndex(index) {
+        return this.gridOptions.api.getDisplayedRowAtIndex(index);
+    }
     getRowNodesForPrimaryKeys(primaryKeyValues) {
         let rowNodes = [];
         if (this.useRowNodeLookUp) {
@@ -1889,8 +1909,10 @@ class Adaptable {
         return isVisible;
     }
     redrawBody() {
-        this.gridOptions.api.redrawRows();
-        this._emit('GridRefreshed');
+        setTimeout(() => {
+            this.gridOptions.api.redrawRows();
+            this._emit('GridRefreshed');
+        }, 0);
     }
     redrawHeader() {
         this.gridOptions.api.refreshHeader();
@@ -1942,10 +1964,8 @@ class Adaptable {
         ];
     }
     getColDefsForFreeTextColumns() {
-        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions
-            .enableFilterOnSpecialColumns;
-        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable)
-            .FreeTextColumnSettings;
+        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
+        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable).FreeTextColumnSettings;
         return this.api.freeTextColumnApi.getAllFreeTextColumn().map((freeTextColumn) => {
             var _a;
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
@@ -2089,13 +2109,12 @@ class Adaptable {
             .enableFilterOnSpecialColumns
             ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
             : true;
-        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable)
-            .CalculatedColumnSettings;
+        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable).CalculatedColumnSettings;
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
-            var _a;
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
-                calculatedColumnSettings.DataType = this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+                calculatedColumnSettings.DataType =
+                    this.CalculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumn.Query);
             }
             const columnTypes = [
                 GeneralConstants_1.AB_SPECIAL_COLUMN,
@@ -2123,15 +2142,13 @@ class Adaptable {
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
                 valueGetter: (params) => {
-                    var _a;
-                    return this.CalculatedColumnExpressionService.ComputeExpressionValue((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression, params.node);
+                    return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
                 },
             };
             if (calculatedColumnSettings.ShowToolTip != null &&
                 calculatedColumnSettings.ShowToolTip == true) {
                 newColDef.tooltipValueGetter = () => {
-                    var _a;
-                    return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression;
+                    return this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query);
                 };
             }
             LoggingHelper_1.LogAdaptableInfo('Setting up Calculated Column: ' + calculatedColumn.ColumnId);
@@ -2474,8 +2491,7 @@ class Adaptable {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
         });
-        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions
-            .showGroupingTotalsAsHeader;
+        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions.showGroupingTotalsAsHeader;
         /**
          * Use Case: Model has updated
          * Action: If user has set to see grouping totals as header create a pinned row (bit of a hack)
@@ -2527,10 +2543,9 @@ class Adaptable {
             const node = event.node;
             const result = RowNode_dispatchLocalEvent.apply(this, arguments);
             const extractGridApiFromRowNode = (rowNode) => {
-                var _a, _b, _c, _d;
+                var _a, _b;
                 // starting with AG Grid 26.1.0 the gridApi is wrapped in a Beans property
-                // while older versions than 26.1.0 had a direct property
-                const rowNodeApi = (_c = (_b = (_a = rowNode) === null || _a === void 0 ? void 0 : _a.beans) === null || _b === void 0 ? void 0 : _b.gridApi) !== null && _c !== void 0 ? _c : (_d = rowNode) === null || _d === void 0 ? void 0 : _d.gridApi;
+                const rowNodeApi = (_b = (_a = rowNode) === null || _a === void 0 ? void 0 : _a.beans) === null || _b === void 0 ? void 0 : _b.gridApi;
                 if (!rowNodeApi) {
                     LoggingHelper_1.LogAdaptableWarning(`No GridAPI found in passed RowNode, this should never happen!`, rowNode);
                 }
@@ -2582,8 +2597,8 @@ class Adaptable {
                 (originalisExternalFilterPresent ? originalisExternalFilterPresent() : false));
         };
         const originaldoesExternalFilterPass = this.gridOptions.doesExternalFilterPass;
-        const evaluateQueryOnClient = !this.api.internalApi.isServerSearchOptionSet('Query');
-        const evaluateFilterOnClient = !this.api.internalApi.isServerSearchOptionSet('Filter');
+        const evaluateQueryOnClient = this.api.internalApi.runModuleInAdaptableQL('Query');
+        const evaluateFilterOnClient = this.api.internalApi.runModuleInAdaptableQL('Filter');
         this.gridOptions.doesExternalFilterPass = (node) => {
             // first we assess Query (if its running locally)
             if (evaluateQueryOnClient && !this.isGroupRowNode(node)) {
@@ -2640,7 +2655,7 @@ class Adaptable {
         try {
             // it is very important that this method is executed as soon as possible and BEFORE the updateColDefsForSpecialColumns() method
             // this will ensure that the columns are recreated as expected (see method implementation&comments for more details)
-            this.cleanupFloatingFilters_WORKAROUND();
+            //this.cleanupFloatingFilters_WORKAROUND();
             this.updateColDefsForSpecialColumns();
             this.applyCurrentTheme();
             this.applyFinalRendering();
@@ -2801,16 +2816,18 @@ class Adaptable {
                     readonlyClassName,
                     highlightAlertClassName,
                 ]
-                    .filter((x) => !!x)
-                    .join(' ');
+                    // we flatten the array because 'userCellClass' might return a string[]
+                    .flat()
+                    .filter((x) => !!x);
+                const returnValueHash = returnValue.join(' ');
                 const primaryKey = this.getPrimaryKeyValueFromRowNode(params.node);
                 const key = `${primaryKey}:${params.colDef.colId}`;
                 if (classNameMap[key] &&
-                    classNameMap[key] !== returnValue &&
+                    classNameMap[key] !== returnValueHash &&
                     // only hard-reset when removing class-names
                     // ag-grid does not remove class-names, it accumulates them
                     // https://www.ag-grid.com/javascript-data-grid/cell-styles/#refresh-of-styles
-                    returnValue.length < ((_a = classNameMap[key]) === null || _a === void 0 ? void 0 : _a.length)) {
+                    returnValueHash.length < ((_a = classNameMap[key]) === null || _a === void 0 ? void 0 : _a.length)) {
                     setTimeout(() => {
                         /**
                          * This is called inside a getter function, inside ag-grid.
@@ -2820,14 +2837,18 @@ class Adaptable {
                         params.api.redrawRows({ rowNodes: [params.node] });
                     }, 0);
                 }
-                classNameMap[key] = returnValue;
-                return StringExtensions_1.StringExtensions.IsNotNullOrEmpty(returnValue) ? returnValue : undefined;
+                classNameMap[key] = returnValueHash;
+                return returnValue.length ? returnValue : undefined;
             };
             return cellClass;
         });
     }
     getExcelClassNameForCell(colId, primaryKeyValue) {
-        return `--excel-cell-${colId}-${primaryKeyValue}`;
+        let excelClassName = `--excel-cell-${colId}-${primaryKeyValue}`;
+        if (excelClassName.indexOf(' ') > 0) {
+            excelClassName = excelClassName.replace(/\s/g, '_');
+        }
+        return excelClassName;
     }
     setupColumnCellEditor({ colId, col }) {
         const adaptableColumn = this.api.columnApi.getColumnFromId(colId);
@@ -2909,8 +2930,7 @@ class Adaptable {
             // set the default to the AG Grid provided values
             // from https://github.com/ag-grid/ag-grid/blob/v26.1.0/community-modules/core/src/ts/columns/columnModel.ts#L2515
             let resultHeaderName = userHeaderName !== null && userHeaderName !== void 0 ? userHeaderName : StringExtensions_1.StringExtensions.CamelCaseToHumanText(col.getColDef().field);
-            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout()
-                .ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
+            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout().ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
             if (layoutCustomHeader) {
                 resultHeaderName = layoutCustomHeader;
             }
@@ -2919,6 +2939,7 @@ class Adaptable {
             if (!layoutCustomHeader && (formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.HeaderName) && !formatColumn.IsSuspended) {
                 // fallback to the formatColumn property if no Layout custom header is provided
                 resultHeaderName = formatColumn.HeaderName;
+                LoggingHelper_1.ConsoleLogWarning(`DEPRECATED: 'FormatColumn.HeaderName' is deprecated: use 'Layout.ColumnHeadersMap' instead`);
             }
             // required here for the initial layout rendering
             abColumn.friendlyName = resultHeaderName;
@@ -3496,7 +3517,10 @@ class Adaptable {
             }
             return state;
         });
-        this.gridOptions.columnApi.applyColumnState({ state: newColumnState, applyOrder: true });
+        this.gridOptions.columnApi.applyColumnState({
+            state: newColumnState,
+            applyOrder: true,
+        });
         this.gridOptions.api.onSortChanged();
     }
     clearColumnSort() {
@@ -3553,7 +3577,9 @@ class Adaptable {
             });
         }
         else {
-            const transaction = this.gridOptions.api.applyTransaction({ update: dataRows });
+            const transaction = this.gridOptions.api.applyTransaction({
+                update: dataRows,
+            });
             return Promise.resolve(transaction === null || transaction === void 0 ? void 0 : transaction.update);
         }
     }
@@ -3594,7 +3620,9 @@ class Adaptable {
             });
         }
         else {
-            const transaction = this.gridOptions.api.applyTransaction({ remove: dataRows });
+            const transaction = this.gridOptions.api.applyTransaction({
+                remove: dataRows,
+            });
             return Promise.resolve(transaction.remove);
         }
     }
@@ -3868,9 +3896,10 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                     alertHighlightClassName,
                     this.getConditionalStyleRowClass(conditionalStyles.filter((cs) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(cs.Style.ClassName)), params),
                 ]
-                    .filter((x) => !!x)
-                    .join(' ');
-                return StringExtensions_1.StringExtensions.IsNotNullOrEmpty(returnValue) ? returnValue : undefined;
+                    // we flatten it because 'userGetRowClass' might return a string[]
+                    .flat()
+                    .filter((x) => !!x);
+                return (returnValue === null || returnValue === void 0 ? void 0 : returnValue.length) ? returnValue : undefined;
             };
         });
     }
@@ -4002,9 +4031,17 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                     const cellStyle = typeof colDef.cellStyle === 'function' ? colDef.cellStyle(cellParams) : {};
                     const excelStyles = [];
                     // add user defined excel styles
-                    const userDefinedCellClass = this.getUserColDefProperty(column.getColId(), 'cellClass');
+                    let userColDefCellClass = this.getUserColDefProperty(column.getColId(), 'cellClass');
+                    const userDefinedCellClass = typeof userColDefCellClass === 'function'
+                        ? userColDefCellClass(cellParams)
+                        : userColDefCellClass;
                     const userDefinedExcelStyle = userDefinedCellClass &&
-                        userExcelStyles.find((excelStyle) => excelStyle.id === userDefinedCellClass);
+                        userExcelStyles.find((excelStyle) => {
+                            var _a;
+                            return typeof userDefinedCellClass === 'string'
+                                ? userDefinedCellClass === excelStyle.id
+                                : (_a = userDefinedCellClass === null || userDefinedCellClass === void 0 ? void 0 : userDefinedCellClass.includes) === null || _a === void 0 ? void 0 : _a.call(userDefinedCellClass, excelStyle.id);
+                        });
                     if (userDefinedExcelStyle) {
                         excelStyles.push(userDefinedExcelStyle);
                     }
@@ -4022,9 +4059,10 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                     if (!excelStyles.length) {
                         return;
                     }
-                    const cellClassId = typeof colDef.cellClass === 'function'
+                    const cellClass = typeof colDef.cellClass === 'function'
                         ? colDef.cellClass(cellParams)
                         : this.getExcelClassNameForCell(column.getId(), this.getPrimaryKeyValueFromRowNode(node));
+                    const cellClassId = Array.isArray(cellClass) ? cellClass.join(' ') : cellClass;
                     const finalCellExcelStyle = Object.assign({}, ...excelStyles, {
                         id: cellClassId,
                     });
@@ -4173,7 +4211,9 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         const globalObject = typeof globalThis !== 'undefined' ? globalThis : window;
         const licenseKey = globalObject.ADAPTABLE_LICENSE_KEY ||
             this.api.internalApi.getAdaptableOptions().licenseKey;
-        return new LicenseService_1.LicenseService(this, licenseKey, { publishedAt: publishTimestamp_1.default });
+        return new LicenseService_1.LicenseService(this, licenseKey, {
+            publishedAt: publishTimestamp_1.default,
+        });
     }
 }
 exports.Adaptable = Adaptable;

package/src/agGrid/agGridHelper.js

@@ -39,7 +39,7 @@ const FormatHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/For
 const CheckboxRenderer_1 = require("./CheckboxRenderer");
 const DataChangeHistoryModule_1 = require("../Strategy/DataChangeHistoryModule");
 const FlashingCellModule_1 = require("../Strategy/FlashingCellModule");
-const SetingsPanelModule_1 = require("../Strategy/SetingsPanelModule");
+const SettingsPanelModule_1 = require("../Strategy/SettingsPanelModule");
 const ChartingModule_1 = require("../Strategy/ChartingModule");
 const tinycolor = require('tinycolor2');
 /**
@@ -97,7 +97,7 @@ class agGridHelper {
         modules.set(ModuleConstants.SystemStatusModuleId, new SystemStatusModule_1.SystemStatusModule(api));
         modules.set(ModuleConstants.ThemeModuleId, new ThemeModule_1.ThemeModule(api));
         modules.set(ModuleConstants.GridInfoModuleId, new GridInfoModule_1.GridInfoModule(api));
-        modules.set(ModuleConstants.SettingsPanelModuleId, new SetingsPanelModule_1.SettingsPanelModule(api));
+        modules.set(ModuleConstants.SettingsPanelModuleId, new SettingsPanelModule_1.SettingsPanelModule(api));
         modules.set(ModuleConstants.ChartingModuleId, new ChartingModule_1.ChartingModule(api));
         return modules;
     }
@@ -248,8 +248,7 @@ class agGridHelper {
             }
         }
         // lets set this here one as the function cannot change the result so dont need to run it each time
-        let excludeColumnFromQuickSearch = this.adaptable.adaptableOptions.searchOptions
-            .excludeColumnFromQuickSearch;
+        let excludeColumnFromQuickSearch = this.adaptable.adaptableOptions.searchOptions.excludeColumnFromQuickSearch;
         if (excludeColumnFromQuickSearch) {
             if (excludeColumnFromQuickSearch(abColumn)) {
                 abColumn.isExcludedFromQuickSearch = true;
@@ -495,7 +494,7 @@ class agGridHelper {
             dataType = Enums_1.DataType.Date;
         }
         else if (Array.isArray(value) && value.length && typeof value[0] === 'number') {
-            dataType = Enums_1.DataType.NumberArray;
+            dataType = Enums_1.DataType.Unknown;
         }
         else {
             switch (typeof value) {
@@ -526,8 +525,6 @@ class agGridHelper {
             switch (colType) {
                 case 'abColDefNumber':
                     return Enums_1.DataType.Number;
-                case 'abColDefNumberArray':
-                    return Enums_1.DataType.NumberArray;
                 case 'abColDefString':
                     return Enums_1.DataType.String;
                 case 'abColDefBoolean':
@@ -553,8 +550,6 @@ class agGridHelper {
                 return 'abColDefDate';
             case Enums_1.DataType.Number:
                 return 'abColDefNumber';
-            case Enums_1.DataType.NumberArray:
-                return 'abColDefNumberArray';
             case Enums_1.DataType.Object:
                 return 'abColDefObject';
             case Enums_1.DataType.String:

package/src/agGrid/agGridMenuHelper.js

@@ -21,8 +21,7 @@ class agGridMenuHelper {
         let userColumnMenuItems = [];
         //First get Ag Grid Column Items
         agGridColumnMenuItems.push(...this.createAgGridColumnMenuItems(originalgetMainMenuItems, params));
-        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions
-            .showAdaptableColumnMenu;
+        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableColumnMenu;
         let hasAdaptableColumnMenuItems = showAdaptableColumnMenu == null || showAdaptableColumnMenu !== false;
         if (hasAdaptableColumnMenuItems) {
             agGridColumnMenuItems.push('separator');
@@ -56,8 +55,7 @@ class agGridMenuHelper {
         let agGridContextMenuItems = [];
         let adaptableContextMenuItems = [];
         let userContextMenuItems = [];
-        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions
-            .showAdaptableContextMenu;
+        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableContextMenu;
         let hasAdaptableContextMenuItems = showAdaptableContextMenu == null || showAdaptableContextMenu !== false;
         let userDefinedContextMenuItems = this.adaptable.adaptableOptions.menuOptions.contextMenuItems;
         let hasUserDefinedContextMenuItems = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(userDefinedContextMenuItems);
@@ -285,8 +283,7 @@ class agGridMenuHelper {
         // here we create agGrid Menu items based on Adaptable Menu Items
         // user has ability to decide whether to show or not
         let contextMenuItems = [];
-        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions
-            .showAdaptableContextMenu;
+        let showAdaptableContextMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableContextMenu;
         if (showAdaptableContextMenu == null || showAdaptableContextMenu !== false) {
             adaptableMenuItems.forEach((adaptableMenuItem) => {
                 if (adaptableMenuItem) {
@@ -321,8 +318,7 @@ class agGridMenuHelper {
     // method to get all the Adaptable Menu Items - together with running the function where user can choose whether or not to display
     getAdaptableMenuItemsColumnHeader(adaptableColumn, menuContext) {
         const adaptableMenuItems = [];
-        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions
-            .showAdaptableColumnMenu;
+        let showAdaptableColumnMenu = this.adaptable.adaptableOptions.menuOptions.showAdaptableColumnMenu;
         let runCheck = showAdaptableColumnMenu == null || showAdaptableColumnMenu !== false;
         //  if (adaptableColumn != null) {
         this.adaptable.adaptableModules.forEach((s) => {

package/src/agGrid/editors/AdaptableDateEditor/index.js

@@ -117,7 +117,7 @@ class AdaptableDateEditor {
         react_dom_1.unmountComponentAtNode(this.el);
     }
     shouldClearExistingValue(params) {
-        return params.keyPress === all_modules_1.KeyCode.BACKSPACE || params.keyPress === all_modules_1.KeyCode.DELETE;
+        return params.key === all_modules_1.KeyCode.BACKSPACE || params.key === all_modules_1.KeyCode.DELETE;
     }
 }
 exports.AdaptableDateEditor = AdaptableDateEditor;

package/src/agGrid/editors/AdaptableNumberEditor/index.js

@@ -93,7 +93,7 @@ class AdaptableNumberEditor {
         react_dom_1.unmountComponentAtNode(this.el);
     }
     shouldClearExistingValue(params) {
-        return params.keyPress === all_modules_1.KeyCode.BACKSPACE || params.keyPress === all_modules_1.KeyCode.DELETE;
+        return params.key === all_modules_1.KeyCode.BACKSPACE || params.key === all_modules_1.KeyCode.DELETE;
     }
 }
 exports.AdaptableNumberEditor = AdaptableNumberEditor;

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

@@ -11,14 +11,16 @@ interface AdaptableFormComponentProps {
     displayTitle: boolean;
     api: AdaptableApi;
     context?: ButtonContext;
+    focusFirstButton?: boolean;
 }
-export declare function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabledButtons, api, context, }: {
+export declare function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabledButtons, api, context, focusFirstButton, }: {
     disabledButtons?: boolean[];
     defaultTone: SimpleButtonProps['tone'];
     onClick: (button: AdaptableButton<ButtonContext>) => void;
     formDef: AdaptableForm<ButtonContext>;
     api: AdaptableApi;
     context: ButtonContext;
+    focusFirstButton?: boolean;
 }): JSX.Element;
-export declare function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displayTitle, api, context, }: AdaptableFormComponentProps): JSX.Element;
+export declare function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displayTitle, api, context, focusFirstButton, }: AdaptableFormComponentProps): JSX.Element;
 export {};

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -10,7 +10,7 @@ const SimpleButton_1 = tslib_1.__importDefault(require("../SimpleButton"));
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../View/Components/AdaptableInput"));
 const DropdownButton_1 = tslib_1.__importDefault(require("../DropdownButton"));
 const react_1 = require("react");
-function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabledButtons, api, context, }) {
+function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabledButtons, api, context, focusFirstButton = true, }) {
     return (React.createElement(React.Fragment, null, formDef.buttons.map((button, index) => {
         var _a;
         const defaultIconProps = {
@@ -23,7 +23,7 @@ function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabled
         let buttonStyle = api.internalApi.getStyleForButton(button, context ? context : { adaptableApi: api });
         let buttonLabel = api.internalApi.getLabelForButton(button, context ? context : { adaptableApi: api });
         let buttonTooltip = api.internalApi.getTooltipForButton(button, context ? context : { adaptableApi: api });
-        return (React.createElement(SimpleButton_1.default, { autoFocus: index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
+        return (React.createElement(SimpleButton_1.default, { autoFocus: focusFirstButton && index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
                 onClick(button);
             } },
             button.icon ? React.createElement("img", Object.assign({}, iconProps)) : null,
@@ -31,7 +31,7 @@ function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabled
     })));
 }
 exports.AdaptableFormComponentButtons = AdaptableFormComponentButtons;
-function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displayTitle, api, context, }) {
+function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displayTitle, api, context, focusFirstButton, }) {
     var _a;
     const getFieldValue = (key) => data[key];
     const setFieldValue = (key, value) => {
@@ -92,6 +92,6 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
         formDef.description && React.createElement(rebass_1.Box, { mb: 3 }, formDef.description),
         React.createElement(FormLayout_1.default, null, (_a = formDef.fields) === null || _a === void 0 ? void 0 : _a.map((field) => (React.createElement(FormLayout_1.FormRow, { key: field.name, label: field.label }, renderField(field))))),
         formDef.buttons ? (React.createElement(rebass_1.Flex, { marginTop: 3, flexDirection: "row", alignItems: "center", justifyContent: "center" },
-            React.createElement(AdaptableFormComponentButtons, { onClick: onButtonClick, disabledButtons: disabledButtons, defaultTone: "success", formDef: formDef, api: api, context: context }))) : null));
+            React.createElement(AdaptableFormComponentButtons, { focusFirstButton: focusFirstButton, onClick: onButtonClick, disabledButtons: disabledButtons, defaultTone: "success", formDef: formDef, api: api, context: context }))) : null));
 }
 exports.AdaptableFormComponent = AdaptableFormComponent;

package/src/components/ApplicationIcon.d.ts

@@ -2,4 +2,5 @@ import * as React from 'react';
 import { AdaptableIcon } from '../types';
 export declare const ApplicationIcon: React.FunctionComponent<{
     icon?: AdaptableIcon;
+    className?: string;
 }>;