handsontable 0.0.0-next-a01036f-20230508 → 0.0.0-next-48677e7-20230509

package/selection/selection.js

@@ -5,6 +5,8 @@ require("core-js/modules/es.object.freeze.js");
 require("core-js/modules/es.symbol.iterator.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
 exports.__esModule = true;
 exports.default = void 0;
 require("core-js/modules/es.array.iterator.js");
@@ -23,8 +25,7 @@ require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
-var _highlight = _interopRequireDefault(require("./highlight/highlight"));
-var _constants = require("./highlight/constants");
+var _highlight = _interopRequireWildcard(require("./highlight/highlight"));
 var _range = _interopRequireDefault(require("./range"));
 var _object = require("./../helpers/object");
 var _mixed = require("./../helpers/mixed");
@@ -35,6 +36,8 @@ var _utils = require("./utils");
 var _templateLiteralTag = require("./../helpers/templateLiteralTag");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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."); }
@@ -152,6 +155,12 @@ var Selection = /*#__PURE__*/function () {
       countCols: function countCols() {
         return _this.tableProps.countColsTranslated();
       },
+      countRowHeaders: function countRowHeaders() {
+        return _this.tableProps.countRowHeaders();
+      },
+      countColHeaders: function countColHeaders() {
+        return _this.tableProps.countColHeaders();
+      },
       visualToRenderableCoords: function visualToRenderableCoords(coords) {
         return _this.tableProps.visualToRenderableCoords(coords);
       },
@@ -336,9 +345,9 @@ var Selection = /*#__PURE__*/function () {
       }
 
       // Set up current selection.
-      this.highlight.getCell().clear();
-      if (this.highlight.isEnabledFor(_constants.CELL_TYPE, cellRange.highlight)) {
-        this.highlight.getCell().add(this.selectedRange.current().highlight).commit().syncWith(cellRange);
+      this.highlight.getFocus().clear();
+      if (this.highlight.isEnabledFor(_highlight.FOCUS_TYPE, cellRange.highlight)) {
+        this.highlight.getFocus().add(this.selectedRange.current().highlight).commit().syncWith(cellRange);
       }
       var layerLevel = this.getLayerLevel();
 
@@ -348,64 +357,85 @@ var Selection = /*#__PURE__*/function () {
         (0, _array.arrayEach)(this.highlight.getAreas(), function (highlight) {
           return void highlight.clear();
         });
-        (0, _array.arrayEach)(this.highlight.getHeaders(), function (highlight) {
+        (0, _array.arrayEach)(this.highlight.getLayeredAreas(), function (highlight) {
+          return void highlight.clear();
+        });
+        (0, _array.arrayEach)(this.highlight.getRowHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        (0, _array.arrayEach)(this.highlight.getColumnHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        (0, _array.arrayEach)(this.highlight.getActiveRowHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        (0, _array.arrayEach)(this.highlight.getActiveColumnHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        (0, _array.arrayEach)(this.highlight.getRowHighlights(), function (highlight) {
           return void highlight.clear();
         });
-        (0, _array.arrayEach)(this.highlight.getActiveHeaders(), function (highlight) {
+        (0, _array.arrayEach)(this.highlight.getColumnHighlights(), function (highlight) {
           return void highlight.clear();
         });
       }
       this.highlight.useLayerLevel(layerLevel);
-      var areaHighlight = this.highlight.createOrGetArea();
-      var headerHighlight = this.highlight.createOrGetHeader();
-      var activeHeaderHighlight = this.highlight.createOrGetActiveHeader();
+      var areaHighlight = this.highlight.createArea();
+      var layeredAreaHighlight = this.highlight.createLayeredArea();
+      var rowHeaderHighlight = this.highlight.createRowHeader();
+      var columnHeaderHighlight = this.highlight.createColumnHeader();
+      var activeRowHeaderHighlight = this.highlight.createActiveRowHeader();
+      var activeColumnHeaderHighlight = this.highlight.createActiveColumnHeader();
+      var rowHighlight = this.highlight.createRowHighlight();
+      var columnHighlight = this.highlight.createColumnHighlight();
       areaHighlight.clear();
-      headerHighlight.clear();
-      activeHeaderHighlight.clear();
-      if (this.highlight.isEnabledFor(_constants.AREA_TYPE, cellRange.highlight) && (this.isMultiple() || layerLevel >= 1)) {
+      layeredAreaHighlight.clear();
+      rowHeaderHighlight.clear();
+      columnHeaderHighlight.clear();
+      activeRowHeaderHighlight.clear();
+      activeColumnHeaderHighlight.clear();
+      rowHighlight.clear();
+      columnHighlight.clear();
+      if (this.highlight.isEnabledFor(_highlight.AREA_TYPE, cellRange.highlight) && (this.isMultiple() || layerLevel >= 1)) {
         areaHighlight.add(cellRange.from).add(cellRange.to).commit();
+        layeredAreaHighlight.add(cellRange.from).add(cellRange.to).commit();
         if (layerLevel === 1) {
           // For single cell selection in the same layer, we do not create area selection to prevent blue background.
           // When non-consecutive selection is performed we have to add that missing area selection to the previous layer
           // based on previous coordinates. It only occurs when the previous selection wasn't select multiple cells.
           var previousRange = this.selectedRange.previous();
-          this.highlight.useLayerLevel(layerLevel - 1).createOrGetArea().add(previousRange.from).commit()
+          this.highlight.useLayerLevel(layerLevel - 1);
+          this.highlight.createArea().add(previousRange.from).commit()
+          // Range may start with hidden indexes. Commit would not found start point (as we add just the `from` coords).
+          .syncWith(previousRange);
+          this.highlight.createLayeredArea().add(previousRange.from).commit()
           // Range may start with hidden indexes. Commit would not found start point (as we add just the `from` coords).
           .syncWith(previousRange);
           this.highlight.useLayerLevel(layerLevel);
         }
       }
-      if (this.highlight.isEnabledFor(_constants.HEADER_TYPE, cellRange.highlight)) {
-        // The header selection generally contains cell selection. In a case when all rows (or columns)
-        // are hidden that visual coordinates are translated to renderable coordinates that do not exist.
-        // Hence no header highlight is generated. In that case, to make a column (or a row) header
-        // highlight, the row and column index has to point to the header (the negative value). See #7052.
-        var areAnyRowsRendered = this.tableProps.countRowsTranslated() === 0;
-        var areAnyColumnsRendered = this.tableProps.countColsTranslated() === 0;
-        var headerCellRange = cellRange;
-        if (areAnyRowsRendered || areAnyColumnsRendered) {
-          headerCellRange = cellRange.clone();
-        }
-        if (areAnyRowsRendered) {
-          headerCellRange.from.row = -1;
-        }
-        if (areAnyColumnsRendered) {
-          headerCellRange.from.col = -1;
-        }
+      if (this.highlight.isEnabledFor(_highlight.HEADER_TYPE, cellRange.highlight)) {
+        var rowCoordsFrom = this.tableProps.createCellCoords(Math.max(cellRange.from.row, 0), -1);
+        var rowCoordsTo = this.tableProps.createCellCoords(cellRange.to.row, -1);
+        var columnCoordsFrom = this.tableProps.createCellCoords(-1, Math.max(cellRange.from.col, 0));
+        var columnCoordsTo = this.tableProps.createCellCoords(-1, cellRange.to.col);
         if (this.settings.selectionMode === 'single') {
-          if (this.isSelectedByAnyHeader()) {
-            headerCellRange.from.normalize();
-          }
-          headerHighlight.add(headerCellRange.from).commit();
+          rowHeaderHighlight.add(rowCoordsFrom).commit();
+          columnHeaderHighlight.add(columnCoordsFrom).commit();
+          rowHighlight.add(rowCoordsFrom).commit();
+          columnHighlight.add(columnCoordsFrom).commit();
         } else {
-          headerHighlight.add(headerCellRange.from).add(headerCellRange.to).commit();
+          rowHeaderHighlight.add(rowCoordsFrom).add(rowCoordsTo).commit();
+          columnHeaderHighlight.add(columnCoordsFrom).add(columnCoordsTo).commit();
+          rowHighlight.add(rowCoordsFrom).add(rowCoordsTo).commit();
+          columnHighlight.add(columnCoordsFrom).add(columnCoordsTo).commit();
         }
         if (this.isEntireRowSelected()) {
           var isRowSelected = this.tableProps.countCols() === cellRange.getWidth();
 
           // Make sure that the whole row is selected (in case where selectionMode is set to 'single')
           if (isRowSelected) {
-            activeHeaderHighlight.add(this.tableProps.createCellCoords(cellRange.from.row, -1)).add(this.tableProps.createCellCoords(cellRange.to.row, -1)).commit();
+            activeRowHeaderHighlight.add(this.tableProps.createCellCoords(cellRange.from.row, Math.min(-this.tableProps.countRowHeaders(), -1))).add(this.tableProps.createCellCoords(cellRange.to.row, -1)).commit();
           }
         }
         if (this.isEntireColumnSelected()) {
@@ -413,7 +443,7 @@ var Selection = /*#__PURE__*/function () {
 
           // Make sure that the whole column is selected (in case where selectionMode is set to 'single')
           if (isColumnSelected) {
-            activeHeaderHighlight.add(this.tableProps.createCellCoords(-1, cellRange.from.col)).add(this.tableProps.createCellCoords(-1, cellRange.to.col)).commit();
+            activeColumnHeaderHighlight.add(this.tableProps.createCellCoords(Math.min(-this.tableProps.countColHeaders(), -1), cellRange.from.col)).add(this.tableProps.createCellCoords(-1, cellRange.to.col)).commit();
           }
         }
       }
@@ -648,7 +678,9 @@ var Selection = /*#__PURE__*/function () {
       if (!includeRowHeaders && !includeColumnHeaders && (nrOfRows === 0 || nrOfColumns === 0)) {
         return;
       }
-      var startCoords = this.tableProps.createCellCoords(includeColumnHeaders ? -1 : 0, includeRowHeaders ? -1 : 0);
+      var rowFrom = includeColumnHeaders ? -this.tableProps.countColHeaders() : 0;
+      var columnFrom = includeRowHeaders ? -this.tableProps.countRowHeaders() : 0;
+      var startCoords = this.tableProps.createCellCoords(rowFrom, columnFrom);
       var endCoords = this.tableProps.createCellCoords(nrOfRows - 1, nrOfColumns - 1);
       this.clear();
       this.setRangeStartOnly(startCoords);
@@ -782,19 +814,29 @@ var Selection = /*#__PURE__*/function () {
       if (!this.isSelected()) {
         return;
       }
-      var cellHighlight = this.highlight.getCell();
+      var focusHighlight = this.highlight.getFocus();
       var currentLayer = this.getLayerLevel();
-      cellHighlight.commit().syncWith(this.selectedRange.current());
+      focusHighlight.commit().syncWith(this.selectedRange.current());
 
       // Rewriting rendered ranges going through all layers.
       for (var layerLevel = 0; layerLevel < this.selectedRange.size(); layerLevel += 1) {
         this.highlight.useLayerLevel(layerLevel);
-        var areaHighlight = this.highlight.createOrGetArea();
-        var headerHighlight = this.highlight.createOrGetHeader();
-        var activeHeaderHighlight = this.highlight.createOrGetActiveHeader();
+        var areaHighlight = this.highlight.createArea();
+        var areaLayeredHighlight = this.highlight.createLayeredArea();
+        var rowHeaderHighlight = this.highlight.createRowHeader();
+        var columnHeaderHighlight = this.highlight.createColumnHeader();
+        var activeRowHeaderHighlight = this.highlight.createActiveRowHeader();
+        var activeColumnHeaderHighlight = this.highlight.createActiveColumnHeader();
+        var rowHighlight = this.highlight.createRowHighlight();
+        var columnHighlight = this.highlight.createColumnHighlight();
         areaHighlight.commit();
-        headerHighlight.commit();
-        activeHeaderHighlight.commit();
+        areaLayeredHighlight.commit();
+        rowHeaderHighlight.commit();
+        columnHeaderHighlight.commit();
+        activeRowHeaderHighlight.commit();
+        activeColumnHeaderHighlight.commit();
+        rowHighlight.commit();
+        columnHighlight.commit();
       }
 
       // Reverting starting layer for the Highlight.

package/selection/selection.mjs

@@ -33,8 +33,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 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 Highlight from "./highlight/highlight.mjs";
-import { AREA_TYPE, HEADER_TYPE, CELL_TYPE } from "./highlight/constants.mjs";
+import Highlight, { AREA_TYPE, HEADER_TYPE, FOCUS_TYPE } from "./highlight/highlight.mjs";
 import SelectionRange from "./range.mjs";
 import { createObjectPropListener, mixin } from "./../helpers/object.mjs";
 import { isUndefined } from "./../helpers/mixed.mjs";
@@ -147,6 +146,12 @@ var Selection = /*#__PURE__*/function () {
       countCols: function countCols() {
         return _this.tableProps.countColsTranslated();
       },
+      countRowHeaders: function countRowHeaders() {
+        return _this.tableProps.countRowHeaders();
+      },
+      countColHeaders: function countColHeaders() {
+        return _this.tableProps.countColHeaders();
+      },
       visualToRenderableCoords: function visualToRenderableCoords(coords) {
         return _this.tableProps.visualToRenderableCoords(coords);
       },
@@ -331,9 +336,9 @@ var Selection = /*#__PURE__*/function () {
       }
 
       // Set up current selection.
-      this.highlight.getCell().clear();
-      if (this.highlight.isEnabledFor(CELL_TYPE, cellRange.highlight)) {
-        this.highlight.getCell().add(this.selectedRange.current().highlight).commit().syncWith(cellRange);
+      this.highlight.getFocus().clear();
+      if (this.highlight.isEnabledFor(FOCUS_TYPE, cellRange.highlight)) {
+        this.highlight.getFocus().add(this.selectedRange.current().highlight).commit().syncWith(cellRange);
       }
       var layerLevel = this.getLayerLevel();
 
@@ -343,64 +348,85 @@ var Selection = /*#__PURE__*/function () {
         arrayEach(this.highlight.getAreas(), function (highlight) {
           return void highlight.clear();
         });
-        arrayEach(this.highlight.getHeaders(), function (highlight) {
+        arrayEach(this.highlight.getLayeredAreas(), function (highlight) {
+          return void highlight.clear();
+        });
+        arrayEach(this.highlight.getRowHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        arrayEach(this.highlight.getColumnHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        arrayEach(this.highlight.getActiveRowHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        arrayEach(this.highlight.getActiveColumnHeaders(), function (highlight) {
+          return void highlight.clear();
+        });
+        arrayEach(this.highlight.getRowHighlights(), function (highlight) {
           return void highlight.clear();
         });
-        arrayEach(this.highlight.getActiveHeaders(), function (highlight) {
+        arrayEach(this.highlight.getColumnHighlights(), function (highlight) {
           return void highlight.clear();
         });
       }
       this.highlight.useLayerLevel(layerLevel);
-      var areaHighlight = this.highlight.createOrGetArea();
-      var headerHighlight = this.highlight.createOrGetHeader();
-      var activeHeaderHighlight = this.highlight.createOrGetActiveHeader();
+      var areaHighlight = this.highlight.createArea();
+      var layeredAreaHighlight = this.highlight.createLayeredArea();
+      var rowHeaderHighlight = this.highlight.createRowHeader();
+      var columnHeaderHighlight = this.highlight.createColumnHeader();
+      var activeRowHeaderHighlight = this.highlight.createActiveRowHeader();
+      var activeColumnHeaderHighlight = this.highlight.createActiveColumnHeader();
+      var rowHighlight = this.highlight.createRowHighlight();
+      var columnHighlight = this.highlight.createColumnHighlight();
       areaHighlight.clear();
-      headerHighlight.clear();
-      activeHeaderHighlight.clear();
+      layeredAreaHighlight.clear();
+      rowHeaderHighlight.clear();
+      columnHeaderHighlight.clear();
+      activeRowHeaderHighlight.clear();
+      activeColumnHeaderHighlight.clear();
+      rowHighlight.clear();
+      columnHighlight.clear();
       if (this.highlight.isEnabledFor(AREA_TYPE, cellRange.highlight) && (this.isMultiple() || layerLevel >= 1)) {
         areaHighlight.add(cellRange.from).add(cellRange.to).commit();
+        layeredAreaHighlight.add(cellRange.from).add(cellRange.to).commit();
         if (layerLevel === 1) {
           // For single cell selection in the same layer, we do not create area selection to prevent blue background.
           // When non-consecutive selection is performed we have to add that missing area selection to the previous layer
           // based on previous coordinates. It only occurs when the previous selection wasn't select multiple cells.
           var previousRange = this.selectedRange.previous();
-          this.highlight.useLayerLevel(layerLevel - 1).createOrGetArea().add(previousRange.from).commit()
+          this.highlight.useLayerLevel(layerLevel - 1);
+          this.highlight.createArea().add(previousRange.from).commit()
+          // Range may start with hidden indexes. Commit would not found start point (as we add just the `from` coords).
+          .syncWith(previousRange);
+          this.highlight.createLayeredArea().add(previousRange.from).commit()
           // Range may start with hidden indexes. Commit would not found start point (as we add just the `from` coords).
           .syncWith(previousRange);
           this.highlight.useLayerLevel(layerLevel);
         }
       }
       if (this.highlight.isEnabledFor(HEADER_TYPE, cellRange.highlight)) {
-        // The header selection generally contains cell selection. In a case when all rows (or columns)
-        // are hidden that visual coordinates are translated to renderable coordinates that do not exist.
-        // Hence no header highlight is generated. In that case, to make a column (or a row) header
-        // highlight, the row and column index has to point to the header (the negative value). See #7052.
-        var areAnyRowsRendered = this.tableProps.countRowsTranslated() === 0;
-        var areAnyColumnsRendered = this.tableProps.countColsTranslated() === 0;
-        var headerCellRange = cellRange;
-        if (areAnyRowsRendered || areAnyColumnsRendered) {
-          headerCellRange = cellRange.clone();
-        }
-        if (areAnyRowsRendered) {
-          headerCellRange.from.row = -1;
-        }
-        if (areAnyColumnsRendered) {
-          headerCellRange.from.col = -1;
-        }
+        var rowCoordsFrom = this.tableProps.createCellCoords(Math.max(cellRange.from.row, 0), -1);
+        var rowCoordsTo = this.tableProps.createCellCoords(cellRange.to.row, -1);
+        var columnCoordsFrom = this.tableProps.createCellCoords(-1, Math.max(cellRange.from.col, 0));
+        var columnCoordsTo = this.tableProps.createCellCoords(-1, cellRange.to.col);
         if (this.settings.selectionMode === 'single') {
-          if (this.isSelectedByAnyHeader()) {
-            headerCellRange.from.normalize();
-          }
-          headerHighlight.add(headerCellRange.from).commit();
+          rowHeaderHighlight.add(rowCoordsFrom).commit();
+          columnHeaderHighlight.add(columnCoordsFrom).commit();
+          rowHighlight.add(rowCoordsFrom).commit();
+          columnHighlight.add(columnCoordsFrom).commit();
         } else {
-          headerHighlight.add(headerCellRange.from).add(headerCellRange.to).commit();
+          rowHeaderHighlight.add(rowCoordsFrom).add(rowCoordsTo).commit();
+          columnHeaderHighlight.add(columnCoordsFrom).add(columnCoordsTo).commit();
+          rowHighlight.add(rowCoordsFrom).add(rowCoordsTo).commit();
+          columnHighlight.add(columnCoordsFrom).add(columnCoordsTo).commit();
         }
         if (this.isEntireRowSelected()) {
           var isRowSelected = this.tableProps.countCols() === cellRange.getWidth();
 
           // Make sure that the whole row is selected (in case where selectionMode is set to 'single')
           if (isRowSelected) {
-            activeHeaderHighlight.add(this.tableProps.createCellCoords(cellRange.from.row, -1)).add(this.tableProps.createCellCoords(cellRange.to.row, -1)).commit();
+            activeRowHeaderHighlight.add(this.tableProps.createCellCoords(cellRange.from.row, Math.min(-this.tableProps.countRowHeaders(), -1))).add(this.tableProps.createCellCoords(cellRange.to.row, -1)).commit();
           }
         }
         if (this.isEntireColumnSelected()) {
@@ -408,7 +434,7 @@ var Selection = /*#__PURE__*/function () {
 
           // Make sure that the whole column is selected (in case where selectionMode is set to 'single')
           if (isColumnSelected) {
-            activeHeaderHighlight.add(this.tableProps.createCellCoords(-1, cellRange.from.col)).add(this.tableProps.createCellCoords(-1, cellRange.to.col)).commit();
+            activeColumnHeaderHighlight.add(this.tableProps.createCellCoords(Math.min(-this.tableProps.countColHeaders(), -1), cellRange.from.col)).add(this.tableProps.createCellCoords(-1, cellRange.to.col)).commit();
           }
         }
       }
@@ -643,7 +669,9 @@ var Selection = /*#__PURE__*/function () {
       if (!includeRowHeaders && !includeColumnHeaders && (nrOfRows === 0 || nrOfColumns === 0)) {
         return;
       }
-      var startCoords = this.tableProps.createCellCoords(includeColumnHeaders ? -1 : 0, includeRowHeaders ? -1 : 0);
+      var rowFrom = includeColumnHeaders ? -this.tableProps.countColHeaders() : 0;
+      var columnFrom = includeRowHeaders ? -this.tableProps.countRowHeaders() : 0;
+      var startCoords = this.tableProps.createCellCoords(rowFrom, columnFrom);
       var endCoords = this.tableProps.createCellCoords(nrOfRows - 1, nrOfColumns - 1);
       this.clear();
       this.setRangeStartOnly(startCoords);
@@ -777,19 +805,29 @@ var Selection = /*#__PURE__*/function () {
       if (!this.isSelected()) {
         return;
       }
-      var cellHighlight = this.highlight.getCell();
+      var focusHighlight = this.highlight.getFocus();
       var currentLayer = this.getLayerLevel();
-      cellHighlight.commit().syncWith(this.selectedRange.current());
+      focusHighlight.commit().syncWith(this.selectedRange.current());
 
       // Rewriting rendered ranges going through all layers.
       for (var layerLevel = 0; layerLevel < this.selectedRange.size(); layerLevel += 1) {
         this.highlight.useLayerLevel(layerLevel);
-        var areaHighlight = this.highlight.createOrGetArea();
-        var headerHighlight = this.highlight.createOrGetHeader();
-        var activeHeaderHighlight = this.highlight.createOrGetActiveHeader();
+        var areaHighlight = this.highlight.createArea();
+        var areaLayeredHighlight = this.highlight.createLayeredArea();
+        var rowHeaderHighlight = this.highlight.createRowHeader();
+        var columnHeaderHighlight = this.highlight.createColumnHeader();
+        var activeRowHeaderHighlight = this.highlight.createActiveRowHeader();
+        var activeColumnHeaderHighlight = this.highlight.createActiveColumnHeader();
+        var rowHighlight = this.highlight.createRowHighlight();
+        var columnHighlight = this.highlight.createColumnHighlight();
         areaHighlight.commit();
-        headerHighlight.commit();
-        activeHeaderHighlight.commit();
+        areaLayeredHighlight.commit();
+        rowHeaderHighlight.commit();
+        columnHeaderHighlight.commit();
+        activeRowHeaderHighlight.commit();
+        activeColumnHeaderHighlight.commit();
+        rowHighlight.commit();
+        columnHighlight.commit();
       }
 
       // Reverting starting layer for the Highlight.

package/settings.d.ts

@@ -144,6 +144,7 @@ export interface GridSettings extends Events {
   hiddenColumns?: HiddenColumnsSettings;
   hiddenRows?: HiddenRowsSettings;
   invalidCellClassName?: string;
+  imeFastEdit?: boolean;
   isEmptyCol?: (this: Core, col: number) => boolean;
   isEmptyRow?: (this: Core, row: number) => boolean;
   label?: LabelOptions;

package/tableView.js

@@ -58,88 +58,98 @@ var privatePool = new WeakMap();
 var _columnHeadersCount = /*#__PURE__*/new WeakMap();
 var _rowHeadersCount = /*#__PURE__*/new WeakMap();
 var TableView = /*#__PURE__*/function () {
+  /**
+   * Instance of {@link Handsontable}.
+   *
+   * @private
+   * @type {Handsontable}
+   */
+
+  /**
+   * Instance of {@link EventManager}.
+   *
+   * @private
+   * @type {EventManager}
+   */
+
+  /**
+   * Current Handsontable's GridSettings object.
+   *
+   * @private
+   * @type {GridSettings}
+   */
+
+  /**
+   * Main <THEAD> element.
+   *
+   * @private
+   * @type {HTMLTableSectionElement}
+   */
+
+  /**
+   * Main <TBODY> element.
+   *
+   * @private
+   * @type {HTMLTableSectionElement}
+   */
+
+  /**
+   * Main Walkontable instance.
+   *
+   * @private
+   * @type {Walkontable}
+   */
+
+  /**
+   * Main Walkontable instance.
+   *
+   * @private
+   * @type {Walkontable}
+   */
+
+  /**
+   * The total number of the column header renderers applied to the table through the
+   * `afterGetColumnHeaderRenderers` hook.
+   *
+   * @type {number}
+   */
+
+  /**
+   * The total number of the row header renderers applied to the table through the
+   * `afterGetRowHeaderRenderers` hook.
+   *
+   * @type {number}
+   */
+
+  /**
+   * The flag determines if the `adjustElementsSize` method call was made during
+   * the render suspending. If true, the method has to be triggered once after render
+   * resuming.
+   *
+   * @private
+   * @type {boolean}
+   */
+
   /**
    * @param {Hanstontable} instance Instance of {@link Handsontable}.
    */
   function TableView(instance) {
     _classCallCheck(this, TableView);
-    /**
-     * Instance of {@link Handsontable}.
-     *
-     * @private
-     * @type {Handsontable}
-     */
     _defineProperty(this, "instance", void 0);
-    /**
-     * Instance of {@link EventManager}.
-     *
-     * @private
-     * @type {EventManager}
-     */
     _defineProperty(this, "eventManager", void 0);
-    /**
-     * Current Handsontable's GridSettings object.
-     *
-     * @private
-     * @type {GridSettings}
-     */
     _defineProperty(this, "settings", void 0);
-    /**
-     * Main <THEAD> element.
-     *
-     * @private
-     * @type {HTMLTableSectionElement}
-     */
     _defineProperty(this, "THEAD", void 0);
-    /**
-     * Main <TBODY> element.
-     *
-     * @private
-     * @type {HTMLTableSectionElement}
-     */
     _defineProperty(this, "TBODY", void 0);
-    /**
-     * Main Walkontable instance.
-     *
-     * @private
-     * @type {Walkontable}
-     */
     _defineProperty(this, "_wt", void 0);
-    /**
-     * Main Walkontable instance.
-     *
-     * @private
-     * @type {Walkontable}
-     */
     _defineProperty(this, "activeWt", void 0);
-    /**
-     * The total number of the column header renderers applied to the table through the
-     * `afterGetColumnHeaderRenderers` hook.
-     *
-     * @type {number}
-     */
     _classPrivateFieldInitSpec(this, _columnHeadersCount, {
       writable: true,
       value: 0
     });
-    /**
-     * The total number of the row header renderers applied to the table through the
-     * `afterGetRowHeaderRenderers` hook.
-     *
-     * @type {number}
-     */
     _classPrivateFieldInitSpec(this, _rowHeadersCount, {
       writable: true,
       value: 0
     });
-    /**
-     * The flag determines if the `adjustElementsSize` method call was made during
-     * the render suspending. If true, the method has to be triggered once after render
-     * resuming.
-     *
-     * @private
-     * @type {boolean}
-     */
     _defineProperty(this, "postponedAdjustElementsSize", false);
     this.instance = instance;
     this.eventManager = new _eventManager.default(this.instance);
@@ -287,6 +297,7 @@ var TableView = /*#__PURE__*/function () {
   }, {
     key: "createElements",
     value: function createElements() {
+      var _this$settings, _this$settings$data, _this$settings2, _this$settings2$data$;
       var priv = privatePool.get(this);
       var _this$instance = this.instance,
         rootElement = _this$instance.rootElement,
@@ -299,6 +310,9 @@ var TableView = /*#__PURE__*/function () {
       (0, _element.addClass)(rootElement, 'handsontable');
       priv.table = rootDocument.createElement('TABLE');
       (0, _element.addClass)(priv.table, 'htCore');
+      priv.table.ariaRowCount = (_this$settings = this.settings) === null || _this$settings === void 0 ? void 0 : (_this$settings$data = _this$settings.data) === null || _this$settings$data === void 0 ? void 0 : _this$settings$data.length;
+      priv.table.ariaColCount = (_this$settings2 = this.settings) === null || _this$settings2 === void 0 ? void 0 : (_this$settings2$data$ = _this$settings2.data[0]) === null || _this$settings2$data$ === void 0 ? void 0 : _this$settings2$data$.length;
+      priv.table.setAttribute('role', 'treegrid');
       if (this.instance.getSettings().tableClassName) {
         (0, _element.addClass)(priv.table, this.instance.getSettings().tableClassName);
       }
@@ -883,15 +897,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;