handsontable 0.0.0-next-e5dbebc-20240319 → 0.0.0-next-923e108-20240319

package/plugins/mergeCells/calculations/selection.js

@@ -36,6 +36,74 @@ class SelectionCalculations {
     this.hot = plugin.hot;
   }
 
+  /**
+   * "Snap" the delta value according to defined merged cells. (In other words, compensate the rowspan -
+   * e.g. Going up with `delta.row = -1` over a merged cell with `rowspan = 3`, `delta.row` should change to `-3`.).
+   *
+   * @param {object} delta The delta object containing `row` and `col` properties.
+   * @param {CellRange} selectionRange The selection range.
+   * @param {object} mergedCell A merged cell object.
+   */
+  snapDelta(delta, selectionRange, mergedCell) {
+    const cellCoords = selectionRange.to;
+    const newRow = cellCoords.row + delta.row;
+    const newColumn = cellCoords.col + delta.col;
+    if (delta.row) {
+      this.jumpOverMergedCell(delta, mergedCell, newRow);
+    } else if (delta.col) {
+      this.jumpOverMergedCell(delta, mergedCell, newColumn);
+    }
+  }
+
+  /**
+   * "Jump" over the merged cell (compensate for the indexes within the merged cell to get past it).
+   *
+   * @private
+   * @param {object} delta The delta object.
+   * @param {MergedCellCoords} mergedCell The merge cell object.
+   * @param {number} newIndex New row/column index, created with the delta.
+   */
+  jumpOverMergedCell(delta, mergedCell, newIndex) {
+    let flatDelta = delta.row || delta.col;
+    let includesIndex = null;
+    let firstIndex = null;
+    let lastIndex = null;
+    if (delta.row) {
+      includesIndex = mergedCell.includesVertically(newIndex);
+      firstIndex = mergedCell.row;
+      lastIndex = mergedCell.getLastRow();
+    } else if (delta.col) {
+      includesIndex = mergedCell.includesHorizontally(newIndex);
+      firstIndex = mergedCell.col;
+      lastIndex = mergedCell.getLastColumn();
+    }
+    if (flatDelta === 0) {
+      return;
+    } else if (flatDelta > 0) {
+      if (includesIndex && newIndex !== firstIndex) {
+        flatDelta += lastIndex - newIndex + 1;
+      }
+    } else if (includesIndex && newIndex !== lastIndex) {
+      flatDelta -= newIndex - firstIndex + 1;
+    }
+    if (delta.row) {
+      delta.row = flatDelta;
+    } else if (delta.col) {
+      delta.col = flatDelta;
+    }
+  }
+
+  /**
+   * Get a selection range with `to` property incremented by the provided delta.
+   *
+   * @param {CellRange} oldSelectionRange The base selection range.
+   * @param {object} delta The delta object with `row` and `col` properties.
+   * @returns {CellRange} A new `CellRange` object.
+   */
+  getUpdatedSelectionRange(oldSelectionRange, delta) {
+    return this.hot._createCellRange(oldSelectionRange.highlight, oldSelectionRange.from, this.hot._createCellCoords(oldSelectionRange.to.row + delta.row, oldSelectionRange.to.col + delta.col));
+  }
+
   /**
    * Generate an additional class name for the entirely-selected merged cells.
    *
@@ -68,7 +136,8 @@ class SelectionCalculations {
     const fullMergeAreaWithinSelection = startRow <= mergedCell.row && startColumn <= mergedCell.col && endRow >= mergeRowEnd && endColumn >= mergeColumnEnd;
     if (fullMergeAreaWithinSelection) {
       return `${this.fullySelectedMergedCellClassName}-${layerLevel}`;
-    } else if (this.isMergeCellFullySelected(mergedCell, this.plugin.hot.getSelectedRange())) {
+    } else if (this.plugin.selectionCalculations.isMergeCellFullySelected(mergedCell, this.plugin.hot.getSelectedRange())) {
+      // eslint-disable-line max-len
       return `${this.fullySelectedMergedCellClassName}-multiple`;
     }
   }

package/plugins/mergeCells/calculations/selection.mjs

@@ -33,6 +33,74 @@ class SelectionCalculations {
     this.hot = plugin.hot;
   }
 
+  /**
+   * "Snap" the delta value according to defined merged cells. (In other words, compensate the rowspan -
+   * e.g. Going up with `delta.row = -1` over a merged cell with `rowspan = 3`, `delta.row` should change to `-3`.).
+   *
+   * @param {object} delta The delta object containing `row` and `col` properties.
+   * @param {CellRange} selectionRange The selection range.
+   * @param {object} mergedCell A merged cell object.
+   */
+  snapDelta(delta, selectionRange, mergedCell) {
+    const cellCoords = selectionRange.to;
+    const newRow = cellCoords.row + delta.row;
+    const newColumn = cellCoords.col + delta.col;
+    if (delta.row) {
+      this.jumpOverMergedCell(delta, mergedCell, newRow);
+    } else if (delta.col) {
+      this.jumpOverMergedCell(delta, mergedCell, newColumn);
+    }
+  }
+
+  /**
+   * "Jump" over the merged cell (compensate for the indexes within the merged cell to get past it).
+   *
+   * @private
+   * @param {object} delta The delta object.
+   * @param {MergedCellCoords} mergedCell The merge cell object.
+   * @param {number} newIndex New row/column index, created with the delta.
+   */
+  jumpOverMergedCell(delta, mergedCell, newIndex) {
+    let flatDelta = delta.row || delta.col;
+    let includesIndex = null;
+    let firstIndex = null;
+    let lastIndex = null;
+    if (delta.row) {
+      includesIndex = mergedCell.includesVertically(newIndex);
+      firstIndex = mergedCell.row;
+      lastIndex = mergedCell.getLastRow();
+    } else if (delta.col) {
+      includesIndex = mergedCell.includesHorizontally(newIndex);
+      firstIndex = mergedCell.col;
+      lastIndex = mergedCell.getLastColumn();
+    }
+    if (flatDelta === 0) {
+      return;
+    } else if (flatDelta > 0) {
+      if (includesIndex && newIndex !== firstIndex) {
+        flatDelta += lastIndex - newIndex + 1;
+      }
+    } else if (includesIndex && newIndex !== lastIndex) {
+      flatDelta -= newIndex - firstIndex + 1;
+    }
+    if (delta.row) {
+      delta.row = flatDelta;
+    } else if (delta.col) {
+      delta.col = flatDelta;
+    }
+  }
+
+  /**
+   * Get a selection range with `to` property incremented by the provided delta.
+   *
+   * @param {CellRange} oldSelectionRange The base selection range.
+   * @param {object} delta The delta object with `row` and `col` properties.
+   * @returns {CellRange} A new `CellRange` object.
+   */
+  getUpdatedSelectionRange(oldSelectionRange, delta) {
+    return this.hot._createCellRange(oldSelectionRange.highlight, oldSelectionRange.from, this.hot._createCellCoords(oldSelectionRange.to.row + delta.row, oldSelectionRange.to.col + delta.col));
+  }
+
   /**
    * Generate an additional class name for the entirely-selected merged cells.
    *
@@ -65,7 +133,8 @@ class SelectionCalculations {
     const fullMergeAreaWithinSelection = startRow <= mergedCell.row && startColumn <= mergedCell.col && endRow >= mergeRowEnd && endColumn >= mergeColumnEnd;
     if (fullMergeAreaWithinSelection) {
       return `${this.fullySelectedMergedCellClassName}-${layerLevel}`;
-    } else if (this.isMergeCellFullySelected(mergedCell, this.plugin.hot.getSelectedRange())) {
+    } else if (this.plugin.selectionCalculations.isMergeCellFullySelected(mergedCell, this.plugin.hot.getSelectedRange())) {
+      // eslint-disable-line max-len
       return `${this.fullySelectedMergedCellClassName}-multiple`;
     }
   }

package/plugins/mergeCells/cellsCollection.js

@@ -3,7 +3,6 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.array.unscopables.flat-map.js");
 var _cellCoords = _interopRequireDefault(require("./cellCoords"));
 var _number = require("../../helpers/number");
 var _console = require("../../helpers/console");
@@ -11,30 +10,17 @@ var _array = require("../../helpers/array");
 var _utils = require("./utils");
 var _templateLiteralTag = require("../../helpers/templateLiteralTag");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 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); }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 /**
  * Defines a container object for the merged cells.
  *
  * @private
  * @class MergedCellsCollection
  */
-var _MergedCellsCollection_brand = /*#__PURE__*/new WeakSet();
 class MergedCellsCollection {
   constructor(mergeCellsPlugin) {
-    /**
-     * Gets the list of the indexes that do not intersect with other merged cells within the provided range.
-     *
-     * @param {CellRange} range The range to search within.
-     * @param {'row' | 'col'} axis The axis to search within.
-     * @param {number} scanDirection  The direction to scan the range. `1` for forward, `-1` for backward.
-     * @returns {number[]}
-     */
-    _classPrivateMethodInitSpec(this, _MergedCellsCollection_brand);
     /**
      * Reference to the Merge Cells plugin.
      *
@@ -273,81 +259,6 @@ class MergedCellsCollection {
     return this.hot._createCellCoords(firstRenderableRow, firstRenderableColumn);
   }
 
-  /**
-   * Gets the start-most visual column index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualColumnIndex The visual column index to start the search from.
-   * @returns {number}
-   */
-  getStartMostColumnIndex(range, visualColumnIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'col', -1);
-    let startMostIndex = visualColumnIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] <= visualColumnIndex) {
-        startMostIndex = indexes[i];
-        break;
-      }
-    }
-    return startMostIndex;
-  }
-
-  /**
-   * Gets the end-most visual column index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualColumnIndex The visual column index to start the search from.
-   * @returns {number}
-   */
-  getEndMostColumnIndex(range, visualColumnIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'col', 1);
-    let endMostIndex = visualColumnIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] >= visualColumnIndex) {
-        endMostIndex = indexes[i];
-        break;
-      }
-    }
-    return endMostIndex;
-  }
-
-  /**
-   * Gets the top-most visual row index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualRowIndex The visual row index to start the search from.
-   * @returns {number}
-   */
-  getTopMostRowIndex(range, visualRowIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'row', -1);
-    let topMostIndex = visualRowIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] <= visualRowIndex) {
-        topMostIndex = indexes[i];
-        break;
-      }
-    }
-    return topMostIndex;
-  }
-
-  /**
-   * Gets the bottom-most visual row index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualRowIndex The visual row index to start the search from.
-   * @returns {number}
-   */
-  getBottomMostRowIndex(range, visualRowIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'row', 1);
-    let bottomMostIndex = visualRowIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] >= visualRowIndex) {
-        bottomMostIndex = indexes[i];
-        break;
-      }
-    }
-    return bottomMostIndex;
-  }
   /**
    * Shift the merged cell in the direction and by an offset defined in the arguments.
    *
@@ -383,31 +294,4 @@ class MergedCellsCollection {
     });
   }
 }
-function _getNonIntersectingIndexes(range, axis) {
-  let scanDirection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  const indexes = new Map();
-  const from = scanDirection === 1 ? range.getTopStartCorner() : range.getBottomEndCorner();
-  const to = scanDirection === 1 ? range.getBottomEndCorner() : range.getTopStartCorner();
-  for (let row = from.row; scanDirection === 1 ? row <= to.row : row >= to.row; row += scanDirection) {
-    for (let column = from.col; scanDirection === 1 ? column <= to.col : column >= to.col; column += scanDirection) {
-      const index = axis === 'row' ? row : column;
-      const mergedCell = this.get(row, column);
-      let lastIndex = index;
-      if (mergedCell) {
-        lastIndex = scanDirection === 1 ? mergedCell[axis] + mergedCell[`${axis}span`] - 1 : mergedCell[axis];
-      }
-      if (!indexes.has(index)) {
-        indexes.set(index, new Set());
-      }
-      indexes.get(index).add(lastIndex);
-    }
-  }
-  return Array.from(new Set(Array.from(indexes.entries()).filter(_ref => {
-    let [, set] = _ref;
-    return set.size === 1;
-  }).flatMap(_ref2 => {
-    let [, set] = _ref2;
-    return Array.from(set);
-  })));
-}
 var _default = exports.default = MergedCellsCollection;

package/plugins/mergeCells/cellsCollection.mjs

@@ -1,12 +1,8 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
-import "core-js/modules/es.array.unscopables.flat-map.js";
-function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 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); }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import MergedCellCoords from "./cellCoords.mjs";
 import { rangeEach, rangeEachReverse } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
@@ -19,18 +15,8 @@ import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
  * @private
  * @class MergedCellsCollection
  */
-var _MergedCellsCollection_brand = /*#__PURE__*/new WeakSet();
 class MergedCellsCollection {
   constructor(mergeCellsPlugin) {
-    /**
-     * Gets the list of the indexes that do not intersect with other merged cells within the provided range.
-     *
-     * @param {CellRange} range The range to search within.
-     * @param {'row' | 'col'} axis The axis to search within.
-     * @param {number} scanDirection  The direction to scan the range. `1` for forward, `-1` for backward.
-     * @returns {number[]}
-     */
-    _classPrivateMethodInitSpec(this, _MergedCellsCollection_brand);
     /**
      * Reference to the Merge Cells plugin.
      *
@@ -269,81 +255,6 @@ class MergedCellsCollection {
     return this.hot._createCellCoords(firstRenderableRow, firstRenderableColumn);
   }
 
-  /**
-   * Gets the start-most visual column index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualColumnIndex The visual column index to start the search from.
-   * @returns {number}
-   */
-  getStartMostColumnIndex(range, visualColumnIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'col', -1);
-    let startMostIndex = visualColumnIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] <= visualColumnIndex) {
-        startMostIndex = indexes[i];
-        break;
-      }
-    }
-    return startMostIndex;
-  }
-
-  /**
-   * Gets the end-most visual column index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualColumnIndex The visual column index to start the search from.
-   * @returns {number}
-   */
-  getEndMostColumnIndex(range, visualColumnIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'col', 1);
-    let endMostIndex = visualColumnIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] >= visualColumnIndex) {
-        endMostIndex = indexes[i];
-        break;
-      }
-    }
-    return endMostIndex;
-  }
-
-  /**
-   * Gets the top-most visual row index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualRowIndex The visual row index to start the search from.
-   * @returns {number}
-   */
-  getTopMostRowIndex(range, visualRowIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'row', -1);
-    let topMostIndex = visualRowIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] <= visualRowIndex) {
-        topMostIndex = indexes[i];
-        break;
-      }
-    }
-    return topMostIndex;
-  }
-
-  /**
-   * Gets the bottom-most visual row index that do not intersect with other merged cells within the provided range.
-   *
-   * @param {CellRange} range The range to search within.
-   * @param {number} visualRowIndex The visual row index to start the search from.
-   * @returns {number}
-   */
-  getBottomMostRowIndex(range, visualRowIndex) {
-    const indexes = _assertClassBrand(_MergedCellsCollection_brand, this, _getNonIntersectingIndexes).call(this, range, 'row', 1);
-    let bottomMostIndex = visualRowIndex;
-    for (let i = 0; i < indexes.length; i++) {
-      if (indexes[i] >= visualRowIndex) {
-        bottomMostIndex = indexes[i];
-        break;
-      }
-    }
-    return bottomMostIndex;
-  }
   /**
    * Shift the merged cell in the direction and by an offset defined in the arguments.
    *
@@ -379,31 +290,4 @@ class MergedCellsCollection {
     });
   }
 }
-function _getNonIntersectingIndexes(range, axis) {
-  let scanDirection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  const indexes = new Map();
-  const from = scanDirection === 1 ? range.getTopStartCorner() : range.getBottomEndCorner();
-  const to = scanDirection === 1 ? range.getBottomEndCorner() : range.getTopStartCorner();
-  for (let row = from.row; scanDirection === 1 ? row <= to.row : row >= to.row; row += scanDirection) {
-    for (let column = from.col; scanDirection === 1 ? column <= to.col : column >= to.col; column += scanDirection) {
-      const index = axis === 'row' ? row : column;
-      const mergedCell = this.get(row, column);
-      let lastIndex = index;
-      if (mergedCell) {
-        lastIndex = scanDirection === 1 ? mergedCell[axis] + mergedCell[`${axis}span`] - 1 : mergedCell[axis];
-      }
-      if (!indexes.has(index)) {
-        indexes.set(index, new Set());
-      }
-      indexes.get(index).add(lastIndex);
-    }
-  }
-  return Array.from(new Set(Array.from(indexes.entries()).filter(_ref => {
-    let [, set] = _ref;
-    return set.size === 1;
-  }).flatMap(_ref2 => {
-    let [, set] = _ref2;
-    return Array.from(set);
-  })));
-}
 export default MergedCellsCollection;

package/plugins/mergeCells/contextMenuItem/toggleMerge.js

@@ -25,17 +25,7 @@ function toggleMergeItem(plugin) {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_MERGE_CELLS);
     },
     callback() {
-      const currentRange = this.getSelectedRangeLast();
-      if (!currentRange) {
-        return;
-      }
-      currentRange.setDirection(this.isRtl() ? 'NE-SW' : 'NW-SE');
-      const {
-        from,
-        to
-      } = currentRange;
-      plugin.toggleMerge(currentRange);
-      this.selectCell(from.row, from.col, to.row, to.col, false);
+      plugin.toggleMergeOnSelection();
     },
     disabled() {
       const sel = this.getSelectedLast();

package/plugins/mergeCells/contextMenuItem/toggleMerge.mjs

@@ -18,17 +18,7 @@ export default function toggleMergeItem(plugin) {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_MERGE_CELLS);
     },
     callback() {
-      const currentRange = this.getSelectedRangeLast();
-      if (!currentRange) {
-        return;
-      }
-      currentRange.setDirection(this.isRtl() ? 'NE-SW' : 'NW-SE');
-      const {
-        from,
-        to
-      } = currentRange;
-      plugin.toggleMerge(currentRange);
-      this.selectCell(from.row, from.col, to.row, to.col, false);
+      plugin.toggleMergeOnSelection();
     },
     disabled() {
       const sel = this.getSelectedLast();