handsontable 0.0.0-next-e5dbebc-20240319 → 0.0.0-next-a7270c3-20240320

package/plugins/mergeCells/mergeCells.mjs

@@ -23,7 +23,6 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { applySpanProperties } from "./utils.mjs";
 import { getStyle } from "../../helpers/dom/element.mjs";
 import { isChrome } from "../../helpers/browser.mjs";
-import { FocusOrder } from "./focusOrder.mjs";
 Hooks.getSingleton().register('beforeMergeCells');
 Hooks.getSingleton().register('afterMergeCells');
 Hooks.getSingleton().register('beforeUnmergeCells');
@@ -69,9 +68,7 @@ const SHORTCUTS_GROUP = PLUGIN_KEY;
  * ```
  * :::
  */
-var _lastSelectedFocus = /*#__PURE__*/new WeakMap();
-var _lastFocusDelta = /*#__PURE__*/new WeakMap();
-var _focusOrder = /*#__PURE__*/new WeakMap();
+var _lastDesiredCoords = /*#__PURE__*/new WeakMap();
 var _MergeCells_brand = /*#__PURE__*/new WeakSet();
 export class MergeCells extends BasePlugin {
   constructor() {
@@ -102,32 +99,9 @@ export class MergeCells extends BasePlugin {
      */
     _defineProperty(this, "selectionCalculations", null);
     /**
-     * The holder for the last selected focus coordinates. This allows keeping the correct coordinates in cases after the
-     * focus is moved out of the merged cell.
-     *
      * @type {CellCoords}
      */
-    _classPrivateFieldInitSpec(this, _lastSelectedFocus, null);
-    /**
-     * The last used transformation delta.
-     *
-     * @type {{ row: number, col: number }}
-     */
-    _classPrivateFieldInitSpec(this, _lastFocusDelta, {
-      row: 0,
-      col: 0
-    });
-    /**
-     * The module responsible for providing the correct focus order (vertical and horizontal) within a selection that
-     * contains merged cells.
-     *
-     * @type {FocusOrder}
-     */
-    _classPrivateFieldInitSpec(this, _focusOrder, new FocusOrder({
-      mergedCellsGetter: (row, column) => this.mergedCellsCollection.get(row, column),
-      rowIndexMapper: this.hot.rowIndexMapper,
-      columnIndexMapper: this.hot.columnIndexMapper
-    }));
+    _classPrivateFieldInitSpec(this, _lastDesiredCoords, null);
   }
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -162,17 +136,17 @@ export class MergeCells extends BasePlugin {
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterInit).call(_this, ...args);
     });
-    this.addHook('modifyTransformFocus', function () {
+    this.addHook('modifyTransformStart', function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      return _assertClassBrand(_MergeCells_brand, _this, _onModifyTransformFocus).call(_this, ...args);
+      return _assertClassBrand(_MergeCells_brand, _this, _onModifyTransformStart).call(_this, ...args);
     });
-    this.addHook('modifyTransformStart', function () {
+    this.addHook('afterModifyTransformStart', function () {
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
         args[_key3] = arguments[_key3];
       }
-      return _assertClassBrand(_MergeCells_brand, _this, _onModifyTransformStart).call(_this, ...args);
+      return _assertClassBrand(_MergeCells_brand, _this, _onAfterModifyTransformStart).call(_this, ...args);
     });
     this.addHook('modifyTransformEnd', function () {
       for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
@@ -180,11 +154,11 @@ export class MergeCells extends BasePlugin {
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onModifyTransformEnd).call(_this, ...args);
     });
-    this.addHook('beforeSelectionHighlightSet', function () {
+    this.addHook('modifyGetCellCoords', function () {
       for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
         args[_key5] = arguments[_key5];
       }
-      return _assertClassBrand(_MergeCells_brand, _this, _onBeforeSelectionHighlightSet).call(_this, ...args);
+      return _assertClassBrand(_MergeCells_brand, _this, _onModifyGetCellCoords).call(_this, ...args);
     });
     this.addHook('beforeSetRangeStart', function () {
       for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
@@ -198,123 +172,105 @@ export class MergeCells extends BasePlugin {
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onBeforeSetRangeStart).call(_this, ...args);
     });
-    this.addHook('beforeSelectionFocusSet', function () {
+    this.addHook('beforeSetRangeEnd', function () {
       for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
         args[_key8] = arguments[_key8];
       }
-      return _assertClassBrand(_MergeCells_brand, _this, _onBeforeSelectionFocusSet).call(_this, ...args);
+      return _assertClassBrand(_MergeCells_brand, _this, _onBeforeSetRangeEnd).call(_this, ...args);
     });
-    this.addHook('afterSelectionFocusSet', function () {
+    this.addHook('afterIsMultipleSelection', function () {
       for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
         args[_key9] = arguments[_key9];
       }
-      return _assertClassBrand(_MergeCells_brand, _this, _onAfterSelectionFocusSet).call(_this, ...args);
-    });
-    this.addHook('afterSelectionEnd', function () {
-      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
-        args[_key10] = arguments[_key10];
-      }
-      return _assertClassBrand(_MergeCells_brand, _this, _onAfterSelectionEnd).call(_this, ...args);
-    });
-    this.addHook('modifyGetCellCoords', function () {
-      for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
-        args[_key11] = arguments[_key11];
-      }
-      return _assertClassBrand(_MergeCells_brand, _this, _onModifyGetCellCoords).call(_this, ...args);
-    });
-    this.addHook('afterIsMultipleSelection', function () {
-      for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
-        args[_key12] = arguments[_key12];
-      }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterIsMultipleSelection).call(_this, ...args);
     });
     this.addHook('afterRenderer', function () {
-      for (var _len13 = arguments.length, args = new Array(_len13), _key13 = 0; _key13 < _len13; _key13++) {
-        args[_key13] = arguments[_key13];
+      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
+        args[_key10] = arguments[_key10];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterRenderer).call(_this, ...args);
     });
     this.addHook('afterContextMenuDefaultOptions', function () {
-      for (var _len14 = arguments.length, args = new Array(_len14), _key14 = 0; _key14 < _len14; _key14++) {
-        args[_key14] = arguments[_key14];
+      for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
+        args[_key11] = arguments[_key11];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _addMergeActionsToContextMenu).call(_this, ...args);
     });
     this.addHook('afterGetCellMeta', function () {
-      for (var _len15 = arguments.length, args = new Array(_len15), _key15 = 0; _key15 < _len15; _key15++) {
-        args[_key15] = arguments[_key15];
+      for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
+        args[_key12] = arguments[_key12];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterGetCellMeta).call(_this, ...args);
     });
     this.addHook('afterViewportRowCalculatorOverride', function () {
-      for (var _len16 = arguments.length, args = new Array(_len16), _key16 = 0; _key16 < _len16; _key16++) {
-        args[_key16] = arguments[_key16];
+      for (var _len13 = arguments.length, args = new Array(_len13), _key13 = 0; _key13 < _len13; _key13++) {
+        args[_key13] = arguments[_key13];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterViewportRowCalculatorOverride).call(_this, ...args);
     });
     this.addHook('afterViewportColumnCalculatorOverride', function () {
-      for (var _len17 = arguments.length, args = new Array(_len17), _key17 = 0; _key17 < _len17; _key17++) {
-        args[_key17] = arguments[_key17];
+      for (var _len14 = arguments.length, args = new Array(_len14), _key14 = 0; _key14 < _len14; _key14++) {
+        args[_key14] = arguments[_key14];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterViewportColumnCalculatorOverride).call(_this, ...args);
     });
     this.addHook('modifyAutofillRange', function () {
-      for (var _len18 = arguments.length, args = new Array(_len18), _key18 = 0; _key18 < _len18; _key18++) {
-        args[_key18] = arguments[_key18];
+      for (var _len15 = arguments.length, args = new Array(_len15), _key15 = 0; _key15 < _len15; _key15++) {
+        args[_key15] = arguments[_key15];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onModifyAutofillRange).call(_this, ...args);
     });
     this.addHook('afterCreateCol', function () {
-      for (var _len19 = arguments.length, args = new Array(_len19), _key19 = 0; _key19 < _len19; _key19++) {
-        args[_key19] = arguments[_key19];
+      for (var _len16 = arguments.length, args = new Array(_len16), _key16 = 0; _key16 < _len16; _key16++) {
+        args[_key16] = arguments[_key16];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterCreateCol).call(_this, ...args);
     });
     this.addHook('afterRemoveCol', function () {
-      for (var _len20 = arguments.length, args = new Array(_len20), _key20 = 0; _key20 < _len20; _key20++) {
-        args[_key20] = arguments[_key20];
+      for (var _len17 = arguments.length, args = new Array(_len17), _key17 = 0; _key17 < _len17; _key17++) {
+        args[_key17] = arguments[_key17];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterRemoveCol).call(_this, ...args);
     });
     this.addHook('afterCreateRow', function () {
-      for (var _len21 = arguments.length, args = new Array(_len21), _key21 = 0; _key21 < _len21; _key21++) {
-        args[_key21] = arguments[_key21];
+      for (var _len18 = arguments.length, args = new Array(_len18), _key18 = 0; _key18 < _len18; _key18++) {
+        args[_key18] = arguments[_key18];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterCreateRow).call(_this, ...args);
     });
     this.addHook('afterRemoveRow', function () {
-      for (var _len22 = arguments.length, args = new Array(_len22), _key22 = 0; _key22 < _len22; _key22++) {
-        args[_key22] = arguments[_key22];
+      for (var _len19 = arguments.length, args = new Array(_len19), _key19 = 0; _key19 < _len19; _key19++) {
+        args[_key19] = arguments[_key19];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterRemoveRow).call(_this, ...args);
     });
     this.addHook('afterChange', function () {
-      for (var _len23 = arguments.length, args = new Array(_len23), _key23 = 0; _key23 < _len23; _key23++) {
-        args[_key23] = arguments[_key23];
+      for (var _len20 = arguments.length, args = new Array(_len20), _key20 = 0; _key20 < _len20; _key20++) {
+        args[_key20] = arguments[_key20];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterChange).call(_this, ...args);
     });
     this.addHook('beforeDrawBorders', function () {
-      for (var _len24 = arguments.length, args = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
-        args[_key24] = arguments[_key24];
+      for (var _len21 = arguments.length, args = new Array(_len21), _key21 = 0; _key21 < _len21; _key21++) {
+        args[_key21] = arguments[_key21];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onBeforeDrawAreaBorders).call(_this, ...args);
     });
     this.addHook('afterDrawSelection', function () {
-      for (var _len25 = arguments.length, args = new Array(_len25), _key25 = 0; _key25 < _len25; _key25++) {
-        args[_key25] = arguments[_key25];
+      for (var _len22 = arguments.length, args = new Array(_len22), _key22 = 0; _key22 < _len22; _key22++) {
+        args[_key22] = arguments[_key22];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onAfterDrawSelection).call(_this, ...args);
     });
     this.addHook('beforeRemoveCellClassNames', function () {
-      for (var _len26 = arguments.length, args = new Array(_len26), _key26 = 0; _key26 < _len26; _key26++) {
-        args[_key26] = arguments[_key26];
+      for (var _len23 = arguments.length, args = new Array(_len23), _key23 = 0; _key23 < _len23; _key23++) {
+        args[_key23] = arguments[_key23];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onBeforeRemoveCellClassNames).call(_this, ...args);
     });
     this.addHook('beforeBeginEditing', function () {
-      for (var _len27 = arguments.length, args = new Array(_len27), _key27 = 0; _key27 < _len27; _key27++) {
-        args[_key27] = arguments[_key27];
+      for (var _len24 = arguments.length, args = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
+        args[_key24] = arguments[_key24];
       }
       return _assertClassBrand(_MergeCells_brand, _this, _onBeforeBeginEditing).call(_this, ...args);
     });
@@ -460,7 +416,9 @@ export class MergeCells extends BasePlugin {
       if (populatedNulls.length === 0) {
         return;
       }
-      this.hot.setDataAtCell(populatedNulls);
+
+      // TODO: Change the `source` argument to a more meaningful value, e.g. `${this.pluginName}.clearCells`.
+      this.hot.setDataAtCell(populatedNulls, undefined, undefined, this.pluginName);
     }
   }
 
@@ -484,6 +442,25 @@ export class MergeCells extends BasePlugin {
     return auto ? true : this.validateSetting(newMergedCellInfo);
   }
 
+  /**
+   * Merge or unmerge, based on last selected range.
+   *
+   * @private
+   */
+  toggleMergeOnSelection() {
+    const currentRange = this.hot.getSelectedRangeLast();
+    if (!currentRange) {
+      return;
+    }
+    currentRange.setDirection(this.hot.isRtl() ? 'NE-SW' : 'NW-SE');
+    const {
+      from,
+      to
+    } = currentRange;
+    this.toggleMerge(currentRange);
+    this.hot.selectCell(from.row, from.col, to.row, to.col, false);
+  }
+
   /**
    * Merges the selection provided as a cell range.
    *
@@ -572,6 +549,7 @@ export class MergeCells extends BasePlugin {
       if (preventPopulation) {
         populationInfo = [mergeParent.row, mergeParent.col, clearedData];
       } else {
+        // TODO: Change the `source` argument to a more meaningful value, e.g. `${this.pluginName}.clearCells`.
         this.hot.populateFromArray(mergeParent.row, mergeParent.col, clearedData, undefined, undefined, this.pluginName);
       }
       if (!auto) {
@@ -877,191 +855,94 @@ function _onAfterIsMultipleSelection(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 (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) {
+      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) {
         return false;
       }
     }
   }
   return isMultiple;
 }
-/**
- * `modifyTransformFocus` hook callback.
- *
- * @param {object} delta The transformation delta.
- */
-function _onModifyTransformFocus(delta) {
-  _classPrivateFieldGet(_lastFocusDelta, this).row = delta.row;
-  _classPrivateFieldGet(_lastFocusDelta, this).col = delta.col;
-}
 /**
  * `modifyTransformStart` hook callback.
  *
  * @param {object} delta The transformation delta.
  */
 function _onModifyTransformStart(delta) {
-  const selectedRange = this.hot.getSelectedRangeLast();
-  const {
-    highlight
-  } = selectedRange;
-  const {
-    columnIndexMapper,
-    rowIndexMapper
-  } = this.hot;
-  if (_classPrivateFieldGet(_lastSelectedFocus, this)) {
-    if (rowIndexMapper.getRenderableFromVisualIndex(_classPrivateFieldGet(_lastSelectedFocus, this).row) !== null) {
-      highlight.row = _classPrivateFieldGet(_lastSelectedFocus, this).row;
+  const currentlySelectedRange = this.hot.getSelectedRangeLast();
+  let newDelta = {
+    row: delta.row,
+    col: delta.col
+  };
+  let nextPosition = null;
+  const currentPosition = this.hot._createCellCoords(currentlySelectedRange.highlight.row, currentlySelectedRange.highlight.col);
+  const mergedParent = this.mergedCellsCollection.get(currentPosition.row, currentPosition.col);
+  if (!_classPrivateFieldGet(_lastDesiredCoords, this)) {
+    _classPrivateFieldSet(_lastDesiredCoords, this, this.hot._createCellCoords(null, null));
+  }
+  if (mergedParent) {
+    // only merge selected
+    const mergeTopLeft = this.hot._createCellCoords(mergedParent.row, mergedParent.col);
+    const mergeBottomRight = this.hot._createCellCoords(mergedParent.row + mergedParent.rowspan - 1, mergedParent.col + mergedParent.colspan - 1);
+    const mergeRange = this.hot._createCellRange(mergeTopLeft, mergeTopLeft, mergeBottomRight);
+    if (!mergeRange.includes(_classPrivateFieldGet(_lastDesiredCoords, this))) {
+      _classPrivateFieldSet(_lastDesiredCoords, this, this.hot._createCellCoords(null, null)); // reset outdated version of lastDesiredCoords
     }
-    if (columnIndexMapper.getRenderableFromVisualIndex(_classPrivateFieldGet(_lastSelectedFocus, this).col) !== null) {
-      highlight.col = _classPrivateFieldGet(_lastSelectedFocus, this).col;
+    newDelta.row = _classPrivateFieldGet(_lastDesiredCoords, this).row ? _classPrivateFieldGet(_lastDesiredCoords, this).row - currentPosition.row : newDelta.row;
+    newDelta.col = _classPrivateFieldGet(_lastDesiredCoords, this).col ? _classPrivateFieldGet(_lastDesiredCoords, this).col - currentPosition.col : newDelta.col;
+    if (delta.row > 0) {
+      // moving down
+      newDelta.row = mergedParent.row + mergedParent.rowspan - 1 - currentPosition.row + delta.row;
+    } else if (delta.row < 0) {
+      // moving up
+      newDelta.row = currentPosition.row - mergedParent.row + delta.row;
+    }
+    if (delta.col > 0) {
+      // moving right
+      newDelta.col = mergedParent.col + mergedParent.colspan - 1 - currentPosition.col + delta.col;
+    } else if (delta.col < 0) {
+      // moving left
+      newDelta.col = currentPosition.col - mergedParent.col + delta.col;
     }
-    _classPrivateFieldSet(_lastSelectedFocus, this, null);
   }
-  const mergedParent = this.mergedCellsCollection.get(highlight.row, highlight.col);
-  if (!mergedParent) {
-    return;
+  nextPosition = this.hot._createCellCoords(currentlySelectedRange.highlight.row + newDelta.row, currentlySelectedRange.highlight.col + newDelta.col);
+  const nextPositionMergedCell = this.mergedCellsCollection.get(nextPosition.row, nextPosition.col);
+  if (nextPositionMergedCell) {
+    // skipping the invisible cells in the merge range
+    const firstRenderableCoords = this.mergedCellsCollection.getFirstRenderableCoords(nextPositionMergedCell.row, nextPositionMergedCell.col);
+    _classPrivateFieldSet(_lastDesiredCoords, this, nextPosition);
+    newDelta = {
+      row: firstRenderableCoords.row - currentPosition.row,
+      col: firstRenderableCoords.col - currentPosition.col
+    };
   }
-  const visualColumnIndexStart = mergedParent.col;
-  const visualColumnIndexEnd = mergedParent.col + mergedParent.colspan - 1;
-  if (delta.col < 0) {
-    const nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexStart - 1 : visualColumnIndexEnd;
-    const notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(nextColumn, -1);
-    if (notHiddenColumnIndex === null) {
-      // There are no visible columns anymore, so move the selection out of the table edge. This will
-      // be processed by the selection Transformer class as a move selection to the previous row (if autoWrapRow is enabled).
-      delta.col = -this.hot.view.countRenderableColumnsInRange(0, highlight.col);
-    } else {
-      delta.col = -Math.max(this.hot.view.countRenderableColumnsInRange(notHiddenColumnIndex, highlight.col) - 1, 1);
-    }
-  } else if (delta.col > 0) {
-    const nextColumn = highlight.col >= visualColumnIndexStart && highlight.col <= visualColumnIndexEnd ? visualColumnIndexEnd + 1 : visualColumnIndexStart;
-    const notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(nextColumn, 1);
-    if (notHiddenColumnIndex === null) {
-      // There are no visible columns anymore, so move the selection out of the table edge. This will
-      // be processed by the selection Transformer class as a move selection to the next row (if autoWrapRow is enabled).
-      delta.col = this.hot.view.countRenderableColumnsInRange(highlight.col, this.hot.countCols());
-    } else {
-      delta.col = Math.max(this.hot.view.countRenderableColumnsInRange(highlight.col, notHiddenColumnIndex) - 1, 1);
-    }
+  if (newDelta.row !== 0) {
+    delta.row = newDelta.row;
   }
-  const visualRowIndexStart = mergedParent.row;
-  const visualRowIndexEnd = mergedParent.row + mergedParent.rowspan - 1;
-  if (delta.row < 0) {
-    const nextRow = highlight.row >= visualRowIndexStart && highlight.row <= visualRowIndexEnd ? visualRowIndexStart - 1 : visualRowIndexEnd;
-    const notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(nextRow, -1);
-    if (notHiddenRowIndex === null) {
-      // There are no visible rows anymore, so move the selection out of the table edge. This will
-      // be processed by the selection Transformer class as a move selection to the previous column (if autoWrapCol is enabled).
-      delta.row = -this.hot.view.countRenderableRowsInRange(0, highlight.row);
-    } else {
-      delta.row = -Math.max(this.hot.view.countRenderableRowsInRange(notHiddenRowIndex, highlight.row) - 1, 1);
-    }
-  } else if (delta.row > 0) {
-    const nextRow = highlight.row >= visualRowIndexStart && highlight.row <= visualRowIndexEnd ? visualRowIndexEnd + 1 : visualRowIndexStart;
-    const notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(nextRow, 1);
-    if (notHiddenRowIndex === null) {
-      // There are no visible rows anymore, so move the selection out of the table edge. This will
-      // be processed by the selection Transformer class as a move selection to the next column (if autoWrapCol is enabled).
-      delta.row = this.hot.view.countRenderableRowsInRange(highlight.row, this.hot.countRows());
-    } else {
-      delta.row = Math.max(this.hot.view.countRenderableRowsInRange(highlight.row, notHiddenRowIndex) - 1, 1);
-    }
+  if (newDelta.col !== 0) {
+    delta.col = newDelta.col;
   }
 }
 /**
- * The hook allows to modify the delta transformation object necessary for correct selection end transformations.
- * The logic here handles "jumping over" merged merged cells, while selecting.
+ * `modifyTransformEnd` hook callback. Needed to handle "jumping over" merged merged cells, while selecting.
  *
- * @param {{ row: number, col: number }} delta The transformation delta.
+ * @param {object} delta The transformation delta.
  */
 function _onModifyTransformEnd(delta) {
-  const selectedRange = this.hot.getSelectedRangeLast();
-  const cloneRange = selectedRange.clone();
-  const {
-    to
-  } = selectedRange;
-  const {
-    columnIndexMapper,
-    rowIndexMapper
-  } = this.hot;
-  const expandCloneRange = (row, col) => {
-    cloneRange.expand(this.hot._createCellCoords(row, col));
-    for (let i = 0; i < this.mergedCellsCollection.mergedCells.length; i += 1) {
-      cloneRange.expandByRange(this.mergedCellsCollection.mergedCells[i].getRange());
-    }
-  };
-  if (delta.col < 0) {
-    let nextColumn = this.mergedCellsCollection.getStartMostColumnIndex(selectedRange, to.col) + delta.col;
-    expandCloneRange(to.row, nextColumn);
-    if (selectedRange.getHorizontalDirection() === 'E-W' && cloneRange.getHorizontalDirection() === 'E-W') {
-      nextColumn = cloneRange.getTopStartCorner().col;
-    }
-    const notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(nextColumn, 1);
-    if (notHiddenColumnIndex !== null) {
-      delta.col = -Math.max(this.hot.view.countRenderableColumnsInRange(notHiddenColumnIndex, to.col) - 1, 1);
-    }
-  } else if (delta.col > 0) {
-    let nextColumn = this.mergedCellsCollection.getEndMostColumnIndex(selectedRange, to.col) + delta.col;
-    expandCloneRange(to.row, nextColumn);
-    if (selectedRange.getHorizontalDirection() === 'W-E' && cloneRange.getHorizontalDirection() === 'W-E') {
-      nextColumn = cloneRange.getBottomEndCorner().col;
-    }
-    const notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(nextColumn, -1);
-    if (notHiddenColumnIndex !== null) {
-      delta.col = Math.max(this.hot.view.countRenderableColumnsInRange(to.col, notHiddenColumnIndex) - 1, 1);
-    }
-  }
-  if (delta.row < 0) {
-    let nextRow = this.mergedCellsCollection.getTopMostRowIndex(selectedRange, to.row) + delta.row;
-    expandCloneRange(nextRow, to.col);
-    if (selectedRange.getVerticalDirection() === 'S-N' && cloneRange.getVerticalDirection() === 'S-N') {
-      nextRow = cloneRange.getTopStartCorner().row;
-    }
-    const notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(nextRow, 1);
-    if (notHiddenRowIndex !== null) {
-      delta.row = -Math.max(this.hot.view.countRenderableRowsInRange(notHiddenRowIndex, to.row) - 1, 1);
-    }
-  } else if (delta.row > 0) {
-    let nextRow = this.mergedCellsCollection.getBottomMostRowIndex(selectedRange, to.row) + delta.row;
-    expandCloneRange(nextRow, to.col);
-    if (selectedRange.getVerticalDirection() === 'N-S' && cloneRange.getVerticalDirection() === 'N-S') {
-      nextRow = cloneRange.getBottomStartCorner().row;
-    }
-    const notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(nextRow, -1);
-    if (notHiddenRowIndex !== null) {
-      delta.row = Math.max(this.hot.view.countRenderableRowsInRange(to.row, notHiddenRowIndex) - 1, 1);
-    }
-  }
-}
-/**
- * The hook corrects the range (before drawing it) after the selection was made on the merged cells.
- * It expands the range to cover the entire area of the selected merged cells.
- */
-function _onBeforeSelectionHighlightSet() {
-  const selectedRange = this.hot.getSelectedRangeLast();
-  const {
-    highlight
-  } = selectedRange;
-  if (this.hot.selection.isSelectedByColumnHeader() || this.hot.selection.isSelectedByRowHeader()) {
-    _classPrivateFieldSet(_lastSelectedFocus, this, highlight.clone());
-    return;
-  }
-  for (let i = 0; i < this.mergedCellsCollection.mergedCells.length; i += 1) {
-    selectedRange.expandByRange(this.mergedCellsCollection.mergedCells[i].getRange(), false);
-  }
-  // TODO: This is a workaround for an issue with the selection not being extended properly.
-  // In some cases when the merge cells are defined in random order the selection is not
-  // extended in that way that it covers all overlapped merge cells.
-  for (let i = 0; i < this.mergedCellsCollection.mergedCells.length; i += 1) {
-    selectedRange.expandByRange(this.mergedCellsCollection.mergedCells[i].getRange(), false);
-  }
-  const mergedParent = this.mergedCellsCollection.get(highlight.row, highlight.col);
-  _classPrivateFieldSet(_lastSelectedFocus, this, highlight.clone());
-  if (mergedParent) {
-    highlight.assign(mergedParent);
-  }
+  const currentSelectionRange = this.hot.getSelectedRangeLast();
+  const newDelta = clone(delta);
+  const newSelectionRange = this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, delta);
+  let tempDelta = clone(newDelta);
+  const mergedCellsWithinRange = this.mergedCellsCollection.getWithinRange(newSelectionRange, true);
+  do {
+    tempDelta = clone(newDelta);
+    this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, newDelta);
+    arrayEach(mergedCellsWithinRange, mergedCell => {
+      this.selectionCalculations.snapDelta(newDelta, currentSelectionRange, mergedCell);
+    });
+  } while (newDelta.row !== tempDelta.row || newDelta.col !== tempDelta.col);
+  delta.row = newDelta.row;
+  delta.col = newDelta.col;
 }
 /**
  * `modifyGetCellCoords` hook callback. Swaps the `getCell` coords with the merged parent coords.
@@ -1140,104 +1021,51 @@ function _onAfterRenderer(TD, row, col) {
   applySpanProperties(TD, mergedCellCopy, row, col);
 }
 /**
- * Clears the last selected coordinates before setting a new selection range.
- */
-function _onBeforeSetRangeStart() {
-  _classPrivateFieldSet(_lastSelectedFocus, this, null);
-}
-/**
- * Detects if the last selected cell was a header cell if so update the order list active node for further
- * computations.
- */
-function _onBeforeSelectionFocusSet() {
-  if (_classPrivateFieldGet(_lastSelectedFocus, this).isCell()) {
-    return;
-  }
-  const selectedRange = this.hot.getSelectedRangeLast();
-  const verticalDir = selectedRange.getVerticalDirection();
-  const horizontalDir = selectedRange.getHorizontalDirection();
-  const focusCoords = _classPrivateFieldGet(_lastSelectedFocus, this).clone().normalize();
-  _classPrivateFieldGet(_focusOrder, this).setActiveNode(focusCoords.row, focusCoords.col);
-  if (_classPrivateFieldGet(_lastFocusDelta, this).row > 0 || _classPrivateFieldGet(_lastFocusDelta, this).col > 0) {
-    _classPrivateFieldGet(_focusOrder, this).setPrevNodeAsActive();
-  } else if (horizontalDir === 'E-W' && _classPrivateFieldGet(_lastFocusDelta, this).col < 0 || verticalDir === 'S-N' && _classPrivateFieldGet(_lastFocusDelta, this).row < 0) {
-    _classPrivateFieldGet(_focusOrder, this).setNextNodeAsActive();
-  }
-}
-/**
- * Changes the focus selection to the next or previous cell or merged cell position.
+ * `beforeSetRangeStart` and `beforeSetRangeStartOnly` hook callback.
+ * A selection within merge area should be rewritten to the start of merge area.
  *
- * @param {number} row The visual row index.
- * @param {number} column The visual column index.
+ * @param {object} coords Cell coords.
  */
-function _onAfterSelectionFocusSet(row, column) {
-  const selectedRange = this.hot.getSelectedRangeLast();
-  const {
-    columnIndexMapper,
-    rowIndexMapper
-  } = this.hot;
-  let notHiddenRowIndex = null;
-  let notHiddenColumnIndex = null;
-  if (_classPrivateFieldGet(_lastFocusDelta, this).col < 0) {
-    const {
-      rowEnd,
-      colEnd
-    } = _classPrivateFieldGet(_focusOrder, this).getPrevHorizontalNode();
-    notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colEnd, -1);
-    notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowEnd, -1);
-  } else if (_classPrivateFieldGet(_lastFocusDelta, this).col > 0) {
-    const {
-      rowStart,
-      colStart
-    } = _classPrivateFieldGet(_focusOrder, this).getNextHorizontalNode();
-    notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colStart, 1);
-    notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowStart, 1);
-  } else if (_classPrivateFieldGet(_lastFocusDelta, this).row < 0) {
-    const {
-      rowEnd,
-      colEnd
-    } = _classPrivateFieldGet(_focusOrder, this).getPrevVerticalNode();
-    notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colEnd, -1);
-    notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowEnd, -1);
-  } else if (_classPrivateFieldGet(_lastFocusDelta, this).row > 0) {
-    const {
-      rowStart,
-      colStart
-    } = _classPrivateFieldGet(_focusOrder, this).getNextVerticalNode();
-    notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colStart, 1);
-    notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowStart, 1);
-  }
-  if (notHiddenRowIndex !== null || notHiddenColumnIndex !== null) {
-    const coords = this.hot._createCellCoords(notHiddenRowIndex, notHiddenColumnIndex);
+function _onBeforeSetRangeStart(coords) {
+  // TODO: It is a workaround, but probably this hook may be needed. Every selection on the merge area
+  // could set start point of the selection to the start of the merge area. However, logic inside `expandByRange` need
+  // an initial start point. Click on the merge cell when there are some hidden indexes break the logic in some cases.
+  // Please take a look at #7010 for more information. I'm not sure if selection directions are calculated properly
+  // and what was idea for flipping direction inside `expandByRange` method.
+  if (this.mergedCellsCollection.isFirstRenderableMergedCell(coords.row, coords.col)) {
     const mergeParent = this.mergedCellsCollection.get(coords.row, coords.col);
-    const focusHighlight = this.hot.selection.highlight.getFocus();
-    row = coords.row;
-    column = coords.col;
-    if (mergeParent) {
-      selectedRange.highlight.assign({
-        row: this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1),
-        col: this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1)
-      });
-    } else {
-      selectedRange.highlight.assign(coords);
-    }
-    focusHighlight.clear();
-    focusHighlight.add(coords).commit();
+    [coords.row, coords.col] = [mergeParent.row, mergeParent.col];
   }
-  _classPrivateFieldGet(_focusOrder, this).setActiveNode(row, column);
-  _classPrivateFieldSet(_lastFocusDelta, this, {
-    row: 0,
-    col: 0
-  });
 }
 /**
- * Creates the horizontal and vertical cells order matrix (linked lists) for focused cell.
+ * `beforeSetRangeEnd` hook callback.
+ * While selecting cells with keyboard or mouse, make sure that rectangular area is expanded to the extent of the
+ * merged cell.
+ *
+ * Note: Please keep in mind that callback may modify both start and end range coordinates by the reference.
+ *
+ * @param {object} coords Cell coords.
  */
-function _onAfterSelectionEnd() {
-  const selection = this.hot.getSelectedRangeLast();
-  if (!selection.isHeader()) {
-    _classPrivateFieldGet(_focusOrder, this).buildFocusOrder(this.hot.getSelectedRangeLast());
+function _onBeforeSetRangeEnd(coords) {
+  const selRange = this.hot.getSelectedRangeLast();
+  selRange.highlight = this.hot._createCellCoords(selRange.highlight.row, selRange.highlight.col); // clone in case we will modify its reference
+  selRange.to = coords;
+  let rangeExpanded = false;
+  if (this.hot.selection.isSelectedByColumnHeader() || this.hot.selection.isSelectedByRowHeader()) {
+    return;
   }
+  do {
+    rangeExpanded = false;
+    for (let i = 0; i < this.mergedCellsCollection.mergedCells.length; i += 1) {
+      const cellInfo = this.mergedCellsCollection.mergedCells[i];
+      const mergedCellRange = cellInfo.getRange();
+      if (selRange.expandByRange(mergedCellRange)) {
+        coords.row = selRange.to.row;
+        coords.col = selRange.to.col;
+        rangeExpanded = true;
+      }
+    }
+  } while (rangeExpanded);
 }
 /**
  * The `afterGetCellMeta` hook callback.
@@ -1366,6 +1194,37 @@ function _onBeforeDrawAreaBorders(corners, className) {
     });
   }
 }
+/**
+ * `afterModifyTransformStart` hook callback. Fixes a problem with navigating through merged cells at the edges of
+ * the table with the <kbd>**Enter**</kbd>/<kbd>**Shift**</kbd>+<kbd>**Enter**</kbd>/<kbd>**Tab**</kbd>/<kbd>**Shift**</kbd>+<kbd>**Tab**</kbd> keys.
+ *
+ * @param {CellCoords} coords Coordinates of the to-be-selected cell.
+ * @param {number} rowTransformDir Row transformation direction (negative value = up, 0 = none, positive value =
+ *   down).
+ * @param {number} colTransformDir Column transformation direction (negative value = up, 0 = none, positive value =
+ *   down).
+ */
+function _onAfterModifyTransformStart(coords, rowTransformDir, colTransformDir) {
+  if (!this.enabled) {
+    return;
+  }
+  const mergedCellAtCoords = this.mergedCellsCollection.get(coords.row, coords.col);
+  if (!mergedCellAtCoords) {
+    return;
+  }
+  const goingDown = rowTransformDir > 0;
+  const goingUp = rowTransformDir < 0;
+  const goingLeft = colTransformDir < 0;
+  const goingRight = colTransformDir > 0;
+  const mergedCellOnBottomEdge = mergedCellAtCoords.row + mergedCellAtCoords.rowspan - 1 === this.hot.countRows() - 1;
+  const mergedCellOnTopEdge = mergedCellAtCoords.row === 0;
+  const mergedCellOnRightEdge = mergedCellAtCoords.col + mergedCellAtCoords.colspan - 1 === this.hot.countCols() - 1;
+  const mergedCellOnLeftEdge = mergedCellAtCoords.col === 0;
+  if (goingDown && mergedCellOnBottomEdge || goingUp && mergedCellOnTopEdge || goingRight && mergedCellOnRightEdge || goingLeft && mergedCellOnLeftEdge) {
+    coords.row = mergedCellAtCoords.row;
+    coords.col = mergedCellAtCoords.col;
+  }
+}
 /**
  * `afterDrawSelection` hook callback. Used to add the additional class name for the entirely-selected merged cells.
  *