@adaptabletools/adaptable 13.0.0-canary.21 → 13.0.0-canary.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.0-canary.21",
+  "version": "13.0.0-canary.22",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1664742496151;
+declare const _default: 1664770961793;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1664742496151;
+exports.default = 1664770961793;

package/src/Api/Implementation/AlertApiImpl.js

@@ -133,10 +133,15 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.gridApi.jumpToCell(cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.column.columnId);
         }
         if (actionName === 'jump-to-row' &&
-            gridDataChangedInfo &&
-            // no sense to jump to a deleted(non-existing) row
-            (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete') {
-            const [firstRowNode] = gridDataChangedInfo.rowNodes;
+            // either a cell change
+            (cellDataChangedInfo ||
+                // or a grid change, but NOT row deletion
+                (gridDataChangedInfo &&
+                    // no sense to jump to a deleted(non-existing) row
+                    (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete'))) {
+            const [firstRowNode] = cellDataChangedInfo
+                ? [cellDataChangedInfo.rowNode]
+                : gridDataChangedInfo.rowNodes;
             const targetRowNodePrimaryKeyValue = this.adaptable.api.gridApi.getPrimaryKeyValueForRowNode(firstRowNode);
             if (targetRowNodePrimaryKeyValue) {
                 this.adaptable.api.gridApi.jumpToRow(targetRowNodePrimaryKeyValue);

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -92,32 +92,34 @@ const AlertBehaviourWizardSection = (props) => {
     const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(data);
     const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(data);
     const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
+    const hasPreventCellEdit = cellChangedAlert;
+    const hasHighlightCell = cellChangedAlert;
+    const hasHighlightRow = cellChangedAlert || rowAddedAlert;
+    const hasJumpToCell = cellChangedAlert;
+    const hasJumpToRow = cellChangedAlert || rowAddedAlert;
     const onChange = (AlertProperties) => {
         props.onChange(Object.assign(Object.assign({}, data), { AlertProperties: Object.assign(Object.assign({}, data.AlertProperties), AlertProperties) }));
     };
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, api.internalApi.getCorrectEnglishVariant('Behaviour')),
         React.createElement(Tabs_1.Tabs.Content, null,
-            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { "data-name": "prevet-cell-edit", style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, onChange: (PreventEdit) => {
+            hasPreventCellEdit && (React.createElement(CheckBox_1.CheckBox, { "data-name": "prevent-cell-edit", style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, onChange: (PreventEdit) => {
                     onChange({
                         PreventEdit,
                     });
                 } },
                 "Prevent Cell Edit",
                 React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)"))),
-            cellChangedAlert && (React.createElement(HighlightStyle, { dataName: "highlight-cell", highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
+            hasHighlightCell && (React.createElement(HighlightStyle, { dataName: "highlight-cell", highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
                     onChange({ HighlightCell });
                 } })),
-            cellChangedAlert && (React.createElement(HighlightStyle, { dataName: "highlight-row", highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
+            hasHighlightRow && (React.createElement(HighlightStyle, { dataName: "highlight-row", highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
                     onChange({ HighlightRow });
                 } })),
-            rowAddedAlert && (React.createElement(HighlightStyle, { dataName: "highlight-row", highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
-                    onChange({ HighlightRow });
-                } })),
-            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-cell", checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
+            hasJumpToCell && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-cell", checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
                     onChange({ JumpToCell });
                 } }, "Jump To Cell")),
-            rowAddedAlert && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-row", checked: AlertProperties.JumpToRow, onChange: (JumpToRow) => {
+            hasJumpToRow && (React.createElement(CheckBox_1.CheckBox, { "data-name": "jump-to-row", checked: AlertProperties.JumpToRow, onChange: (JumpToRow) => {
                     onChange({ JumpToRow });
                 } }, "Jump To Row")),
             React.createElement(CheckBox_1.CheckBox, { "data-name": "show-in-div", checked: AlertProperties.ShowInDiv, onChange: (ShowInDiv) => {

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -17,9 +17,32 @@ const AlertButtonsEditor = (props) => {
     const onChange = (newButtons) => {
         props.onChange(newButtons);
     };
+    const alertDefinition = adaptableAlert.alertDefinition;
+    const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
+    const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
+    const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
+    const hasHighlightCell = cellChangedAlert;
+    const hasHighlightRow = cellChangedAlert || rowAddedAlert;
+    const hasJumpToCell = cellChangedAlert;
+    const hasJumpToRow = cellChangedAlert || rowAddedAlert;
+    const hasUndo = cellChangedAlert;
     const AlertButtons = (0, Helper_1.cloneObject)(props.AlertButtons || []) || [];
     const buttonActions = [];
-    buttonActions.push('highlight-row', 'jump-to-row', 'highlight-cell', 'jump-to-cell', 'undo');
+    if (hasHighlightRow) {
+        buttonActions.push('highlight-row');
+    }
+    if (hasJumpToRow) {
+        buttonActions.push('jump-to-row');
+    }
+    if (hasHighlightCell) {
+        buttonActions.push('highlight-cell');
+    }
+    if (hasJumpToCell) {
+        buttonActions.push('jump-to-cell');
+    }
+    if (hasUndo) {
+        buttonActions.push('undo');
+    }
     buttonActions.push('suspend');
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between" },

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "13.0.0-canary.21";
+declare const _default: "13.0.0-canary.22";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '13.0.0-canary.21'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '13.0.0-canary.22'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version