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

package/shortcutContexts/grid.mjs

@@ -0,0 +1,243 @@
+import { isDefined } from "../helpers/mixed.mjs";
+import { GRID_GROUP, EDITOR_EDIT_GROUP } from "./constants.mjs";
+import { createKeyboardShortcutCommandsPool } from "./commands/index.mjs";
+/**
+ * The context that defines shortcut list available for selected cell or cells.
+ *
+ * @param {Handsontable} hot The Handsontable instance.
+ */
+export function shortcutsGridContext(hot) {
+  var context = hot.getShortcutManager().addContext('grid');
+  var commandsPool = createKeyboardShortcutCommandsPool(hot);
+  var config = {
+    runOnlyIf: function runOnlyIf() {
+      var _hot$getSettings = hot.getSettings(),
+        navigableHeaders = _hot$getSettings.navigableHeaders;
+      return isDefined(hot.getSelected()) && (navigableHeaders || !navigableHeaders && hot.countRenderedRows() > 0 && hot.countRenderedCols() > 0);
+    },
+    group: GRID_GROUP
+  };
+  context.addShortcuts([{
+    keys: [['F2']],
+    callback: function callback(event) {
+      return commandsPool.editorFastOpen(event);
+    }
+  }, {
+    keys: [['Enter'], ['Enter', 'Shift']],
+    callback: function callback(event, keys) {
+      return commandsPool.editorOpen(event, keys);
+    }
+  }, {
+    keys: [['Backspace'], ['Delete']],
+    callback: function callback() {
+      return commandsPool.emptySelectedCells();
+    }
+  }], {
+    group: EDITOR_EDIT_GROUP,
+    runOnlyIf: function runOnlyIf() {
+      return isDefined(hot.getSelected());
+    }
+  });
+  context.addShortcuts([{
+    keys: [['Control/Meta', 'A'], ['Control/Meta', 'Shift', 'Space']],
+    callback: function callback() {
+      return commandsPool.selectAll();
+    }
+  }, {
+    keys: [['Control/Meta', 'Enter']],
+    callback: function callback() {
+      return commandsPool.populateSelectedCellsData();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return !hot.getSelectedRangeLast().highlight.isHeader() && hot.getSelectedRangeLast().getCellsCount() > 1;
+    }
+  }, {
+    keys: [['Control', 'Space']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToColumns();
+    }
+  }, {
+    keys: [['Shift', 'Space']],
+    stopPropagation: true,
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToRows();
+    }
+  }, {
+    keys: [['ArrowUp']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionUp();
+    }
+  }, {
+    keys: [['ArrowUp', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostTop();
+    }
+  }, {
+    keys: [['ArrowUp', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionUp();
+    }
+  }, {
+    keys: [['ArrowUp', 'Shift', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToMostTop();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return !(hot.selection.isSelectedByCorner() || hot.selection.isSelectedByColumnHeader());
+    }
+  }, {
+    keys: [['ArrowDown']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionDown();
+    }
+  }, {
+    keys: [['ArrowDown', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostBottom();
+    }
+  }, {
+    keys: [['ArrowDown', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionDown();
+    }
+  }, {
+    keys: [['ArrowDown', 'Shift', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToMostBottom();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return !(hot.selection.isSelectedByCorner() || hot.selection.isSelectedByColumnHeader());
+    }
+  }, {
+    keys: [['ArrowLeft']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionLeft();
+    }
+  }, {
+    keys: [['ArrowLeft', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostLeft();
+    }
+  }, {
+    keys: [['ArrowLeft', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionLeft();
+    }
+  }, {
+    keys: [['ArrowLeft', 'Shift', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToMostLeft();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return !(hot.selection.isSelectedByCorner() || hot.selection.isSelectedByRowHeader());
+    }
+  }, {
+    keys: [['ArrowRight']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionRight();
+    }
+  }, {
+    keys: [['ArrowRight', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostRight();
+    }
+  }, {
+    keys: [['ArrowRight', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionRight();
+    }
+  }, {
+    keys: [['ArrowRight', 'Shift', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToMostRight();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return !(hot.selection.isSelectedByCorner() || hot.selection.isSelectedByRowHeader());
+    }
+  }, {
+    keys: [['Home']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostInlineStart();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return hot.view.isMainTableNotFullyCoveredByOverlays();
+    }
+  }, {
+    keys: [['Home', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToMostInlineStart();
+    }
+  }, {
+    keys: [['Home', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostTopInlineStart();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return hot.view.isMainTableNotFullyCoveredByOverlays();
+    }
+  }, {
+    keys: [['End']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostInlineEnd();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return hot.view.isMainTableNotFullyCoveredByOverlays();
+    }
+  }, {
+    keys: [['End', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionToMostInlineEnd();
+    }
+  }, {
+    keys: [['End', 'Control/Meta']],
+    captureCtrl: true,
+    callback: function callback() {
+      return commandsPool.moveCellSelectionToMostBottomInlineEnd();
+    },
+    runOnlyIf: function runOnlyIf() {
+      return hot.view.isMainTableNotFullyCoveredByOverlays();
+    }
+  }, {
+    keys: [['PageUp']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionUpByViewportHight();
+    }
+  }, {
+    keys: [['PageUp', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionUpByViewportHeight();
+    }
+  }, {
+    keys: [['PageDown']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionDownByViewportHeight();
+    }
+  }, {
+    keys: [['PageDown', 'Shift']],
+    callback: function callback() {
+      return commandsPool.extendCellsSelectionDownByViewportHeight();
+    }
+  }, {
+    keys: [['Tab']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionInlineStart();
+    }
+  }, {
+    keys: [['Shift', 'Tab']],
+    callback: function callback() {
+      return commandsPool.moveCellSelectionInlineEnd();
+    }
+  }], config);
+}

package/shortcutContexts/index.js

@@ -0,0 +1,29 @@
+"use strict";
+
+require("core-js/modules/es.object.keys.js");
+exports.__esModule = true;
+var _exportNames = {
+  registerAllShortcutContexts: true
+};
+exports.registerAllShortcutContexts = registerAllShortcutContexts;
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _editor = require("./editor");
+var _grid = require("./grid");
+var _constants = require("./constants");
+Object.keys(_constants).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _constants[key]) return;
+  exports[key] = _constants[key];
+});
+/**
+ * Register all shortcut contexts.
+ *
+ * @param {Handsontable} hotInstance The Handsontable instance.
+ */
+function registerAllShortcutContexts(hotInstance) {
+  [_editor.shortcutsEditorContext, _grid.shortcutsGridContext].forEach(function (context) {
+    return context(hotInstance);
+  });
+}

package/shortcutContexts/index.mjs

@@ -0,0 +1,15 @@
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/web.dom-collections.for-each.js";
+import { shortcutsEditorContext } from "./editor.mjs";
+import { shortcutsGridContext } from "./grid.mjs";
+export * from "./constants.mjs";
+/**
+ * Register all shortcut contexts.
+ *
+ * @param {Handsontable} hotInstance The Handsontable instance.
+ */
+export function registerAllShortcutContexts(hotInstance) {
+  [shortcutsEditorContext, shortcutsGridContext].forEach(function (context) {
+    return context(hotInstance);
+  });
+}

package/shortcuts/manager.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.createShortcutManager = void 0;
 var _uniqueMap = require("../utils/dataStructures/uniqueMap");
+var _event = require("../helpers/dom/event");
 var _context = require("./context");
 var _recorder = require("./recorder");
 /* eslint-disable jsdoc/require-description-complete-sentence */
@@ -126,6 +127,7 @@ var createShortcutManager = function createShortcutManager(_ref) {
           event.preventDefault();
         }
         if (stopPropagation) {
+          (0, _event.stopImmediatePropagation)(event);
           event.stopPropagation();
         }
         if (isExecutionCancelled) {

package/shortcuts/manager.mjs

@@ -1,4 +1,5 @@
 import { createUniqueMap } from "../utils/dataStructures/uniqueMap.mjs";
+import { stopImmediatePropagation } from "../helpers/dom/event.mjs";
 import { createContext } from "./context.mjs";
 import { useRecorder } from "./recorder.mjs";
 /* eslint-disable jsdoc/require-description-complete-sentence */
@@ -121,6 +122,7 @@ export var createShortcutManager = function createShortcutManager(_ref) {
           event.preventDefault();
         }
         if (stopPropagation) {
+          stopImmediatePropagation(event);
           event.stopPropagation();
         }
         if (isExecutionCancelled) {

package/shortcuts/recorder.js

@@ -88,7 +88,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     if (event.keyCode === 229 || result === false || (0, _event.isImmediatePropagationStopped)(event)) {
       return;
     }
-    var pressedKey = (0, _utils.normalizeEventKey)(event.key);
+    var pressedKey = (0, _utils.normalizeEventKey)(event);
     var extraModifierKeys = [];
     if (isModifierKey(pressedKey)) {
       modifierKeysObserver.press(pressedKey);
@@ -114,7 +114,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     if (handleEvent(event) === false) {
       return;
     }
-    var pressedKey = (0, _utils.normalizeEventKey)(event.key);
+    var pressedKey = (0, _utils.normalizeEventKey)(event);
     if (isModifierKey(pressedKey) === false) {
       return;
     }

package/shortcuts/recorder.mjs

@@ -84,7 +84,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     if (event.keyCode === 229 || result === false || isImmediatePropagationStopped(event)) {
       return;
     }
-    var pressedKey = normalizeEventKey(event.key);
+    var pressedKey = normalizeEventKey(event);
     var extraModifierKeys = [];
     if (isModifierKey(pressedKey)) {
       modifierKeysObserver.press(pressedKey);
@@ -110,7 +110,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     if (handleEvent(event) === false) {
       return;
     }
-    var pressedKey = normalizeEventKey(event.key);
+    var pressedKey = normalizeEventKey(event);
     if (isModifierKey(pressedKey) === false) {
       return;
     }

package/shortcuts/utils.js

@@ -10,6 +10,10 @@ require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.regexp.constructor.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.string.replace.js");
 // This file handles key-name discrepancies between browsers.
 // For the list of discrepancies, go to: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values.
 var mappings = new Map([[' ', 'space'],
@@ -46,13 +50,25 @@ var getKeysList = function getKeysList(normalizedKeys) {
 };
 
 /**
- * Normalize a `KeyboardEvent.key` property, to use it for keyboard shortcuts.
+ * The regex tests if the event.code matches to the pattern and it's used to extract letters and digits from
+ * the string.
+ */
+exports.getKeysList = getKeysList;
+var codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
+
+/**
+ * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
+ * is triggered with Alt, Control or Shift keys the `key` property contains modified key e.g. for Alt+L
+ * it will be `ł`. But that value is only valid for polish keyboard layout. To fix that limitations, for
+ * letters and digits the value is taken from the `code` property which holds original value before
+ * transformation.
  *
- * @param {string} key KeyboardEvent's key property.
+ * @param {Event} event The KeyboardEvent object.
  * @returns {string}
  */
-exports.getKeysList = getKeysList;
-var normalizeEventKey = function normalizeEventKey(key) {
-  return key.toLowerCase();
+var normalizeEventKey = function normalizeEventKey(_ref) {
+  var key = _ref.key,
+    code = _ref.code;
+  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
 };
 exports.normalizeEventKey = normalizeEventKey;

package/shortcuts/utils.mjs

@@ -6,6 +6,10 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.join.js";
 import "core-js/modules/es.array.sort.js";
 import "core-js/modules/es.array.map.js";
+import "core-js/modules/es.regexp.constructor.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.regexp.to-string.js";
+import "core-js/modules/es.string.replace.js";
 // This file handles key-name discrepancies between browsers.
 // For the list of discrepancies, go to: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values.
 var mappings = new Map([[' ', 'space'],
@@ -41,11 +45,23 @@ export var getKeysList = function getKeysList(normalizedKeys) {
 };
 
 /**
- * Normalize a `KeyboardEvent.key` property, to use it for keyboard shortcuts.
+ * The regex tests if the event.code matches to the pattern and it's used to extract letters and digits from
+ * the string.
+ */
+var codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
+
+/**
+ * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
+ * is triggered with Alt, Control or Shift keys the `key` property contains modified key e.g. for Alt+L
+ * it will be `ł`. But that value is only valid for polish keyboard layout. To fix that limitations, for
+ * letters and digits the value is taken from the `code` property which holds original value before
+ * transformation.
  *
- * @param {string} key KeyboardEvent's key property.
+ * @param {Event} event The KeyboardEvent object.
  * @returns {string}
  */
-export var normalizeEventKey = function normalizeEventKey(key) {
-  return key.toLowerCase();
+export var normalizeEventKey = function normalizeEventKey(_ref) {
+  var key = _ref.key,
+    code = _ref.code;
+  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
 };

package/tableView.js

@@ -613,6 +613,44 @@ var TableView = /*#__PURE__*/function () {
       return this.countNotHiddenRowIndexes(visualFixedRowsBottom, 1);
     }
 
+    /**
+     * The function returns the number of renderable column indexes within the passed range of the visual indexes.
+     *
+     * @param {number} columnStart The column visual start index.
+     * @param {number} columnEnd The column visual end index.
+     * @returns {number}
+     */
+  }, {
+    key: "countRenderableColumnsInRange",
+    value: function countRenderableColumnsInRange(columnStart, columnEnd) {
+      var count = 0;
+      for (var column = columnStart; column <= columnEnd; column++) {
+        if (this.instance.columnIndexMapper.getRenderableFromVisualIndex(column) !== null) {
+          count += 1;
+        }
+      }
+      return count;
+    }
+
+    /**
+     * The function returns the number of renderable row indexes within the passed range of the visual indexes.
+     *
+     * @param {number} rowStart The row visual start index.
+     * @param {number} rowEnd The row visual end index.
+     * @returns {number}
+     */
+  }, {
+    key: "countRenderableRowsInRange",
+    value: function countRenderableRowsInRange(rowStart, rowEnd) {
+      var count = 0;
+      for (var row = rowStart; row <= rowEnd; row++) {
+        if (this.instance.rowIndexMapper.getRenderableFromVisualIndex(row) !== null) {
+          count += 1;
+        }
+      }
+      return count;
+    }
+
     /**
      * Checks if at least one cell than belongs to the main table is not covered by the top, left or
      * bottom overlay.
@@ -884,15 +922,29 @@ var TableView = /*#__PURE__*/function () {
         },
         onBeforeHighlightingRowHeader: function onBeforeHighlightingRowHeader(renderableRow, headerLevel, highlightMeta) {
           var rowMapper = _this2.instance.rowIndexMapper;
-          var visualRow = rowMapper.getVisualFromRenderableIndex(renderableRow);
+          var areColumnHeadersSelected = renderableRow < 0;
+          var visualRow = renderableRow;
+          if (!areColumnHeadersSelected) {
+            visualRow = rowMapper.getVisualFromRenderableIndex(renderableRow);
+          }
           var newVisualRow = _this2.instance.runHooks('beforeHighlightingRowHeader', visualRow, headerLevel, highlightMeta);
-          return rowMapper.getRenderableFromVisualIndex(rowMapper.getNearestNotHiddenIndex(newVisualRow, 1));
+          if (!areColumnHeadersSelected) {
+            return rowMapper.getRenderableFromVisualIndex(rowMapper.getNearestNotHiddenIndex(newVisualRow, 1));
+          }
+          return newVisualRow;
         },
         onBeforeHighlightingColumnHeader: function onBeforeHighlightingColumnHeader(renderableColumn, headerLevel, highlightMeta) {
           var columnMapper = _this2.instance.columnIndexMapper;
-          var visualColumn = columnMapper.getVisualFromRenderableIndex(renderableColumn);
+          var areRowHeadersSelected = renderableColumn < 0;
+          var visualColumn = renderableColumn;
+          if (!areRowHeadersSelected) {
+            visualColumn = columnMapper.getVisualFromRenderableIndex(renderableColumn);
+          }
           var newVisualColumn = _this2.instance.runHooks('beforeHighlightingColumnHeader', visualColumn, headerLevel, highlightMeta);
-          return columnMapper.getRenderableFromVisualIndex(columnMapper.getNearestNotHiddenIndex(newVisualColumn, 1));
+          if (!areRowHeadersSelected) {
+            return columnMapper.getRenderableFromVisualIndex(columnMapper.getNearestNotHiddenIndex(newVisualColumn, 1));
+          }
+          return newVisualColumn;
         },
         onAfterDrawSelection: function onAfterDrawSelection(currentRow, currentColumn, layerLevel) {
           var cornersOfSelection;
@@ -903,10 +955,7 @@ var TableView = /*#__PURE__*/function () {
           var selectedRange = _this2.instance.selection.getSelectedRange();
           var selectionRangeSize = selectedRange.size();
           if (selectionRangeSize > 0) {
-            // Selection layers are stored from the "oldest" to the "newest". We should calculate the offset.
-            // Please look at the `SelectedRange` class and it's method for getting selection's layer for more information.
-            var selectionOffset = (layerLevel !== null && layerLevel !== void 0 ? layerLevel : 0) + 1 - selectionRangeSize;
-            var selectionForLayer = selectedRange.peekByIndex(selectionOffset);
+            var selectionForLayer = selectedRange.peekByIndex(layerLevel !== null && layerLevel !== void 0 ? layerLevel : 0);
             cornersOfSelection = [selectionForLayer.from.row, selectionForLayer.from.col, selectionForLayer.to.row, selectionForLayer.to.col];
           }
           return _this2.instance.runHooks('afterDrawSelection', visualRowIndex, visualColumnIndex, cornersOfSelection, layerLevel);
@@ -1080,7 +1129,7 @@ var TableView = /*#__PURE__*/function () {
     key: "isSelectedOnlyCell",
     value: function isSelectedOnlyCell() {
       var _this$instance$getSel, _this$instance$getSel2;
-      return (_this$instance$getSel = (_this$instance$getSel2 = this.instance.getSelectedRangeLast()) === null || _this$instance$getSel2 === void 0 ? void 0 : _this$instance$getSel2.isSingle()) !== null && _this$instance$getSel !== void 0 ? _this$instance$getSel : false;
+      return (_this$instance$getSel = (_this$instance$getSel2 = this.instance.getSelectedRangeLast()) === null || _this$instance$getSel2 === void 0 ? void 0 : _this$instance$getSel2.isSingleCell()) !== null && _this$instance$getSel !== void 0 ? _this$instance$getSel : false;
     }
 
     /**

package/tableView.mjs

@@ -608,6 +608,44 @@ var TableView = /*#__PURE__*/function () {
       return this.countNotHiddenRowIndexes(visualFixedRowsBottom, 1);
     }
 
+    /**
+     * The function returns the number of renderable column indexes within the passed range of the visual indexes.
+     *
+     * @param {number} columnStart The column visual start index.
+     * @param {number} columnEnd The column visual end index.
+     * @returns {number}
+     */
+  }, {
+    key: "countRenderableColumnsInRange",
+    value: function countRenderableColumnsInRange(columnStart, columnEnd) {
+      var count = 0;
+      for (var column = columnStart; column <= columnEnd; column++) {
+        if (this.instance.columnIndexMapper.getRenderableFromVisualIndex(column) !== null) {
+          count += 1;
+        }
+      }
+      return count;
+    }
+
+    /**
+     * The function returns the number of renderable row indexes within the passed range of the visual indexes.
+     *
+     * @param {number} rowStart The row visual start index.
+     * @param {number} rowEnd The row visual end index.
+     * @returns {number}
+     */
+  }, {
+    key: "countRenderableRowsInRange",
+    value: function countRenderableRowsInRange(rowStart, rowEnd) {
+      var count = 0;
+      for (var row = rowStart; row <= rowEnd; row++) {
+        if (this.instance.rowIndexMapper.getRenderableFromVisualIndex(row) !== null) {
+          count += 1;
+        }
+      }
+      return count;
+    }
+
     /**
      * Checks if at least one cell than belongs to the main table is not covered by the top, left or
      * bottom overlay.
@@ -879,15 +917,29 @@ var TableView = /*#__PURE__*/function () {
         },
         onBeforeHighlightingRowHeader: function onBeforeHighlightingRowHeader(renderableRow, headerLevel, highlightMeta) {
           var rowMapper = _this2.instance.rowIndexMapper;
-          var visualRow = rowMapper.getVisualFromRenderableIndex(renderableRow);
+          var areColumnHeadersSelected = renderableRow < 0;
+          var visualRow = renderableRow;
+          if (!areColumnHeadersSelected) {
+            visualRow = rowMapper.getVisualFromRenderableIndex(renderableRow);
+          }
           var newVisualRow = _this2.instance.runHooks('beforeHighlightingRowHeader', visualRow, headerLevel, highlightMeta);
-          return rowMapper.getRenderableFromVisualIndex(rowMapper.getNearestNotHiddenIndex(newVisualRow, 1));
+          if (!areColumnHeadersSelected) {
+            return rowMapper.getRenderableFromVisualIndex(rowMapper.getNearestNotHiddenIndex(newVisualRow, 1));
+          }
+          return newVisualRow;
         },
         onBeforeHighlightingColumnHeader: function onBeforeHighlightingColumnHeader(renderableColumn, headerLevel, highlightMeta) {
           var columnMapper = _this2.instance.columnIndexMapper;
-          var visualColumn = columnMapper.getVisualFromRenderableIndex(renderableColumn);
+          var areRowHeadersSelected = renderableColumn < 0;
+          var visualColumn = renderableColumn;
+          if (!areRowHeadersSelected) {
+            visualColumn = columnMapper.getVisualFromRenderableIndex(renderableColumn);
+          }
           var newVisualColumn = _this2.instance.runHooks('beforeHighlightingColumnHeader', visualColumn, headerLevel, highlightMeta);
-          return columnMapper.getRenderableFromVisualIndex(columnMapper.getNearestNotHiddenIndex(newVisualColumn, 1));
+          if (!areRowHeadersSelected) {
+            return columnMapper.getRenderableFromVisualIndex(columnMapper.getNearestNotHiddenIndex(newVisualColumn, 1));
+          }
+          return newVisualColumn;
         },
         onAfterDrawSelection: function onAfterDrawSelection(currentRow, currentColumn, layerLevel) {
           var cornersOfSelection;
@@ -898,10 +950,7 @@ var TableView = /*#__PURE__*/function () {
           var selectedRange = _this2.instance.selection.getSelectedRange();
           var selectionRangeSize = selectedRange.size();
           if (selectionRangeSize > 0) {
-            // Selection layers are stored from the "oldest" to the "newest". We should calculate the offset.
-            // Please look at the `SelectedRange` class and it's method for getting selection's layer for more information.
-            var selectionOffset = (layerLevel !== null && layerLevel !== void 0 ? layerLevel : 0) + 1 - selectionRangeSize;
-            var selectionForLayer = selectedRange.peekByIndex(selectionOffset);
+            var selectionForLayer = selectedRange.peekByIndex(layerLevel !== null && layerLevel !== void 0 ? layerLevel : 0);
             cornersOfSelection = [selectionForLayer.from.row, selectionForLayer.from.col, selectionForLayer.to.row, selectionForLayer.to.col];
           }
           return _this2.instance.runHooks('afterDrawSelection', visualRowIndex, visualColumnIndex, cornersOfSelection, layerLevel);
@@ -1075,7 +1124,7 @@ var TableView = /*#__PURE__*/function () {
     key: "isSelectedOnlyCell",
     value: function isSelectedOnlyCell() {
       var _this$instance$getSel, _this$instance$getSel2;
-      return (_this$instance$getSel = (_this$instance$getSel2 = this.instance.getSelectedRangeLast()) === null || _this$instance$getSel2 === void 0 ? void 0 : _this$instance$getSel2.isSingle()) !== null && _this$instance$getSel !== void 0 ? _this$instance$getSel : false;
+      return (_this$instance$getSel = (_this$instance$getSel2 = this.instance.getSelectedRangeLast()) === null || _this$instance$getSel2 === void 0 ? void 0 : _this$instance$getSel2.isSingleCell()) !== null && _this$instance$getSel !== void 0 ? _this$instance$getSel : false;
     }
 
     /**