handsontable 0.0.0-next-06a64be-20230621 → 0.0.0-next-be250b6-20230621

package/plugins/nestedHeaders/stateManager/index.mjs

@@ -411,6 +411,43 @@ var StateManager = /*#__PURE__*/function () {
       return stepBackColumn;
     }
 
+    /**
+     * The method is helpful in cases where the column index targets in-between currently
+     * collapsed column. In that case, the method returns the right-most column index
+     * where the nested header ends.
+     *
+     * @param {number} headerLevel Header level (there is support for negative and positive values).
+     * @param {number} columnIndex A visual column index.
+     * @returns {number}
+     */
+  }, {
+    key: "findRightMostColumnIndex",
+    value: function findRightMostColumnIndex(headerLevel, columnIndex) {
+      var _this$getHeaderSettin3;
+      var _ref4 = (_this$getHeaderSettin3 = this.getHeaderSettings(headerLevel, columnIndex)) !== null && _this$getHeaderSettin3 !== void 0 ? _this$getHeaderSettin3 : {
+          isRoot: true,
+          origColspan: 1
+        },
+        isRoot = _ref4.isRoot,
+        origColspan = _ref4.origColspan;
+      if (isRoot) {
+        return columnIndex + origColspan - 1;
+      }
+      var stepForthColumn = columnIndex + 1;
+      while (stepForthColumn < this.getColumnsCount()) {
+        var _this$getHeaderSettin4;
+        var _ref5 = (_this$getHeaderSettin4 = this.getHeaderSettings(headerLevel, stepForthColumn)) !== null && _this$getHeaderSettin4 !== void 0 ? _this$getHeaderSettin4 : {
+            isRoot: true
+          },
+          isRootNode = _ref5.isRoot;
+        if (isRootNode) {
+          break;
+        }
+        stepForthColumn += 1;
+      }
+      return stepForthColumn - 1;
+    }
+
     /**
      * Gets a total number of headers levels.
      *

package/plugins/nestedRows/nestedRows.js

@@ -62,6 +62,7 @@ var PLUGIN_KEY = 'nestedRows';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 var PLUGIN_PRIORITY = 300;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 var privatePool = new WeakMap();
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
@@ -203,6 +204,7 @@ var NestedRows = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('beforeUpdateData', function (data) {
         return _this2.onBeforeLoadData(data);
       });
+      this.registerShortcuts();
       _get(_getPrototypeOf(NestedRows.prototype), "enablePlugin", this).call(this);
     }
 
@@ -213,6 +215,7 @@ var NestedRows = /*#__PURE__*/function (_BasePlugin) {
     key: "disablePlugin",
     value: function disablePlugin() {
       this.hot.rowIndexMapper.unregisterMap('nestedRows');
+      this.unregisterShortcuts();
       _get(_getPrototypeOf(NestedRows.prototype), "disablePlugin", this).call(this);
     }
 
@@ -236,6 +239,48 @@ var NestedRows = /*#__PURE__*/function (_BasePlugin) {
       _get(_getPrototypeOf(NestedRows.prototype), "updatePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for toggling collapsible columns.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this3 = this;
+      this.hot.getShortcutManager().getContext('grid').addShortcut({
+        keys: [['Enter']],
+        callback: function callback() {
+          var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
+            highlight = _this3$hot$getSelecte.highlight;
+          if (highlight.col === -1 && highlight.row >= 0) {
+            var row = _this3.collapsingUI.translateTrimmedRow(highlight.row);
+            if (_this3.collapsingUI.areChildrenCollapsed(row)) {
+              _this3.collapsingUI.expandChildren(row);
+            } else {
+              _this3.collapsingUI.collapseChildren(row);
+            }
+          }
+        },
+        runOnlyIf: function runOnlyIf() {
+          var _this3$hot$getSelecte2;
+          return (_this3$hot$getSelecte2 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte2 === void 0 ? void 0 : _this3$hot$getSelecte2.highlight.isHeader();
+        },
+        group: SHORTCUTS_GROUP
+      });
+    }
+
+    /**
+     * Unregister shortcuts responsible for toggling collapsible columns.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /**
      * `beforeRowMove` hook callback.
      *
@@ -415,15 +460,15 @@ var NestedRows = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterRemoveRow",
     value: function onAfterRemoveRow(index, amount, logicRows, source) {
-      var _this3 = this;
+      var _this4 = this;
       if (source === this.pluginName) {
         return;
       }
       var priv = privatePool.get(this);
       setTimeout(function () {
         priv.skipRender = null;
-        _this3.headersUI.updateRowHeaderWidth();
-        _this3.collapsingUI.collapsedRowsStash.applyStash();
+        _this4.headersUI.updateRowHeaderWidth();
+        _this4.collapsingUI.collapsedRowsStash.applyStash();
       }, 0);
     }
 
@@ -439,17 +484,17 @@ var NestedRows = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeRemoveRow",
     value: function onBeforeRemoveRow(index, amount, physicalRows) {
-      var _this4 = this;
+      var _this5 = this;
       var modifiedPhysicalRows = Array.from(physicalRows.reduce(function (removedRows, physicalIndex) {
-        if (_this4.dataManager.isParent(physicalIndex)) {
-          var children = _this4.dataManager.getDataObject(physicalIndex).__children;
+        if (_this5.dataManager.isParent(physicalIndex)) {
+          var children = _this5.dataManager.getDataObject(physicalIndex).__children;
 
           // Preserve a parent in the list of removed rows.
           removedRows.add(physicalIndex);
           if (Array.isArray(children)) {
             // Add a children to the list of removed rows.
             children.forEach(function (child) {
-              return removedRows.add(_this4.dataManager.getRowIndex(child));
+              return removedRows.add(_this5.dataManager.getRowIndex(child));
             });
           }
           return removedRows;

package/plugins/nestedRows/nestedRows.mjs

@@ -55,6 +55,7 @@ import { TrimmingMap } from "../../translations/index.mjs";
 import RowMoveController from "./utils/rowMoveController.mjs";
 export var PLUGIN_KEY = 'nestedRows';
 export var PLUGIN_PRIORITY = 300;
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 var privatePool = new WeakMap();
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
@@ -196,6 +197,7 @@ export var NestedRows = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('beforeUpdateData', function (data) {
         return _this2.onBeforeLoadData(data);
       });
+      this.registerShortcuts();
       _get(_getPrototypeOf(NestedRows.prototype), "enablePlugin", this).call(this);
     }
 
@@ -206,6 +208,7 @@ export var NestedRows = /*#__PURE__*/function (_BasePlugin) {
     key: "disablePlugin",
     value: function disablePlugin() {
       this.hot.rowIndexMapper.unregisterMap('nestedRows');
+      this.unregisterShortcuts();
       _get(_getPrototypeOf(NestedRows.prototype), "disablePlugin", this).call(this);
     }
 
@@ -229,6 +232,48 @@ export var NestedRows = /*#__PURE__*/function (_BasePlugin) {
       _get(_getPrototypeOf(NestedRows.prototype), "updatePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for toggling collapsible columns.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this3 = this;
+      this.hot.getShortcutManager().getContext('grid').addShortcut({
+        keys: [['Enter']],
+        callback: function callback() {
+          var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
+            highlight = _this3$hot$getSelecte.highlight;
+          if (highlight.col === -1 && highlight.row >= 0) {
+            var row = _this3.collapsingUI.translateTrimmedRow(highlight.row);
+            if (_this3.collapsingUI.areChildrenCollapsed(row)) {
+              _this3.collapsingUI.expandChildren(row);
+            } else {
+              _this3.collapsingUI.collapseChildren(row);
+            }
+          }
+        },
+        runOnlyIf: function runOnlyIf() {
+          var _this3$hot$getSelecte2;
+          return (_this3$hot$getSelecte2 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte2 === void 0 ? void 0 : _this3$hot$getSelecte2.highlight.isHeader();
+        },
+        group: SHORTCUTS_GROUP
+      });
+    }
+
+    /**
+     * Unregister shortcuts responsible for toggling collapsible columns.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /**
      * `beforeRowMove` hook callback.
      *
@@ -408,15 +453,15 @@ export var NestedRows = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterRemoveRow",
     value: function onAfterRemoveRow(index, amount, logicRows, source) {
-      var _this3 = this;
+      var _this4 = this;
       if (source === this.pluginName) {
         return;
       }
       var priv = privatePool.get(this);
       setTimeout(function () {
         priv.skipRender = null;
-        _this3.headersUI.updateRowHeaderWidth();
-        _this3.collapsingUI.collapsedRowsStash.applyStash();
+        _this4.headersUI.updateRowHeaderWidth();
+        _this4.collapsingUI.collapsedRowsStash.applyStash();
       }, 0);
     }
 
@@ -432,17 +477,17 @@ export var NestedRows = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeRemoveRow",
     value: function onBeforeRemoveRow(index, amount, physicalRows) {
-      var _this4 = this;
+      var _this5 = this;
       var modifiedPhysicalRows = Array.from(physicalRows.reduce(function (removedRows, physicalIndex) {
-        if (_this4.dataManager.isParent(physicalIndex)) {
-          var children = _this4.dataManager.getDataObject(physicalIndex).__children;
+        if (_this5.dataManager.isParent(physicalIndex)) {
+          var children = _this5.dataManager.getDataObject(physicalIndex).__children;
 
           // Preserve a parent in the list of removed rows.
           removedRows.add(physicalIndex);
           if (Array.isArray(children)) {
             // Add a children to the list of removed rows.
             children.forEach(function (child) {
-              return removedRows.add(_this4.dataManager.getRowIndex(child));
+              return removedRows.add(_this5.dataManager.getRowIndex(child));
             });
           }
           return removedRows;

package/renderers/checkboxRenderer/checkboxRenderer.js

@@ -16,7 +16,7 @@ var _baseRenderer = require("../baseRenderer");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _element = require("../../helpers/dom/element");
 var _mixed = require("../../helpers/mixed");
-var _editorManager = require("../../editorManager");
+var _shortcutContexts = require("../../shortcutContexts");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var isListeningKeyDownEvent = new WeakMap();
@@ -163,7 +163,7 @@ function checkboxRenderer(instance, TD, row, col, prop, value, cellProperties) {
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
       },
 
-      relativeToGroup: _editorManager.SHORTCUTS_GROUP_EDITOR,
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
       position: 'before'
     }], config);
   }

package/renderers/checkboxRenderer/checkboxRenderer.mjs

@@ -11,7 +11,7 @@ import { baseRenderer } from "../baseRenderer/index.mjs";
 import EventManager from "../../eventManager.mjs";
 import { empty, addClass } from "../../helpers/dom/element.mjs";
 import { isEmpty, stringify } from "../../helpers/mixed.mjs";
-import { SHORTCUTS_GROUP_EDITOR } from "../../editorManager.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 var isListeningKeyDownEvent = new WeakMap();
 var isCheckboxListenerAdded = new WeakMap();