handsontable 0.0.0-next-2b3d6d8-20230623 → 0.0.0-next-c3d199b-20230626

package/plugins/dropdownMenu/dropdownMenu.mjs

@@ -32,7 +32,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { BasePlugin } from "../base/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
+import { objectEach } from "../../helpers/object.mjs";
 import CommandExecutor from "../contextMenu/commandExecutor.mjs";
+import { getDocumentOffsetByElement } from "../contextMenu/utils.mjs";
 import EventManager from "../../eventManager.mjs";
 import { hasClass } from "../../helpers/dom/element.mjs";
 import ItemsFactory from "../contextMenu/itemsFactory.mjs";
@@ -47,6 +49,7 @@ Hooks.getSingleton().register('afterDropdownMenuExecute');
 export var PLUGIN_KEY = 'dropdownMenu';
 export var PLUGIN_PRIORITY = 230;
 var BUTTON_CLASS_NAME = 'changeType';
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**
@@ -176,6 +179,7 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
       if (typeof settings.callback === 'function') {
         this.commandExecutor.setCommonCallback(settings.callback);
       }
+      this.registerShortcuts();
       _get(_getPrototypeOf(DropdownMenu.prototype), "enablePlugin", this).call(this);
       this.callOnPluginsReady(function () {
         _this2.hot.runHooks('afterDropdownMenuDefaultOptions', predefinedItems);
@@ -239,9 +243,71 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
       if (this.menu) {
         this.menu.destroy();
       }
+      this.unregisterShortcuts();
       _get(_getPrototypeOf(DropdownMenu.prototype), "disablePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for toggling dropdown menu.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this3 = this;
+      var context = this.hot.getShortcutManager().getContext('grid');
+      var callback = function callback() {
+        var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
+          highlight = _this3$hot$getSelecte.highlight;
+        if ((highlight.isHeader() && highlight.row === -1 || highlight.isCell()) && highlight.col >= 0) {
+          _this3.hot.selectColumns(highlight.col, highlight.col, -1);
+          var _this3$hot$getSelecte2 = _this3.hot.getSelectedRangeLast(),
+            from = _this3$hot$getSelecte2.from;
+          var offset = getDocumentOffsetByElement(_this3.menu.container, _this3.hot.rootDocument);
+          var target = _this3.hot.getCell(-1, from.col, true);
+          var rect = target.getBoundingClientRect();
+          _this3.open({
+            left: rect.left + offset.left,
+            top: rect.top + target.offsetHeight + offset.top
+          }, {
+            left: rect.width
+          });
+          _this3.hot._registerTimeout(function () {
+            _this3.menu.selectFirstCell();
+          });
+        }
+      };
+      context.addShortcuts([{
+        keys: [['Shift', 'Alt', 'ArrowDown'], ['Shift', 'Enter']],
+        callback: callback,
+        runOnlyIf: function runOnlyIf() {
+          var _this3$hot$getSelecte3;
+          return ((_this3$hot$getSelecte3 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte3 === void 0 ? void 0 : _this3$hot$getSelecte3.highlight.isHeader()) && !_this3.menu.isOpened();
+        },
+        group: SHORTCUTS_GROUP
+      }, {
+        keys: [['Shift', 'Alt', 'ArrowDown']],
+        callback: callback,
+        runOnlyIf: function runOnlyIf() {
+          var _this3$hot$getSelecte4;
+          return ((_this3$hot$getSelecte4 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte4 === void 0 ? void 0 : _this3$hot$getSelecte4.highlight.isCell()) && !_this3.menu.isOpened();
+        },
+        group: SHORTCUTS_GROUP
+      }]);
+    }
+
+    /**
+     * Unregister shortcuts responsible for toggling dropdown menu.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /**
      * Registers the DOM listeners.
      *
@@ -250,33 +316,42 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "registerEvents",
     value: function registerEvents() {
-      var _this3 = this;
+      var _this4 = this;
       this.eventManager.addEventListener(this.hot.rootElement, 'click', function (event) {
-        return _this3.onTableClick(event);
+        return _this4.onTableClick(event);
       });
     }
 
     /**
      * Opens menu and re-position it based on the passed coordinates.
      *
-     * @param {object|Event} position An object with `pageX` and `pageY` properties which contains values relative to
-     *                                the top left of the fully rendered content area in the browser or with `clientX`
-     *                                and `clientY`  properties which contains values relative to the upper left edge
-     *                                of the content area (the viewport) of the browser window. This object is structurally
-     *                                compatible with native mouse event so it can be used either.
+     * @param {{ top: number, left: number }|Event} position An object with `top` and `left` properties
+     * which contains coordinates relative to the browsers viewport (without included scroll offsets).
+     * Or if the native event is passed the menu will be positioned based on the `pageX` and `pageY`
+     * coordinates.
+     * @param {{ above: number, below: number, left: number, right: number }} offset An object allows applying
+     * the offset to the menu position.
      * @fires Hooks#beforeDropdownMenuShow
      * @fires Hooks#afterDropdownMenuShow
      */
   }, {
     key: "open",
     value: function open(position) {
-      if (!this.menu) {
+      var _this$menu,
+        _this5 = this;
+      var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+        above: 0,
+        below: 0,
+        left: 0,
+        right: 0
+      };
+      if ((_this$menu = this.menu) !== null && _this$menu !== void 0 && _this$menu.isOpened()) {
         return;
       }
       this.menu.open();
-      if (position.width) {
-        this.menu.setOffset('left', position.width);
-      }
+      objectEach(offset, function (value, key) {
+        _this5.menu.setOffset(key, value);
+      });
       this.menu.setPosition(position);
     }
 
@@ -286,10 +361,8 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "close",
     value: function close() {
-      if (!this.menu) {
-        return;
-      }
-      this.menu.close();
+      var _this$menu2;
+      (_this$menu2 = this.menu) === null || _this$menu2 === void 0 ? void 0 : _this$menu2.close();
     }
 
     /**
@@ -361,23 +434,14 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
     key: "onTableClick",
     value: function onTableClick(event) {
       event.stopPropagation();
-      if (hasClass(event.target, BUTTON_CLASS_NAME) && !this.menu.isOpened()) {
-        var offsetTop = 0;
-        var offsetLeft = 0;
-        if (this.hot.rootDocument !== this.menu.container.ownerDocument) {
-          var frameElement = this.hot.rootWindow.frameElement;
-          var _frameElement$getBoun = frameElement.getBoundingClientRect(),
-            top = _frameElement$getBoun.top,
-            left = _frameElement$getBoun.left;
-          offsetTop = top;
-          offsetLeft = left;
-        }
+      if (hasClass(event.target, BUTTON_CLASS_NAME)) {
+        var offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
         var rect = event.target.getBoundingClientRect();
         this.open({
-          left: rect.left + offsetLeft,
-          top: rect.top + event.target.offsetHeight + 3 + offsetTop,
-          width: rect.width,
-          height: rect.height
+          left: rect.left + offset.left,
+          top: rect.top + event.target.offsetHeight + 3 + offset.top
+        }, {
+          left: rect.width
         });
       }
     }

package/plugins/mergeCells/mergeCells.js

@@ -243,9 +243,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;
@@ -662,8 +659,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;
@@ -1340,19 +1340,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

@@ -236,9 +236,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;
@@ -655,8 +652,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;
@@ -1333,19 +1333,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/multiColumnSorting/multiColumnSorting.js

@@ -16,8 +16,8 @@ require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 exports.__esModule = true;
 exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.MultiColumnSorting = void 0;
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.sort.js");
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.object.set-prototype-of.js");
 require("core-js/modules/es.object.get-prototype-of.js");
 var _columnSorting = require("../columnSorting");
@@ -45,8 +45,8 @@ var PLUGIN_KEY = 'multiColumnSorting';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 var PLUGIN_PRIORITY = 170;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-var APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 var CONFLICTED_PLUGIN_KEY = 'columnSorting';
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 
 /**
@@ -151,6 +151,45 @@ var MultiColumnSorting = /*#__PURE__*/function (_ColumnSorting) {
       _get(_getPrototypeOf(MultiColumnSorting.prototype), "disablePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for toggling column sorting functionality.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this2 = this;
+      _get(_getPrototypeOf(MultiColumnSorting.prototype), "registerShortcuts", this).call(this);
+      this.hot.getShortcutManager().getContext('grid').addShortcut({
+        keys: [['Control/Meta', 'Enter']],
+        callback: function callback() {
+          var _this2$hot$getSelecte = _this2.hot.getSelectedRangeLast(),
+            highlight = _this2$hot$getSelecte.highlight;
+          if (highlight.row === -1 && highlight.col >= 0) {
+            _this2.sort(_this2.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
+          }
+        },
+        runOnlyIf: function runOnlyIf() {
+          var _this2$hot$getSelecte2;
+          return (_this2$hot$getSelecte2 = _this2.hot.getSelectedRangeLast()) === null || _this2$hot$getSelecte2 === void 0 ? void 0 : _this2$hot$getSelecte2.highlight.isHeader();
+        },
+        group: SHORTCUTS_GROUP
+      });
+    }
+
+    /**
+     * Unregister shortcuts responsible for toggling column sorting functionality.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      _get(_getPrototypeOf(MultiColumnSorting.prototype), "unregisterShortcuts", this).call(this);
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /**
      * Sorts the table by chosen columns and orders.
      *
@@ -319,7 +358,7 @@ var MultiColumnSorting = /*#__PURE__*/function (_ColumnSorting) {
         if (this.hot.getShortcutManager().isCtrlPressed()) {
           this.hot.deselectCell();
           this.hot.selectColumns(coords.col);
-          this.sort(this.getNextSortConfig(coords.col, APPEND_COLUMN_CONFIG_STRATEGY));
+          this.sort(this.getNextSortConfig(coords.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
         } else {
           this.sort(this.getColumnNextConfig(coords.col));
         }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -1,6 +1,6 @@
 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); }
-import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.sort.js";
+import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.set-prototype-of.js";
 import "core-js/modules/es.object.get-prototype-of.js";
 import "core-js/modules/es.object.to-string.js";
@@ -30,7 +30,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-import { ColumnSorting } from "../columnSorting/index.mjs";
+import { APPEND_COLUMN_CONFIG_STRATEGY, ColumnSorting } from "../columnSorting/index.mjs";
 import { registerRootComparator } from "../columnSorting/sortService/index.mjs";
 import { wasHeaderClickedProperly } from "../columnSorting/utils.mjs";
 import { addClass, removeClass } from "../../helpers/dom/element.mjs";
@@ -39,8 +39,8 @@ import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
 export var PLUGIN_KEY = 'multiColumnSorting';
 export var PLUGIN_PRIORITY = 170;
-var APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 var CONFLICTED_PLUGIN_KEY = 'columnSorting';
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 registerRootComparator(PLUGIN_KEY, rootComparator);
 
 /**
@@ -145,6 +145,45 @@ export var MultiColumnSorting = /*#__PURE__*/function (_ColumnSorting) {
       _get(_getPrototypeOf(MultiColumnSorting.prototype), "disablePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for toggling column sorting functionality.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this2 = this;
+      _get(_getPrototypeOf(MultiColumnSorting.prototype), "registerShortcuts", this).call(this);
+      this.hot.getShortcutManager().getContext('grid').addShortcut({
+        keys: [['Control/Meta', 'Enter']],
+        callback: function callback() {
+          var _this2$hot$getSelecte = _this2.hot.getSelectedRangeLast(),
+            highlight = _this2$hot$getSelecte.highlight;
+          if (highlight.row === -1 && highlight.col >= 0) {
+            _this2.sort(_this2.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
+          }
+        },
+        runOnlyIf: function runOnlyIf() {
+          var _this2$hot$getSelecte2;
+          return (_this2$hot$getSelecte2 = _this2.hot.getSelectedRangeLast()) === null || _this2$hot$getSelecte2 === void 0 ? void 0 : _this2$hot$getSelecte2.highlight.isHeader();
+        },
+        group: SHORTCUTS_GROUP
+      });
+    }
+
+    /**
+     * Unregister shortcuts responsible for toggling column sorting functionality.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      _get(_getPrototypeOf(MultiColumnSorting.prototype), "unregisterShortcuts", this).call(this);
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /**
      * Sorts the table by chosen columns and orders.
      *

package/plugins/nestedHeaders/nestedHeaders.js

@@ -25,8 +25,8 @@ require("core-js/modules/es.weak-map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _element = require("../../helpers/dom/element");
 var _number = require("../../helpers/number");
-var _event = require("../../helpers/dom/event");
 var _templateLiteralTag = require("../../helpers/templateLiteralTag");
+var _event = require("../../helpers/dom/event");
 var _console = require("../../helpers/console");
 var _selection = require("../../selection");
 var _base = require("../base");
@@ -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);
       });
@@ -216,9 +222,18 @@ var NestedHeaders = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('beforeCopy', function () {
         return _this2.onBeforeCopy.apply(_this2, arguments);
       });
+      this.addHook('beforeSelectColumns', function () {
+        return _this2.onBeforeSelectColumns.apply(_this2, arguments);
+      });
       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 +455,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 +499,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 +511,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 +643,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 +664,93 @@ 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);
+        }
+      }
+    }
+
+    /**
+     * The hook observes the column selection from the Selection API and modifies the column range to
+     * ensure that the whole nested column will be covered.
+     *
+     * @private
+     * @param {*} from The coords object where the selection starts.
+     * @param {*} to The coords object where the selection ends.
+     */
+  }, {
+    key: "onBeforeSelectColumns",
+    value: function onBeforeSelectColumns(from, to) {
+      var headerLevel = from.row;
+      var startNodeData = this._getHeaderTreeNodeDataByCoords({
+        row: headerLevel,
+        col: from.col
+      });
+      var endNodeData = this._getHeaderTreeNodeDataByCoords({
+        row: headerLevel,
+        col: to.col
+      });
+      if (to.col < from.col) {
+        // Column selection from right to left
+        if (startNodeData) {
+          from.col = startNodeData.columnIndex + startNodeData.origColspan - 1;
+        }
+        if (endNodeData) {
+          to.col = endNodeData.columnIndex;
+        }
+      } else if (to.col >= from.col) {
+        // Column selection from left to right or a single column selection
+        if (startNodeData) {
+          from.col = startNodeData.columnIndex;
+        }
+        if (endNodeData) {
+          to.col = endNodeData.columnIndex + endNodeData.origColspan - 1;
+        }
       }
-      (_this$hot = this.hot).selectColumns.apply(_this$hot, columnsToSelect);
     }
 
     /**