handsontable 0.0.0-next-f748da8-20240318 → 0.0.0-next-76fc9bd-20240319

package/selection/selection.mjs

@@ -22,9 +22,6 @@ import { A11Y_SELECTED } from "../helpers/a11y.mjs";
  * @class Selection
  * @util
  */
-var _transformation = /*#__PURE__*/new WeakMap();
-var _focusTransformation = /*#__PURE__*/new WeakMap();
-var _isFocusSelectionChanged = /*#__PURE__*/new WeakMap();
 var _disableHeadersHighlight = /*#__PURE__*/new WeakMap();
 var _selectionSource = /*#__PURE__*/new WeakMap();
 var _expectedLayersCount = /*#__PURE__*/new WeakMap();
@@ -64,17 +61,11 @@ class Selection {
      */
     _defineProperty(this, "highlight", void 0);
     /**
-     * The module for modifying coordinates of the start and end selection.
+     * The module for modifying coordinates.
      *
      * @type {Transformation}
      */
-    _classPrivateFieldInitSpec(this, _transformation, void 0);
-    /**
-     * The module for modifying coordinates of the focus selection.
-     *
-     * @type {Transformation}
-     */
-    _classPrivateFieldInitSpec(this, _focusTransformation, void 0);
+    _defineProperty(this, "transformation", void 0);
     /**
      * The collection of the selection layer levels where the whole row was selected using the row header or
      * the corner header.
@@ -89,12 +80,6 @@ class Selection {
      * @type {Set<number>}
      */
     _defineProperty(this, "selectedByColumnHeader", new Set());
-    /**
-     * The flag which determines if the focus selection was changed.
-     *
-     * @type {boolean}
-     */
-    _classPrivateFieldInitSpec(this, _isFocusSelectionChanged, false);
     /**
      * When sets disable highlighting the headers even when the logical coordinates points on them.
      *
@@ -136,112 +121,71 @@ class Selection {
       createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
       createCellRange: (highlight, from, to) => this.tableProps.createCellRange(highlight, from, to)
     });
-    _classPrivateFieldSet(_transformation, this, new Transformation(this.selectedRange, {
+    this.transformation = new Transformation(this.selectedRange, {
       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),
-      findFirstNonHiddenRenderableRow: function () {
-        return _this.tableProps.findFirstNonHiddenRenderableRow(...arguments);
-      },
-      findFirstNonHiddenRenderableColumn: function () {
-        return _this.tableProps.findFirstNonHiddenRenderableColumn(...arguments);
-      },
       createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
+      navigableHeaders: () => settings.navigableHeaders,
       fixedRowsBottom: () => settings.fixedRowsBottom,
       minSpareRows: () => settings.minSpareRows,
       minSpareCols: () => settings.minSpareCols,
       autoWrapRow: () => settings.autoWrapRow,
       autoWrapCol: () => settings.autoWrapCol
-    }));
-    _classPrivateFieldSet(_focusTransformation, this, new Transformation(this.selectedRange, {
-      rowIndexMapper: this.tableProps.rowIndexMapper,
-      columnIndexMapper: this.tableProps.columnIndexMapper,
-      countRenderableRows: () => {
-        const range = this.selectedRange.current();
-        return this.tableProps.countRenderableRowsInRange(0, range.getOuterBottomEndCorner().row);
-      },
-      countRenderableColumns: () => {
-        const range = this.selectedRange.current();
-        return this.tableProps.countRenderableColumnsInRange(0, range.getOuterBottomEndCorner().col);
-      },
-      visualToRenderableCoords: coords => this.tableProps.visualToRenderableCoords(coords),
-      renderableToVisualCoords: coords => this.tableProps.renderableToVisualCoords(coords),
-      findFirstNonHiddenRenderableRow: function () {
-        return _this.tableProps.findFirstNonHiddenRenderableRow(...arguments);
-      },
-      findFirstNonHiddenRenderableColumn: function () {
-        return _this.tableProps.findFirstNonHiddenRenderableColumn(...arguments);
-      },
-      createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
-      fixedRowsBottom: () => 0,
-      minSpareRows: () => 0,
-      minSpareCols: () => 0,
-      autoWrapRow: () => true,
-      autoWrapCol: () => true
-    }));
-    _classPrivateFieldGet(_transformation, this).addLocalHook('beforeTransformStart', function () {
+    });
+    this.transformation.addLocalHook('beforeTransformStart', function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
       return _this.runLocalHooks('beforeModifyTransformStart', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('afterTransformStart', function () {
+    this.transformation.addLocalHook('afterTransformStart', function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
       return _this.runLocalHooks('afterModifyTransformStart', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('beforeTransformEnd', function () {
+    this.transformation.addLocalHook('beforeTransformEnd', function () {
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
         args[_key3] = arguments[_key3];
       }
       return _this.runLocalHooks('beforeModifyTransformEnd', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('afterTransformEnd', function () {
+    this.transformation.addLocalHook('afterTransformEnd', function () {
       for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
         args[_key4] = arguments[_key4];
       }
       return _this.runLocalHooks('afterModifyTransformEnd', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('insertRowRequire', function () {
+    this.transformation.addLocalHook('insertRowRequire', function () {
       for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
         args[_key5] = arguments[_key5];
       }
       return _this.runLocalHooks('insertRowRequire', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('insertColRequire', function () {
+    this.transformation.addLocalHook('insertColRequire', function () {
       for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
         args[_key6] = arguments[_key6];
       }
       return _this.runLocalHooks('insertColRequire', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('beforeRowWrap', function () {
+    this.transformation.addLocalHook('beforeRowWrap', function () {
       for (var _len7 = arguments.length, args = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
         args[_key7] = arguments[_key7];
       }
       return _this.runLocalHooks('beforeRowWrap', ...args);
     });
-    _classPrivateFieldGet(_transformation, this).addLocalHook('beforeColumnWrap', function () {
+    this.transformation.addLocalHook('beforeColumnWrap', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];
       }
       return _this.runLocalHooks('beforeColumnWrap', ...args);
     });
-    _classPrivateFieldGet(_focusTransformation, this).addLocalHook('beforeTransformStart', function () {
-      for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
-        args[_key9] = arguments[_key9];
-      }
-      return _this.runLocalHooks('beforeModifyTransformFocus', ...args);
-    });
-    _classPrivateFieldGet(_focusTransformation, this).addLocalHook('afterTransformStart', function () {
-      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
-        args[_key10] = arguments[_key10];
-      }
-      return _this.runLocalHooks('afterModifyTransformFocus', ...args);
-    });
   }
 
   /**
@@ -332,7 +276,6 @@ class Selection {
     // 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();
-    _classPrivateFieldSet(_isFocusSelectionChanged, this, false);
     this.runLocalHooks(`beforeSetRangeStart${fragment ? 'Only' : ''}`, coordsClone);
     if (!isMultipleMode || isMultipleMode && !isMultipleSelection && isUndefined(multipleSelection)) {
       this.selectedRange.clear();
@@ -390,20 +333,7 @@ class Selection {
       cellRange.setFrom(cellRange.highlight);
       cellRange.setTo(cellRange.highlight);
     } else {
-      const horizontalDir = cellRange.getHorizontalDirection();
-      const verticalDir = cellRange.getVerticalDirection();
-      const isMultiple = this.isMultiple();
       cellRange.setTo(coordsClone);
-      if (isMultiple && (horizontalDir !== cellRange.getHorizontalDirection() || cellRange.getWidth() === 1 && !cellRange.includes(cellRange.highlight))) {
-        cellRange.from.assign({
-          col: cellRange.highlight.col
-        });
-      }
-      if (isMultiple && (verticalDir !== cellRange.getVerticalDirection() || cellRange.getHeight() === 1 && !cellRange.includes(cellRange.highlight))) {
-        cellRange.from.assign({
-          row: cellRange.highlight.row
-        });
-      }
     }
 
     // Prevent creating "area" selection that overlaps headers.
@@ -413,7 +343,11 @@ class Selection {
       }
     }
     this.runLocalHooks('beforeHighlightSet');
-    this.setRangeFocus(this.selectedRange.current().highlight);
+    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();
 
     // If the next layer level is lower than previous then clear all area and header highlights. This is the
@@ -501,31 +435,15 @@ class Selection {
   }
 
   /**
-   * Sets the selection focus position at the specified coordinates.
+   * Returns information if we have a multiselection. This method check multiselection only on the latest layer of
+   * the selection.
    *
-   * @param {CellCoords} coords The CellCoords instance with defined visual coordinates.
+   * @returns {boolean}
    */
-  setRangeFocus(coords) {
-    if (this.selectedRange.isEmpty()) {
-      return;
-    }
-    const cellRange = this.selectedRange.current();
-    if (!this.inProgress) {
-      this.runLocalHooks('beforeSetFocus', coords);
-    }
-    const focusHighlight = this.highlight.getFocus();
-    focusHighlight.clear();
-    cellRange.setHighlight(coords);
-    if (!this.inProgress) {
-      this.runLocalHooks('beforeHighlightSet');
-    }
-    if (this.highlight.isEnabledFor(FOCUS_TYPE, cellRange.highlight)) {
-      focusHighlight.add(cellRange.highlight).commit().syncWith(cellRange);
-    }
-    if (!this.inProgress) {
-      _classPrivateFieldSet(_isFocusSelectionChanged, this, true);
-      this.runLocalHooks('afterSetFocus', cellRange.highlight);
-    }
+  isMultiple() {
+    const isMultipleListener = createObjectPropListener(!this.selectedRange.current().isSingle());
+    this.runLocalHooks('afterIsMultipleSelection', isMultipleListener);
+    return isMultipleListener.value;
   }
 
   /**
@@ -538,13 +456,7 @@ class Selection {
    */
   transformStart(rowDelta, colDelta) {
     let createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    if (this.settings.navigableHeaders) {
-      _classPrivateFieldGet(_transformation, this).setOffsetSize({
-        x: this.tableProps.countRowHeaders(),
-        y: this.tableProps.countColHeaders()
-      });
-    }
-    this.setRangeStart(_classPrivateFieldGet(_transformation, this).transformStart(rowDelta, colDelta, createMissingRecords));
+    this.setRangeStart(this.transformation.transformStart(rowDelta, colDelta, createMissingRecords));
   }
 
   /**
@@ -554,44 +466,7 @@ class Selection {
    * @param {number} colDelta Columns number to move, value can be passed as negative number.
    */
   transformEnd(rowDelta, colDelta) {
-    if (this.settings.navigableHeaders) {
-      _classPrivateFieldGet(_transformation, this).setOffsetSize({
-        x: this.tableProps.countRowHeaders(),
-        y: this.tableProps.countColHeaders()
-      });
-    }
-    this.setRangeEnd(_classPrivateFieldGet(_transformation, this).transformEnd(rowDelta, colDelta));
-  }
-
-  /**
-   * Transforms the focus cell selection relative to the current focus position.
-   *
-   * @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.
-   */
-  transformFocus(rowDelta, colDelta) {
-    const range = this.selectedRange.current();
-    const {
-      row,
-      col
-    } = range.getOuterTopStartCorner();
-    const columnsInRange = this.tableProps.countRenderableColumnsInRange(0, col - 1);
-    const rowsInRange = this.tableProps.countRenderableRowsInRange(0, row - 1);
-    if (range.highlight.isHeader()) {
-      // for header focus selection calculate the new coords based on the selection including headers
-      _classPrivateFieldGet(_focusTransformation, this).setOffsetSize({
-        x: col < 0 ? Math.abs(col) : -columnsInRange,
-        y: row < 0 ? Math.abs(row) : -rowsInRange
-      });
-    } else {
-      // for focus selection in cells calculate the new coords only based on the selected cells
-      _classPrivateFieldGet(_focusTransformation, this).setOffsetSize({
-        x: col < 0 ? 0 : -columnsInRange,
-        y: row < 0 ? 0 : -rowsInRange
-      });
-    }
-    const focusCoords = _classPrivateFieldGet(_focusTransformation, this).transformStart(rowDelta, colDelta);
-    this.setRangeFocus(focusCoords.normalize());
+    this.setRangeEnd(this.transformation.transformEnd(rowDelta, colDelta));
   }
 
   /**
@@ -612,30 +487,6 @@ class Selection {
     return !this.selectedRange.isEmpty();
   }
 
-  /**
-   * Returns information if we have a multi-selection. This method check multi-selection only on the latest layer of
-   * the selection.
-   *
-   * @returns {boolean}
-   */
-  isMultiple() {
-    if (!this.isSelected()) {
-      return false;
-    }
-    const isMultipleListener = createObjectPropListener(!this.selectedRange.current().isSingle());
-    this.runLocalHooks('afterIsMultipleSelection', isMultipleListener);
-    return isMultipleListener.value;
-  }
-
-  /**
-   * Checks if the last selection involves changing the focus cell position only.
-   *
-   * @returns {boolean}
-   */
-  isFocusSelectionChanged() {
-    return this.isSelected() && _classPrivateFieldGet(_isFocusSelectionChanged, this);
-  }
-
   /**
    * Returns `true` if the selection was applied by clicking to the row header. If the `layerLevel`
    * argument is passed then only that layer will be checked. Otherwise, it checks if any row header
@@ -918,10 +769,9 @@ 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 | { row: number, col: 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. An object with `row` and `col` properties also can be passed to change the focus
-   * position horizontally.
+   * @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) {
@@ -942,20 +792,11 @@ class Selection {
       countColHeaders
     });
     if (isValid) {
-      let highlightRow = 0;
-      let highlightColumn = 0;
-      if (Number.isInteger(focusPosition === null || focusPosition === void 0 ? void 0 : focusPosition.row) && Number.isInteger(focusPosition === null || focusPosition === void 0 ? void 0 : focusPosition.col)) {
-        highlightRow = clamp(focusPosition.row, columnHeaderLastIndex, countRows - 1);
-        highlightColumn = clamp(focusPosition.col, Math.min(start, end), Math.max(start, end));
-      } else {
-        highlightRow = clamp(focusPosition, columnHeaderLastIndex, countRows - 1);
-        highlightColumn = start;
-      }
-      const highlight = this.tableProps.createCellCoords(highlightRow, highlightColumn);
-      const fromRow = countColHeaders === 0 ? 0 : clamp(highlight.row, columnHeaderLastIndex, -1);
+      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
@@ -975,10 +816,9 @@ 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 | { row: number, col: 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. An object with `row` and `col` properties also can be passed to change the focus
-   * position horizontally.
+   * @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) {
@@ -997,20 +837,11 @@ class Selection {
       countColHeaders: 0
     });
     if (isValid) {
-      let highlightRow = 0;
-      let highlightColumn = 0;
-      if (Number.isInteger(focusPosition === null || focusPosition === void 0 ? void 0 : focusPosition.row) && Number.isInteger(focusPosition === null || focusPosition === void 0 ? void 0 : focusPosition.col)) {
-        highlightRow = clamp(focusPosition.row, Math.min(startRow, endRow), Math.max(startRow, endRow));
-        highlightColumn = clamp(focusPosition.col, rowHeaderLastIndex, countCols - 1);
-      } else {
-        highlightRow = startRow;
-        highlightColumn = clamp(focusPosition, rowHeaderLastIndex, countCols - 1);
-      }
-      const highlight = this.tableProps.createCellCoords(highlightRow, highlightColumn);
-      const fromColumn = countRowHeaders === 0 ? 0 : clamp(highlight.col, rowHeaderLastIndex, -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

package/selection/transformation.js

@@ -33,10 +33,10 @@ var _Transformation_brand = /*#__PURE__*/new WeakSet();
 class Transformation {
   constructor(range, options) {
     /**
-     * Clamps the coords to make sure they points to the cell (or header) in the table range.
+     * Sets the additional offset in table size that may occur when the `navigableHeaders` option
+     * is enabled.
      *
-     * @param {CellCoords} zeroBasedCoords The coords object to clamp.
-     * @returns {{rowDir: 1|0|-1, colDir: 1|0|-1}}
+     * @param {{x: number, y: number}} offset Offset as x and y properties.
      */
     _classPrivateMethodInitSpec(this, _Transformation_brand);
     /**
@@ -77,6 +77,10 @@ class Transformation {
    */
   transformStart(rowDelta, colDelta) {
     let createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    _assertClassBrand(_Transformation_brand, this, _setOffsetSize).call(this, {
+      x: _classPrivateFieldGet(_options, this).navigableHeaders() ? _classPrivateFieldGet(_options, this).countRowHeaders() : 0,
+      y: _classPrivateFieldGet(_options, this).navigableHeaders() ? _classPrivateFieldGet(_options, this).countColHeaders() : 0
+    });
     const delta = _classPrivateFieldGet(_options, this).createCellCoords(rowDelta, colDelta);
     let visualCoords = _classPrivateFieldGet(_range, this).current().highlight;
     const highlightRenderableCoords = _classPrivateFieldGet(_options, this).visualToRenderableCoords(visualCoords);
@@ -156,46 +160,23 @@ class Transformation {
    * @returns {CellCoords} Visual coordinates after transformation.
    */
   transformEnd(rowDelta, colDelta) {
+    _assertClassBrand(_Transformation_brand, this, _setOffsetSize).call(this, {
+      x: _classPrivateFieldGet(_options, this).navigableHeaders() ? _classPrivateFieldGet(_options, this).countRowHeaders() : 0,
+      y: _classPrivateFieldGet(_options, this).navigableHeaders() ? _classPrivateFieldGet(_options, this).countColHeaders() : 0
+    });
     const delta = _classPrivateFieldGet(_options, this).createCellCoords(rowDelta, colDelta);
     const cellRange = _classPrivateFieldGet(_range, this).current();
     const highlightRenderableCoords = _classPrivateFieldGet(_options, this).visualToRenderableCoords(cellRange.highlight);
-    const toRow = _assertClassBrand(_Transformation_brand, this, _findFirstNonHiddenZeroBasedRow).call(this, cellRange.to.row, cellRange.from.row);
-    const toColumn = _assertClassBrand(_Transformation_brand, this, _findFirstNonHiddenZeroBasedColumn).call(this, cellRange.to.col, cellRange.from.col);
     const visualCoords = cellRange.to.clone();
     let rowTransformDir = 0;
     let colTransformDir = 0;
     this.runLocalHooks('beforeTransformEnd', delta);
-    if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null && toRow !== null && toColumn !== null) {
+    if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null) {
       const {
-        row: highlightRow,
-        col: highlightColumn
-      } = _assertClassBrand(_Transformation_brand, this, _visualToZeroBasedCoords).call(this, cellRange.highlight);
-      const coords = _classPrivateFieldGet(_options, this).createCellCoords(toRow + delta.row, toColumn + delta.col);
-      const topStartCorner = cellRange.getTopStartCorner();
-      const topEndCorner = cellRange.getTopEndCorner();
-      const bottomEndCorner = cellRange.getBottomEndCorner();
-      const restDelta = {
-        row: coords.row - highlightRow,
-        col: coords.col - highlightColumn
-      };
-      if (delta.col < 0) {
-        if (toColumn >= highlightColumn && coords.col < highlightColumn) {
-          coords.col = _assertClassBrand(_Transformation_brand, this, _findFirstNonHiddenZeroBasedColumn).call(this, topStartCorner.col, topEndCorner.col) + restDelta.col;
-        }
-      } else if (delta.col > 0) {
-        if (toColumn <= highlightColumn && coords.col > highlightColumn) {
-          coords.col = _assertClassBrand(_Transformation_brand, this, _findFirstNonHiddenZeroBasedColumn).call(this, topEndCorner.col, topStartCorner.col) + restDelta.col;
-        }
-      }
-      if (delta.row < 0) {
-        if (toRow >= highlightRow && coords.row < highlightRow) {
-          coords.row = _assertClassBrand(_Transformation_brand, this, _findFirstNonHiddenZeroBasedRow).call(this, topStartCorner.row, bottomEndCorner.row) + restDelta.row;
-        }
-      } else if (delta.row > 0) {
-        if (toRow <= highlightRow && coords.row > highlightRow) {
-          coords.row = _assertClassBrand(_Transformation_brand, this, _findFirstNonHiddenZeroBasedRow).call(this, bottomEndCorner.row, topStartCorner.row) + restDelta.row;
-        }
-      }
+        row,
+        col
+      } = _assertClassBrand(_Transformation_brand, this, _visualToZeroBasedCoords).call(this, cellRange.to);
+      const coords = _classPrivateFieldGet(_options, this).createCellCoords(row + delta.row, col + delta.col);
       const {
         rowDir,
         colDir
@@ -215,24 +196,23 @@ class Transformation {
     this.runLocalHooks('afterTransformEnd', visualCoords, rowTransformDir, colTransformDir);
     return visualCoords;
   }
-
-  /**
-   * Sets the additional offset in table size that may occur when the `navigableHeaders` option
-   * is enabled.
-   *
-   * @param {{x: number, y: number}} offset Offset as x and y properties.
-   */
-  setOffsetSize(_ref) {
-    let {
-      x,
-      y
-    } = _ref;
-    _classPrivateFieldSet(_offset, this, {
-      x,
-      y
-    });
-  }
 }
+function _setOffsetSize(_ref) {
+  let {
+    x,
+    y
+  } = _ref;
+  _classPrivateFieldSet(_offset, this, {
+    x,
+    y
+  });
+}
+/**
+ * Clamps the coords to make sure they points to the cell (or header) in the table range.
+ *
+ * @param {CellCoords} zeroBasedCoords The coords object to clamp.
+ * @returns {{rowDir: 1|0|-1, colDir: 1|0|-1}}
+ */
 function _clampCoords(zeroBasedCoords) {
   const {
     width,
@@ -271,34 +251,6 @@ function _getTableSize() {
     height: _classPrivateFieldGet(_offset, this).y + _classPrivateFieldGet(_options, this).countRenderableRows()
   };
 }
-/**
- * Finds the first non-hidden zero-based row in the table range.
- *
- * @param {number} visualRowFrom The visual row from which the search should start.
- * @param {number} visualRowTo The visual row to which the search should end.
- * @returns {number | null}
- */
-function _findFirstNonHiddenZeroBasedRow(visualRowFrom, visualRowTo) {
-  const row = _classPrivateFieldGet(_options, this).findFirstNonHiddenRenderableRow(visualRowFrom, visualRowTo);
-  if (row === null) {
-    return null;
-  }
-  return _classPrivateFieldGet(_offset, this).y + row;
-}
-/**
- * Finds the first non-hidden zero-based column in the table range.
- *
- * @param {number} visualColumnFrom The visual column from which the search should start.
- * @param {number} visualColumnTo The visual column to which the search should end.
- * @returns {number | null}
- */
-function _findFirstNonHiddenZeroBasedColumn(visualColumnFrom, visualColumnTo) {
-  const column = _classPrivateFieldGet(_options, this).findFirstNonHiddenRenderableColumn(visualColumnFrom, visualColumnTo);
-  if (column === null) {
-    return null;
-  }
-  return _classPrivateFieldGet(_offset, this).x + column;
-}
 /**
  * Translates the visual coordinates to zero-based ones.
  *
@@ -310,9 +262,6 @@ function _visualToZeroBasedCoords(visualCoords) {
     row,
     col
   } = _classPrivateFieldGet(_options, this).visualToRenderableCoords(visualCoords);
-  if (row === null || col === null) {
-    throw new Error('Renderable coords are not visible.');
-  }
   return _classPrivateFieldGet(_options, this).createCellCoords(_classPrivateFieldGet(_offset, this).y + row, _classPrivateFieldGet(_offset, this).x + col);
 }
 /**