@adaptabletools/adaptable 15.2.2 → 15.3.0

package/src/Strategy/ExportModule.js

@@ -45,31 +45,66 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.queryApi.internalApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
     }
     addContextMenuItems(menuContext) {
-        const canExport = !menuContext.isRowGroupColumn &&
-            this.isModuleAvailable() &&
-            menuContext.selectedCellInfo &&
-            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
-            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
+        const canExport = !menuContext.isRowGroupColumn && this.isModuleAvailable();
         if (!canExport) {
             return;
         }
-        const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
+        let returnMenuItems = [];
+        let selectedCellmenuItems = [];
+        let selectedRowmenuItems = [];
+        const canExportCells = menuContext.selectedCellInfo &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
+        const canExportRows = menuContext.selectedRowInfo &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows) &&
+            menuContext.gridCell &&
+            menuContext.gridCell.primaryKeyValue &&
+            menuContext.isSelectedRow;
+        if (canExportCells) {
+            const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
+            selectedCellmenuItems = this.buildReportMenuItems(selectedCellReport);
+        }
+        if (canExportRows) {
+            const selectedRowReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_ROWS_REPORT);
+            selectedRowmenuItems = this.buildReportMenuItems(selectedRowReport);
+        }
+        // if only selected cells then just do one level
+        if (canExportCells && !canExportRows) {
+            returnMenuItems.push(this.buildExportMenuItem('Export Selected Cells', selectedCellmenuItems));
+            // if only selected Rows then just do one level
+        }
+        else if (canExportRows && !canExportCells) {
+            returnMenuItems.push(this.buildExportMenuItem('Export Selected Rows', selectedRowmenuItems));
+        }
+        // if both selected Cells and Rows then add a new level
+        else if (canExportRows && canExportCells) {
+            const exportSelectedCellsMenuItem = this.buildExportMenuItem('Cells', selectedCellmenuItems);
+            const exportSelectedRowsMenuItem = this.buildExportMenuItem('Rows', selectedRowmenuItems);
+            returnMenuItems.push(this.buildExportMenuItem('Export Selected', [
+                exportSelectedCellsMenuItem,
+                exportSelectedRowsMenuItem,
+            ]));
+        }
+        return returnMenuItems;
+    }
+    buildReportMenuItems(report) {
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(selectedCellReport, destination)));
+            menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(selectedCellReport, customDestination.name)));
+            menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
-        return [
-            {
-                label: 'Export Selected Cells',
-                module: this.moduleInfo.ModuleName,
-                isVisible: true,
-                icon: { name: this.moduleInfo.Glyph },
-                subItems: menuItems,
-            },
-        ];
+        return menuItems;
+    }
+    buildExportMenuItem(label, subItems) {
+        return {
+            label: label,
+            module: this.moduleInfo.ModuleName,
+            isVisible: true,
+            icon: { name: this.moduleInfo.Glyph },
+            subItems: subItems,
+        };
     }
     async export(report, exportDestination) {
         var _a;
@@ -153,7 +188,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         this.convertReportToExcel(report, reportData);
                         break;
                     case Enums_1.ExportDestination.Clipboard:
-                        this.copyToClipboard(report, reportData);
+                        this.copyToClipboard(reportData);
                         break;
                     case Enums_1.ExportDestination.CSV:
                         this.convertReportToCsv(report, reportData);
@@ -247,7 +282,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         });
     }
     convertReportToCsv(report, reportData) {
-        const csvContent = this.createCSVContent(report);
+        const csvContent = this.createCSVContent(reportData);
         if (StringExtensions_1.default.IsNullOrEmpty(csvContent)) {
             this.showEmptyExportWarning();
             return;
@@ -262,20 +297,24 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         this.api.exportApi.exportDataToExcel(reportData, this.api.internalApi.getReportService().getReportFileName(report.Name));
     }
-    copyToClipboard(report, reportData) {
-        const csvContent = this.createTabularContent(report);
+    copyToClipboard(reportData) {
+        const csvContent = this.createTabularContent(reportData);
         if (StringExtensions_1.default.IsNullOrEmpty(csvContent)) {
             this.showEmptyExportWarning();
             return;
         }
         Helper_1.Helper.copyToClipboard(csvContent);
     }
-    createCSVContent(report) {
-        const reportDataAsArray = this.api.internalApi.getReportService().getReportDataAsArray(report);
+    createCSVContent(reportData) {
+        const reportDataAsArray = this.api.internalApi
+            .getReportService()
+            .convertReportDataToArray(reportData);
         return Helper_1.Helper.convertArrayToCsv(reportDataAsArray, ',');
     }
-    createTabularContent(report) {
-        const reportDataAsArray = this.api.internalApi.getReportService().getReportDataAsArray(report);
+    createTabularContent(reportData) {
+        const reportDataAsArray = this.api.internalApi
+            .getReportService()
+            .convertReportDataToArray(reportData);
         return Helper_1.Helper.convertArrayToCsv(reportDataAsArray, '\t');
     }
     getTeamSharingAction() {

package/src/Utilities/Helpers/FormatHelper.js

@@ -40,12 +40,24 @@ function NumberFormatter(input, options = {}) {
         n *= -1;
         n = parseFloat(n.toFixed(12));
     }
+    if (options.Abs) {
+        n = Math.abs(n);
+    }
     if (options.Truncate) {
         n = Math.trunc(n);
     }
+    if (options.Ceiling) {
+        n = Math.ceil(n);
+    }
+    if (options.Round) {
+        n = Math.round(n);
+    }
+    if (options.Floor) {
+        n = Math.floor(n);
+    }
     let s;
     let digitsToUse;
-    if (options.Truncate) {
+    if (options.Truncate || options.Ceiling || options.Round || options.Floor) {
         digitsToUse = 0;
     }
     else if (options.FractionDigits != null) {

package/src/View/Components/EntityRulesEditor/EntityRulePredicatesEditor/EntityRulePredicatesEditor.js

@@ -61,11 +61,11 @@ const EntityRulePredicatesEditor = (props) => {
         enablePredicateColumnId && (React.createElement(rebass_1.Flex, { className: "ab-EntityRulePredicateEditor-ScopeTypeSelector", p: 2, mb: 2, flexDirection: "column" },
             React.createElement(rebass_1.Text, { mb: 2 }, "Create Predicate Rule(s) using"),
             React.createElement(Radio_1.default, { "data-name": "entity-scope", onClick: () => handlePredicateScopeTypeChange(false), mr: 3, checked: !columnPredicateEnabled },
-                "The Alert's Trigger:",
+                "Active Column:",
                 ' ',
                 React.createElement(Tag_1.Tag, { ml: 1, mr: 1 }, scopeString || 'Not Defined'),
                 ' '),
-            React.createElement(Radio_1.default, { "data-name": "column-scope", onClick: () => handlePredicateScopeTypeChange(true), checked: columnPredicateEnabled }, "Selected Columns (overriding the Alert's Trigger)"))),
+            React.createElement(Radio_1.default, { "data-name": "column-scope", onClick: () => handlePredicateScopeTypeChange(true), checked: columnPredicateEnabled }, "Selected Columns (overriding Active Column)"))),
         (((_e = (_d = props.data.Rule) === null || _d === void 0 ? void 0 : _d.Predicates) === null || _e === void 0 ? void 0 : _e.length) ? props.data.Rule.Predicates : [null]).map((predicate, index) => {
             const currentPredicatDef = props.predicateDefs.find((pd) => pd.id === (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId));
             let editorPredicateDefs = defaultPredicateDefs;

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -260,8 +260,13 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                             React.createElement(Input_1.default, { "data-name": "prefix", value: (_a = data.DisplayFormat.Options.Prefix) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
                             React.createElement(Input_1.default, { "data-name": "suffix", value: (_b = data.DisplayFormat.Options.Suffix) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
-                        React.createElement(FormLayout_1.FormRow, { label: "Content" },
-                            React.createElement(Input_1.default, { "data-name": "content", type: "number", value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }))),
+                        React.createElement(FormLayout_1.FormRow, { label: "Truncate" },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "truncate-checkbox", checked: data.DisplayFormat.Options.Truncate, onChange: (checked) => setFormatOption('Truncate', checked) })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Ceiling" },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "ceiling-checkbox", checked: data.DisplayFormat.Options.Ceiling, onChange: (checked) => setFormatOption('Ceiling', checked) })),
+                        ' ',
+                        React.createElement(FormLayout_1.FormRow, { label: "Absolute" },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "abs-checkbox", checked: data.DisplayFormat.Options.Abs, onChange: (checked) => setFormatOption('Abs', checked) }))),
                     React.createElement(FormLayout_1.default, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Fraction Digits" },
                             React.createElement(Input_1.default, { "data-name": "fraction-digits", type: "number", min: "0", 
@@ -275,10 +280,16 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                             React.createElement(Input_1.default, { "data-name": "integer-digits", type: "number", min: "0", value: data.DisplayFormat.Options.IntegerDigits, onChange: (e) => setFormatOption('IntegerDigits', Number(e.currentTarget.value)) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Multiplier" },
                             React.createElement(Input_1.default, { "data-name": "multiplier", type: "number", value: data.DisplayFormat.Options.Multiplier, onChange: (e) => setFormatOption('Multiplier', Number(e.currentTarget.value)) })),
+                        ' ',
+                        React.createElement(FormLayout_1.FormRow, { label: "Content" },
+                            React.createElement(Input_1.default, { "data-name": "content", value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) })),
+                        ' ',
                         React.createElement(FormLayout_1.FormRow, { label: "Parentheses" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "parentheses-checkbox", checked: data.DisplayFormat.Options.Parentheses, onChange: (checked) => setFormatOption('Parentheses', checked) })),
-                        React.createElement(FormLayout_1.FormRow, { label: "Truncate" },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "truncate-checkbox", checked: data.DisplayFormat.Options.Truncate, onChange: (checked) => setFormatOption('Truncate', checked) })))))),
+                        React.createElement(FormLayout_1.FormRow, { label: "Floor" },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "floor-checkbox", checked: data.DisplayFormat.Options.Floor, onChange: (checked) => setFormatOption('Floor', checked) })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Round" },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "round-checkbox", checked: data.DisplayFormat.Options.Round, onChange: (checked) => setFormatOption('Round', checked) })))))),
         scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Custom Formats"),
             React.createElement(Tabs_1.Tabs.Content, null,

package/src/agGrid/Adaptable.js

@@ -66,6 +66,7 @@ const renderReactRoot_1 = require("../renderReactRoot");
 const ChartingService_1 = require("../Utilities/Services/ChartingService");
 const ThemeService_1 = require("../Utilities/Services/ThemeService");
 const AdaptableLogger_1 = require("./AdaptableLogger");
+const attachAddaptableColumnTypes_1 = require("./attachAddaptableColumnTypes");
 const tinycolor = require('tinycolor2');
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
@@ -352,7 +353,6 @@ 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, _h, _j;
         this.logger = new AdaptableLogger_1.AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
         const perfAdaptableInit = this.logger.beginPerf(`Adaptable init()`);
         if (runtimeConfig) {
@@ -455,18 +455,7 @@ class Adaptable {
             this.gridOptions.api.__adaptable = this;
         }
         this.gridOptions.columnTypes = this.gridOptions.columnTypes || {};
-        Object.assign(this.gridOptions.columnTypes, {
-            [GeneralConstants_1.AB_SPECIAL_COLUMN]: {},
-            abColDefNumber: (_a = this.gridOptions.columnTypes.abColDefNumber) !== null && _a !== void 0 ? _a : {},
-            abColDefString: (_b = this.gridOptions.columnTypes.abColDefString) !== null && _b !== void 0 ? _b : {},
-            abColDefBoolean: (_c = this.gridOptions.columnTypes.abColDefBoolean) !== null && _c !== void 0 ? _c : {},
-            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 : {},
-            abColDefTupleNumberArray: (_h = this.gridOptions.columnTypes.abColDefTupleNumberArray) !== null && _h !== void 0 ? _h : {},
-            abColDefObjectNumberArray: (_j = this.gridOptions.columnTypes.abColDefObjectNumberArray) !== null && _j !== void 0 ? _j : {},
-        });
+        (0, attachAddaptableColumnTypes_1.attachColumnTypes)(this.gridOptions);
         if (this.gridOptions.columnTypes.abColDefNumber.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefNumber.cellEditor =
                 this.variant === 'react' ? AdaptableNumberEditor_1.ReactAdaptableNumberEditor : AdaptableNumberEditor_1.AdaptableNumberEditor;
@@ -2511,7 +2500,7 @@ class Adaptable {
             if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
                 columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
-            const isExternalEvaluation = !this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
+            const isExternalEvaluation = !this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
                     ? calculatedColumn.FriendlyName
@@ -3023,7 +3012,7 @@ class Adaptable {
                 if (!this.isGroupRowNode(node)) {
                     const currentQuery = this.api.queryApi.getCurrentQuery();
                     if (currentQuery) {
-                        const evaluateQueryOnClient = this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Query', currentQuery);
+                        const evaluateQueryOnClient = this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Query', undefined, currentQuery);
                         if (evaluateQueryOnClient) {
                             const isCurrentQueryValid = this.api.queryLanguageApi.isValidBooleanExpression(currentQuery, ModuleConstants_1.QueryModuleId, `Invalid CurrentQuery '${currentQuery}'`);
                             if (!isCurrentQueryValid ||
@@ -3035,13 +3024,13 @@ class Adaptable {
                         }
                     }
                 }
-                const evaluateFilterOnClient = this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Filter');
+                const columnFilters = this.api.filterApi.getActiveColumnFilters();
                 try {
-                    // we then assess filters (if running locally)
-                    if (evaluateFilterOnClient) {
-                        const columnFilters = this.api.filterApi.getActiveColumnFilters();
-                        if (columnFilters.length > 0) {
-                            for (const columnFilter of columnFilters) {
+                    if (columnFilters.length > 0) {
+                        for (const columnFilter of columnFilters) {
+                            const evaluateFilterOnClient = this.api.queryLanguageApi.internalApi.evaluatePredicatesInAdaptableQL('Filter', columnFilter, [columnFilter.Predicate]);
+                            if (evaluateFilterOnClient) {
+                                // we then assess filters (if running locally)
                                 if (!this.api.filterApi.internalApi.evaluateColumnFilter(columnFilter, node)) {
                                     return false;
                                 }

package/src/agGrid/agGridMenuHelper.js

@@ -244,6 +244,7 @@ class agGridMenuHelper {
         // lets build a picture of what has been right clicked.  Will take time to get right but lets start
         let isSingleSelectedColumn = false;
         let isSelectedCell = false;
+        let isSelectedRow = false;
         let clickedCell = undefined;
         if (adaptableColumn) {
             clickedCell = this.adaptable.getGridCellFromRowNode(params.node, adaptableColumn.columnId);
@@ -259,8 +260,13 @@ class agGridMenuHelper {
             }
         }
         let selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
+        if (selectedRowInfo) {
+            let matchedPKValue = selectedRowInfo.gridRows.find((gr) => gr != null && gr.primaryKeyValue == clickedCell.primaryKeyValue);
+            isSelectedRow = matchedPKValue != null;
+        }
         return {
             isSelectedCell: isSelectedCell,
+            isSelectedRow: isSelectedRow,
             gridCell: clickedCell,
             adaptableColumn: adaptableColumn,
             agGridColumn: params.column,

package/src/agGrid/attachAddaptableColumnTypes.d.ts

@@ -0,0 +1,15 @@
+import { GridOptions } from '@ag-grid-community/core';
+export declare const attachColumnTypes: (gridOptions: GridOptions) => {
+    [key: string]: import("@ag-grid-community/core").ColDef<any>;
+} & {
+    [x: string]: import("@ag-grid-community/core").ColDef<any>;
+    abColDefNumber: import("@ag-grid-community/core").ColDef<any>;
+    abColDefString: import("@ag-grid-community/core").ColDef<any>;
+    abColDefBoolean: import("@ag-grid-community/core").ColDef<any>;
+    abColDefDate: import("@ag-grid-community/core").ColDef<any>;
+    abColDefObject: import("@ag-grid-community/core").ColDef<any>;
+    abColDefCustom: import("@ag-grid-community/core").ColDef<any>;
+    abColDefNumberArray: import("@ag-grid-community/core").ColDef<any>;
+    abColDefTupleNumberArray: import("@ag-grid-community/core").ColDef<any>;
+    abColDefObjectNumberArray: import("@ag-grid-community/core").ColDef<any>;
+};

package/src/agGrid/attachAddaptableColumnTypes.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.attachColumnTypes = void 0;
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
+const attachColumnTypes = (gridOptions) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    gridOptions.columnTypes = (_a = gridOptions.columnTypes) !== null && _a !== void 0 ? _a : {};
+    return Object.assign(gridOptions.columnTypes, {
+        [GeneralConstants_1.AB_SPECIAL_COLUMN]: {},
+        abColDefNumber: (_b = gridOptions.columnTypes.abColDefNumber) !== null && _b !== void 0 ? _b : {},
+        abColDefString: (_c = gridOptions.columnTypes.abColDefString) !== null && _c !== void 0 ? _c : {},
+        abColDefBoolean: (_d = gridOptions.columnTypes.abColDefBoolean) !== null && _d !== void 0 ? _d : {},
+        abColDefDate: (_e = gridOptions.columnTypes.abColDefDate) !== null && _e !== void 0 ? _e : {},
+        abColDefObject: (_f = gridOptions.columnTypes.abColDefObject) !== null && _f !== void 0 ? _f : {},
+        abColDefCustom: (_g = gridOptions.columnTypes.abColDefCustom) !== null && _g !== void 0 ? _g : {},
+        abColDefNumberArray: (_h = gridOptions.columnTypes.abColDefNumberArray) !== null && _h !== void 0 ? _h : {},
+        abColDefTupleNumberArray: (_j = gridOptions.columnTypes.abColDefTupleNumberArray) !== null && _j !== void 0 ? _j : {},
+        abColDefObjectNumberArray: (_k = gridOptions.columnTypes.abColDefObjectNumberArray) !== null && _k !== void 0 ? _k : {},
+    });
+};
+exports.attachColumnTypes = attachColumnTypes;

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -10,6 +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");
+const AdaptableContext_1 = require("../../View/AdaptableContext");
 function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabledButtons, api, context, focusFirstButton = true, }) {
     return (React.createElement(React.Fragment, null, formDef.buttons.map((button, index) => {
         var _a;
@@ -33,6 +34,7 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
         const newData = Object.assign(Object.assign({}, data), { [key]: value });
         onChange(newData);
     };
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const disabledButtons = (0, react_1.useMemo)(() => {
         var _a, _b;
         return (_b = (_a = formDef.buttons) === null || _a === void 0 ? void 0 : _a.map((button) => {
@@ -85,7 +87,34 @@ function AdaptableFormComponent({ formDef, data, onChange, onButtonClick, displa
     return (React.createElement(React.Fragment, null,
         displayTitle && formDef.title && (React.createElement(rebass_1.Box, { "data-name": "form-title", fontSize: 5, mb: 2, style: { fontWeight: 'bold' } }, formDef.title)),
         formDef.description && (React.createElement(rebass_1.Box, { "data-name": "form-description", mb: 3 }, formDef.description)),
-        React.createElement(FormLayout_1.default, { "data-name": "form-content", columns: columns, style: { overflow: 'auto' }, paddingRight: 1 }, (_c = formDef.fields) === null || _c === void 0 ? void 0 : _c.map((field, index) => {
+        React.createElement(FormLayout_1.default, { onKeyDown: (event) => {
+                const target = event.target;
+                const targetName = target.name;
+                const field = formDef.fields
+                    .map((field) => {
+                    if (Array.isArray(field)) {
+                        return field.filter((f) => f.name === targetName)[0];
+                    }
+                    else {
+                        return field.name === targetName ? field : null;
+                    }
+                })
+                    .filter(Boolean)[0];
+                if (field && field.fieldType === 'number') {
+                    // for number fields
+                    // hook them up to the CellEditorKeyDown event
+                    // so Shortcuts work as expected
+                    const value = event.target.value;
+                    adaptable._emit('CellEditorKeyDown', {
+                        keyDownEvent: event,
+                        cellValue: value,
+                        columnId: field.name,
+                        updateValueCallback: (updatedValue) => {
+                            setFieldValue(field.name, updatedValue);
+                        },
+                    });
+                }
+            }, "data-name": "form-content", columns: columns, style: { overflow: 'auto' }, paddingRight: 1 }, (_c = formDef.fields) === null || _c === void 0 ? void 0 : _c.map((field, index) => {
             if (Array.isArray(field)) {
                 const rowFields = {};
                 field.map((fieldItem, index) => {

package/src/components/Dashboard/DashboardManager.js

@@ -6,13 +6,19 @@ const ModuleManager_1 = require("../DragAndDropContext/ModuleManager");
 const DashboardManager = ({ tabs, onTabsChange, availableToolbars, api, disabled, }) => {
     const moduleService = api.internalApi.getModuleService();
     const moduleInfo = moduleService.getModuleInfoByModule('Dashboard');
-    const preparedTabs = tabs.map((tab) => {
-        return Object.assign(Object.assign({}, tab), { Items: tab.Toolbars });
+    const moduleTabs = tabs.map((tab) => {
+        return {
+            Name: tab.Name,
+            Items: tab.Toolbars,
+        };
     });
     const handleTabsChange = React.useCallback((tabs) => {
-        const preparedTabs = tabs.map((tab) => (Object.assign(Object.assign({}, tab), { Toolbars: tab.Items })));
-        onTabsChange(preparedTabs);
+        const dashboardTabs = tabs.map((tab) => ({
+            Name: tab.Name,
+            Toolbars: tab.Items,
+        }));
+        onTabsChange(dashboardTabs);
     }, []);
-    return (React.createElement(ModuleManager_1.ModuleManager, { availableItems: availableToolbars, disabled: disabled, onTabsChange: handleTabsChange, tabs: preparedTabs, tabsTitle: moduleInfo.FriendlyName + ' Tabs', unusedPanelTitle: 'Available Toolbars', dragItemText: "Drag into a Tab below" }));
+    return (React.createElement(ModuleManager_1.ModuleManager, { availableItems: availableToolbars, disabled: disabled, onTabsChange: handleTabsChange, tabs: moduleTabs, tabsTitle: moduleInfo.FriendlyName + ' Tabs', unusedPanelTitle: 'Available Toolbars', dragItemText: "Drag into a Tab below" }));
 };
 exports.default = DashboardManager;

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

@@ -2263,6 +2263,12 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             ref: string;
             isOpt?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
         })[];
     };
     ExportableColumnContext: {