handsontable 0.0.0-next-2b3d6d8-20230623 → 0.0.0-next-74a68c1-20230627

package/plugins/filters/filters.mjs

@@ -67,6 +67,7 @@ import { CONDITION_NONE, CONDITION_BY_VALUE, OPERATION_AND, OPERATION_OR, OPERAT
 import { TrimmingMap } from "../../translations/index.mjs";
 export var PLUGIN_KEY = 'filters';
 export var PLUGIN_PRIORITY = 250;
+var SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -282,6 +283,7 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         this.dropdownMenuPlugin.disablePlugin();
         this.dropdownMenuPlugin.enablePlugin();
       }
+      this.registerShortcuts();
       _get(_getPrototypeOf(Filters.prototype), "enablePlugin", this).call(this);
     }
 
@@ -305,9 +307,41 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         this.conditionCollection = null;
         this.hot.rowIndexMapper.unregisterMap(this.pluginName);
       }
+      this.unregisterShortcuts();
       _get(_getPrototypeOf(Filters.prototype), "disablePlugin", this).call(this);
     }
 
+    /**
+     * Register shortcuts responsible for clearing the filters.
+     *
+     * @private
+     */
+  }, {
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this4 = this;
+      this.hot.getShortcutManager().getContext('grid').addShortcut({
+        keys: [['Alt', 'A']],
+        stopPropagation: true,
+        callback: function callback() {
+          _this4.clearConditions();
+          _this4.filter();
+        },
+        group: SHORTCUTS_GROUP
+      });
+    }
+
+    /**
+     * Unregister shortcuts responsible for clearing the filters.
+     *
+     * @private
+     */
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+    }
+
     /* eslint-disable jsdoc/require-description-complete-sentence */
     /**
      * @memberof Filters#
@@ -474,7 +508,7 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "filter",
     value: function filter() {
-      var _this4 = this;
+      var _this5 = this;
       var dataFilter = this._createDataFilter();
       var needToFilter = !this.conditionCollection.isEmpty();
       var visibleVisualRows = [];
@@ -484,18 +518,18 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         if (needToFilter) {
           var trimmedRows = [];
           this.hot.batchExecution(function () {
-            _this4.filtersRowsMap.clear();
+            _this5.filtersRowsMap.clear();
             visibleVisualRows = arrayMap(dataFilter.filter(), function (rowData) {
               return rowData.meta.visualRow;
             });
             var visibleVisualRowsAssertion = createArrayAssertion(visibleVisualRows);
-            rangeEach(_this4.hot.countSourceRows() - 1, function (row) {
+            rangeEach(_this5.hot.countSourceRows() - 1, function (row) {
               if (!visibleVisualRowsAssertion(row)) {
                 trimmedRows.push(row);
               }
             });
             arrayEach(trimmedRows, function (physicalRow) {
-              _this4.filtersRowsMap.setValueAtIndex(physicalRow, true);
+              _this5.filtersRowsMap.setValueAtIndex(physicalRow, true);
             });
           }, true);
           if (!visibleVisualRows.length) {
@@ -508,7 +542,6 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
       this.hot.runHooks('afterFilter', conditions);
       this.hot.view.adjustElementsSize(true);
       this.hot.render();
-      this.clearColumnSelection();
     }
 
     /**
@@ -532,20 +565,6 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
       };
     }
 
-    /**
-     * Clears column selection.
-     *
-     * @private
-     */
-  }, {
-    key: "clearColumnSelection",
-    value: function clearColumnSelection() {
-      var selectedColumn = this.getSelectedColumn();
-      if (selectedColumn !== null) {
-        this.hot.selectCell(0, selectedColumn.visualIndex);
-      }
-    }
-
     /**
      * Returns handsontable source data with cell meta based on current selection.
      *
@@ -555,21 +574,21 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "getDataMapAtColumn",
     value: function getDataMapAtColumn(column) {
-      var _this5 = this;
+      var _this6 = this;
       var visualColumn = this.hot.toVisualColumn(column);
       var data = [];
       arrayEach(this.hot.getSourceDataAtCol(visualColumn), function (value, rowIndex) {
-        var _this5$hot$getDataAtC;
-        var _this5$hot$getCellMet = _this5.hot.getCellMeta(rowIndex, visualColumn),
-          row = _this5$hot$getCellMet.row,
-          col = _this5$hot$getCellMet.col,
-          visualCol = _this5$hot$getCellMet.visualCol,
-          visualRow = _this5$hot$getCellMet.visualRow,
-          type = _this5$hot$getCellMet.type,
-          instance = _this5$hot$getCellMet.instance,
-          dateFormat = _this5$hot$getCellMet.dateFormat,
-          locale = _this5$hot$getCellMet.locale;
-        var dataValue = (_this5$hot$getDataAtC = _this5.hot.getDataAtCell(_this5.hot.toVisualRow(rowIndex), visualColumn)) !== null && _this5$hot$getDataAtC !== void 0 ? _this5$hot$getDataAtC : value;
+        var _this6$hot$getDataAtC;
+        var _this6$hot$getCellMet = _this6.hot.getCellMeta(rowIndex, visualColumn),
+          row = _this6$hot$getCellMet.row,
+          col = _this6$hot$getCellMet.col,
+          visualCol = _this6$hot$getCellMet.visualCol,
+          visualRow = _this6$hot$getCellMet.visualRow,
+          type = _this6$hot$getCellMet.type,
+          instance = _this6$hot$getCellMet.instance,
+          dateFormat = _this6$hot$getCellMet.dateFormat,
+          locale = _this6$hot$getCellMet.locale;
+        var dataValue = (_this6$hot$getDataAtC = _this6.hot.getDataAtCell(_this6.hot.toVisualRow(rowIndex), visualColumn)) !== null && _this6$hot$getDataAtC !== void 0 ? _this6$hot$getDataAtC : value;
         data.push({
           meta: {
             row: row,
@@ -596,14 +615,14 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onAfterChange",
     value: function onAfterChange(changes) {
-      var _this6 = this;
+      var _this7 = this;
       if (changes) {
         arrayEach(changes, function (change) {
           var _change = _slicedToArray(change, 2),
             prop = _change[1];
-          var columnIndex = _this6.hot.propToCol(prop);
-          if (_this6.conditionCollection.hasConditions(columnIndex)) {
-            _this6.updateValueComponentCondition(columnIndex);
+          var columnIndex = _this7.hot.propToCol(prop);
+          if (_this7.conditionCollection.hasConditions(columnIndex)) {
+            _this7.updateValueComponentCondition(columnIndex);
           }
         });
       }
@@ -674,10 +693,10 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onBeforeDropdownMenuSetItems",
     value: function onBeforeDropdownMenuSetItems() {
-      var _this7 = this;
+      var _this8 = this;
       if (this.dropdownMenuPlugin) {
         this.dropdownMenuPlugin.menu.addLocalHook('afterOpen', function () {
-          _this7.dropdownMenuPlugin.menu.hotMenu.updateSettings({
+          _this8.dropdownMenuPlugin.menu.hotMenu.updateSettings({
             hiddenRows: true
           });
         });
@@ -768,6 +787,7 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
         });
         this.filtersRowsMap.clear();
         this.filter();
+        this.hot.selectCell(0, selectedColumn.visualIndex);
       }
       (_this$dropdownMenuPlu3 = this.dropdownMenuPlugin) === null || _this$dropdownMenuPlu3 === void 0 ? void 0 : _this$dropdownMenuPlu3.close();
     }
@@ -860,10 +880,10 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "_createDataFilter",
     value: function _createDataFilter() {
-      var _this8 = this;
+      var _this9 = this;
       var conditionCollection = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.conditionCollection;
       return new DataFilter(conditionCollection, function (physicalColumn) {
-        return _this8.getDataMapAtColumn(physicalColumn);
+        return _this9.getDataMapAtColumn(physicalColumn);
       });
     }
 
@@ -995,12 +1015,12 @@ export var Filters = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this9 = this;
+      var _this10 = this;
       if (this.enabled) {
         this.components.forEach(function (component, key) {
           if (component !== null) {
             component.destroy();
-            _this9.components.set(key, null);
+            _this10.components.set(key, null);
           }
         });
         this.conditionCollection.destroy();

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);
     }
 
     /**