@adaptabletools/adaptable 11.0.0-canary.1 → 11.0.0-canary.5

package/src/agGrid/Adaptable.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bindAdaptableAgGrid = exports.AdaptableNoCodeWizard = exports.Adaptable = void 0;
 const tslib_1 = require("tslib");
 const all_modules_1 = require("@ag-grid-community/all-modules");
-const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
-const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
-const throttle_1 = tslib_1.__importDefault(require("lodash-es/throttle"));
-const uniqBy_1 = tslib_1.__importDefault(require("lodash-es/uniqBy"));
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
+const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
+const uniqBy_1 = tslib_1.__importDefault(require("lodash/uniqBy"));
 const React = tslib_1.__importStar(require("react"));
 const ReactDOM = tslib_1.__importStar(require("react-dom"));
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const AdaptableApiImpl_1 = require("../Api/Implementation/AdaptableApiImpl");
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -428,8 +428,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;
         });
     }
@@ -514,7 +522,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 || {};
@@ -730,12 +738,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 = {
@@ -903,13 +911,12 @@ class Adaptable {
         }
         return null;
     }
-    getFlashingCellRowStyle(params) {
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
-        return this.getFlashingCellStyleFor(primaryKeyValue);
-    }
-    getFlashingCellStyleFor(primaryKey, colId) {
+    getFlashingCellStyle(col, params) {
         var _a;
-        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, colId);
+        const primaryKey = params.node.aggData
+            ? params.node.id
+            : this.getPrimaryKeyValueFromRowNode(params.node);
+        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
         if (!flashingCell) {
             return {};
         }
@@ -919,10 +926,6 @@ class Adaptable {
                 ? flashingCell.flashingCellDefinition.DownChangeStyle
                 : flashingCell.flashingCellDefinition.NeutralChangeStyle)) !== null && _a !== void 0 ? _a : {});
     }
-    getFlashingCellStyle(col, params) {
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
-        return this.getFlashingCellStyleFor(primaryKeyValue, col.columnId);
-    }
     getCellHighlightStyle(col, params) {
         const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
         const cellHightlight = this.api.internalApi
@@ -1111,7 +1114,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) {
@@ -1265,7 +1271,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
@@ -1431,7 +1440,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();
@@ -1681,18 +1693,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;
                 }
@@ -1718,15 +1727,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) {
@@ -1744,14 +1752,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);
     }
@@ -1789,9 +1800,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) {
@@ -2530,10 +2542,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);
                 }
@@ -2643,7 +2654,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();
@@ -2804,16 +2815,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.
@@ -2823,14 +2836,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 primaryKeyString = `${primaryKeyValue}`;
+        if (primaryKeyString.indexOf(' ') > 0) {
+            primaryKeyString.replace(/\s/g, '_');
+        }
+        return `--excel-cell-${colId}-${primaryKeyString}`;
     }
     setupColumnCellEditor({ colId, col }) {
         const adaptableColumn = this.api.columnApi.getColumnFromId(colId);
@@ -2921,6 +2938,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;
@@ -3155,14 +3173,30 @@ class Adaptable {
         if (oldValue == newValue) {
             return;
         }
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(rowNode);
-        if (!primaryKeyValue) {
-            return;
-        }
         const abColumn = this.api.columnApi.getColumnFromId(colId);
         if (!abColumn) {
             return;
         }
+        if (this.isGroupRowNode(rowNode)) {
+            const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
+                oldValue: oldValue,
+                newValue: newValue,
+                column: abColumn,
+                /**
+                 * A grouped row does not have an underling data item.
+                 * Because of this we use the rowNode.id as an identifier.
+                 */
+                primaryKeyValue: rowNode.id,
+                rowNode: rowNode,
+                trigger: 'aggChange',
+            });
+            this.DataService.CreateDataChangedEvent(dataChangedInfo);
+            return;
+        }
+        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(rowNode);
+        if (!primaryKeyValue) {
+            return;
+        }
         const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
             oldValue: oldValue,
             newValue: newValue,
@@ -3482,7 +3516,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() {
@@ -3539,7 +3576,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);
         }
     }
@@ -3580,7 +3619,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);
         }
     }
@@ -3854,9 +3895,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;
             };
         });
     }
@@ -3988,9 +4030,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);
                     }
@@ -4008,9 +4058,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,
                     });
@@ -4159,7 +4210,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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.agGridHelper = void 0;
 const tslib_1 = require("tslib");
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
 const AlertModule_1 = require("../Strategy/AlertModule");
@@ -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;

package/src/agGrid/agGridMenuHelper.js

@@ -4,7 +4,7 @@ exports.agGridMenuHelper = void 0;
 const tslib_1 = require("tslib");
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const icons_1 = require("../components/icons");
-const flatten_1 = tslib_1.__importDefault(require("lodash-es/flatten"));
+const flatten_1 = tslib_1.__importDefault(require("lodash/flatten"));
 // tslint:disable-next-line: class-name
 class agGridMenuHelper {
     constructor(adaptable, gridOptions) {
@@ -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/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;
 }>;

package/src/components/ApplicationIcon.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationIcon = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-exports.ApplicationIcon = ({ icon }) => {
+exports.ApplicationIcon = ({ icon, className }) => {
     if (!icon) {
         return null;
     }
     let width = icon.style && icon.style.width ? icon.style.width : 'var(--ab-cmp-simple-button__width)';
     let height = icon.style && icon.style.height ? icon.style.height : 'var(--ab-cmp-simple-button__height)';
-    return (React.createElement("img", { className: "ab-Dashboard__application-icon", src: icon.src, style: { width: width, height: height } }));
+    return React.createElement("img", { className: className, src: icon.src, style: { width: width, height: height } });
 };

package/src/components/Dashboard/Dashboard.js

@@ -14,7 +14,10 @@ function Dashboard(props) {
     const [collapsed, setCollapsed] = useProperty_1.default(props, 'collapsed', false);
     const [floating, setFloating] = useProperty_1.default(props, 'floating', false);
     const [inline, setInline] = useProperty_1.default(props, 'inline', false);
-    const [position, setPosition] = useProperty_1.default(props, 'position', { x: 0, y: 0 });
+    const [position, setPosition] = useProperty_1.default(props, 'position', {
+        x: 0,
+        y: 0,
+    });
     const expanded = !floating && !collapsed;
     const { handleRef, targetRef } = useDraggable_1.default({
         onDrop(dx, dy) {

package/src/components/Dashboard/DashboardManager.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { DashboardTab } from '../../PredefinedConfig/DashboardState';
 import { AdaptableDashboardToolbar } from '../../PredefinedConfig/Common/Types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
@@ -6,10 +6,12 @@ export interface DashboardToolbar {
     Id: AdaptableDashboardToolbar | string;
     Title: string;
 }
-declare function DashboardManager({ tabs, onTabsChange, availableToolbars, api, }: {
+interface DashboardManagerProps {
     tabs: DashboardTab[];
     onTabsChange: (tabs: DashboardTab[]) => void;
     availableToolbars: DashboardToolbar[];
     api: AdaptableApi;
-}): JSX.Element;
+    disabled: boolean;
+}
+declare const DashboardManager: React.FunctionComponent<DashboardManagerProps>;
 export default DashboardManager;