handsontable 16.0.1 → 16.1.0-next-91b8a0f-20250905

package/plugins/manualColumnResize/manualColumnResize.js

@@ -265,7 +265,7 @@ class ManualColumnResize extends _base.BasePlugin {
    * @param {HTMLCellElement} TH TH HTML element.
    */
   setupHandlePosition(TH) {
-    if (!TH.parentNode) {
+    if (!TH.parentNode || _classPrivateFieldGet(_dblclick, this) > 1) {
       return;
     }
     _classPrivateFieldSet(_currentTH, this, TH);
@@ -417,8 +417,8 @@ class ManualColumnResize extends _base.BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.render();
       this.hot.view.adjustElementsSize();
+      this.hot.render();
     };
     const resize = (column, forceRender) => {
       const hookNewSize = this.hot.runHooks('beforeColumnResize', _classPrivateFieldGet(_newSize, this), column, true);
@@ -577,8 +577,8 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
   };
   const resize = (column, forceRender) => {
     this.hot.runHooks('beforeColumnResize', _classPrivateFieldGet(_newSize, this), column, false);

package/plugins/manualColumnResize/manualColumnResize.mjs

@@ -260,7 +260,7 @@ export class ManualColumnResize extends BasePlugin {
    * @param {HTMLCellElement} TH TH HTML element.
    */
   setupHandlePosition(TH) {
-    if (!TH.parentNode) {
+    if (!TH.parentNode || _classPrivateFieldGet(_dblclick, this) > 1) {
       return;
     }
     _classPrivateFieldSet(_currentTH, this, TH);
@@ -412,8 +412,8 @@ export class ManualColumnResize extends BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.render();
       this.hot.view.adjustElementsSize();
+      this.hot.render();
     };
     const resize = (column, forceRender) => {
       const hookNewSize = this.hot.runHooks('beforeColumnResize', _classPrivateFieldGet(_newSize, this), column, true);
@@ -571,8 +571,8 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
   };
   const resize = (column, forceRender) => {
     this.hot.runHooks('beforeColumnResize', _classPrivateFieldGet(_newSize, this), column, false);

package/plugins/manualRowMove/manualRowMove.js

@@ -395,7 +395,7 @@ class ManualRowMove extends _base.BasePlugin {
    * @returns {Array}
    */
   prepareRowsToMoving() {
-    const selection = this.hot.getSelectedRangeLast();
+    const selection = this.hot.getSelectedRangeActive();
     const selectedRows = [];
     if (!selection) {
       return selectedRows;
@@ -528,7 +528,7 @@ function _onBeforeOnCellMouseDown(event, coords, TD, controller) {
     wtViewport
   } = this.hot.view._wt;
   const isHeaderSelection = this.hot.selection.isSelectedByRowHeader();
-  const selection = this.hot.getSelectedRangeLast();
+  const selection = this.hot.getSelectedRangeActive();
   if (!selection || !isHeaderSelection || _classPrivateFieldGet(_pressed, this) || event.button !== 0) {
     _classPrivateFieldSet(_pressed, this, false);
     _classPrivateFieldGet(_rowsToMove, this).length = 0;
@@ -589,7 +589,7 @@ function _onMouseMove(event) {
  *                            a boolean value that allows or disallows changing the selection for that particular area.
  */
 function _onBeforeOnCellMouseOver(event, coords, TD, controller) {
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   if (!selectedRange || !_classPrivateFieldGet(_pressed, this)) {
     return;
   }
@@ -624,8 +624,8 @@ function _onMouseUp() {
   _classPrivateFieldGet(_rowsToMove, this).length = 0;
   if (movePerformed === true) {
     this.persistentStateSave();
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
     const selectionStart = this.hot.toVisualRow(firstMovedPhysicalRow);
     const selectionEnd = selectionStart + rowsLen - 1;
     this.hot.selectRows(selectionStart, selectionEnd);

package/plugins/manualRowMove/manualRowMove.mjs

@@ -391,7 +391,7 @@ export class ManualRowMove extends BasePlugin {
    * @returns {Array}
    */
   prepareRowsToMoving() {
-    const selection = this.hot.getSelectedRangeLast();
+    const selection = this.hot.getSelectedRangeActive();
     const selectedRows = [];
     if (!selection) {
       return selectedRows;
@@ -523,7 +523,7 @@ function _onBeforeOnCellMouseDown(event, coords, TD, controller) {
     wtViewport
   } = this.hot.view._wt;
   const isHeaderSelection = this.hot.selection.isSelectedByRowHeader();
-  const selection = this.hot.getSelectedRangeLast();
+  const selection = this.hot.getSelectedRangeActive();
   if (!selection || !isHeaderSelection || _classPrivateFieldGet(_pressed, this) || event.button !== 0) {
     _classPrivateFieldSet(_pressed, this, false);
     _classPrivateFieldGet(_rowsToMove, this).length = 0;
@@ -584,7 +584,7 @@ function _onMouseMove(event) {
  *                            a boolean value that allows or disallows changing the selection for that particular area.
  */
 function _onBeforeOnCellMouseOver(event, coords, TD, controller) {
-  const selectedRange = this.hot.getSelectedRangeLast();
+  const selectedRange = this.hot.getSelectedRangeActive();
   if (!selectedRange || !_classPrivateFieldGet(_pressed, this)) {
     return;
   }
@@ -619,8 +619,8 @@ function _onMouseUp() {
   _classPrivateFieldGet(_rowsToMove, this).length = 0;
   if (movePerformed === true) {
     this.persistentStateSave();
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
     const selectionStart = this.hot.toVisualRow(firstMovedPhysicalRow);
     const selectionEnd = selectionStart + rowsLen - 1;
     this.hot.selectRows(selectionStart, selectionEnd);

package/plugins/manualRowResize/manualRowResize.js

@@ -249,6 +249,9 @@ class ManualRowResize extends _base.BasePlugin {
    * @param {HTMLCellElement} TH TH HTML element.
    */
   setupHandlePosition(TH) {
+    if (_classPrivateFieldGet(_dblclick, this) > 1) {
+      return;
+    }
     _classPrivateFieldSet(_currentTH, this, TH);
     const {
       view
@@ -414,8 +417,8 @@ class ManualRowResize extends _base.BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.render();
       this.hot.view.adjustElementsSize();
+      this.hot.render();
     };
     const resize = (row, forceRender) => {
       const hookNewSize = this.hot.runHooks('beforeRowResize', this.getActualRowHeight(row), row, true);
@@ -542,8 +545,8 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
   };
   const runHooks = (row, forceRender) => {
     this.hot.runHooks('beforeRowResize', this.getActualRowHeight(row), row, false);

package/plugins/manualRowResize/manualRowResize.mjs

@@ -244,6 +244,9 @@ export class ManualRowResize extends BasePlugin {
    * @param {HTMLCellElement} TH TH HTML element.
    */
   setupHandlePosition(TH) {
+    if (_classPrivateFieldGet(_dblclick, this) > 1) {
+      return;
+    }
     _classPrivateFieldSet(_currentTH, this, TH);
     const {
       view
@@ -409,8 +412,8 @@ export class ManualRowResize extends BasePlugin {
    */
   afterMouseDownTimeout() {
     const render = () => {
-      this.hot.render();
       this.hot.view.adjustElementsSize();
+      this.hot.render();
     };
     const resize = (row, forceRender) => {
       const hookNewSize = this.hot.runHooks('beforeRowResize', this.getActualRowHeight(row), row, true);
@@ -536,8 +539,8 @@ function _onMouseMove(event) {
  */
 function _onMouseUp() {
   const render = () => {
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
   };
   const runHooks = (row, forceRender) => {
     this.hot.runHooks('beforeRowResize', this.getActualRowHeight(row), row, false);

package/plugins/mergeCells/contextMenuItem/toggleMerge.js

@@ -14,38 +14,38 @@ function toggleMergeItem(plugin) {
   return {
     key: 'mergeCells',
     name() {
-      const sel = this.getSelectedLast();
-      if (sel) {
-        const info = plugin.mergedCellsCollection.get(sel[0], sel[1]);
-        if (info.row === sel[0] && info.col === sel[1] && info.row + info.rowspan - 1 === sel[2] && info.col + info.colspan - 1 === sel[3]) {
+      const selection = this.getSelectedActive();
+      if (selection) {
+        const info = plugin.mergedCellsCollection.get(selection[0], selection[1]);
+        if (info.row === selection[0] && info.col === selection[1] && info.row + info.rowspan - 1 === selection[2] && info.col + info.colspan - 1 === selection[3]) {
           return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_UNMERGE_CELLS);
         }
       }
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_MERGE_CELLS);
     },
     callback() {
-      const currentRange = this.getSelectedRangeLast();
-      if (!currentRange) {
+      const activeRange = this.getSelectedRangeActive();
+      if (!activeRange) {
         return;
       }
-      currentRange.setDirection(this.isRtl() ? 'NE-SW' : 'NW-SE');
+      activeRange.setDirection(this.isRtl() ? 'NE-SW' : 'NW-SE');
       const {
         from,
         to
-      } = currentRange;
-      plugin.toggleMerge(currentRange);
+      } = activeRange;
+      plugin.toggleMerge(activeRange);
       this.selectCell(from.row, from.col, to.row, to.col, false);
     },
     disabled() {
-      const sel = this.getSelectedLast();
-      if (!sel) {
+      const selection = this.getSelectedActive();
+      if (!selection) {
         return true;
       }
       const isSingleCell = _cellCoords.default.isSingleCell({
-        row: sel[0],
-        col: sel[1],
-        rowspan: sel[2] - sel[0] + 1,
-        colspan: sel[3] - sel[1] + 1
+        row: selection[0],
+        col: selection[1],
+        rowspan: selection[2] - selection[0] + 1,
+        colspan: selection[3] - selection[1] + 1
       });
       return isSingleCell || this.selection.isSelectedByCorner();
     },

package/plugins/mergeCells/contextMenuItem/toggleMerge.mjs

@@ -8,38 +8,38 @@ export default function toggleMergeItem(plugin) {
   return {
     key: 'mergeCells',
     name() {
-      const sel = this.getSelectedLast();
-      if (sel) {
-        const info = plugin.mergedCellsCollection.get(sel[0], sel[1]);
-        if (info.row === sel[0] && info.col === sel[1] && info.row + info.rowspan - 1 === sel[2] && info.col + info.colspan - 1 === sel[3]) {
+      const selection = this.getSelectedActive();
+      if (selection) {
+        const info = plugin.mergedCellsCollection.get(selection[0], selection[1]);
+        if (info.row === selection[0] && info.col === selection[1] && info.row + info.rowspan - 1 === selection[2] && info.col + info.colspan - 1 === selection[3]) {
           return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_UNMERGE_CELLS);
         }
       }
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_MERGE_CELLS);
     },
     callback() {
-      const currentRange = this.getSelectedRangeLast();
-      if (!currentRange) {
+      const activeRange = this.getSelectedRangeActive();
+      if (!activeRange) {
         return;
       }
-      currentRange.setDirection(this.isRtl() ? 'NE-SW' : 'NW-SE');
+      activeRange.setDirection(this.isRtl() ? 'NE-SW' : 'NW-SE');
       const {
         from,
         to
-      } = currentRange;
-      plugin.toggleMerge(currentRange);
+      } = activeRange;
+      plugin.toggleMerge(activeRange);
       this.selectCell(from.row, from.col, to.row, to.col, false);
     },
     disabled() {
-      const sel = this.getSelectedLast();
-      if (!sel) {
+      const selection = this.getSelectedActive();
+      if (!selection) {
         return true;
       }
       const isSingleCell = MergedCellCoords.isSingleCell({
-        row: sel[0],
-        col: sel[1],
-        rowspan: sel[2] - sel[0] + 1,
-        colspan: sel[3] - sel[1] + 1
+        row: selection[0],
+        col: selection[1],
+        rowspan: selection[2] - selection[0] + 1,
+        colspan: selection[3] - selection[1] + 1
       });
       return isSingleCell || this.selection.isSelectedByCorner();
     },

package/plugins/mergeCells/focusOrder.js

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 var _linkedList = _interopRequireDefault(require("../../utils/dataStructures/linkedList"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
@@ -35,11 +37,13 @@ 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);
@@ -183,53 +187,73 @@ 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.default());
-    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.default());
-    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) {
@@ -242,38 +266,49 @@ 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;
   }
 }
 exports.FocusOrder = FocusOrder;
-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();
@@ -282,6 +317,7 @@ function _pushOrderNode(selectedRange, listOrder, mergeCellsVisitor, row, column
     return null;
   }
   const node = {
+    selectionLayer,
     colStart: column,
     colEnd: column,
     rowStart: row,