handsontable 0.0.0-next-59715d3-20230523 → 0.0.0-next-93e34dc-20230601

package/plugins/customBorders/customBorders.js

@@ -9,10 +9,6 @@ require("core-js/modules/es.symbol.iterator.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-require("core-js/modules/es.array.slice.js");
-require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.array.from.js");
-require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.weak-map.js");
 exports.__esModule = true;
 exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.CustomBorders = void 0;
@@ -38,12 +34,6 @@ var _selection = require("../../selection");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -229,25 +219,11 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionType = (0, _selection.detectSelectionType)(selectionRanges);
       var selectionSchemaNormalizer = (0, _selection.normalizeSelectionFactory)(selectionType);
       (0, _array.arrayEach)(selectionRanges, function (selection) {
-        var _selectionSchemaNorma = selectionSchemaNormalizer(selection),
-          _selectionSchemaNorma2 = _slicedToArray(_selectionSchemaNorma, 4),
-          rowStart = _selectionSchemaNorma2[0],
-          columnStart = _selectionSchemaNorma2[1],
-          rowEnd = _selectionSchemaNorma2[2],
-          columnEnd = _selectionSchemaNorma2[3];
-        var _loop = function _loop(row) {
-          var _loop2 = function _loop2(col) {
-            (0, _array.arrayEach)(borderKeys, function (borderKey) {
-              _this3.prepareBorderFromCustomAdded(row, col, normBorder, (0, _utils.toInlinePropName)(borderKey));
-            });
-          };
-          for (var col = columnStart; col <= columnEnd; col += 1) {
-            _loop2(col);
-          }
-        };
-        for (var row = rowStart; row <= rowEnd; row += 1) {
-          _loop(row);
-        }
+        selectionSchemaNormalizer(selection).forAll(function (row, col) {
+          (0, _array.arrayEach)(borderKeys, function (borderKey) {
+            _this3.prepareBorderFromCustomAdded(row, col, normBorder, (0, _utils.toInlinePropName)(borderKey));
+          });
+        });
       });
 
       /*
@@ -290,27 +266,13 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionSchemaNormalizer = (0, _selection.normalizeSelectionFactory)(selectionType);
       var selectedBorders = [];
       (0, _array.arrayEach)(selectionRanges, function (selection) {
-        var _selectionSchemaNorma3 = selectionSchemaNormalizer(selection),
-          _selectionSchemaNorma4 = _slicedToArray(_selectionSchemaNorma3, 4),
-          rowStart = _selectionSchemaNorma4[0],
-          columnStart = _selectionSchemaNorma4[1],
-          rowEnd = _selectionSchemaNorma4[2],
-          columnEnd = _selectionSchemaNorma4[3];
-        var _loop3 = function _loop3(row) {
-          var _loop4 = function _loop4(col) {
-            (0, _array.arrayEach)(_this4.savedBorders, function (border) {
-              if (border.row === row && border.col === col) {
-                selectedBorders.push((0, _utils.denormalizeBorder)(border));
-              }
-            });
-          };
-          for (var col = columnStart; col <= columnEnd; col += 1) {
-            _loop4(col);
-          }
-        };
-        for (var row = rowStart; row <= rowEnd; row += 1) {
-          _loop3(row);
-        }
+        selectionSchemaNormalizer(selection).forAll(function (row, col) {
+          (0, _array.arrayEach)(_this4.savedBorders, function (border) {
+            if (border.row === row && border.col === col) {
+              selectedBorders.push((0, _utils.denormalizeBorder)(border));
+            }
+          });
+        });
       });
       return selectedBorders;
     }
@@ -735,10 +697,12 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelectionsFromContextMenu",
     value: function checkCustomSelectionsFromContextMenu(border, place, remove) {
+      var _this12 = this;
       var check = false;
       (0, _array.arrayEach)(this.hot.selection.highlight.customSelections, function (customSelection) {
         if (border.id === customSelection.settings.id) {
-          (0, _object.objectEach)(customSelection.instanceBorders, function (borderObject) {
+          var borders = _this12.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+          (0, _array.arrayEach)(borders, function (borderObject) {
             borderObject.toggleHiddenClass(place, remove); // TODO this also bad?
           });
 
@@ -763,6 +727,7 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelections",
     value: function checkCustomSelections(border, cellRange, place) {
+      var _this13 = this;
       var hideCount = this.countHide(border);
       var check = false;
       if (hideCount === 4) {
@@ -774,7 +739,8 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
             customSelection.visualCellRange = cellRange;
             customSelection.commit();
             if (place) {
-              (0, _object.objectEach)(customSelection.instanceBorders, function (borderObject) {
+              var borders = _this13.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+              (0, _array.arrayEach)(borders, function (borderObject) {
                 borderObject.changeBorderStyle(place, border);
               });
             }

package/plugins/customBorders/customBorders.mjs

@@ -1,10 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.object.assign.js";
@@ -25,10 +19,6 @@ import "core-js/modules/es.symbol.iterator.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
-import "core-js/modules/es.array.slice.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.array.from.js";
-import "core-js/modules/es.regexp.exec.js";
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -45,7 +35,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { BasePlugin } from "../base/index.mjs";
-import { hasOwnProperty, objectEach, deepClone } from "../../helpers/object.mjs";
+import { hasOwnProperty, deepClone } from "../../helpers/object.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayReduce, arrayMap } from "../../helpers/array.mjs";
 import * as C from "../../i18n/constants.mjs";
@@ -220,25 +210,11 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionType = detectSelectionType(selectionRanges);
       var selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
       arrayEach(selectionRanges, function (selection) {
-        var _selectionSchemaNorma = selectionSchemaNormalizer(selection),
-          _selectionSchemaNorma2 = _slicedToArray(_selectionSchemaNorma, 4),
-          rowStart = _selectionSchemaNorma2[0],
-          columnStart = _selectionSchemaNorma2[1],
-          rowEnd = _selectionSchemaNorma2[2],
-          columnEnd = _selectionSchemaNorma2[3];
-        var _loop = function _loop(row) {
-          var _loop2 = function _loop2(col) {
-            arrayEach(borderKeys, function (borderKey) {
-              _this3.prepareBorderFromCustomAdded(row, col, normBorder, toInlinePropName(borderKey));
-            });
-          };
-          for (var col = columnStart; col <= columnEnd; col += 1) {
-            _loop2(col);
-          }
-        };
-        for (var row = rowStart; row <= rowEnd; row += 1) {
-          _loop(row);
-        }
+        selectionSchemaNormalizer(selection).forAll(function (row, col) {
+          arrayEach(borderKeys, function (borderKey) {
+            _this3.prepareBorderFromCustomAdded(row, col, normBorder, toInlinePropName(borderKey));
+          });
+        });
       });
 
       /*
@@ -281,27 +257,13 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
       var selectedBorders = [];
       arrayEach(selectionRanges, function (selection) {
-        var _selectionSchemaNorma3 = selectionSchemaNormalizer(selection),
-          _selectionSchemaNorma4 = _slicedToArray(_selectionSchemaNorma3, 4),
-          rowStart = _selectionSchemaNorma4[0],
-          columnStart = _selectionSchemaNorma4[1],
-          rowEnd = _selectionSchemaNorma4[2],
-          columnEnd = _selectionSchemaNorma4[3];
-        var _loop3 = function _loop3(row) {
-          var _loop4 = function _loop4(col) {
-            arrayEach(_this4.savedBorders, function (border) {
-              if (border.row === row && border.col === col) {
-                selectedBorders.push(denormalizeBorder(border));
-              }
-            });
-          };
-          for (var col = columnStart; col <= columnEnd; col += 1) {
-            _loop4(col);
-          }
-        };
-        for (var row = rowStart; row <= rowEnd; row += 1) {
-          _loop3(row);
-        }
+        selectionSchemaNormalizer(selection).forAll(function (row, col) {
+          arrayEach(_this4.savedBorders, function (border) {
+            if (border.row === row && border.col === col) {
+              selectedBorders.push(denormalizeBorder(border));
+            }
+          });
+        });
       });
       return selectedBorders;
     }
@@ -726,10 +688,12 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelectionsFromContextMenu",
     value: function checkCustomSelectionsFromContextMenu(border, place, remove) {
+      var _this12 = this;
       var check = false;
       arrayEach(this.hot.selection.highlight.customSelections, function (customSelection) {
         if (border.id === customSelection.settings.id) {
-          objectEach(customSelection.instanceBorders, function (borderObject) {
+          var borders = _this12.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+          arrayEach(borders, function (borderObject) {
             borderObject.toggleHiddenClass(place, remove); // TODO this also bad?
           });
 
@@ -754,6 +718,7 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelections",
     value: function checkCustomSelections(border, cellRange, place) {
+      var _this13 = this;
       var hideCount = this.countHide(border);
       var check = false;
       if (hideCount === 4) {
@@ -765,7 +730,8 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
             customSelection.visualCellRange = cellRange;
             customSelection.commit();
             if (place) {
-              objectEach(customSelection.instanceBorders, function (borderObject) {
+              var borders = _this13.hot.view._wt.selectionManager.getBorderInstances(customSelection);
+              arrayEach(borders, function (borderObject) {
                 borderObject.changeBorderStyle(place, border);
               });
             }

package/plugins/mergeCells/mergeCells.js

@@ -242,9 +242,6 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterDrawSelection', function () {
         return _this2.onAfterDrawSelection.apply(_this2, arguments);
       });
-      this.addHook('beforeRemoveCellClassNames', function () {
-        return _this2.onBeforeRemoveCellClassNames.apply(_this2, arguments);
-      });
       this.addHook('beforeUndoStackChange', function (action, source) {
         if (source === 'MergeCells') {
           return false;
@@ -661,8 +658,11 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       gridContext.addShortcut({
         keys: [['Control', 'm']],
         callback: function callback() {
-          _this7.toggleMerge(_this7.hot.getSelectedRangeLast());
-          _this7.hot.render();
+          var range = _this7.hot.getSelectedRangeLast();
+          if (range && !range.isSingleHeader()) {
+            _this7.toggleMerge(range);
+            _this7.hot.render();
+          }
         },
         runOnlyIf: function runOnlyIf(event) {
           return !event.altKey;
@@ -1339,19 +1339,6 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       }
       return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
     }
-
-    /**
-     * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
-     *
-     * @private
-     * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
-     *   all the cells in the table.
-     */
-  }, {
-    key: "onBeforeRemoveCellClassNames",
-    value: function onBeforeRemoveCellClassNames() {
-      return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
-    }
   }], [{
     key: "PLUGIN_KEY",
     get: function get() {

package/plugins/mergeCells/mergeCells.mjs

@@ -235,9 +235,6 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterDrawSelection', function () {
         return _this2.onAfterDrawSelection.apply(_this2, arguments);
       });
-      this.addHook('beforeRemoveCellClassNames', function () {
-        return _this2.onBeforeRemoveCellClassNames.apply(_this2, arguments);
-      });
       this.addHook('beforeUndoStackChange', function (action, source) {
         if (source === 'MergeCells') {
           return false;
@@ -654,8 +651,11 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       gridContext.addShortcut({
         keys: [['Control', 'm']],
         callback: function callback() {
-          _this7.toggleMerge(_this7.hot.getSelectedRangeLast());
-          _this7.hot.render();
+          var range = _this7.hot.getSelectedRangeLast();
+          if (range && !range.isSingleHeader()) {
+            _this7.toggleMerge(range);
+            _this7.hot.render();
+          }
         },
         runOnlyIf: function runOnlyIf(event) {
           return !event.altKey;
@@ -1332,19 +1332,6 @@ export var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       }
       return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
     }
-
-    /**
-     * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
-     *
-     * @private
-     * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
-     *   all the cells in the table.
-     */
-  }, {
-    key: "onBeforeRemoveCellClassNames",
-    value: function onBeforeRemoveCellClassNames() {
-      return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
-    }
   }], [{
     key: "PLUGIN_KEY",
     get: function get() {

package/plugins/nestedHeaders/nestedHeaders.js

@@ -201,6 +201,12 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('beforeOnCellMouseOver', function () {
         return _this2.onBeforeOnCellMouseOver.apply(_this2, arguments);
       });
+      this.addHook('modifyTransformStart', function () {
+        return _this2.onModifyTransformStart.apply(_this2, arguments);
+      });
+      this.addHook('afterSelection', function () {
+        return _this2.updateFocusHighlightPosition();
+      });
       this.addHook('afterGetColumnHeaderRenderers', function (array) {
         return _this2.onAfterGetColumnHeaderRenderers(array);
       });
@@ -219,6 +225,12 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterViewportColumnCalculatorOverride', function () {
         return _this2.onAfterViewportColumnCalculatorOverride.apply(_this2, arguments);
       });
+      this.hot.columnIndexMapper.addLocalHook('cacheUpdated', function () {
+        return _this2.updateFocusHighlightPosition();
+      });
+      this.hot.rowIndexMapper.addLocalHook('cacheUpdated', function () {
+        return _this2.updateFocusHighlightPosition();
+      });
       _get(_getPrototypeOf(NestedHeaders.prototype), "enablePlugin", this).call(this);
       this.updatePlugin(); // @TODO: Workaround for broken plugin initialization abstraction.
     }
@@ -440,6 +452,34 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       return this.hot.getColHeader(visualColumnIndex, headerLevel);
     }
 
+    /**
+     * Updates the selection focus highlight position to point to the nested header root element (TH)
+     * even when the logical coordinates point in-between the header.
+     *
+     * @private
+     */
+  }, {
+    key: "updateFocusHighlightPosition",
+    value: function updateFocusHighlightPosition() {
+      var _this$hot;
+      var selection = (_this$hot = this.hot) === null || _this$hot === void 0 ? void 0 : _this$hot.getSelectedRangeLast();
+      if (!selection) {
+        return;
+      }
+      var highlight = selection.highlight;
+      var isNestedHeadersRange = highlight.isHeader() && highlight.col >= 0;
+      if (isNestedHeadersRange) {
+        var columnIndex = _classPrivateFieldGet(this, _stateManager).findLeftMostColumnIndex(highlight.row, highlight.col);
+        var focusHighlight = this.hot.selection.highlight.getFocus();
+
+        // Correct the highlight/focus selection to highlight the correct TH element
+        focusHighlight.visualCellRange.highlight.col = columnIndex;
+        focusHighlight.visualCellRange.from.col = columnIndex;
+        focusHighlight.visualCellRange.to.col = columnIndex;
+        focusHighlight.commit();
+      }
+    }
+
     /**
      * Allows to control which header DOM element will be used to highlight.
      *
@@ -456,8 +496,7 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       if (!headerNodeData) {
         return visualColumn;
       }
-      var classNames = highlightMeta.classNames,
-        columnCursor = highlightMeta.columnCursor,
+      var columnCursor = highlightMeta.columnCursor,
         selectionType = highlightMeta.selectionType,
         selectionWidth = highlightMeta.selectionWidth;
       var _classPrivateFieldGet4 = _classPrivateFieldGet(this, _stateManager).getHeaderSettings(headerLevel, visualColumn),
@@ -469,8 +508,8 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
         }
       } else if (selectionType === _selection.ACTIVE_HEADER_TYPE) {
         if (colspan > selectionWidth - columnCursor || !isRoot) {
-          // Reset the class names array so the generated TH element won't be modified.
-          classNames.length = 0;
+          // Prevents adding any CSS class names to the TH element
+          return null;
         }
       }
       return visualColumn;
@@ -601,7 +640,7 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeOnCellMouseOver",
     value: function onBeforeOnCellMouseOver(event, coords, TD, controller) {
-      var _this$hot;
+      var _this$hot$selection;
       if (!this.hot.view.isMouseDown()) {
         return;
       }
@@ -622,13 +661,54 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       controller.cell = true;
       var columnsToSelect = [];
       if (coords.col < from.col) {
-        columnsToSelect.push(bottomEndCoords.col, columnIndex);
+        columnsToSelect.push(bottomEndCoords.col, columnIndex, coords.row);
       } else if (coords.col > from.col) {
-        columnsToSelect.push(topStartCoords.col, columnIndex + origColspan - 1);
+        columnsToSelect.push(topStartCoords.col, columnIndex + origColspan - 1, coords.row);
       } else {
-        columnsToSelect.push(columnIndex, columnIndex + origColspan - 1);
+        columnsToSelect.push(columnIndex, columnIndex + origColspan - 1, coords.row);
+      }
+      (_this$hot$selection = this.hot.selection).selectColumns.apply(_this$hot$selection, columnsToSelect);
+    }
+
+    /**
+     * `modifyTransformStart` hook is called every time the keyboard navigation is used.
+     *
+     * @private
+     * @param {object} delta The transformation delta.
+     */
+  }, {
+    key: "onModifyTransformStart",
+    value: function onModifyTransformStart(delta) {
+      var _this$hot$getSelected = this.hot.getSelectedRangeLast(),
+        highlight = _this$hot$getSelected.highlight;
+      var nextCoords = this.hot._createCellCoords(highlight.row + delta.row, highlight.col + delta.col);
+      var isNestedHeadersRange = nextCoords.isHeader() && nextCoords.col >= 0;
+      if (!isNestedHeadersRange) {
+        return;
+      }
+      var visualColumnIndexStart = _classPrivateFieldGet(this, _stateManager).findLeftMostColumnIndex(nextCoords.row, nextCoords.col);
+      var visualColumnIndexEnd = _classPrivateFieldGet(this, _stateManager).findRightMostColumnIndex(nextCoords.row, nextCoords.col);
+      if (delta.col < 0) {
+        var nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexStart - 1 : visualColumnIndexEnd;
+        var notHiddenColumnIndex = this.hot.columnIndexMapper.getNearestNotHiddenIndex(nextColumn, -1);
+        if (notHiddenColumnIndex === null) {
+          // There are no visible columns anymore, so move the selection out of the table edge. This will
+          // be processed by the selection Transformer class as a move selection to the previous row (if autoWrapRow is enabled).
+          delta.col = -this.hot.view.countRenderableColumnsInRange(0, highlight.col);
+        } else {
+          delta.col = -Math.max(this.hot.view.countRenderableColumnsInRange(notHiddenColumnIndex, highlight.col) - 1, 1);
+        }
+      } else if (delta.col > 0) {
+        var _nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexEnd + 1 : visualColumnIndexStart;
+        var _notHiddenColumnIndex = this.hot.columnIndexMapper.getNearestNotHiddenIndex(_nextColumn, 1);
+        if (_notHiddenColumnIndex === null) {
+          // There are no visible columns anymore, so move the selection out of the table edge. This will
+          // be processed by the selection Transformer class as a move selection to the next row (if autoWrapRow is enabled).
+          delta.col = this.hot.view.countRenderableColumnsInRange(highlight.col, this.hot.countCols());
+        } else {
+          delta.col = Math.max(this.hot.view.countRenderableColumnsInRange(highlight.col, _notHiddenColumnIndex) - 1, 1);
+        }
       }
-      (_this$hot = this.hot).selectColumns.apply(_this$hot, columnsToSelect);
     }
 
     /**

package/plugins/nestedHeaders/nestedHeaders.mjs

@@ -194,6 +194,12 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('beforeOnCellMouseOver', function () {
         return _this2.onBeforeOnCellMouseOver.apply(_this2, arguments);
       });
+      this.addHook('modifyTransformStart', function () {
+        return _this2.onModifyTransformStart.apply(_this2, arguments);
+      });
+      this.addHook('afterSelection', function () {
+        return _this2.updateFocusHighlightPosition();
+      });
       this.addHook('afterGetColumnHeaderRenderers', function (array) {
         return _this2.onAfterGetColumnHeaderRenderers(array);
       });
@@ -212,6 +218,12 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterViewportColumnCalculatorOverride', function () {
         return _this2.onAfterViewportColumnCalculatorOverride.apply(_this2, arguments);
       });
+      this.hot.columnIndexMapper.addLocalHook('cacheUpdated', function () {
+        return _this2.updateFocusHighlightPosition();
+      });
+      this.hot.rowIndexMapper.addLocalHook('cacheUpdated', function () {
+        return _this2.updateFocusHighlightPosition();
+      });
       _get(_getPrototypeOf(NestedHeaders.prototype), "enablePlugin", this).call(this);
       this.updatePlugin(); // @TODO: Workaround for broken plugin initialization abstraction.
     }
@@ -433,6 +445,34 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       return this.hot.getColHeader(visualColumnIndex, headerLevel);
     }
 
+    /**
+     * Updates the selection focus highlight position to point to the nested header root element (TH)
+     * even when the logical coordinates point in-between the header.
+     *
+     * @private
+     */
+  }, {
+    key: "updateFocusHighlightPosition",
+    value: function updateFocusHighlightPosition() {
+      var _this$hot;
+      var selection = (_this$hot = this.hot) === null || _this$hot === void 0 ? void 0 : _this$hot.getSelectedRangeLast();
+      if (!selection) {
+        return;
+      }
+      var highlight = selection.highlight;
+      var isNestedHeadersRange = highlight.isHeader() && highlight.col >= 0;
+      if (isNestedHeadersRange) {
+        var columnIndex = _classPrivateFieldGet(this, _stateManager).findLeftMostColumnIndex(highlight.row, highlight.col);
+        var focusHighlight = this.hot.selection.highlight.getFocus();
+
+        // Correct the highlight/focus selection to highlight the correct TH element
+        focusHighlight.visualCellRange.highlight.col = columnIndex;
+        focusHighlight.visualCellRange.from.col = columnIndex;
+        focusHighlight.visualCellRange.to.col = columnIndex;
+        focusHighlight.commit();
+      }
+    }
+
     /**
      * Allows to control which header DOM element will be used to highlight.
      *
@@ -449,8 +489,7 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       if (!headerNodeData) {
         return visualColumn;
       }
-      var classNames = highlightMeta.classNames,
-        columnCursor = highlightMeta.columnCursor,
+      var columnCursor = highlightMeta.columnCursor,
         selectionType = highlightMeta.selectionType,
         selectionWidth = highlightMeta.selectionWidth;
       var _classPrivateFieldGet4 = _classPrivateFieldGet(this, _stateManager).getHeaderSettings(headerLevel, visualColumn),
@@ -462,8 +501,8 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
         }
       } else if (selectionType === ACTIVE_HEADER_TYPE) {
         if (colspan > selectionWidth - columnCursor || !isRoot) {
-          // Reset the class names array so the generated TH element won't be modified.
-          classNames.length = 0;
+          // Prevents adding any CSS class names to the TH element
+          return null;
         }
       }
       return visualColumn;
@@ -594,7 +633,7 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeOnCellMouseOver",
     value: function onBeforeOnCellMouseOver(event, coords, TD, controller) {
-      var _this$hot;
+      var _this$hot$selection;
       if (!this.hot.view.isMouseDown()) {
         return;
       }
@@ -615,13 +654,54 @@ export var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       controller.cell = true;
       var columnsToSelect = [];
       if (coords.col < from.col) {
-        columnsToSelect.push(bottomEndCoords.col, columnIndex);
+        columnsToSelect.push(bottomEndCoords.col, columnIndex, coords.row);
       } else if (coords.col > from.col) {
-        columnsToSelect.push(topStartCoords.col, columnIndex + origColspan - 1);
+        columnsToSelect.push(topStartCoords.col, columnIndex + origColspan - 1, coords.row);
       } else {
-        columnsToSelect.push(columnIndex, columnIndex + origColspan - 1);
+        columnsToSelect.push(columnIndex, columnIndex + origColspan - 1, coords.row);
+      }
+      (_this$hot$selection = this.hot.selection).selectColumns.apply(_this$hot$selection, columnsToSelect);
+    }
+
+    /**
+     * `modifyTransformStart` hook is called every time the keyboard navigation is used.
+     *
+     * @private
+     * @param {object} delta The transformation delta.
+     */
+  }, {
+    key: "onModifyTransformStart",
+    value: function onModifyTransformStart(delta) {
+      var _this$hot$getSelected = this.hot.getSelectedRangeLast(),
+        highlight = _this$hot$getSelected.highlight;
+      var nextCoords = this.hot._createCellCoords(highlight.row + delta.row, highlight.col + delta.col);
+      var isNestedHeadersRange = nextCoords.isHeader() && nextCoords.col >= 0;
+      if (!isNestedHeadersRange) {
+        return;
+      }
+      var visualColumnIndexStart = _classPrivateFieldGet(this, _stateManager).findLeftMostColumnIndex(nextCoords.row, nextCoords.col);
+      var visualColumnIndexEnd = _classPrivateFieldGet(this, _stateManager).findRightMostColumnIndex(nextCoords.row, nextCoords.col);
+      if (delta.col < 0) {
+        var nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexStart - 1 : visualColumnIndexEnd;
+        var notHiddenColumnIndex = this.hot.columnIndexMapper.getNearestNotHiddenIndex(nextColumn, -1);
+        if (notHiddenColumnIndex === null) {
+          // There are no visible columns anymore, so move the selection out of the table edge. This will
+          // be processed by the selection Transformer class as a move selection to the previous row (if autoWrapRow is enabled).
+          delta.col = -this.hot.view.countRenderableColumnsInRange(0, highlight.col);
+        } else {
+          delta.col = -Math.max(this.hot.view.countRenderableColumnsInRange(notHiddenColumnIndex, highlight.col) - 1, 1);
+        }
+      } else if (delta.col > 0) {
+        var _nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexEnd + 1 : visualColumnIndexStart;
+        var _notHiddenColumnIndex = this.hot.columnIndexMapper.getNearestNotHiddenIndex(_nextColumn, 1);
+        if (_notHiddenColumnIndex === null) {
+          // There are no visible columns anymore, so move the selection out of the table edge. This will
+          // be processed by the selection Transformer class as a move selection to the next row (if autoWrapRow is enabled).
+          delta.col = this.hot.view.countRenderableColumnsInRange(highlight.col, this.hot.countCols());
+        } else {
+          delta.col = Math.max(this.hot.view.countRenderableColumnsInRange(highlight.col, _notHiddenColumnIndex) - 1, 1);
+        }
       }
-      (_this$hot = this.hot).selectColumns.apply(_this$hot, columnsToSelect);
     }
 
     /**