handsontable 0.0.0-next-d96e9b5-20240220 → 0.0.0-next-d4816a9-20240221

package/selection/selection.mjs

@@ -24,9 +24,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();
@@ -66,23 +63,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, {
-      writable: true,
-      value: void 0
-    });
-    /**
-     * The module for modifying coordinates of the focus selection.
-     *
-     * @type {Transformation}
-     */
-    _classPrivateFieldInitSpec(this, _focusTransformation, {
-      writable: true,
-      value: 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.
@@ -97,15 +82,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, {
-      writable: true,
-      value: false
-    });
     /**
      * When sets disable highlighting the headers even when the logical coordinates points on them.
      *
@@ -156,100 +132,71 @@ class Selection {
       createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
       createCellRange: (highlight, from, to) => this.tableProps.createCellRange(highlight, from, to)
     });
-    _classPrivateFieldSet(this, _transformation, 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),
       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(this, _focusTransformation, 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),
-      createCellCoords: (row, column) => this.tableProps.createCellCoords(row, column),
-      fixedRowsBottom: () => 0,
-      minSpareRows: () => 0,
-      minSpareCols: () => 0,
-      autoWrapRow: () => true,
-      autoWrapCol: () => true
-    }));
-    _classPrivateFieldGet(this, _transformation).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(this, _transformation).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(this, _transformation).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(this, _transformation).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(this, _transformation).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(this, _transformation).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(this, _transformation).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(this, _transformation).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(this, _focusTransformation).addLocalHook('beforeTransformStart', function () {
-      for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
-        args[_key9] = arguments[_key9];
-      }
-      return _this.runLocalHooks('beforeModifyTransformStart', ...args);
-    });
-    _classPrivateFieldGet(this, _focusTransformation).addLocalHook('afterTransformStart', function () {
-      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
-        args[_key10] = arguments[_key10];
-      }
-      return _this.runLocalHooks('afterModifyTransformStart', ...args);
-    });
   }
 
   /**
@@ -340,7 +287,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(this, _isFocusSelectionChanged, false);
     this.runLocalHooks(`beforeSetRangeStart${fragment ? 'Only' : ''}`, coordsClone);
     if (!isMultipleMode || isMultipleMode && !isMultipleSelection && isUndefined(multipleSelection)) {
       this.selectedRange.clear();
@@ -398,20 +344,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.from.assign({
-          col: cellRange.highlight.col
-        });
-      }
-      if (isMultiple && verticalDir !== cellRange.getVerticalDirection()) {
-        cellRange.from.assign({
-          row: cellRange.highlight.row
-        });
-      }
     }
 
     // Prevent creating "area" selection that overlaps headers.
@@ -421,7 +354,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
@@ -509,28 +446,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();
-    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(this, _isFocusSelectionChanged, true);
-      this.runLocalHooks('afterSetFocus', cellRange.highlight);
-    }
+  isMultiple() {
+    const isMultipleListener = createObjectPropListener(!this.selectedRange.current().isSingle());
+    this.runLocalHooks('afterIsMultipleSelection', isMultipleListener);
+    return isMultipleListener.value;
   }
 
   /**
@@ -543,13 +467,7 @@ class Selection {
    */
   transformStart(rowDelta, colDelta) {
     let createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    if (this.settings.navigableHeaders) {
-      _classPrivateFieldGet(this, _transformation).setOffsetSize({
-        x: this.tableProps.countRowHeaders(),
-        y: this.tableProps.countColHeaders()
-      });
-    }
-    this.setRangeStart(_classPrivateFieldGet(this, _transformation).transformStart(rowDelta, colDelta, createMissingRecords));
+    this.setRangeStart(this.transformation.transformStart(rowDelta, colDelta, createMissingRecords));
   }
 
   /**
@@ -559,44 +477,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(this, _transformation).setOffsetSize({
-        x: this.tableProps.countRowHeaders(),
-        y: this.tableProps.countColHeaders()
-      });
-    }
-    this.setRangeEnd(_classPrivateFieldGet(this, _transformation).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(this, _focusTransformation).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(this, _focusTransformation).setOffsetSize({
-        x: col < 0 ? 0 : -columnsInRange,
-        y: row < 0 ? 0 : -rowsInRange
-      });
-    }
-    const focusCoords = _classPrivateFieldGet(this, _focusTransformation).transformStart(rowDelta, colDelta);
-    this.setRangeFocus(focusCoords.normalize());
+    this.setRangeEnd(this.transformation.transformEnd(rowDelta, colDelta));
   }
 
   /**
@@ -617,30 +498,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(this, _isFocusSelectionChanged);
-  }
-
   /**
    * 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
@@ -946,20 +803,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
@@ -1000,20 +848,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

@@ -8,9 +8,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
 function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
 function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
@@ -32,6 +32,7 @@ function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.
 var _range = /*#__PURE__*/new WeakMap();
 var _options = /*#__PURE__*/new WeakMap();
 var _offset = /*#__PURE__*/new WeakMap();
+var _setOffsetSize = /*#__PURE__*/new WeakSet();
 var _clampCoords = /*#__PURE__*/new WeakSet();
 var _getTableSize = /*#__PURE__*/new WeakSet();
 var _visualToZeroBasedCoords = /*#__PURE__*/new WeakSet();
@@ -66,6 +67,13 @@ class Transformation {
      * @returns {{rowDir: 1|0|-1, colDir: 1|0|-1}}
      */
     _classPrivateMethodInitSpec(this, _clampCoords);
+    /**
+     * 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.
+     */
+    _classPrivateMethodInitSpec(this, _setOffsetSize);
     /**
      * Instance of the SelectionRange, holder for visual coordinates applied to the table.
      *
@@ -113,6 +121,10 @@ class Transformation {
    */
   transformStart(rowDelta, colDelta) {
     let createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    _classPrivateMethodGet(this, _setOffsetSize, _setOffsetSize2).call(this, {
+      x: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countRowHeaders() : 0,
+      y: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countColHeaders() : 0
+    });
     const delta = _classPrivateFieldGet(this, _options).createCellCoords(rowDelta, colDelta);
     let visualCoords = _classPrivateFieldGet(this, _range).current().highlight;
     const highlightRenderableCoords = _classPrivateFieldGet(this, _options).visualToRenderableCoords(visualCoords);
@@ -192,6 +204,10 @@ class Transformation {
    * @returns {CellCoords} Visual coordinates after transformation.
    */
   transformEnd(rowDelta, colDelta) {
+    _classPrivateMethodGet(this, _setOffsetSize, _setOffsetSize2).call(this, {
+      x: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countRowHeaders() : 0,
+      y: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countColHeaders() : 0
+    });
     const delta = _classPrivateFieldGet(this, _options).createCellCoords(rowDelta, colDelta);
     const cellRange = _classPrivateFieldGet(this, _range).current();
     const highlightRenderableCoords = _classPrivateFieldGet(this, _options).visualToRenderableCoords(cellRange.highlight);
@@ -201,34 +217,10 @@ class Transformation {
     this.runLocalHooks('beforeTransformEnd', delta);
     if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null) {
       const {
-        row: toRow,
-        col: toColumn
+        row,
+        col
       } = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.to);
-      const {
-        row: highlightRow,
-        col: highlightColumn
-      } = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.highlight);
-      const coords = _classPrivateFieldGet(this, _options).createCellCoords(toRow + delta.row, toColumn + delta.col);
-      const columnDeltaRest = coords.col - highlightColumn;
-      const rowDeltaRest = coords.row - highlightRow;
-      if (delta.col < 0) {
-        if (toColumn >= highlightColumn && coords.col < highlightColumn) {
-          coords.col = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getTopStartCorner()).col + columnDeltaRest;
-        }
-      } else if (delta.col > 0) {
-        if (toColumn <= highlightColumn && coords.col > highlightColumn) {
-          coords.col = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getTopEndCorner()).col + columnDeltaRest;
-        }
-      }
-      if (delta.row < 0) {
-        if (toRow >= highlightRow && coords.row < highlightRow) {
-          coords.row = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getTopStartCorner()).row + rowDeltaRest;
-        }
-      } else if (delta.row > 0) {
-        if (toRow <= highlightRow && coords.row > highlightRow) {
-          coords.row = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getBottomStartCorner()).row + rowDeltaRest;
-        }
-      }
+      const coords = _classPrivateFieldGet(this, _options).createCellCoords(row + delta.row, col + delta.col);
       const {
         rowDir,
         colDir
@@ -248,23 +240,16 @@ 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(this, _offset, {
-      x,
-      y
-    });
-  }
+}
+function _setOffsetSize2(_ref) {
+  let {
+    x,
+    y
+  } = _ref;
+  _classPrivateFieldSet(this, _offset, {
+    x,
+    y
+  });
 }
 function _clampCoords2(zeroBasedCoords) {
   const {

package/selection/transformation.mjs

@@ -2,9 +2,9 @@ import "core-js/modules/es.error.cause.js";
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
 function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
 function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
@@ -28,6 +28,7 @@ import localHooks from "./../mixins/localHooks.mjs";
 var _range = /*#__PURE__*/new WeakMap();
 var _options = /*#__PURE__*/new WeakMap();
 var _offset = /*#__PURE__*/new WeakMap();
+var _setOffsetSize = /*#__PURE__*/new WeakSet();
 var _clampCoords = /*#__PURE__*/new WeakSet();
 var _getTableSize = /*#__PURE__*/new WeakSet();
 var _visualToZeroBasedCoords = /*#__PURE__*/new WeakSet();
@@ -62,6 +63,13 @@ class Transformation {
      * @returns {{rowDir: 1|0|-1, colDir: 1|0|-1}}
      */
     _classPrivateMethodInitSpec(this, _clampCoords);
+    /**
+     * 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.
+     */
+    _classPrivateMethodInitSpec(this, _setOffsetSize);
     /**
      * Instance of the SelectionRange, holder for visual coordinates applied to the table.
      *
@@ -109,6 +117,10 @@ class Transformation {
    */
   transformStart(rowDelta, colDelta) {
     let createMissingRecords = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    _classPrivateMethodGet(this, _setOffsetSize, _setOffsetSize2).call(this, {
+      x: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countRowHeaders() : 0,
+      y: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countColHeaders() : 0
+    });
     const delta = _classPrivateFieldGet(this, _options).createCellCoords(rowDelta, colDelta);
     let visualCoords = _classPrivateFieldGet(this, _range).current().highlight;
     const highlightRenderableCoords = _classPrivateFieldGet(this, _options).visualToRenderableCoords(visualCoords);
@@ -188,6 +200,10 @@ class Transformation {
    * @returns {CellCoords} Visual coordinates after transformation.
    */
   transformEnd(rowDelta, colDelta) {
+    _classPrivateMethodGet(this, _setOffsetSize, _setOffsetSize2).call(this, {
+      x: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countRowHeaders() : 0,
+      y: _classPrivateFieldGet(this, _options).navigableHeaders() ? _classPrivateFieldGet(this, _options).countColHeaders() : 0
+    });
     const delta = _classPrivateFieldGet(this, _options).createCellCoords(rowDelta, colDelta);
     const cellRange = _classPrivateFieldGet(this, _range).current();
     const highlightRenderableCoords = _classPrivateFieldGet(this, _options).visualToRenderableCoords(cellRange.highlight);
@@ -197,34 +213,10 @@ class Transformation {
     this.runLocalHooks('beforeTransformEnd', delta);
     if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null) {
       const {
-        row: toRow,
-        col: toColumn
+        row,
+        col
       } = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.to);
-      const {
-        row: highlightRow,
-        col: highlightColumn
-      } = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.highlight);
-      const coords = _classPrivateFieldGet(this, _options).createCellCoords(toRow + delta.row, toColumn + delta.col);
-      const columnDeltaRest = coords.col - highlightColumn;
-      const rowDeltaRest = coords.row - highlightRow;
-      if (delta.col < 0) {
-        if (toColumn >= highlightColumn && coords.col < highlightColumn) {
-          coords.col = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getTopStartCorner()).col + columnDeltaRest;
-        }
-      } else if (delta.col > 0) {
-        if (toColumn <= highlightColumn && coords.col > highlightColumn) {
-          coords.col = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getTopEndCorner()).col + columnDeltaRest;
-        }
-      }
-      if (delta.row < 0) {
-        if (toRow >= highlightRow && coords.row < highlightRow) {
-          coords.row = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getTopStartCorner()).row + rowDeltaRest;
-        }
-      } else if (delta.row > 0) {
-        if (toRow <= highlightRow && coords.row > highlightRow) {
-          coords.row = _classPrivateMethodGet(this, _visualToZeroBasedCoords, _visualToZeroBasedCoords2).call(this, cellRange.getBottomStartCorner()).row + rowDeltaRest;
-        }
-      }
+      const coords = _classPrivateFieldGet(this, _options).createCellCoords(row + delta.row, col + delta.col);
       const {
         rowDir,
         colDir
@@ -244,23 +236,16 @@ 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(this, _offset, {
-      x,
-      y
-    });
-  }
+}
+function _setOffsetSize2(_ref) {
+  let {
+    x,
+    y
+  } = _ref;
+  _classPrivateFieldSet(this, _offset, {
+    x,
+    y
+  });
 }
 function _clampCoords2(zeroBasedCoords) {
   const {

package/shortcutContexts/commands/editor/closeAndSave.js

@@ -3,9 +3,9 @@
 exports.__esModule = true;
 const command = exports.command = {
   name: 'editorCloseAndSave',
-  callback(hot, event) {
+  callback(hot, event, keys) {
     const editorManager = hot._getEditorManager();
     editorManager.closeEditorAndSaveChanges(event.ctrlKey || event.metaKey);
-    editorManager.moveSelectionAfterEnter(event);
+    editorManager.moveSelectionAfterEnter(keys.includes('shift'));
   }
 };

package/shortcutContexts/commands/editor/closeAndSave.mjs

@@ -1,8 +1,8 @@
 export const command = {
   name: 'editorCloseAndSave',
-  callback(hot, event) {
+  callback(hot, event, keys) {
     const editorManager = hot._getEditorManager();
     editorManager.closeEditorAndSaveChanges(event.ctrlKey || event.metaKey);
-    editorManager.moveSelectionAfterEnter(event);
+    editorManager.moveSelectionAfterEnter(keys.includes('shift'));
   }
 };