handsontable 16.0.1 → 16.1.0-next-abd8f2e-20250904

package/plugins/mergeCells/focusOrder.mjs

@@ -1,5 +1,7 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
@@ -31,11 +33,13 @@ export class FocusOrder {
     /**
      * Pushes a new node to the provided list order.
      *
-     * @param {CellRange} selectedRange The selected range to build the focus order for.
-     * @param {LinkedList} listOrder The list order to push the node to.
-     * @param {WeakSet} mergeCellsVisitor The set of visited cells.
-     * @param {number} row The visual row index.
-     * @param {number} column The visual column index.
+     * @param {object} options The options object.
+     * @param {CellRange} options.selectedRange The selected range to build the focus order for.
+     * @param {number} options.selectionLayer The selection layer index.
+     * @param {LinkedList} options.listOrder The list order to push the node to.
+     * @param {WeakSet} options.mergeCellsVisitor The set of visited cells.
+     * @param {number} options.row The visual row index.
+     * @param {number} options.column The visual column index.
      * @returns {NodeStructure | null}
      */
     _classPrivateMethodInitSpec(this, _FocusOrder_brand);
@@ -179,53 +183,73 @@ export class FocusOrder {
   /**
    * Rebuilds the focus order list based on the provided selection.
    *
-   * @param {CellRange} selectedRange The selected range to build the focus order for.
+   * @param {CellRange[]} selectedRanges The selected ranges to build the focus order for.
    */
-  buildFocusOrder(selectedRange) {
-    const topStart = selectedRange.getTopStartCorner();
-    const bottomEnd = selectedRange.getBottomEndCorner();
-    const visitedHorizontalCells = new WeakSet();
+  buildFocusOrder(selectedRanges) {
     _classPrivateFieldSet(_cellsHorizontalOrder, this, new LinkedList());
-    for (let r = topStart.row; r <= bottomEnd.row; r++) {
-      if (_classPrivateFieldGet(_rowIndexMapper, this).isHidden(r)) {
-        // eslint-disable-next-line no-continue
-        continue;
-      }
-      for (let c = topStart.col; c <= bottomEnd.col; c++) {
-        if (_classPrivateFieldGet(_columnIndexMapper, this).isHidden(c)) {
+    selectedRanges.forEach((range, selectionLayer) => {
+      const visitedHorizontalCells = new WeakSet();
+      const topStart = range.getTopStartCorner();
+      const bottomEnd = range.getBottomEndCorner();
+      for (let r = topStart.row; r <= bottomEnd.row; r++) {
+        if (_classPrivateFieldGet(_rowIndexMapper, this).isHidden(r)) {
           // eslint-disable-next-line no-continue
           continue;
         }
-        const node = _assertClassBrand(_FocusOrder_brand, this, _pushOrderNode).call(this, selectedRange, _classPrivateFieldGet(_cellsHorizontalOrder, this), visitedHorizontalCells, r, c);
-        if (node) {
-          _classPrivateFieldSet(_currentHorizontalLinkedNode, this, node);
+        for (let c = topStart.col; c <= bottomEnd.col; c++) {
+          if (_classPrivateFieldGet(_columnIndexMapper, this).isHidden(c)) {
+            // eslint-disable-next-line no-continue
+            continue;
+          }
+          const node = _assertClassBrand(_FocusOrder_brand, this, _pushOrderNode).call(this, {
+            selectedRange: range,
+            selectionLayer,
+            listOrder: _classPrivateFieldGet(_cellsHorizontalOrder, this),
+            mergeCellsVisitor: visitedHorizontalCells,
+            row: r,
+            column: c
+          });
+          if (node) {
+            _classPrivateFieldSet(_currentHorizontalLinkedNode, this, node);
+          }
         }
       }
-    }
+    });
 
     // create circular linked list
     if (_classPrivateFieldGet(_cellsHorizontalOrder, this).first) {
       _classPrivateFieldGet(_cellsHorizontalOrder, this).first.prev = _classPrivateFieldGet(_cellsHorizontalOrder, this).last;
       _classPrivateFieldGet(_cellsHorizontalOrder, this).last.next = _classPrivateFieldGet(_cellsHorizontalOrder, this).first;
     }
-    const visitedVerticalCells = new WeakSet();
     _classPrivateFieldSet(_cellsVerticalOrder, this, new LinkedList());
-    for (let c = topStart.col; c <= bottomEnd.col; c++) {
-      if (_classPrivateFieldGet(_columnIndexMapper, this).isHidden(c)) {
-        // eslint-disable-next-line no-continue
-        continue;
-      }
-      for (let r = topStart.row; r <= bottomEnd.row; r++) {
-        if (_classPrivateFieldGet(_rowIndexMapper, this).isHidden(r)) {
+    selectedRanges.forEach((range, selectionLayer) => {
+      const visitedVerticalCells = new WeakSet();
+      const topStart = range.getTopStartCorner();
+      const bottomEnd = range.getBottomEndCorner();
+      for (let c = topStart.col; c <= bottomEnd.col; c++) {
+        if (_classPrivateFieldGet(_columnIndexMapper, this).isHidden(c)) {
           // eslint-disable-next-line no-continue
           continue;
         }
-        const node = _assertClassBrand(_FocusOrder_brand, this, _pushOrderNode).call(this, selectedRange, _classPrivateFieldGet(_cellsVerticalOrder, this), visitedVerticalCells, r, c);
-        if (node) {
-          _classPrivateFieldSet(_currentVerticalLinkedNode, this, node);
+        for (let r = topStart.row; r <= bottomEnd.row; r++) {
+          if (_classPrivateFieldGet(_rowIndexMapper, this).isHidden(r)) {
+            // eslint-disable-next-line no-continue
+            continue;
+          }
+          const node = _assertClassBrand(_FocusOrder_brand, this, _pushOrderNode).call(this, {
+            selectedRange: range,
+            selectionLayer,
+            listOrder: _classPrivateFieldGet(_cellsVerticalOrder, this),
+            mergeCellsVisitor: visitedVerticalCells,
+            row: r,
+            column: c
+          });
+          if (node) {
+            _classPrivateFieldSet(_currentVerticalLinkedNode, this, node);
+          }
         }
       }
-    }
+    });
 
     // create circular linked list
     if (_classPrivateFieldGet(_cellsVerticalOrder, this).first) {
@@ -238,37 +262,48 @@ export class FocusOrder {
    *
    * @param {number} row The visual row index.
    * @param {number} column The visual column index.
+   * @param {number} selectionLayerIndex The index of the selection layer to which the focus should be marked as active.
    * @returns {FocusOrder}
    */
-  setActiveNode(row, column) {
+  setActiveNode(row, column, selectionLayerIndex) {
     _classPrivateFieldGet(_cellsHorizontalOrder, this).inorder(node => {
       const {
+        selectionLayer,
         rowStart,
         rowEnd,
         colStart,
         colEnd
       } = node.data;
-      if (row >= rowStart && row <= rowEnd && column >= colStart && column <= colEnd) {
+      if (selectionLayer === selectionLayerIndex && row >= rowStart && row <= rowEnd && column >= colStart && column <= colEnd) {
         _classPrivateFieldSet(_currentHorizontalLinkedNode, this, node);
-        return false;
+        return true;
       }
     });
     _classPrivateFieldGet(_cellsVerticalOrder, this).inorder(node => {
       const {
+        selectionLayer,
         rowStart,
         rowEnd,
         colStart,
         colEnd
       } = node.data;
-      if (row >= rowStart && row <= rowEnd && column >= colStart && column <= colEnd) {
+      if (selectionLayer === selectionLayerIndex && row >= rowStart && row <= rowEnd && column >= colStart && column <= colEnd) {
         _classPrivateFieldSet(_currentVerticalLinkedNode, this, node);
-        return false;
+        return true;
       }
     });
     return this;
   }
 }
-function _pushOrderNode(selectedRange, listOrder, mergeCellsVisitor, row, column) {
+function _pushOrderNode(_ref2) {
+  let {
+    selectedRange,
+    selectionLayer,
+    listOrder,
+    mergeCellsVisitor,
+    row,
+    column
+  } = _ref2;
   const topStart = selectedRange.getTopStartCorner();
   const bottomEnd = selectedRange.getBottomEndCorner();
   const highlight = selectedRange.highlight.clone().normalize();
@@ -277,6 +312,7 @@ function _pushOrderNode(selectedRange, listOrder, mergeCellsVisitor, row, column
     return null;
   }
   const node = {
+    selectionLayer,
     colStart: column,
     colEnd: column,
     rowStart: row,

package/plugins/mergeCells/mergeCells.js

@@ -554,7 +554,7 @@ class MergeCells extends _base.BasePlugin {
    * @param {CellRange} [cellRange] Selection cell range.
    */
   mergeSelection() {
-    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeLast();
+    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeActive();
     if (!cellRange) {
       return;
     }
@@ -574,7 +574,7 @@ class MergeCells extends _base.BasePlugin {
    * @param {CellRange} [cellRange] Selection cell range.
    */
   unmergeSelection() {
-    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeLast();
+    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeActive();
     if (!cellRange) {
       return;
     }
@@ -741,7 +741,7 @@ class MergeCells extends _base.BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        const range = this.hot.getSelectedRangeLast();
+        const range = this.hot.getSelectedRangeActive();
         if (range && !range.isSingleHeader()) {
           this.toggleMerge(range);
           this.hot.render();
@@ -946,7 +946,7 @@ function _onAfterInit() {
 function _onAfterIsMultipleSelection(isMultiple) {
   if (isMultiple) {
     const mergedCells = this.mergedCellsCollection.mergedCells;
-    const selectionRange = this.hot.getSelectedRangeLast();
+    const selectionRange = this.hot.getSelectedRangeActive();
     const topStartCoords = selectionRange.getTopStartCorner();
     const bottomEndCoords = selectionRange.getBottomEndCorner();
     for (let group = 0; group < mergedCells.length; group += 1) {
@@ -972,7 +972,7 @@ function _onModifyTransformFocus(delta) {
  * @param {object} delta The transformation delta.
  */
 function _onModifyTransformStart(delta) {
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   const {
     highlight
   } = selectedRange;
@@ -1047,7 +1047,7 @@ function _onModifyTransformStart(delta) {
  * @param {{ row: number, col: number }} delta The transformation delta.
  */
 function _onModifyTransformEnd(delta) {
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   const cloneRange = selectedRange.clone();
   const {
     to
@@ -1193,7 +1193,7 @@ function _onBeforeSelectionFocusSet() {
   if (_classPrivateFieldGet(_lastSelectedFocus, this).isCell()) {
     return;
   }
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   const verticalDir = selectedRange.getVerticalDirection();
   const horizontalDir = selectedRange.getHorizontalDirection();
   const focusCoords = _classPrivateFieldGet(_lastSelectedFocus, this).clone().normalize();
@@ -1211,43 +1211,53 @@ function _onBeforeSelectionFocusSet() {
  * @param {number} column The visual column index.
  */
 function _onAfterSelectionFocusSet(row, column) {
-  const selectedRange = this.hot.getSelectedRangeLast();
   const {
     columnIndexMapper,
     rowIndexMapper
   } = this.hot;
+  let activeSelectionLayerIndex = this.hot.getActiveSelectionLayerIndex();
   let notHiddenRowIndex = null;
   let notHiddenColumnIndex = null;
   if (_classPrivateFieldGet(_lastFocusDelta, this).col < 0) {
     const {
       rowEnd,
-      colEnd
+      colEnd,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getPrevHorizontalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colEnd, -1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowEnd, -1);
+    activeSelectionLayerIndex = selectionLayer;
   } else if (_classPrivateFieldGet(_lastFocusDelta, this).col > 0) {
     const {
       rowStart,
-      colStart
+      colStart,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getNextHorizontalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colStart, 1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowStart, 1);
+    activeSelectionLayerIndex = selectionLayer;
   } else if (_classPrivateFieldGet(_lastFocusDelta, this).row < 0) {
     const {
       rowEnd,
-      colEnd
+      colEnd,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getPrevVerticalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colEnd, -1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowEnd, -1);
+    activeSelectionLayerIndex = selectionLayer;
   } else if (_classPrivateFieldGet(_lastFocusDelta, this).row > 0) {
     const {
       rowStart,
-      colStart
+      colStart,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getNextVerticalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colStart, 1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowStart, 1);
+    activeSelectionLayerIndex = selectionLayer;
   }
   if (notHiddenRowIndex !== null || notHiddenColumnIndex !== null) {
+    this.hot.selection.setActiveSelectionLayerIndex(activeSelectionLayerIndex);
+    const selectedRange = this.hot.getSelectedRangeActive();
     const coords = this.hot._createCellCoords(notHiddenRowIndex, notHiddenColumnIndex);
     const mergeParent = this.mergedCellsCollection.get(coords.row, coords.col);
     const focusHighlight = this.hot.selection.highlight.getFocus();
@@ -1264,7 +1274,7 @@ function _onAfterSelectionFocusSet(row, column) {
     focusHighlight.clear();
     focusHighlight.add(coords).commit();
   }
-  _classPrivateFieldGet(_focusOrder, this).setActiveNode(row, column);
+  _classPrivateFieldGet(_focusOrder, this).setActiveNode(row, column, activeSelectionLayerIndex);
   _classPrivateFieldSet(_lastFocusDelta, this, {
     row: 0,
     col: 0
@@ -1274,10 +1284,7 @@ function _onAfterSelectionFocusSet(row, column) {
  * Creates the horizontal and vertical cells order matrix (linked lists) for focused cell.
  */
 function _onAfterSelectionEnd() {
-  const selection = this.hot.getSelectedRangeLast();
-  if (!selection.isHeader()) {
-    _classPrivateFieldGet(_focusOrder, this).buildFocusOrder(this.hot.getSelectedRangeLast());
-  }
+  _classPrivateFieldGet(_focusOrder, this).buildFocusOrder(this.hot.getSelectedRange());
 }
 /**
  * The `afterGetCellMeta` hook callback.
@@ -1392,7 +1399,7 @@ function _onAfterChange(changes, source) {
  */
 function _onBeforeDrawAreaBorders(corners, className) {
   if (className && className === 'area') {
-    const selectedRange = this.hot.getSelectedRangeLast();
+    const selectedRange = this.hot.getSelectedRangeActive();
     const mergedCellsWithinRange = this.mergedCellsCollection.getWithinRange(selectedRange);
     (0, _array.arrayEach)(mergedCellsWithinRange, mergedCell => {
       if (selectedRange.getBottomEndCorner().row === mergedCell.getLastRow() && selectedRange.getBottomEndCorner().col === mergedCell.getLastColumn()) {
@@ -1442,7 +1449,7 @@ function _onBeforeBeginEditing(row, column, initialValue, event) {
   if (!(event instanceof MouseEvent)) {
     return;
   }
-  const selection = this.hot.getSelectedRangeLast();
+  const selection = this.hot.getSelectedRangeActive();
   const mergeCell = this.mergedCellsCollection.getByRange(selection);
   if (!mergeCell) {
     return;

package/plugins/mergeCells/mergeCells.mjs

@@ -550,7 +550,7 @@ export class MergeCells extends BasePlugin {
    * @param {CellRange} [cellRange] Selection cell range.
    */
   mergeSelection() {
-    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeLast();
+    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeActive();
     if (!cellRange) {
       return;
     }
@@ -570,7 +570,7 @@ export class MergeCells extends BasePlugin {
    * @param {CellRange} [cellRange] Selection cell range.
    */
   unmergeSelection() {
-    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeLast();
+    let cellRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.hot.getSelectedRangeActive();
     if (!cellRange) {
       return;
     }
@@ -737,7 +737,7 @@ export class MergeCells extends BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        const range = this.hot.getSelectedRangeLast();
+        const range = this.hot.getSelectedRangeActive();
         if (range && !range.isSingleHeader()) {
           this.toggleMerge(range);
           this.hot.render();
@@ -941,7 +941,7 @@ function _onAfterInit() {
 function _onAfterIsMultipleSelection(isMultiple) {
   if (isMultiple) {
     const mergedCells = this.mergedCellsCollection.mergedCells;
-    const selectionRange = this.hot.getSelectedRangeLast();
+    const selectionRange = this.hot.getSelectedRangeActive();
     const topStartCoords = selectionRange.getTopStartCorner();
     const bottomEndCoords = selectionRange.getBottomEndCorner();
     for (let group = 0; group < mergedCells.length; group += 1) {
@@ -967,7 +967,7 @@ function _onModifyTransformFocus(delta) {
  * @param {object} delta The transformation delta.
  */
 function _onModifyTransformStart(delta) {
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   const {
     highlight
   } = selectedRange;
@@ -1042,7 +1042,7 @@ function _onModifyTransformStart(delta) {
  * @param {{ row: number, col: number }} delta The transformation delta.
  */
 function _onModifyTransformEnd(delta) {
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   const cloneRange = selectedRange.clone();
   const {
     to
@@ -1188,7 +1188,7 @@ function _onBeforeSelectionFocusSet() {
   if (_classPrivateFieldGet(_lastSelectedFocus, this).isCell()) {
     return;
   }
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   const verticalDir = selectedRange.getVerticalDirection();
   const horizontalDir = selectedRange.getHorizontalDirection();
   const focusCoords = _classPrivateFieldGet(_lastSelectedFocus, this).clone().normalize();
@@ -1206,43 +1206,53 @@ function _onBeforeSelectionFocusSet() {
  * @param {number} column The visual column index.
  */
 function _onAfterSelectionFocusSet(row, column) {
-  const selectedRange = this.hot.getSelectedRangeLast();
   const {
     columnIndexMapper,
     rowIndexMapper
   } = this.hot;
+  let activeSelectionLayerIndex = this.hot.getActiveSelectionLayerIndex();
   let notHiddenRowIndex = null;
   let notHiddenColumnIndex = null;
   if (_classPrivateFieldGet(_lastFocusDelta, this).col < 0) {
     const {
       rowEnd,
-      colEnd
+      colEnd,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getPrevHorizontalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colEnd, -1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowEnd, -1);
+    activeSelectionLayerIndex = selectionLayer;
   } else if (_classPrivateFieldGet(_lastFocusDelta, this).col > 0) {
     const {
       rowStart,
-      colStart
+      colStart,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getNextHorizontalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colStart, 1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowStart, 1);
+    activeSelectionLayerIndex = selectionLayer;
   } else if (_classPrivateFieldGet(_lastFocusDelta, this).row < 0) {
     const {
       rowEnd,
-      colEnd
+      colEnd,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getPrevVerticalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colEnd, -1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowEnd, -1);
+    activeSelectionLayerIndex = selectionLayer;
   } else if (_classPrivateFieldGet(_lastFocusDelta, this).row > 0) {
     const {
       rowStart,
-      colStart
+      colStart,
+      selectionLayer
     } = _classPrivateFieldGet(_focusOrder, this).getNextVerticalNode();
     notHiddenColumnIndex = columnIndexMapper.getNearestNotHiddenIndex(colStart, 1);
     notHiddenRowIndex = rowIndexMapper.getNearestNotHiddenIndex(rowStart, 1);
+    activeSelectionLayerIndex = selectionLayer;
   }
   if (notHiddenRowIndex !== null || notHiddenColumnIndex !== null) {
+    this.hot.selection.setActiveSelectionLayerIndex(activeSelectionLayerIndex);
+    const selectedRange = this.hot.getSelectedRangeActive();
     const coords = this.hot._createCellCoords(notHiddenRowIndex, notHiddenColumnIndex);
     const mergeParent = this.mergedCellsCollection.get(coords.row, coords.col);
     const focusHighlight = this.hot.selection.highlight.getFocus();
@@ -1259,7 +1269,7 @@ function _onAfterSelectionFocusSet(row, column) {
     focusHighlight.clear();
     focusHighlight.add(coords).commit();
   }
-  _classPrivateFieldGet(_focusOrder, this).setActiveNode(row, column);
+  _classPrivateFieldGet(_focusOrder, this).setActiveNode(row, column, activeSelectionLayerIndex);
   _classPrivateFieldSet(_lastFocusDelta, this, {
     row: 0,
     col: 0
@@ -1269,10 +1279,7 @@ function _onAfterSelectionFocusSet(row, column) {
  * Creates the horizontal and vertical cells order matrix (linked lists) for focused cell.
  */
 function _onAfterSelectionEnd() {
-  const selection = this.hot.getSelectedRangeLast();
-  if (!selection.isHeader()) {
-    _classPrivateFieldGet(_focusOrder, this).buildFocusOrder(this.hot.getSelectedRangeLast());
-  }
+  _classPrivateFieldGet(_focusOrder, this).buildFocusOrder(this.hot.getSelectedRange());
 }
 /**
  * The `afterGetCellMeta` hook callback.
@@ -1387,7 +1394,7 @@ function _onAfterChange(changes, source) {
  */
 function _onBeforeDrawAreaBorders(corners, className) {
   if (className && className === 'area') {
-    const selectedRange = this.hot.getSelectedRangeLast();
+    const selectedRange = this.hot.getSelectedRangeActive();
     const mergedCellsWithinRange = this.mergedCellsCollection.getWithinRange(selectedRange);
     arrayEach(mergedCellsWithinRange, mergedCell => {
       if (selectedRange.getBottomEndCorner().row === mergedCell.getLastRow() && selectedRange.getBottomEndCorner().col === mergedCell.getLastColumn()) {
@@ -1437,7 +1444,7 @@ function _onBeforeBeginEditing(row, column, initialValue, event) {
   if (!(event instanceof MouseEvent)) {
     return;
   }
-  const selection = this.hot.getSelectedRangeLast();
+  const selection = this.hot.getSelectedRangeActive();
   const mergeCell = this.mergedCellsCollection.getByRange(selection);
   if (!mergeCell) {
     return;

package/plugins/mergeCells/renderer.js

@@ -42,7 +42,7 @@ function createMergeCellRenderer(plugin) {
     if (!(0, _object.isObject)(mergedCell)) {
       TD.removeAttribute('rowspan');
       TD.removeAttribute('colspan');
-      if ((0, _browser.isSafari)() && updateNextCellsHeight.has(row) && !hot.getSettings().rowHeaders) {
+      if (updateNextCellsHeight.has(row) && !hot.getSettings().rowHeaders) {
         TD.style.height = `${updateNextCellsHeight.get(row)}px`;
         updateNextCellsHeight.delete(row);
       }
@@ -57,13 +57,19 @@ function createMergeCellRenderer(plugin) {
     } = mergedCell;
     const [lastMergedRowIndex, lastMergedColumnIndex] = plugin.translateMergedCellToRenderable(origRow, origRowspan, origColumn, origColspan);
     const isVirtualRenderingEnabled = plugin.getSetting('virtualized');
-
-    // Safari bug fix - the height of the cells next to the merged cell must be defined
-    // so that their height is proportional to the height of the merged cell
-    // (this emulates default behavior in Chrome, FF etc.)
-    if ((0, _browser.isSafari)() && origColumn === 0 && !hot.getSettings().rowHeaders) {
-      const height = (0, _utils.sumCellsHeights)(hot, origRow, origRowspan);
-      updateNextCellsHeight.set(row, height / origRowspan);
+    if (origColumn === 0 && !hot.getSettings().rowHeaders) {
+      const rowHeights = hot._getRowHeightFromSettings(row);
+      if (rowHeights !== undefined) {
+        const borderBoxSizing = hot.stylesHandler.areCellsBorderBox();
+        const borderCompensation = borderBoxSizing ? 0 : 1;
+        updateNextCellsHeight.set(row, rowHeights - borderCompensation);
+      } else if ((0, _browser.isSafari)()) {
+        // Safari bug fix - the height of the cells next to the merged cell must be defined
+        // so that their height is proportional to the height of the merged cell
+        // (this emulates default behavior in Chrome, FF etc.)
+        const height = (0, _utils.sumCellsHeights)(hot, origRow, origRowspan);
+        updateNextCellsHeight.set(row, height / origRowspan);
+      }
     }
     const renderedRowIndex = rowMapper.getRenderableFromVisualIndex(row);
     const renderedColumnIndex = columnMapper.getRenderableFromVisualIndex(col);

package/plugins/mergeCells/renderer.mjs

@@ -38,7 +38,7 @@ export function createMergeCellRenderer(plugin) {
     if (!isObject(mergedCell)) {
       TD.removeAttribute('rowspan');
       TD.removeAttribute('colspan');
-      if (isSafari() && updateNextCellsHeight.has(row) && !hot.getSettings().rowHeaders) {
+      if (updateNextCellsHeight.has(row) && !hot.getSettings().rowHeaders) {
         TD.style.height = `${updateNextCellsHeight.get(row)}px`;
         updateNextCellsHeight.delete(row);
       }
@@ -53,13 +53,19 @@ export function createMergeCellRenderer(plugin) {
     } = mergedCell;
     const [lastMergedRowIndex, lastMergedColumnIndex] = plugin.translateMergedCellToRenderable(origRow, origRowspan, origColumn, origColspan);
     const isVirtualRenderingEnabled = plugin.getSetting('virtualized');
-
-    // Safari bug fix - the height of the cells next to the merged cell must be defined
-    // so that their height is proportional to the height of the merged cell
-    // (this emulates default behavior in Chrome, FF etc.)
-    if (isSafari() && origColumn === 0 && !hot.getSettings().rowHeaders) {
-      const height = sumCellsHeights(hot, origRow, origRowspan);
-      updateNextCellsHeight.set(row, height / origRowspan);
+    if (origColumn === 0 && !hot.getSettings().rowHeaders) {
+      const rowHeights = hot._getRowHeightFromSettings(row);
+      if (rowHeights !== undefined) {
+        const borderBoxSizing = hot.stylesHandler.areCellsBorderBox();
+        const borderCompensation = borderBoxSizing ? 0 : 1;
+        updateNextCellsHeight.set(row, rowHeights - borderCompensation);
+      } else if (isSafari()) {
+        // Safari bug fix - the height of the cells next to the merged cell must be defined
+        // so that their height is proportional to the height of the merged cell
+        // (this emulates default behavior in Chrome, FF etc.)
+        const height = sumCellsHeights(hot, origRow, origRowspan);
+        updateNextCellsHeight.set(row, height / origRowspan);
+      }
     }
     const renderedRowIndex = rowMapper.getRenderableFromVisualIndex(row);
     const renderedColumnIndex = columnMapper.getRenderableFromVisualIndex(col);

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -122,7 +122,7 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
       callback: () => {
         const {
           highlight
-        } = this.hot.getSelectedRangeLast();
+        } = this.hot.getSelectedRangeActive();
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
         }
@@ -132,8 +132,8 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected, _this$hot$getSelected2;
-        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
-        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
+        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
+        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
       relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
       position: 'before',

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -119,7 +119,7 @@ export class MultiColumnSorting extends ColumnSorting {
       callback: () => {
         const {
           highlight
-        } = this.hot.getSelectedRangeLast();
+        } = this.hot.getSelectedRangeActive();
         if (highlight.row === -1 && highlight.col >= 0) {
           this.sort(this.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
         }
@@ -129,8 +129,8 @@ export class MultiColumnSorting extends ColumnSorting {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected, _this$hot$getSelected2;
-        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
-        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
+        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
+        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.isHeader();
       },
       relativeToGroup: SHORTCUTS_GROUP_EDITOR,
       position: 'before',

package/plugins/multipleSelectionHandles/multipleSelectionHandles.js

@@ -89,7 +89,7 @@ class MultipleSelectionHandles extends _base.BasePlugin {
     this.eventManager.addEventListener(rootElement, 'touchstart', event => {
       let selectedRange;
       if ((0, _element.hasClass)(event.target, 'topSelectionHandle-HitArea')) {
-        selectedRange = _this.hot.getSelectedRangeLast();
+        selectedRange = _this.hot.getSelectedRangeActive();
         _this.dragged.push('top');
         _this.touchStartRange = {
           width: selectedRange.getWidth(),
@@ -99,7 +99,7 @@ class MultipleSelectionHandles extends _base.BasePlugin {
         event.preventDefault();
         return false;
       } else if ((0, _element.hasClass)(event.target, 'bottomSelectionHandle-HitArea')) {
-        selectedRange = _this.hot.getSelectedRangeLast();
+        selectedRange = _this.hot.getSelectedRangeActive();
         _this.dragged.push('bottom');
         _this.touchStartRange = {
           width: selectedRange.getWidth(),
@@ -145,7 +145,7 @@ class MultipleSelectionHandles extends _base.BasePlugin {
         if (targetCoords.col === -1) {
           targetCoords.col = 0;
         }
-        selectedRange = _this.hot.getSelectedRangeLast();
+        selectedRange = _this.hot.getSelectedRangeActive();
         rangeWidth = selectedRange.getWidth();
         rangeHeight = selectedRange.getHeight();
         rangeDirection = selectedRange.getDirection();