handsontable 0.0.0-next-8dc7078-20240322 → 0.0.0-next-28fc088-20240325

package/selection/transformation.mjs

@@ -29,10 +29,10 @@ var _Transformation_brand = /*#__PURE__*/new WeakSet();
 class Transformation {
   constructor(range, options) {
     /**
-     * Sets the additional offset in table size that may occur when the `navigableHeaders` option
-     * is enabled.
+     * Clamps the coords to make sure they points to the cell (or header) in the table range.
      *
-     * @param {{x: number, y: number}} offset Offset as x and y properties.
+     * @param {CellCoords} zeroBasedCoords The coords object to clamp.
+     * @returns {{rowDir: 1|0|-1, colDir: 1|0|-1}}
      */
     _classPrivateMethodInitSpec(this, _Transformation_brand);
     /**
@@ -73,10 +73,6 @@ 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,23 +152,46 @@ 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) {
+    if (highlightRenderableCoords.row !== null && highlightRenderableCoords.col !== null && toRow !== null && toColumn !== null) {
       const {
-        row,
-        col
-      } = _assertClassBrand(_Transformation_brand, this, _visualToZeroBasedCoords).call(this, cellRange.to);
-      const coords = _classPrivateFieldGet(_options, this).createCellCoords(row + delta.row, col + delta.col);
+        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;
+        }
+      }
       const {
         rowDir,
         colDir
@@ -192,23 +211,24 @@ 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,
@@ -247,6 +267,34 @@ 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.
  *
@@ -258,6 +306,9 @@ 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);
 }
 /**

package/shortcutContexts/commands/editor/closeAndSave.js

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

package/shortcutContexts/commands/editor/closeAndSave.mjs

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

package/shortcutContexts/commands/editor/open.js

@@ -6,20 +6,35 @@ const command = exports.command = {
   name: 'editorOpen',
   callback(hot, event, keys) {
     const editorManager = hot._getEditorManager();
+    const selectedRange = hot.getSelectedRangeLast();
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = selectedRange;
+
+    // supports for navigating with enter key when multiple cells are selected
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      const settings = hot.getSettings();
+      const enterMoves = typeof settings.enterMoves === 'function' ? settings.enterMoves(event) : settings.enterMoves;
+      if (keys.includes('shift')) {
+        hot.selection.transformFocus(-enterMoves.row, -enterMoves.col);
+      } else {
+        hot.selection.transformFocus(enterMoves.row, enterMoves.col);
+      }
+      return;
+    }
     if (highlight.isHeader()) {
       return;
     }
+
+    // supports editor opening with enter key
     if (hot.getSettings().enterBeginsEditing) {
       if (editorManager.cellProperties.readOnly) {
-        editorManager.moveSelectionAfterEnter();
+        editorManager.moveSelectionAfterEnter(event);
       } else {
         editorManager.openEditor(null, event, true);
       }
     } else {
-      editorManager.moveSelectionAfterEnter(keys.includes('shift'));
+      editorManager.moveSelectionAfterEnter(event);
     }
     (0, _event.stopImmediatePropagation)(event); // required by HandsontableEditor
   }

package/shortcutContexts/commands/editor/open.mjs

@@ -3,20 +3,35 @@ export const command = {
   name: 'editorOpen',
   callback(hot, event, keys) {
     const editorManager = hot._getEditorManager();
+    const selectedRange = hot.getSelectedRangeLast();
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = selectedRange;
+
+    // supports for navigating with enter key when multiple cells are selected
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      const settings = hot.getSettings();
+      const enterMoves = typeof settings.enterMoves === 'function' ? settings.enterMoves(event) : settings.enterMoves;
+      if (keys.includes('shift')) {
+        hot.selection.transformFocus(-enterMoves.row, -enterMoves.col);
+      } else {
+        hot.selection.transformFocus(enterMoves.row, enterMoves.col);
+      }
+      return;
+    }
     if (highlight.isHeader()) {
       return;
     }
+
+    // supports editor opening with enter key
     if (hot.getSettings().enterBeginsEditing) {
       if (editorManager.cellProperties.readOnly) {
-        editorManager.moveSelectionAfterEnter();
+        editorManager.moveSelectionAfterEnter(event);
       } else {
         editorManager.openEditor(null, event, true);
       }
     } else {
-      editorManager.moveSelectionAfterEnter(keys.includes('shift'));
+      editorManager.moveSelectionAfterEnter(event);
     }
     stopImmediatePropagation(event); // required by HandsontableEditor
   }

package/shortcutContexts/commands/extendCellsSelection/down.js

@@ -7,7 +7,7 @@ const command = exports.command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader()) {
+    if (!hot.selection.isSelectedByColumnHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader())) {
       hot.selection.transformEnd(1, 0);
     }
   }

package/shortcutContexts/commands/extendCellsSelection/down.mjs

@@ -4,7 +4,7 @@ export const command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader()) {
+    if (!hot.selection.isSelectedByColumnHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader())) {
       hot.selection.transformEnd(1, 0);
     }
   }

package/shortcutContexts/commands/extendCellsSelection/left.js

@@ -7,7 +7,7 @@ const command = exports.command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader()) {
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader())) {
       hot.selection.transformEnd(0, -1 * hot.getDirectionFactor());
     }
   }

package/shortcutContexts/commands/extendCellsSelection/left.mjs

@@ -4,7 +4,7 @@ export const command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader()) {
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader())) {
       hot.selection.transformEnd(0, -1 * hot.getDirectionFactor());
     }
   }

package/shortcutContexts/commands/extendCellsSelection/right.js

@@ -7,7 +7,7 @@ const command = exports.command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader()) {
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader())) {
       hot.selection.transformEnd(0, hot.getDirectionFactor());
     }
   }

package/shortcutContexts/commands/extendCellsSelection/right.mjs

@@ -4,7 +4,7 @@ export const command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader()) {
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByColumnHeader())) {
       hot.selection.transformEnd(0, hot.getDirectionFactor());
     }
   }

package/shortcutContexts/commands/extendCellsSelection/toColumns.js

@@ -12,7 +12,7 @@ const command = exports.command = {
     if (hot.selection.isSelectedByRowHeader()) {
       hot.selection.selectAll(true, true);
     } else {
-      hot.selectColumns(from.col, to.col, highlight.row);
+      hot.selectColumns(from.col, to.col, highlight);
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toColumns.mjs

@@ -9,7 +9,7 @@ export const command = {
     if (hot.selection.isSelectedByRowHeader()) {
       hot.selection.selectAll(true, true);
     } else {
-      hot.selectColumns(from.col, to.col, highlight.row);
+      hot.selectColumns(from.col, to.col, highlight);
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostBottom.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(hot.countRows() - 1, -1);
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.row = highlight.row;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the row highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostBottom.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(hot.countRows() - 1, -1);
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.row = highlight.row;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the row highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.js

@@ -9,10 +9,16 @@ const command = exports.command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const column = columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.mjs

@@ -6,10 +6,16 @@ export const command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const column = columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.js

@@ -9,10 +9,17 @@ const command = exports.command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(0, 1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const fixedColumns = parseInt(hot.getSettings().fixedColumnsStart, 10);
+      const column = columnIndexMapper.getNearestNotHiddenIndex(fixedColumns, 1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.mjs

@@ -6,10 +6,17 @@ export const command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(0, 1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const fixedColumns = parseInt(hot.getSettings().fixedColumnsStart, 10);
+      const column = columnIndexMapper.getNearestNotHiddenIndex(fixedColumns, 1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostLeft.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [hot.countCols() - 1, -1] : [0, 1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostLeft.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [hot.countCols() - 1, -1] : [0, 1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostRight.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [0, 1] : [hot.countCols() - 1, -1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostRight.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [0, 1] : [hot.countCols() - 1, -1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostTop.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(0, 1);
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.row = highlight.row;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the row highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostTop.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(0, 1);
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.row = highlight.row;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the row highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toRows.js

@@ -12,7 +12,7 @@ const command = exports.command = {
     if (hot.selection.isSelectedByColumnHeader()) {
       hot.selection.selectAll(true, true);
     } else {
-      hot.selectRows(from.row, to.row, highlight.col);
+      hot.selectRows(from.row, to.row, highlight);
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toRows.mjs

@@ -9,7 +9,7 @@ export const command = {
     if (hot.selection.isSelectedByColumnHeader()) {
       hot.selection.selectAll(true, true);
     } else {
-      hot.selectRows(from.row, to.row, highlight.col);
+      hot.selectRows(from.row, to.row, highlight);
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/up.js

@@ -7,7 +7,7 @@ const command = exports.command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader()) {
+    if (!hot.selection.isSelectedByColumnHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader())) {
       hot.selection.transformEnd(-1, 0);
     }
   }

package/shortcutContexts/commands/extendCellsSelection/up.mjs

@@ -4,7 +4,7 @@ export const command = {
     const {
       highlight
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader()) {
+    if (!hot.selection.isSelectedByColumnHeader() && !hot.selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && hot.selection.isSelectedByRowHeader())) {
       hot.selection.transformEnd(-1, 0);
     }
   }

package/shortcutContexts/commands/moveCellSelection/inlineEnd.js

@@ -5,7 +5,12 @@ const command = exports.command = {
   name: 'moveCellSelectionInlineEnd',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(-tabMoves.row, -tabMoves.col);
+    } else {
+      hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    }
   }
 };

package/shortcutContexts/commands/moveCellSelection/inlineEnd.mjs

@@ -2,7 +2,12 @@ export const command = {
   name: 'moveCellSelectionInlineEnd',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(-tabMoves.row, -tabMoves.col);
+    } else {
+      hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    }
   }
 };

package/shortcutContexts/commands/moveCellSelection/inlineStart.js

@@ -5,7 +5,12 @@ const command = exports.command = {
   name: 'moveCellSelectionInlineStart',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(tabMoves.row, tabMoves.col);
+    } else {
+      hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    }
   }
 };

package/shortcutContexts/commands/moveCellSelection/inlineStart.mjs

@@ -2,7 +2,12 @@ export const command = {
   name: 'moveCellSelectionInlineStart',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(tabMoves.row, tabMoves.col);
+    } else {
+      hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    }
   }
 };