handsontable 0.0.0-next-b66c79f-20230713 → 0.0.0-next-08765b9-20230714

package/selection/selection.mjs

@@ -1,13 +1,17 @@
 import "core-js/modules/es.error.cause.js";
-import Highlight from "./highlight/highlight.mjs";
-import { AREA_TYPE, HEADER_TYPE, CELL_TYPE } from "./highlight/constants.mjs";
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 { CellCoords, CellRange } from "./../3rdparty/walkontable/src/index.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";
+import { clamp } from "./../helpers/number.mjs";
 import { arrayEach } from "./../helpers/array.mjs";
 import localHooks from "./../mixins/localHooks.mjs";
 import Transformation from "./transformation.mjs";
-import { detectSelectionType, isValidCoord, normalizeSelectionFactory, SELECTION_TYPE_EMPTY, SELECTION_TYPE_UNRECOGNIZED } from "./utils.mjs";
+import { detectSelectionType, normalizeSelectionFactory, SELECTION_TYPE_EMPTY, SELECTION_TYPE_UNRECOGNIZED } from "./utils.mjs";
 import { toSingleLine } from "./../helpers/templateLiteralTag.mjs";
 /**
  * @class Selection
@@ -21,57 +25,62 @@ class Selection {
      *
      * @type {GridSettings}
      */
-    this.settings = settings;
+    _defineProperty(this, "settings", void 0);
     /**
      * An additional object with dynamically defined properties which describes table state.
      *
      * @type {object}
      */
-    this.tableProps = tableProps;
+    _defineProperty(this, "tableProps", void 0);
     /**
      * The flag which determines if the selection is in progress.
      *
      * @type {boolean}
      */
-    this.inProgress = false;
+    _defineProperty(this, "inProgress", false);
     /**
-     * The flag indicates that selection was performed by clicking the corner overlay.
+     * Selection data layer (handle visual coordinates).
      *
-     * @type {boolean}
+     * @type {SelectionRange}
      */
-    this.selectedByCorner = false;
+    _defineProperty(this, "selectedRange", new SelectionRange((highlight, from, to) => {
+      return this.tableProps.createCellRange(highlight, from, to);
+    }));
     /**
-     * The collection of the selection layer levels where the whole row was selected using the row header or
-     * the corner header.
+     * Visualization layer.
      *
-     * @type {Set.<number>}
+     * @type {Highlight}
      */
-    this.selectedByRowHeader = new Set();
+    _defineProperty(this, "highlight", void 0);
     /**
-     * The collection of the selection layer levels where the whole column was selected using the column header or
-     * the corner header.
+     * The module for modifying coordinates.
      *
-     * @type {Set.<number>}
+     * @type {Transformation}
      */
-    this.selectedByColumnHeader = new Set();
+    _defineProperty(this, "transformation", void 0);
     /**
-     * Selection data layer (handle visual coordinates).
+     * The collection of the selection layer levels where the whole row was selected using the row header or
+     * the corner header.
      *
-     * @type {SelectionRange}
+     * @type {Set<number>}
      */
-    this.selectedRange = new SelectionRange((highlight, from, to) => {
-      return this.tableProps.createCellRange(highlight, from, to);
-    });
+    _defineProperty(this, "selectedByRowHeader", new Set());
     /**
-     * Visualization layer.
+     * The collection of the selection layer levels where the whole column was selected using the column header or
+     * the corner header.
      *
-     * @type {Highlight}
+     * @type {Set<number>}
      */
+    _defineProperty(this, "selectedByColumnHeader", new Set());
+    this.settings = settings;
+    this.tableProps = tableProps;
     this.highlight = new Highlight({
       headerClassName: settings.currentHeaderClassName,
       activeHeaderClassName: settings.activeHeaderClassName,
       rowClassName: settings.currentRowClassName,
       columnClassName: settings.currentColClassName,
+      rowIndexMapper: this.tableProps.rowIndexMapper,
+      columnIndexMapper: this.tableProps.columnIndexMapper,
       disabledCellSelection: (row, column) => this.tableProps.isDisabledCellSelection(row, column),
       cellCornerVisible: function () {
         return _this.isCellCornerVisible(...arguments);
@@ -82,21 +91,19 @@ class Selection {
       visualToRenderableCoords: coords => this.tableProps.visualToRenderableCoords(coords),
       renderableToVisualCoords: coords => this.tableProps.renderableToVisualCoords(coords),
       createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
-      createCellRange: (highlight, from, to) => this.tableProps.createCellRange(highlight, from, to),
-      rowIndexMapper: () => this.tableProps.rowIndexMapper(),
-      columnIndexMapper: () => this.tableProps.columnIndexMapper()
+      createCellRange: (highlight, from, to) => this.tableProps.createCellRange(highlight, from, to)
     });
-    /**
-     * The module for modifying coordinates.
-     *
-     * @type {Transformation}
-     */
     this.transformation = new Transformation(this.selectedRange, {
-      countRows: () => this.tableProps.countRowsTranslated(),
-      countCols: () => this.tableProps.countColsTranslated(),
+      rowIndexMapper: this.tableProps.rowIndexMapper,
+      columnIndexMapper: this.tableProps.columnIndexMapper,
+      countRenderableRows: () => this.tableProps.countRenderableRows(),
+      countRenderableColumns: () => this.tableProps.countRenderableColumns(),
+      countRowHeaders: () => this.tableProps.countRowHeaders(),
+      countColHeaders: () => this.tableProps.countColHeaders(),
       visualToRenderableCoords: coords => this.tableProps.visualToRenderableCoords(coords),
       renderableToVisualCoords: coords => this.tableProps.renderableToVisualCoords(coords),
       createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
+      navigableHeaders: () => settings.navigableHeaders,
       fixedRowsBottom: () => settings.fixedRowsBottom,
       minSpareRows: () => settings.minSpareRows,
       minSpareCols: () => settings.minSpareCols,
@@ -151,14 +158,14 @@ class Selection {
   }
 
   /**
-   * Indicate that selection process began. It sets internaly `.inProgress` property to `true`.
+   * Indicate that selection process began. It sets internally `.inProgress` property to `true`.
    */
   begin() {
     this.inProgress = true;
   }
 
   /**
-   * Indicate that selection process finished. It sets internaly `.inProgress` property to `false`.
+   * Indicate that selection process finished. It sets internally `.inProgress` property to `false`.
    */
   finish() {
     this.runLocalHooks('afterSelectionFinished', Array.from(this.selectedRange));
@@ -183,33 +190,25 @@ class Selection {
    *                                      the default trigger will be used.
    * @param {boolean} [fragment=false] If `true`, the selection will be treated as a partial selection where the
    *                                   `setRangeEnd` method won't be called on every `setRangeStart` call.
+   * @param {CellCoords} [highlightCoords] If set, allows changing the coordinates of the highlight/focus cell.
    */
   setRangeStart(coords, multipleSelection) {
     let fragment = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    let highlightCoords = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : coords;
     const isMultipleMode = this.settings.selectionMode === 'multiple';
     const isMultipleSelection = isUndefined(multipleSelection) ? this.tableProps.getShortcutManager().isCtrlPressed() : multipleSelection;
-    const isRowNegative = coords.row < 0;
-    const isColumnNegative = coords.col < 0;
-    const selectedByCorner = isRowNegative && isColumnNegative;
     // We are creating copy. We would like to modify just the start of the selection by below hook. Then original coords
     // should be handled by next methods.
     const coordsClone = coords.clone();
-    this.selectedByCorner = selectedByCorner;
     this.runLocalHooks(`beforeSetRangeStart${fragment ? 'Only' : ''}`, coordsClone);
     if (!isMultipleMode || isMultipleMode && !isMultipleSelection && isUndefined(multipleSelection)) {
       this.selectedRange.clear();
     }
-    this.selectedRange.add(coordsClone);
+    this.selectedRange.add(coordsClone).current().setHighlight(highlightCoords.clone());
     if (this.getLayerLevel() === 0) {
       this.selectedByRowHeader.clear();
       this.selectedByColumnHeader.clear();
     }
-    if (!selectedByCorner && isColumnNegative) {
-      this.selectedByRowHeader.add(this.getLayerLevel());
-    }
-    if (!selectedByCorner && isRowNegative) {
-      this.selectedByColumnHeader.add(this.getLayerLevel());
-    }
     if (!fragment) {
       this.setRangeEnd(coords);
     }
@@ -222,9 +221,11 @@ class Selection {
    * @param {boolean} [multipleSelection] If `true`, selection will be worked in 'multiple' mode. This option works
    *                                      only when 'selectionMode' is set as 'multiple'. If the argument is not defined
    *                                      the default trigger will be used.
+   * @param {CellCoords} [highlightCoords] If set, allows changing the coordinates of the highlight/focus cell.
    */
   setRangeStartOnly(coords, multipleSelection) {
-    this.setRangeStart(coords, multipleSelection, true);
+    let highlightCoords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : coords;
+    this.setRangeStart(coords, multipleSelection, true, highlightCoords);
   }
 
   /**
@@ -236,21 +237,39 @@ class Selection {
     if (this.selectedRange.isEmpty()) {
       return;
     }
-
-    // We are creating copy. We would like to modify just the end of the selection by below hook. Then original coords
-    // should be handled by next methods.
     const coordsClone = coords.clone();
+    const countRows = this.tableProps.countRows();
+    const countCols = this.tableProps.countCols();
+    const isSingle = this.selectedRange.current().clone().setTo(coords).isSingleHeader();
+
+    // Ignore processing the end range when the header selection starts overlapping the corner and
+    // the selection is not a single header highlight.
+    if ((countRows > 0 || countCols > 0) && (countRows === 0 && coordsClone.col < 0 && !isSingle || countCols === 0 && coordsClone.row < 0 && !isSingle)) {
+      return;
+    }
     this.runLocalHooks('beforeSetRangeEnd', coordsClone);
     this.begin();
     const cellRange = this.selectedRange.current();
-    if (this.settings.selectionMode !== 'single') {
-      cellRange.setTo(this.tableProps.createCellCoords(coordsClone.row, coordsClone.col));
+    if (!this.settings.navigableHeaders) {
+      cellRange.highlight.normalize();
+    }
+    if (this.settings.selectionMode === 'single') {
+      cellRange.setFrom(cellRange.highlight);
+      cellRange.setTo(cellRange.highlight);
+    } else {
+      cellRange.setTo(coordsClone);
     }
 
-    // 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);
+    // Prevent creating "area" selection that overlaps headers.
+    if (countRows > 0 && countCols > 0) {
+      if (!this.settings.navigableHeaders || this.settings.navigableHeaders && !cellRange.isSingleHeader()) {
+        cellRange.to.normalize();
+      }
+    }
+    const focusHighlight = this.highlight.getFocus();
+    focusHighlight.clear();
+    if (this.highlight.isEnabledFor(FOCUS_TYPE, cellRange.highlight)) {
+      focusHighlight.add(this.selectedRange.current().highlight).commit().syncWith(cellRange);
     }
     const layerLevel = this.getLayerLevel();
 
@@ -258,69 +277,80 @@ class Selection {
     // indication that the new selection is performing.
     if (layerLevel < this.highlight.layerLevel) {
       arrayEach(this.highlight.getAreas(), highlight => void highlight.clear());
-      arrayEach(this.highlight.getHeaders(), highlight => void highlight.clear());
-      arrayEach(this.highlight.getActiveHeaders(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getLayeredAreas(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getRowHeaders(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getColumnHeaders(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getActiveRowHeaders(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getActiveColumnHeaders(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getActiveCornerHeaders(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getRowHighlights(), highlight => void highlight.clear());
+      arrayEach(this.highlight.getColumnHighlights(), highlight => void highlight.clear());
     }
     this.highlight.useLayerLevel(layerLevel);
-    const areaHighlight = this.highlight.createOrGetArea();
-    const headerHighlight = this.highlight.createOrGetHeader();
-    const activeHeaderHighlight = this.highlight.createOrGetActiveHeader();
+    const areaHighlight = this.highlight.createArea();
+    const layeredAreaHighlight = this.highlight.createLayeredArea();
+    const rowHeaderHighlight = this.highlight.createRowHeader();
+    const columnHeaderHighlight = this.highlight.createColumnHeader();
+    const activeRowHeaderHighlight = this.highlight.createActiveRowHeader();
+    const activeColumnHeaderHighlight = this.highlight.createActiveColumnHeader();
+    const activeCornerHeaderHighlight = this.highlight.createActiveCornerHeader();
+    const rowHighlight = this.highlight.createRowHighlight();
+    const columnHighlight = this.highlight.createColumnHighlight();
     areaHighlight.clear();
-    headerHighlight.clear();
-    activeHeaderHighlight.clear();
+    layeredAreaHighlight.clear();
+    rowHeaderHighlight.clear();
+    columnHeaderHighlight.clear();
+    activeRowHeaderHighlight.clear();
+    activeColumnHeaderHighlight.clear();
+    activeCornerHeaderHighlight.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.
         const 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.
-      const areAnyRowsRendered = this.tableProps.countRowsTranslated() === 0;
-      const areAnyColumnsRendered = this.tableProps.countColsTranslated() === 0;
-      let headerCellRange = cellRange;
-      if (areAnyRowsRendered || areAnyColumnsRendered) {
-        headerCellRange = cellRange.clone();
-      }
-      if (areAnyRowsRendered) {
-        headerCellRange.from.row = -1;
-      }
-      if (areAnyColumnsRendered) {
-        headerCellRange.from.col = -1;
-      }
-      if (this.settings.selectionMode === 'single') {
-        if (this.isSelectedByAnyHeader()) {
-          headerCellRange.from.normalize();
+      if (!cellRange.isSingleHeader()) {
+        const rowCoordsFrom = this.tableProps.createCellCoords(Math.max(cellRange.from.row, 0), -1);
+        const rowCoordsTo = this.tableProps.createCellCoords(cellRange.to.row, -1);
+        const columnCoordsFrom = this.tableProps.createCellCoords(-1, Math.max(cellRange.from.col, 0));
+        const columnCoordsTo = this.tableProps.createCellCoords(-1, cellRange.to.col);
+        if (this.settings.selectionMode === 'single') {
+          rowHeaderHighlight.add(rowCoordsFrom).commit();
+          columnHeaderHighlight.add(columnCoordsFrom).commit();
+          rowHighlight.add(rowCoordsFrom).commit();
+          columnHighlight.add(columnCoordsFrom).commit();
+        } else {
+          rowHeaderHighlight.add(rowCoordsFrom).add(rowCoordsTo).commit();
+          columnHeaderHighlight.add(columnCoordsFrom).add(columnCoordsTo).commit();
+          rowHighlight.add(rowCoordsFrom).add(rowCoordsTo).commit();
+          columnHighlight.add(columnCoordsFrom).add(columnCoordsTo).commit();
         }
-        headerHighlight.add(headerCellRange.from).commit();
-      } else {
-        headerHighlight.add(headerCellRange.from).add(headerCellRange.to).commit();
       }
-      if (this.isEntireRowSelected()) {
-        const 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();
-        }
+      const highlightRowHeaders = this.isEntireRowSelected() && (countCols > 0 && countCols === cellRange.getWidth() || countCols === 0 && (this.isSelectedByRowHeader() || this.isSelectedByCorner()));
+      const highlightColumnHeaders = this.isEntireColumnSelected() && (countRows > 0 && countRows === cellRange.getHeight() || countRows === 0 && (this.isSelectedByColumnHeader() || this.isSelectedByCorner()));
+      if (highlightRowHeaders) {
+        activeRowHeaderHighlight.add(this.tableProps.createCellCoords(Math.max(cellRange.from.row, 0), Math.min(-this.tableProps.countRowHeaders(), -1))).add(this.tableProps.createCellCoords(Math.max(cellRange.to.row, 0), -1)).commit();
       }
-      if (this.isEntireColumnSelected()) {
-        const isColumnSelected = this.tableProps.countRows() === cellRange.getHeight();
-
-        // 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();
-        }
+      if (highlightColumnHeaders) {
+        activeColumnHeaderHighlight.add(this.tableProps.createCellCoords(Math.min(-this.tableProps.countColHeaders(), -1), Math.max(cellRange.from.col, 0))).add(this.tableProps.createCellCoords(-1, Math.max(cellRange.to.col, 0))).commit();
+      }
+      if (highlightRowHeaders && highlightColumnHeaders) {
+        activeCornerHeaderHighlight.add(this.tableProps.createCellCoords(-this.tableProps.countColHeaders(), -this.tableProps.countRowHeaders())).add(this.tableProps.createCellCoords(-1, -1)).commit();
       }
     }
     this.runLocalHooks('afterSetRangeEnd', coords);
@@ -343,12 +373,12 @@ class Selection {
    *
    * @param {number} rowDelta Rows number to move, value can be passed as negative number.
    * @param {number} colDelta Columns number to move, value can be passed as negative number.
-   * @param {boolean} [force=false] If `true` the new rows/columns will be created if necessary. Otherwise, row/column will
-   *                        be created according to `minSpareRows/minSpareCols` settings of Handsontable.
+   * @param {boolean} [createMissingRecords=false] If `true` the new rows/columns will be created if necessary.
+   * Otherwise, row/column will be created according to `minSpareRows/minSpareCols` settings of Handsontable.
    */
   transformStart(rowDelta, colDelta) {
-    let force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    this.setRangeStart(this.transformation.transformStart(rowDelta, colDelta, force));
+    let createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    this.setRangeStart(this.transformation.transformStart(rowDelta, colDelta, createMissingRecords));
   }
 
   /**
@@ -389,7 +419,7 @@ class Selection {
    */
   isSelectedByRowHeader() {
     let layerLevel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getLayerLevel();
-    return !this.isSelectedByCorner(layerLevel) && this.isEntireRowSelected(layerLevel);
+    return !this.isSelectedByCorner(layerLevel) && (layerLevel === -1 ? this.selectedByRowHeader.size > 0 : this.selectedByRowHeader.has(layerLevel));
   }
 
   /**
@@ -401,7 +431,19 @@ class Selection {
    */
   isEntireRowSelected() {
     let layerLevel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getLayerLevel();
-    return layerLevel === -1 ? this.selectedByRowHeader.size > 0 : this.selectedByRowHeader.has(layerLevel);
+    const tester = range => {
+      const {
+        col
+      } = range.getOuterTopStartCorner();
+      const rowHeaders = this.tableProps.countRowHeaders();
+      const countCols = this.tableProps.countCols();
+      return (rowHeaders > 0 && col < 0 || rowHeaders === 0) && range.getWidth() === countCols;
+    };
+    if (layerLevel === -1) {
+      return Array.from(this.selectedRange).some(range => tester(range));
+    }
+    const range = this.selectedRange.peekByIndex(layerLevel);
+    return range ? tester(range) : false;
   }
 
   /**
@@ -414,7 +456,7 @@ class Selection {
    */
   isSelectedByColumnHeader() {
     let layerLevel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getLayerLevel();
-    return !this.isSelectedByCorner() && this.isEntireColumnSelected(layerLevel);
+    return !this.isSelectedByCorner() && (layerLevel === -1 ? this.selectedByColumnHeader.size > 0 : this.selectedByColumnHeader.has(layerLevel));
   }
 
   /**
@@ -426,7 +468,19 @@ class Selection {
    */
   isEntireColumnSelected() {
     let layerLevel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getLayerLevel();
-    return layerLevel === -1 ? this.selectedByColumnHeader.size > 0 : this.selectedByColumnHeader.has(layerLevel);
+    const tester = range => {
+      const {
+        row
+      } = range.getOuterTopStartCorner();
+      const colHeaders = this.tableProps.countColHeaders();
+      const countRows = this.tableProps.countRows();
+      return (colHeaders > 0 && row < 0 || colHeaders === 0) && range.getHeight() === countRows;
+    };
+    if (layerLevel === -1) {
+      return Array.from(this.selectedRange).some(range => tester(range));
+    }
+    const range = this.selectedRange.peekByIndex(layerLevel);
+    return range ? tester(range) : false;
   }
 
   /**
@@ -444,7 +498,7 @@ class Selection {
    * @returns {boolean}
    */
   isSelectedByCorner() {
-    return this.selectedByCorner;
+    return this.selectedByColumnHeader.has(this.getLayerLevel()) && this.selectedByRowHeader.has(this.getLayerLevel());
   }
 
   /**
@@ -503,29 +557,47 @@ class Selection {
   }
 
   /**
-   * Select all cells.
+   * Selects all cells and headers.
    *
-   * @param {boolean} [includeRowHeaders=false] `true` If the selection should include the row headers, `false`
-   * otherwise.
-   * @param {boolean} [includeColumnHeaders=false] `true` If the selection should include the column headers, `false`
-   * otherwise.
+   * @param {boolean} [includeRowHeaders=false] `true` If the selection should include the row headers,
+   * `false` otherwise.
+   * @param {boolean} [includeColumnHeaders=false] `true` If the selection should include the column
+   * headers, `false` otherwise.
+   * @param {{row: number, col: number}} [focusPosition] The argument allows changing the cell/header
+   * focus position. The value takes an object with a `row` and `col` properties from -N to N, where
+   * negative values point to the headers and positive values point to the cell range.
    */
   selectAll() {
     let includeRowHeaders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     let includeColumnHeaders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    let focusPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+      row: this.tableProps.countColHeaders() > 0 ? -this.tableProps.countColHeaders() : 0,
+      col: this.tableProps.countRowHeaders() > 0 ? -this.tableProps.countRowHeaders() : 0
+    };
     const nrOfRows = this.tableProps.countRows();
     const nrOfColumns = this.tableProps.countCols();
+    const countRowHeaders = this.tableProps.countRowHeaders();
+    const countColHeaders = this.tableProps.countColHeaders();
+    const rowFrom = includeRowHeaders ? -countColHeaders : 0;
+    const columnFrom = includeColumnHeaders ? -countRowHeaders : 0;
 
     // We can't select cells when there is no data.
-    if (!includeRowHeaders && !includeColumnHeaders && (nrOfRows === 0 || nrOfColumns === 0)) {
+    if (rowFrom === 0 && columnFrom === 0 && (nrOfRows === 0 || nrOfColumns === 0)) {
       return;
     }
-    const startCoords = this.tableProps.createCellCoords(includeColumnHeaders ? -1 : 0, includeRowHeaders ? -1 : 0);
+    const highlightRow = Number.isInteger(focusPosition.row) ? focusPosition.row : 0;
+    const highlightColumn = Number.isInteger(focusPosition.col) ? focusPosition.col : 0;
+    const startCoords = this.tableProps.createCellCoords(rowFrom, columnFrom);
+    const highlight = this.tableProps.createCellCoords(clamp(highlightRow, rowFrom, nrOfRows - 1), clamp(highlightColumn, columnFrom, nrOfColumns - 1));
     const endCoords = this.tableProps.createCellCoords(nrOfRows - 1, nrOfColumns - 1);
     this.clear();
-    this.setRangeStartOnly(startCoords);
-    this.selectedByRowHeader.add(this.getLayerLevel());
-    this.selectedByColumnHeader.add(this.getLayerLevel());
+    this.setRangeStartOnly(startCoords, void 0, highlight);
+    if (columnFrom < 0) {
+      this.selectedByRowHeader.add(this.getLayerLevel());
+    }
+    if (rowFrom < 0) {
+      this.selectedByColumnHeader.add(this.getLayerLevel());
+    }
     this.setRangeEnd(endCoords);
     this.finish();
   }
@@ -552,21 +624,29 @@ class Selection {
       propToCol: prop => this.tableProps.propToCol(prop),
       keepDirection: true
     });
-    const nrOfRows = this.tableProps.countRows();
-    const nrOfColumns = this.tableProps.countCols();
+    const navigableHeaders = this.settings.navigableHeaders;
+    const tableParams = {
+      countRows: this.tableProps.countRows(),
+      countCols: this.tableProps.countCols(),
+      countRowHeaders: navigableHeaders ? this.tableProps.countRowHeaders() : 0,
+      countColHeaders: navigableHeaders ? this.tableProps.countColHeaders() : 0
+    };
 
     // Check if every layer of the coordinates are valid.
     const isValid = !selectionRanges.some(selection => {
-      const [rowStart, columnStart, rowEnd, columnEnd] = selectionSchemaNormalizer(selection);
-      const _isValid = isValidCoord(rowStart, nrOfRows) && isValidCoord(columnStart, nrOfColumns) && isValidCoord(rowEnd, nrOfRows) && isValidCoord(columnEnd, nrOfColumns);
-      return !_isValid;
+      const cellRange = selectionSchemaNormalizer(selection);
+      const rangeValidity = cellRange.isValid(tableParams);
+      return !(rangeValidity && !cellRange.containsHeaders() || rangeValidity && cellRange.containsHeaders() && cellRange.isSingleHeader());
     });
     if (isValid) {
       this.clear();
       arrayEach(selectionRanges, selection => {
-        const [rowStart, columnStart, rowEnd, columnEnd] = selectionSchemaNormalizer(selection);
-        this.setRangeStartOnly(this.tableProps.createCellCoords(rowStart, columnStart), false);
-        this.setRangeEnd(this.tableProps.createCellCoords(rowEnd, columnEnd));
+        const {
+          from,
+          to
+        } = selectionSchemaNormalizer(selection);
+        this.setRangeStartOnly(from.clone(), false);
+        this.setRangeEnd(to.clone());
         this.finish();
       });
     }
@@ -579,22 +659,43 @@ class Selection {
    *
    * @param {number|string} startColumn Visual column index or column property from which the selection starts.
    * @param {number|string} [endColumn] Visual column index or column property from to the selection finishes.
-   * @param {number} [headerLevel=-1] A row header index that triggers the column selection. The value can
-   *                                  take -1 to -N, where -1 means the header closest to the cells.
-   *
+   * @param {number} [focusPosition=0] The argument allows changing the cell/header focus position.
+   *                                   The value can take visual row index from -N to N, where negative values
+   *                                   point to the headers and positive values point to the cell range.
    * @returns {boolean} Returns `true` if selection was successful, `false` otherwise.
    */
   selectColumns(startColumn) {
     let endColumn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : startColumn;
-    let headerLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
+    let focusPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     const start = typeof startColumn === 'string' ? this.tableProps.propToCol(startColumn) : startColumn;
     const end = typeof endColumn === 'string' ? this.tableProps.propToCol(endColumn) : endColumn;
-    const nrOfColumns = this.tableProps.countCols();
-    const nrOfRows = this.tableProps.countRows();
-    const isValid = isValidCoord(start, nrOfColumns) && isValidCoord(end, nrOfColumns);
+    const countRows = this.tableProps.countRows();
+    const countCols = this.tableProps.countCols();
+    const countColHeaders = this.tableProps.countColHeaders();
+    const columnHeaderLastIndex = countColHeaders === 0 ? 0 : -countColHeaders;
+    const fromCoords = new CellCoords(columnHeaderLastIndex, start);
+    const toCoords = new CellCoords(countRows - 1, end);
+    const isValid = new CellRange(fromCoords, fromCoords, toCoords).isValid({
+      countRows,
+      countCols,
+      countRowHeaders: 0,
+      countColHeaders
+    });
     if (isValid) {
-      this.setRangeStartOnly(this.tableProps.createCellCoords(headerLevel, start));
-      this.setRangeEnd(this.tableProps.createCellCoords(nrOfRows - 1, end));
+      const fromRow = countColHeaders === 0 ? 0 : clamp(focusPosition, columnHeaderLastIndex, -1);
+      const toRow = countRows - 1;
+      const from = this.tableProps.createCellCoords(fromRow, start);
+      const to = this.tableProps.createCellCoords(toRow, end);
+      const highlight = this.tableProps.createCellCoords(clamp(focusPosition, columnHeaderLastIndex, countRows - 1), start);
+      this.runLocalHooks('beforeSelectColumns', from, to, highlight);
+
+      // disallow modifying row axis for that hooks
+      from.row = fromRow;
+      to.row = toRow;
+      this.setRangeStartOnly(from, void 0, highlight);
+      this.selectedByColumnHeader.add(this.getLayerLevel());
+      this.setRangeEnd(to);
+      this.runLocalHooks('afterSelectColumns', from, to, highlight);
       this.finish();
     }
     return isValid;
@@ -605,20 +706,41 @@ class Selection {
    *
    * @param {number} startRow Visual row index from which the selection starts.
    * @param {number} [endRow] Visual row index from to the selection finishes.
-   * @param {number} [headerLevel=-1] A column header index that triggers the row selection.
-   *                                  The value can take -1 to -N, where -1 means the header
-   *                                  closest to the cells.
+   * @param {number} [focusPosition=0] The argument allows changing the cell/header focus position.
+   *                                   The value can take visual column index from -N to N, where negative values
+   *                                   point to the headers and positive values point to the cell range.
    * @returns {boolean} Returns `true` if selection was successful, `false` otherwise.
    */
   selectRows(startRow) {
     let endRow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : startRow;
-    let headerLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
-    const nrOfRows = this.tableProps.countRows();
-    const nrOfColumns = this.tableProps.countCols();
-    const isValid = isValidCoord(startRow, nrOfRows) && isValidCoord(endRow, nrOfRows);
+    let focusPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    const countRows = this.tableProps.countRows();
+    const countCols = this.tableProps.countCols();
+    const countRowHeaders = this.tableProps.countRowHeaders();
+    const rowHeaderLastIndex = countRowHeaders === 0 ? 0 : -countRowHeaders;
+    const fromCoords = new CellCoords(startRow, rowHeaderLastIndex);
+    const toCoords = new CellCoords(endRow, countCols - 1);
+    const isValid = new CellRange(fromCoords, fromCoords, toCoords).isValid({
+      countRows,
+      countCols,
+      countRowHeaders,
+      countColHeaders: 0
+    });
     if (isValid) {
-      this.setRangeStartOnly(this.tableProps.createCellCoords(startRow, headerLevel));
-      this.setRangeEnd(this.tableProps.createCellCoords(endRow, nrOfColumns - 1));
+      const fromColumn = countRowHeaders === 0 ? 0 : clamp(focusPosition, rowHeaderLastIndex, -1);
+      const toColumn = countCols - 1;
+      const from = this.tableProps.createCellCoords(startRow, fromColumn);
+      const to = this.tableProps.createCellCoords(endRow, toColumn);
+      const highlight = this.tableProps.createCellCoords(startRow, clamp(focusPosition, rowHeaderLastIndex, countCols - 1));
+      this.runLocalHooks('beforeSelectRows', from, to, highlight);
+
+      // disallow modifying column axis for that hooks
+      from.col = fromColumn;
+      to.col = toColumn;
+      this.setRangeStartOnly(from, void 0, highlight);
+      this.selectedByRowHeader.add(this.getLayerLevel());
+      this.setRangeEnd(to);
+      this.runLocalHooks('afterSelectRows', from, to, highlight);
       this.finish();
     }
     return isValid;
@@ -635,19 +757,31 @@ class Selection {
     if (!this.isSelected()) {
       return;
     }
-    const cellHighlight = this.highlight.getCell();
+    const focusHighlight = this.highlight.getFocus();
     const currentLayer = this.getLayerLevel();
-    cellHighlight.commit().syncWith(this.selectedRange.current());
+    focusHighlight.commit().syncWith(this.selectedRange.current());
 
     // Rewriting rendered ranges going through all layers.
     for (let layerLevel = 0; layerLevel < this.selectedRange.size(); layerLevel += 1) {
       this.highlight.useLayerLevel(layerLevel);
-      const areaHighlight = this.highlight.createOrGetArea();
-      const headerHighlight = this.highlight.createOrGetHeader();
-      const activeHeaderHighlight = this.highlight.createOrGetActiveHeader();
+      const areaHighlight = this.highlight.createArea();
+      const areaLayeredHighlight = this.highlight.createLayeredArea();
+      const rowHeaderHighlight = this.highlight.createRowHeader();
+      const columnHeaderHighlight = this.highlight.createColumnHeader();
+      const activeRowHeaderHighlight = this.highlight.createActiveRowHeader();
+      const activeColumnHeaderHighlight = this.highlight.createActiveColumnHeader();
+      const activeCornerHeaderHighlight = this.highlight.createActiveCornerHeader();
+      const rowHighlight = this.highlight.createRowHighlight();
+      const columnHighlight = this.highlight.createColumnHighlight();
       areaHighlight.commit();
-      headerHighlight.commit();
-      activeHeaderHighlight.commit();
+      areaLayeredHighlight.commit();
+      rowHeaderHighlight.commit();
+      columnHeaderHighlight.commit();
+      activeRowHeaderHighlight.commit();
+      activeColumnHeaderHighlight.commit();
+      activeCornerHeaderHighlight.commit();
+      rowHighlight.commit();
+      columnHighlight.commit();
     }
 
     // Reverting starting layer for the Highlight.