handsontable 0.0.0-next-ba17d71-20240207 → 0.0.0-next-a2cc849-20240208

package/editorManager.js

@@ -318,18 +318,22 @@ class EditorManager {
   }
 
   /**
-   * Controls selection's behaviour after clicking `Enter`.
+   * Controls selection's behavior after clicking `Enter`.
    *
    * @private
-   * @param {boolean} isShiftPressed If `true`, then the selection will move up after hit enter.
+   * @param {KeyboardEvent} event The keyboard event object.
    */
-  moveSelectionAfterEnter(isShiftPressed) {
-    const enterMoves = typeof this.tableMeta.enterMoves === 'function' ? this.tableMeta.enterMoves(event) : this.tableMeta.enterMoves;
-    if (isShiftPressed) {
-      // move selection up
-      this.selection.transformStart(-enterMoves.row, -enterMoves.col);
+  moveSelectionAfterEnter(event) {
+    const enterMoves = {
+      ...(typeof this.tableMeta.enterMoves === 'function' ? this.tableMeta.enterMoves(event) : this.tableMeta.enterMoves)
+    };
+    if (event.shiftKey) {
+      enterMoves.row = -enterMoves.row;
+      enterMoves.col = -enterMoves.col;
+    }
+    if (this.hot.selection.isMultiple()) {
+      this.selection.transformFocus(enterMoves.row, enterMoves.col);
     } else {
-      // move selection down (add a new row if needed)
       this.selection.transformStart(enterMoves.row, enterMoves.col, true);
     }
   }

package/editorManager.mjs

@@ -314,18 +314,22 @@ class EditorManager {
   }
 
   /**
-   * Controls selection's behaviour after clicking `Enter`.
+   * Controls selection's behavior after clicking `Enter`.
    *
    * @private
-   * @param {boolean} isShiftPressed If `true`, then the selection will move up after hit enter.
+   * @param {KeyboardEvent} event The keyboard event object.
    */
-  moveSelectionAfterEnter(isShiftPressed) {
-    const enterMoves = typeof this.tableMeta.enterMoves === 'function' ? this.tableMeta.enterMoves(event) : this.tableMeta.enterMoves;
-    if (isShiftPressed) {
-      // move selection up
-      this.selection.transformStart(-enterMoves.row, -enterMoves.col);
+  moveSelectionAfterEnter(event) {
+    const enterMoves = {
+      ...(typeof this.tableMeta.enterMoves === 'function' ? this.tableMeta.enterMoves(event) : this.tableMeta.enterMoves)
+    };
+    if (event.shiftKey) {
+      enterMoves.row = -enterMoves.row;
+      enterMoves.col = -enterMoves.col;
+    }
+    if (this.hot.selection.isMultiple()) {
+      this.selection.transformFocus(enterMoves.row, enterMoves.col);
     } else {
-      // move selection down (add a new row if needed)
       this.selection.transformStart(enterMoves.row, enterMoves.col, true);
     }
   }

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-ba17d71-20240207";
+  const hotVersion = "0.0.0-next-a2cc849-20240208";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-ba17d71-20240207";
+  const hotVersion = "0.0.0-next-a2cc849-20240208";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-ba17d71-20240207",
+  "version": "0.0.0-next-a2cc849-20240208",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/pluginHooks.d.ts

@@ -133,6 +133,7 @@ export interface Events {
   afterSelectionByProp?: (row: number, prop: string, row2: number, prop2: string, preventScrolling: { value: boolean }, selectionLayerLevel: number) => void;
   afterSelectionEnd?: (row: number, column: number, row2: number, column2: number, selectionLayerLevel: number) => void;
   afterSelectionEndByProp?: (row: number, prop: string, row2: number, prop2: string, selectionLayerLevel: number) => void;
+  afterSelectionFocusSet?: (row: number, column: number, preventScrolling: { value: boolean }) => void;
   afterSelectRows?: (from: CellCoords, to: CellCoords, highlight: CellCoords) => void;
   afterSetCellMeta?: (row: number, column: number, key: string, value: any) => void;
   afterSetDataAtCell?: (changes: CellChange[], source?: ChangeSource) => void;

package/pluginHooks.js

@@ -650,7 +650,9 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {string} prop Selection start data source object property name.
  * @param {number} row2 Selection end visual row index.
  * @param {string} prop2 Selection end data source object property name.
- * @param {object} preventScrolling Object with `value` property where its value change will be observed.
+ * @param {object} preventScrolling A reference to the observable object with the `value` property.
+ *                                  Property `preventScrolling.value` expects a boolean value that
+ *                                  Handsontable uses to control scroll behavior after selection.
  * @param {number} selectionLayerLevel The number which indicates what selection layer is currently modified.
  * @example
  * ```js
@@ -700,6 +702,46 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {number} selectionLayerLevel The number which indicates what selection layer is currently modified.
  */
 'afterSelectionEndByProp',
+/**
+ * Fired after the focus position within a selected range is changed.
+ *
+ * @since 14.2.0
+ * @event Hooks#afterSelectionFocusSet
+ * @param {number} row The focus visual row index position.
+ * @param {number} column The focus visual column index position.
+ * @param {object} preventScrolling A reference to the observable object with the `value` property.
+ *                                  Property `preventScrolling.value` expects a boolean value that
+ *                                  Handsontable uses to control scroll behavior after selection.
+ * @example
+ * ```js
+ * ::: only-for javascript
+ * new Handsontable(element, {
+ *   afterSelectionFocusSet: (row, column, preventScrolling) => {
+ *     // If set to `false` (default): when focused cell selection is outside the viewport,
+ *     // Handsontable scrolls the viewport to that cell.
+ *     // If set to `true`: when focused cell selection is outside the viewport,
+ *     // Handsontable doesn't scroll the viewport.
+ *     preventScrolling.value = true;
+ *   }
+ * })
+ * ```
+ * :::
+ *
+ * ::: only-for react
+ * ```jsx
+ * <HotTable
+ *   afterSelectionFocusSet={(row, column, preventScrolling) => {
+ *     // If set to `false` (default): when focused cell selection is outside the viewport,
+ *     // Handsontable scrolls the viewport to that cell.
+ *     // If set to `true`: when focused cell selection is outside the viewport,
+ *     // Handsontable doesn't scroll the viewport.
+ *     preventScrolling.value = true;
+ *   }}
+ * />
+ * ```
+ * :::
+ */
+'afterSelectionFocusSet',
 /**
  * Fired before one or more columns are selected (e.g. During mouse header click or {@link Core#selectColumns} API call).
  *

package/pluginHooks.mjs

@@ -646,7 +646,9 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {string} prop Selection start data source object property name.
  * @param {number} row2 Selection end visual row index.
  * @param {string} prop2 Selection end data source object property name.
- * @param {object} preventScrolling Object with `value` property where its value change will be observed.
+ * @param {object} preventScrolling A reference to the observable object with the `value` property.
+ *                                  Property `preventScrolling.value` expects a boolean value that
+ *                                  Handsontable uses to control scroll behavior after selection.
  * @param {number} selectionLayerLevel The number which indicates what selection layer is currently modified.
  * @example
  * ```js
@@ -696,6 +698,46 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  * @param {number} selectionLayerLevel The number which indicates what selection layer is currently modified.
  */
 'afterSelectionEndByProp',
+/**
+ * Fired after the focus position within a selected range is changed.
+ *
+ * @since 14.2.0
+ * @event Hooks#afterSelectionFocusSet
+ * @param {number} row The focus visual row index position.
+ * @param {number} column The focus visual column index position.
+ * @param {object} preventScrolling A reference to the observable object with the `value` property.
+ *                                  Property `preventScrolling.value` expects a boolean value that
+ *                                  Handsontable uses to control scroll behavior after selection.
+ * @example
+ * ```js
+ * ::: only-for javascript
+ * new Handsontable(element, {
+ *   afterSelectionFocusSet: (row, column, preventScrolling) => {
+ *     // If set to `false` (default): when focused cell selection is outside the viewport,
+ *     // Handsontable scrolls the viewport to that cell.
+ *     // If set to `true`: when focused cell selection is outside the viewport,
+ *     // Handsontable doesn't scroll the viewport.
+ *     preventScrolling.value = true;
+ *   }
+ * })
+ * ```
+ * :::
+ *
+ * ::: only-for react
+ * ```jsx
+ * <HotTable
+ *   afterSelectionFocusSet={(row, column, preventScrolling) => {
+ *     // If set to `false` (default): when focused cell selection is outside the viewport,
+ *     // Handsontable scrolls the viewport to that cell.
+ *     // If set to `true`: when focused cell selection is outside the viewport,
+ *     // Handsontable doesn't scroll the viewport.
+ *     preventScrolling.value = true;
+ *   }}
+ * />
+ * ```
+ * :::
+ */
+'afterSelectionFocusSet',
 /**
  * Fired before one or more columns are selected (e.g. During mouse header click or {@link Core#selectColumns} API call).
  *

package/plugins/collapsibleColumns/collapsibleColumns.js

@@ -9,6 +9,7 @@ var _number = require("../../helpers/number");
 var _console = require("../../helpers/console");
 var _element = require("../../helpers/dom/element");
 var _event = require("../../helpers/dom/event");
+var _shortcutContexts = require("../../shortcutContexts");
 var _a11y = require("../../helpers/a11y");
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
@@ -308,12 +309,17 @@ class CollapsibleColumns extends _base.BasePlugin {
             col: columnIndex
           });
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before'
     });
   }
 

package/plugins/collapsibleColumns/collapsibleColumns.mjs

@@ -18,6 +18,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
 import { addClass, hasClass, removeClass, fastInnerText, removeAttribute, setAttribute } from "../../helpers/dom/element.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import { A11Y_EXPANDED, A11Y_HIDDEN } from "../../helpers/a11y.mjs";
 export const PLUGIN_KEY = 'collapsibleColumns';
 export const PLUGIN_PRIORITY = 290;
@@ -305,12 +306,17 @@ export class CollapsibleColumns extends BasePlugin {
             col: columnIndex
           });
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before'
     });
   }
 

package/plugins/columnSorting/columnSorting.js

@@ -12,6 +12,7 @@ var _base = require("../base");
 var _translations = require("../../translations");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _columnStatesManager = require("./columnStatesManager");
+var _shortcutContexts = require("../../shortcutContexts");
 var _utils = require("./utils");
 var _domHelpers = require("./domHelpers");
 var _rootComparator = require("./rootComparator");
@@ -249,12 +250,17 @@ class ColumnSorting extends _base.BasePlugin {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getColumnNextConfig(highlight.col));
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/columnSorting/columnSorting.mjs

@@ -15,6 +15,7 @@ import { BasePlugin } from "../base/index.mjs";
 import { IndexesSequence, PhysicalIndexToValueMap as IndexToValueMap } from "../../translations/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import { ColumnStatesManager } from "./columnStatesManager.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import { HEADER_SPAN_CLASS, getNextSortOrder, areValidSortStates, getHeaderSpanElement, isFirstLevelColumnHeader, wasHeaderClickedProperly } from "./utils.mjs";
 import { getClassesToRemove, getClassesToAdd } from "./domHelpers.mjs";
 import { rootComparator } from "./rootComparator.mjs";
@@ -245,12 +246,17 @@ export class ColumnSorting extends BasePlugin {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getColumnNextConfig(highlight.col));
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/contextMenu/menu/defaultShortcutsList.js

@@ -9,10 +9,26 @@ exports.createDefaultShortcutsList = createDefaultShortcutsList;
  * @returns {KeyboardShortcut[]}
  */
 function createDefaultShortcutsList(menu) {
+  const {
+    hot,
+    hotMenu
+  } = menu;
   return [{
-    keys: [['Tab'], ['Shift', 'Tab'], ['Control/Meta', 'A']],
-    forwardToContext: menu.hot.getShortcutManager().getContext('grid'),
+    keys: [['Control/Meta', 'A']],
+    forwardToContext: hot.getShortcutManager().getContext('grid'),
     callback: () => menu.close(true)
+  }, {
+    keys: [['Tab'], ['Shift', 'Tab']],
+    callback: (event, keys) => {
+      const settings = hot.getSettings();
+      const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
+      if (keys.includes('shift')) {
+        hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+      } else {
+        hot.selection.transformStart(tabMoves.row, tabMoves.col);
+      }
+      menu.close(true);
+    }
   }, {
     keys: [['Escape']],
     callback: () => menu.close()
@@ -25,7 +41,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowRight']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection) {
         const subMenu = menu.openSubMenu(selection[0]);
         if (subMenu) {
@@ -36,7 +52,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowLeft']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection && menu.isSubMenu()) {
         menu.close();
         if (menu.isSubMenu()) {
@@ -53,11 +69,11 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['Enter'], ['Space']],
     callback: event => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (!selection) {
         return;
       }
-      if (menu.hotMenu.getSourceDataAtRow(selection[0]).submenu) {
+      if (hotMenu.getSourceDataAtRow(selection[0]).submenu) {
         menu.openSubMenu(selection[0]).getNavigator().toFirstItem();
       } else {
         menu.executeCommand(event);
@@ -67,9 +83,9 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageUp']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection) {
-        menu.hotMenu.selection.transformStart(-menu.hotMenu.countVisibleRows(), 0);
+        hotMenu.selection.transformStart(-hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toFirstItem();
       }
@@ -77,9 +93,9 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageDown']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection) {
-        menu.hotMenu.selection.transformStart(menu.hotMenu.countVisibleRows(), 0);
+        hotMenu.selection.transformStart(hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toLastItem();
       }

package/plugins/contextMenu/menu/defaultShortcutsList.mjs

@@ -5,10 +5,26 @@
  * @returns {KeyboardShortcut[]}
  */
 export function createDefaultShortcutsList(menu) {
+  const {
+    hot,
+    hotMenu
+  } = menu;
   return [{
-    keys: [['Tab'], ['Shift', 'Tab'], ['Control/Meta', 'A']],
-    forwardToContext: menu.hot.getShortcutManager().getContext('grid'),
+    keys: [['Control/Meta', 'A']],
+    forwardToContext: hot.getShortcutManager().getContext('grid'),
     callback: () => menu.close(true)
+  }, {
+    keys: [['Tab'], ['Shift', 'Tab']],
+    callback: (event, keys) => {
+      const settings = hot.getSettings();
+      const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
+      if (keys.includes('shift')) {
+        hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+      } else {
+        hot.selection.transformStart(tabMoves.row, tabMoves.col);
+      }
+      menu.close(true);
+    }
   }, {
     keys: [['Escape']],
     callback: () => menu.close()
@@ -21,7 +37,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowRight']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection) {
         const subMenu = menu.openSubMenu(selection[0]);
         if (subMenu) {
@@ -32,7 +48,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['ArrowLeft']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection && menu.isSubMenu()) {
         menu.close();
         if (menu.isSubMenu()) {
@@ -49,11 +65,11 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['Enter'], ['Space']],
     callback: event => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (!selection) {
         return;
       }
-      if (menu.hotMenu.getSourceDataAtRow(selection[0]).submenu) {
+      if (hotMenu.getSourceDataAtRow(selection[0]).submenu) {
         menu.openSubMenu(selection[0]).getNavigator().toFirstItem();
       } else {
         menu.executeCommand(event);
@@ -63,9 +79,9 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageUp']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection) {
-        menu.hotMenu.selection.transformStart(-menu.hotMenu.countVisibleRows(), 0);
+        hotMenu.selection.transformStart(-hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toFirstItem();
       }
@@ -73,9 +89,9 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageDown']],
     callback: () => {
-      const selection = menu.hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedLast();
       if (selection) {
-        menu.hotMenu.selection.transformStart(menu.hotMenu.countVisibleRows(), 0);
+        hotMenu.selection.transformStart(hotMenu.countVisibleRows(), 0);
       } else {
         menu.getNavigator().toLastItem();
       }

package/plugins/mergeCells/mergeCells.js

@@ -1031,8 +1031,10 @@ function _onAfterIsMultipleSelection2(isMultiple) {
   if (isMultiple) {
     const mergedCells = this.mergedCellsCollection.mergedCells;
     const selectionRange = this.hot.getSelectedRangeLast();
+    const topStartCoords = selectionRange.getTopStartCorner();
+    const bottomEndCoords = selectionRange.getBottomEndCorner();
     for (let group = 0; group < mergedCells.length; group += 1) {
-      if (selectionRange.from.row === mergedCells[group].row && selectionRange.from.col === mergedCells[group].col && selectionRange.to.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && selectionRange.to.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
+      if (topStartCoords.row === mergedCells[group].row && topStartCoords.col === mergedCells[group].col && bottomEndCoords.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && bottomEndCoords.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
         return false;
       }
     }

package/plugins/mergeCells/mergeCells.mjs

@@ -1026,8 +1026,10 @@ function _onAfterIsMultipleSelection2(isMultiple) {
   if (isMultiple) {
     const mergedCells = this.mergedCellsCollection.mergedCells;
     const selectionRange = this.hot.getSelectedRangeLast();
+    const topStartCoords = selectionRange.getTopStartCorner();
+    const bottomEndCoords = selectionRange.getBottomEndCorner();
     for (let group = 0; group < mergedCells.length; group += 1) {
-      if (selectionRange.from.row === mergedCells[group].row && selectionRange.from.col === mergedCells[group].col && selectionRange.to.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && selectionRange.to.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
+      if (topStartCoords.row === mergedCells[group].row && topStartCoords.col === mergedCells[group].col && bottomEndCoords.row === mergedCells[group].row + mergedCells[group].rowspan - 1 && bottomEndCoords.col === mergedCells[group].col + mergedCells[group].colspan - 1) {
         return false;
       }
     }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -9,6 +9,7 @@ var _element = require("../../helpers/dom/element");
 var _rootComparator = require("./rootComparator");
 var _utils2 = require("./utils");
 var _domHelpers = require("./domHelpers");
+var _shortcutContexts = require("../../shortcutContexts");
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -130,12 +131,17 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -9,6 +9,7 @@ import { addClass, removeClass } from "../../helpers/dom/element.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
@@ -127,12 +128,17 @@ export class MultiColumnSorting extends ColumnSorting {
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before',
       group: SHORTCUTS_GROUP
     });
   }

package/plugins/nestedHeaders/nestedHeaders.js

@@ -364,6 +364,7 @@ class NestedHeaders extends _base.BasePlugin {
       return _classPrivateMethodGet(_this, _onModifyTransformStart, _onModifyTransformStart2).call(_this, ...args);
     });
     this.addHook('afterSelection', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
+    this.addHook('afterSelectionFocusSet', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
     this.addHook('beforeViewportScrollHorizontally', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];

package/plugins/nestedHeaders/nestedHeaders.mjs

@@ -360,6 +360,7 @@ export class NestedHeaders extends BasePlugin {
       return _classPrivateMethodGet(_this, _onModifyTransformStart, _onModifyTransformStart2).call(_this, ...args);
     });
     this.addHook('afterSelection', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
+    this.addHook('afterSelectionFocusSet', () => _classPrivateMethodGet(this, _updateFocusHighlightPosition, _updateFocusHighlightPosition2).call(this));
     this.addHook('beforeViewportScrollHorizontally', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];

package/plugins/nestedRows/nestedRows.js

@@ -11,6 +11,7 @@ var _contextMenu = _interopRequireDefault(require("./ui/contextMenu"));
 var _console = require("../../helpers/console");
 var _data = require("../../helpers/data");
 var _translations = require("../../translations");
+var _shortcutContexts = require("../../shortcutContexts");
 var _rowMoveController = _interopRequireDefault(require("./utils/rowMoveController"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
@@ -400,13 +401,18 @@ class NestedRows extends _base.BasePlugin {
             this.collapsingUI.collapseChildren(row);
           }
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
         const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before'
     });
   }