handsontable 0.0.0-next-29d7f5c-20241210 → 0.0.0-next-2580147-20241212

package/plugins/mergeCells/calculations/autofill.mjs

@@ -1,4 +1,6 @@
 import "core-js/modules/es.error.cause.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.every.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : 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); }
@@ -35,35 +37,20 @@ class AutofillCalculations {
     this.mergedCellsCollection = this.plugin.mergedCellsCollection;
   }
 
-  /**
-   * Correct the provided selection area, so it's not selecting only a part of a merged cell.
-   *
-   * @param {Array} selectionArea The selection to correct.
-   */
-  correctSelectionAreaSize(selectionArea) {
-    if (selectionArea[0] === selectionArea[2] && selectionArea[1] === selectionArea[3]) {
-      const mergedCell = this.mergedCellsCollection.get(selectionArea[0], selectionArea[1]);
-      if (mergedCell) {
-        selectionArea[2] = selectionArea[0] + mergedCell.rowspan - 1;
-        selectionArea[3] = selectionArea[1] + mergedCell.colspan - 1;
-      }
-    }
-  }
-
   /**
    * Get the direction of the autofill process.
    *
-   * @param {Array} selectionArea The selection area.
-   * @param {Array} finalArea The final area (base + drag).
+   * @param {Array} baseArea The selection area.
+   * @param {Array} fullArea The final area (base + drag).
    * @returns {string} `up`, `down`, `left` or `right`.
    */
-  getDirection(selectionArea, finalArea) {
+  getDirection(baseArea, fullArea) {
     let direction = null;
-    if (finalArea[0] === selectionArea[0] && finalArea[1] === selectionArea[1] && finalArea[3] === selectionArea[3]) {
+    if (fullArea[0] === baseArea[0] && fullArea[1] === baseArea[1] && fullArea[3] === baseArea[3]) {
       direction = 'down';
-    } else if (finalArea[2] === selectionArea[2] && finalArea[1] === selectionArea[1] && finalArea[3] === selectionArea[3]) {
+    } else if (fullArea[2] === baseArea[2] && fullArea[1] === baseArea[1] && fullArea[3] === baseArea[3]) {
       direction = 'up';
-    } else if (finalArea[1] === selectionArea[1] && finalArea[2] === selectionArea[2]) {
+    } else if (fullArea[1] === baseArea[1] && fullArea[2] === baseArea[2]) {
       direction = 'right';
     } else {
       direction = 'left';
@@ -75,20 +62,20 @@ class AutofillCalculations {
    * Snap the drag area to the farthest merged cell, so it won't clip any of the merged cells.
    *
    * @param {Array} baseArea The base selected area.
-   * @param {Array} dragArea The drag area.
+   * @param {Array} fullArea The drag area.
    * @param {string} dragDirection The autofill drag direction.
    * @param {Array} foundMergedCells MergeCellCoords found in the base selection area.
    * @returns {Array} The new drag area.
    */
-  snapDragArea(baseArea, dragArea, dragDirection, foundMergedCells) {
-    const newDragArea = dragArea.slice(0);
-    const fillSize = this.getAutofillSize(baseArea, dragArea, dragDirection);
+  snapDragArea(baseArea, fullArea, dragDirection, foundMergedCells) {
+    const newDragArea = fullArea.slice(0);
+    const fillSize = this.getAutofillSize(baseArea, fullArea, dragDirection);
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
     const verticalDirection = ['up', 'down'].indexOf(dragDirection) > -1;
     const fullCycle = verticalDirection ? baseAreaEndRow - baseAreaStartRow + 1 : baseAreaEndColumn - baseAreaStartColumn + 1;
     const fulls = Math.floor(fillSize / fullCycle) * fullCycle;
     const partials = fillSize - fulls;
-    const farthestCollection = this.getFarthestCollection(baseArea, dragArea, dragDirection, foundMergedCells);
+    const farthestCollection = this.getFarthestCollection(baseArea, fullArea, dragDirection, foundMergedCells);
     if (farthestCollection) {
       if (dragDirection === 'down') {
         const fill = farthestCollection.row + farthestCollection.rowspan - baseAreaStartRow - partials;
@@ -153,13 +140,13 @@ class AutofillCalculations {
    *
    * @private
    * @param {Array} baseArea The base selection area.
-   * @param {Array} dragArea The drag area (containing the base area).
+   * @param {Array} fullArea The drag area (containing the base area).
    * @param {string} direction The drag direction.
    * @returns {number|null} The "length" (height or width, depending on the direction) of the drag.
    */
-  getAutofillSize(baseArea, dragArea, direction) {
+  getAutofillSize(baseArea, fullArea, direction) {
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
-    const [dragAreaStartRow, dragAreaStartColumn, dragAreaEndRow, dragAreaEndColumn] = dragArea;
+    const [dragAreaStartRow, dragAreaStartColumn, dragAreaEndRow, dragAreaEndColumn] = fullArea;
     switch (direction) {
       case 'up':
         return baseAreaStartRow - dragAreaStartRow;
@@ -179,22 +166,30 @@ class AutofillCalculations {
    *
    * @private
    * @param {Array} baseArea The base selection area.
-   * @param {Array} dragArea The base selection area extended by the drag area.
+   * @param {Array} fullArea The base selection area extended by the drag area.
    * @param {string} direction Drag direction.
    * @returns {Array|null} Array representing the drag area coordinates.
    */
-  getDragArea(baseArea, dragArea, direction) {
+  getDragArea(baseArea, fullArea, direction) {
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
-    const [dragAreaStartRow, dragAreaStartColumn, dragAreaEndRow, dragAreaEndColumn] = dragArea;
+    const [fullAreaStartRow, fullAreaStartColumn, fullAreaEndRow, fullAreaEndColumn] = fullArea;
     switch (direction) {
       case 'up':
-        return [dragAreaStartRow, dragAreaStartColumn, baseAreaStartRow - 1, baseAreaEndColumn];
+        return [fullAreaStartRow, fullAreaStartColumn, baseAreaStartRow - 1, baseAreaEndColumn];
       case 'down':
-        return [baseAreaEndRow + 1, baseAreaStartColumn, dragAreaEndRow, baseAreaEndColumn];
+        {
+          const mergedCell = this.mergedCellsCollection.get(fullAreaEndRow, baseAreaEndColumn);
+          const rowShift = mergedCell ? mergedCell.rowspan - 1 : 0;
+          return [baseAreaEndRow + 1, baseAreaStartColumn, fullAreaEndRow + rowShift, baseAreaEndColumn];
+        }
       case 'left':
-        return [dragAreaStartRow, dragAreaStartColumn, baseAreaEndRow, baseAreaStartColumn - 1];
+        return [fullAreaStartRow, fullAreaStartColumn, baseAreaEndRow, baseAreaStartColumn - 1];
       case 'right':
-        return [baseAreaStartRow, baseAreaEndColumn + 1, dragAreaEndRow, dragAreaEndColumn];
+        {
+          const mergedCell = this.mergedCellsCollection.get(fullAreaEndRow, baseAreaEndColumn);
+          const columnShift = mergedCell ? mergedCell.colspan - 1 : 0;
+          return [baseAreaStartRow, baseAreaEndColumn + columnShift, fullAreaEndRow, fullAreaEndColumn];
+        }
       default:
         return null;
     }
@@ -205,17 +200,17 @@ class AutofillCalculations {
    *
    * @private
    * @param {Array} baseArea The base selection area.
-   * @param {Array} dragArea The drag area (containing the base area).
+   * @param {Array} fullArea The drag area (containing the base area).
    * @param {string} direction The drag direction.
    * @param {Array} mergedCellArray Array of the merged cells found in the base area.
    * @returns {MergedCellCoords|null}
    */
-  getFarthestCollection(baseArea, dragArea, direction, mergedCellArray) {
+  getFarthestCollection(baseArea, fullArea, direction, mergedCellArray) {
     const [baseAreaStartRow, baseAreaStartColumn, baseAreaEndRow, baseAreaEndColumn] = baseArea;
     const verticalDirection = ['up', 'down'].indexOf(direction) > -1;
     const baseEnd = verticalDirection ? baseAreaEndRow : baseAreaEndColumn;
     const baseStart = verticalDirection ? baseAreaStartRow : baseAreaStartColumn;
-    const fillSize = this.getAutofillSize(baseArea, dragArea, direction);
+    const fillSize = this.getAutofillSize(baseArea, fullArea, direction);
     const fullCycle = verticalDirection ? baseAreaEndRow - baseAreaStartRow + 1 : baseAreaEndColumn - baseAreaStartColumn + 1;
     const fulls = Math.floor(fillSize / fullCycle) * fullCycle;
     const partials = fillSize - fulls;
@@ -290,7 +285,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'down':
               this.plugin.mergedCellsCollection.add({
@@ -298,7 +293,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'left':
               this.plugin.mergedCellsCollection.add({
@@ -306,7 +301,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col - fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'right':
               this.plugin.mergedCellsCollection.add({
@@ -314,7 +309,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col + fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             default:
           }
@@ -389,7 +384,28 @@ class AutofillCalculations {
     const topLeft = this.plugin.hot._createCellCoords(dragAreaStartRow, dragAreaStartColumn);
     const bottomRight = this.plugin.hot._createCellCoords(dragAreaEndRow, dragAreaEndColumn);
     const dragRange = this.plugin.hot._createCellRange(topLeft, topLeft, bottomRight);
-    return this.mergedCellsCollection.getWithinRange(dragRange, true).length > 0;
+    const mergedCellsWithPartials = this.mergedCellsCollection.getWithinRange(dragRange, true);
+    if (mergedCellsWithPartials.length === 0) {
+      return false;
+    }
+    const mergedCellsWithoutPartials = this.mergedCellsCollection.getWithinRange(dragRange, false);
+    if (mergedCellsWithoutPartials.length === 0) {
+      return true;
+    }
+    if (direction === 'up' || direction === 'down') {
+      return !mergedCellsWithoutPartials.every(_ref => {
+        let {
+          colspan
+        } = _ref;
+        return colspan === dragRange.getWidth();
+      });
+    }
+    return !mergedCellsWithoutPartials.every(_ref2 => {
+      let {
+        rowspan
+      } = _ref2;
+      return rowspan === dragRange.getHeight();
+    });
   }
 }
 export default AutofillCalculations;

package/plugins/mergeCells/cellsCollection.js

@@ -109,18 +109,33 @@ class MergedCellsCollection {
   /**
    * Get the first-found merged cell containing the provided range.
    *
-   * @param {CellRange|object} range The range to search merged cells for.
-   * @returns {MergedCellCoords|boolean}
+   * @param {CellRange} range The range to search merged cells for.
+   * @returns {MergedCellCoords | false}
    */
   getByRange(range) {
+    const {
+      row: rowStart,
+      col: columnStart
+    } = range.getTopStartCorner();
+    const {
+      row: rowEnd,
+      col: columnEnd
+    } = range.getBottomEndCorner();
+    const mergedCellsLength = this.mergedCells.length;
     let result = false;
-    (0, _array.arrayEach)(this.mergedCells, mergedCell => {
-      if (mergedCell.row <= range.from.row && mergedCell.row + mergedCell.rowspan - 1 >= range.to.row && mergedCell.col <= range.from.col && mergedCell.col + mergedCell.colspan - 1 >= range.to.col) {
+    for (let i = 0; i < mergedCellsLength; i++) {
+      const mergedCell = this.mergedCells[i];
+      const {
+        row,
+        col,
+        rowspan,
+        colspan
+      } = mergedCell;
+      if (row >= rowStart && row + rowspan - 1 <= rowEnd && col >= columnStart && col + colspan - 1 <= columnEnd) {
         result = mergedCell;
-        return result;
+        break;
       }
-      return true;
-    });
+    }
     return result;
   }
 
@@ -230,7 +245,9 @@ class MergedCellsCollection {
       _assertClassBrand(_MergedCellsCollection_brand, this, _addMergedCellToMatrix).call(this, newMergedCell);
       return newMergedCell;
     }
-    (0, _console.warn)(MergedCellsCollection.IS_OVERLAPPING_WARNING(newMergedCell));
+    if (isOverlapping) {
+      (0, _console.warn)(MergedCellsCollection.IS_OVERLAPPING_WARNING(newMergedCell));
+    }
     return false;
   }
 

package/plugins/mergeCells/cellsCollection.mjs

@@ -105,18 +105,33 @@ class MergedCellsCollection {
   /**
    * Get the first-found merged cell containing the provided range.
    *
-   * @param {CellRange|object} range The range to search merged cells for.
-   * @returns {MergedCellCoords|boolean}
+   * @param {CellRange} range The range to search merged cells for.
+   * @returns {MergedCellCoords | false}
    */
   getByRange(range) {
+    const {
+      row: rowStart,
+      col: columnStart
+    } = range.getTopStartCorner();
+    const {
+      row: rowEnd,
+      col: columnEnd
+    } = range.getBottomEndCorner();
+    const mergedCellsLength = this.mergedCells.length;
     let result = false;
-    arrayEach(this.mergedCells, mergedCell => {
-      if (mergedCell.row <= range.from.row && mergedCell.row + mergedCell.rowspan - 1 >= range.to.row && mergedCell.col <= range.from.col && mergedCell.col + mergedCell.colspan - 1 >= range.to.col) {
+    for (let i = 0; i < mergedCellsLength; i++) {
+      const mergedCell = this.mergedCells[i];
+      const {
+        row,
+        col,
+        rowspan,
+        colspan
+      } = mergedCell;
+      if (row >= rowStart && row + rowspan - 1 <= rowEnd && col >= columnStart && col + colspan - 1 <= columnEnd) {
         result = mergedCell;
-        return result;
+        break;
       }
-      return true;
-    });
+    }
     return result;
   }
 
@@ -226,7 +241,9 @@ class MergedCellsCollection {
       _assertClassBrand(_MergedCellsCollection_brand, this, _addMergedCellToMatrix).call(this, newMergedCell);
       return newMergedCell;
     }
-    warn(MergedCellsCollection.IS_OVERLAPPING_WARNING(newMergedCell));
+    if (isOverlapping) {
+      warn(MergedCellsCollection.IS_OVERLAPPING_WARNING(newMergedCell));
+    }
     return false;
   }
 

package/plugins/mergeCells/mergeCells.js

@@ -909,8 +909,8 @@ class MergeCells extends _base.BasePlugin {
   /**
    * The `modifyAutofillRange` hook callback.
    *
-   * @param {Array} drag The drag area coordinates.
-   * @param {Array} select The selection information.
+   * @param {Array} fullArea The drag + base area coordinates.
+   * @param {Array} baseArea The selection information.
    * @returns {Array} The new drag area.
    */
 }
@@ -1294,23 +1294,19 @@ function _onAfterViewportColumnCalculatorOverride(calc) {
   this.modifyViewportColumnStart(calc, nrOfRows);
   this.modifyViewportColumnEnd(calc, nrOfRows);
 }
-function _onModifyAutofillRange(drag, select) {
-  this.autofillCalculations.correctSelectionAreaSize(select);
-  const dragDirection = this.autofillCalculations.getDirection(select, drag);
-  let dragArea = drag;
-  if (this.autofillCalculations.dragAreaOverlapsCollections(select, dragArea, dragDirection)) {
-    dragArea = select;
-    return dragArea;
+function _onModifyAutofillRange(fullArea, baseArea) {
+  const dragDirection = this.autofillCalculations.getDirection(baseArea, fullArea);
+  if (this.autofillCalculations.dragAreaOverlapsCollections(baseArea, fullArea, dragDirection)) {
+    return baseArea;
   }
-  const from = this.hot._createCellCoords(select[0], select[1]);
-  const to = this.hot._createCellCoords(select[2], select[3]);
+  const from = this.hot._createCellCoords(baseArea[0], baseArea[1]);
+  const to = this.hot._createCellCoords(baseArea[2], baseArea[3]);
   const range = this.hot._createCellRange(from, from, to);
   const mergedCellsWithinSelectionArea = this.mergedCellsCollection.getWithinRange(range);
   if (mergedCellsWithinSelectionArea.length === 0) {
-    return dragArea;
+    return fullArea;
   }
-  dragArea = this.autofillCalculations.snapDragArea(select, dragArea, dragDirection, mergedCellsWithinSelectionArea);
-  return dragArea;
+  return this.autofillCalculations.snapDragArea(baseArea, fullArea, dragDirection, mergedCellsWithinSelectionArea);
 }
 /**
  * `afterCreateCol` hook callback.

package/plugins/mergeCells/mergeCells.mjs

@@ -905,8 +905,8 @@ export class MergeCells extends BasePlugin {
   /**
    * The `modifyAutofillRange` hook callback.
    *
-   * @param {Array} drag The drag area coordinates.
-   * @param {Array} select The selection information.
+   * @param {Array} fullArea The drag + base area coordinates.
+   * @param {Array} baseArea The selection information.
    * @returns {Array} The new drag area.
    */
 }
@@ -1289,23 +1289,19 @@ function _onAfterViewportColumnCalculatorOverride(calc) {
   this.modifyViewportColumnStart(calc, nrOfRows);
   this.modifyViewportColumnEnd(calc, nrOfRows);
 }
-function _onModifyAutofillRange(drag, select) {
-  this.autofillCalculations.correctSelectionAreaSize(select);
-  const dragDirection = this.autofillCalculations.getDirection(select, drag);
-  let dragArea = drag;
-  if (this.autofillCalculations.dragAreaOverlapsCollections(select, dragArea, dragDirection)) {
-    dragArea = select;
-    return dragArea;
+function _onModifyAutofillRange(fullArea, baseArea) {
+  const dragDirection = this.autofillCalculations.getDirection(baseArea, fullArea);
+  if (this.autofillCalculations.dragAreaOverlapsCollections(baseArea, fullArea, dragDirection)) {
+    return baseArea;
   }
-  const from = this.hot._createCellCoords(select[0], select[1]);
-  const to = this.hot._createCellCoords(select[2], select[3]);
+  const from = this.hot._createCellCoords(baseArea[0], baseArea[1]);
+  const to = this.hot._createCellCoords(baseArea[2], baseArea[3]);
   const range = this.hot._createCellRange(from, from, to);
   const mergedCellsWithinSelectionArea = this.mergedCellsCollection.getWithinRange(range);
   if (mergedCellsWithinSelectionArea.length === 0) {
-    return dragArea;
+    return fullArea;
   }
-  dragArea = this.autofillCalculations.snapDragArea(select, dragArea, dragDirection, mergedCellsWithinSelectionArea);
-  return dragArea;
+  return this.autofillCalculations.snapDragArea(baseArea, fullArea, dragDirection, mergedCellsWithinSelectionArea);
 }
 /**
  * `afterCreateCol` hook callback.

package/plugins/undoRedo/actions/filters.js

@@ -48,9 +48,7 @@ class FiltersAction extends _base.BaseAction {
   undo(hot, undoneCallback) {
     const filters = hot.getPlugin('filters');
     hot.addHookOnce('afterViewRender', undoneCallback);
-    if (this.previousConditionsStack) {
-      filters.conditionCollection.importAllConditions(this.previousConditionsStack);
-    }
+    filters.conditionCollection.importAllConditions(this.previousConditionsStack);
     filters.filter();
   }
 

package/plugins/undoRedo/actions/filters.mjs

@@ -45,9 +45,7 @@ export class FiltersAction extends BaseAction {
   undo(hot, undoneCallback) {
     const filters = hot.getPlugin('filters');
     hot.addHookOnce('afterViewRender', undoneCallback);
-    if (this.previousConditionsStack) {
-      filters.conditionCollection.importAllConditions(this.previousConditionsStack);
-    }
+    filters.conditionCollection.importAllConditions(this.previousConditionsStack);
     filters.filter();
   }
 

package/shortcutContexts/commands/moveCellSelection/downByViewportHeight.js

@@ -12,6 +12,7 @@ const command = exports.command = {
       row
     } = hot.getSelectedRangeLast().highlight;
     let rowsStep = hot.countVisibleRows() + columnHeadersCount;
+    rowsStep = rowsStep === 0 ? 1 : rowsStep;
 
     // if the last row is currently selected move the focus to the first row (if autoWrap is enabled)
     if (row === hot.countRows() - 1) {

package/shortcutContexts/commands/moveCellSelection/downByViewportHeight.mjs

@@ -9,6 +9,7 @@ export const command = {
       row
     } = hot.getSelectedRangeLast().highlight;
     let rowsStep = hot.countVisibleRows() + columnHeadersCount;
+    rowsStep = rowsStep === 0 ? 1 : rowsStep;
 
     // if the last row is currently selected move the focus to the first row (if autoWrap is enabled)
     if (row === hot.countRows() - 1) {

package/shortcutContexts/commands/moveCellSelection/upByViewportHeight.js

@@ -11,7 +11,8 @@ const command = exports.command = {
     const {
       row
     } = hot.getSelectedRangeLast().highlight;
-    let rowsStep = -(hot.countVisibleRows() + columnHeadersCount);
+    let rowsStep = hot.countVisibleRows() + columnHeadersCount;
+    rowsStep = rowsStep === 0 ? -1 : -rowsStep;
 
     // if the first row is currently selected move the focus to the last row (if autoWrap is enabled)
     if (row === -columnHeadersCount) {

package/shortcutContexts/commands/moveCellSelection/upByViewportHeight.mjs

@@ -8,7 +8,8 @@ export const command = {
     const {
       row
     } = hot.getSelectedRangeLast().highlight;
-    let rowsStep = -(hot.countVisibleRows() + columnHeadersCount);
+    let rowsStep = hot.countVisibleRows() + columnHeadersCount;
+    rowsStep = rowsStep === 0 ? -1 : -rowsStep;
 
     // if the first row is currently selected move the focus to the last row (if autoWrap is enabled)
     if (row === -columnHeadersCount) {

package/styles/handsontable.css

@@ -25,8 +25,8 @@
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
  * USE OR INABILITY TO USE THIS SOFTWARE.
  *
- * Version: 0.0.0-next-29d7f5c-20241210
- * Release date: 17/10/2024 (built at 10/12/2024 13:06:12)
+ * Version: 0.0.0-next-2580147-20241212
+ * Release date: 17/10/2024 (built at 12/12/2024 09:18:43)
  */
 .ht-wrapper:not([class*=ht-theme]) {
   --ht-cell-horizontal-padding: 8px;
@@ -210,6 +210,9 @@
 .handsontable tbody tr td:last-child {
   border-inline-end-color: var(--ht-border-color);
 }
+.handsontable thead tr:only-of-type th .relative::after {
+  bottom: 0;
+}
 .handsontable thead tr th {
   padding: 0;
 }