handsontable 0.0.0-next-71bce98-20241210 → 0.0.0-next-cd0001d-20241212

package/base.js

@@ -45,8 +45,8 @@ Handsontable.hooks = _hooks.Hooks.getSingleton();
 Handsontable.CellCoords = _src.CellCoords;
 Handsontable.CellRange = _src.CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "10/12/2024 16:44:21";
-Handsontable.version = "0.0.0-next-71bce98-20241210";
+Handsontable.buildDate = "12/12/2024 09:48:01";
+Handsontable.version = "0.0.0-next-cd0001d-20241212";
 Handsontable.languages = {
   dictionaryKeys: _registry.dictionaryKeys,
   getLanguageDictionary: _registry.getLanguageDictionary,

package/base.mjs

@@ -35,8 +35,8 @@ Handsontable.hooks = Hooks.getSingleton();
 Handsontable.CellCoords = CellCoords;
 Handsontable.CellRange = CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "10/12/2024 16:44:26";
-Handsontable.version = "0.0.0-next-71bce98-20241210";
+Handsontable.buildDate = "12/12/2024 09:48:07";
+Handsontable.version = "0.0.0-next-cd0001d-20241212";
 Handsontable.languages = {
   dictionaryKeys,
   getLanguageDictionary,

package/core.js

@@ -711,10 +711,11 @@ function Core(rootElement, userSettings) {
         default:
           throw new Error(`There is no such action "${action}"`);
       }
-      instance.view.render();
       if (!keepEmptyRows) {
         grid.adjustRowsAndCols(); // makes sure that we did not add rows that will be removed in next refresh
       }
+      instance.view.render();
+      instance.view.adjustElementsSize();
     },
     /**
      * Makes sure there are empty rows at the bottom of the table.
@@ -763,7 +764,7 @@ function Core(rootElement, userSettings) {
 
         // should I add empty cols to meet minCols?
         if (minCols && !tableMeta.columns && nrOfColumns < minCols) {
-          // The synchronization with cell meta is not desired here. For `minSpareRows` option,
+          // The synchronization with cell meta is not desired here. For `minCols` option,
           // we don't want to touch/shift cell meta objects.
           const colsToCreate = minCols - nrOfColumns;
           emptyCols += colsToCreate;
@@ -777,16 +778,13 @@ function Core(rootElement, userSettings) {
           const emptyColsMissing = minSpareCols - emptyCols;
           const colsToCreate = Math.min(emptyColsMissing, tableMeta.maxCols - nrOfColumns);
 
-          // The synchronization with cell meta is not desired here. For `minSpareRows` option,
+          // The synchronization with cell meta is not desired here. For `minSpareCols` option,
           // we don't want to touch/shift cell meta objects.
           datamap.createCol(nrOfColumns, colsToCreate, {
             source: 'auto'
           });
         }
       }
-      if (instance.view) {
-        instance.view.adjustElementsSize();
-      }
     },
     /**
      * Populate the data from the provided 2d array from the given cell coordinates.

package/core.mjs

@@ -706,10 +706,11 @@ export default function Core(rootElement, userSettings) {
         default:
           throw new Error(`There is no such action "${action}"`);
       }
-      instance.view.render();
       if (!keepEmptyRows) {
         grid.adjustRowsAndCols(); // makes sure that we did not add rows that will be removed in next refresh
       }
+      instance.view.render();
+      instance.view.adjustElementsSize();
     },
     /**
      * Makes sure there are empty rows at the bottom of the table.
@@ -758,7 +759,7 @@ export default function Core(rootElement, userSettings) {
 
         // should I add empty cols to meet minCols?
         if (minCols && !tableMeta.columns && nrOfColumns < minCols) {
-          // The synchronization with cell meta is not desired here. For `minSpareRows` option,
+          // The synchronization with cell meta is not desired here. For `minCols` option,
           // we don't want to touch/shift cell meta objects.
           const colsToCreate = minCols - nrOfColumns;
           emptyCols += colsToCreate;
@@ -772,16 +773,13 @@ export default function Core(rootElement, userSettings) {
           const emptyColsMissing = minSpareCols - emptyCols;
           const colsToCreate = Math.min(emptyColsMissing, tableMeta.maxCols - nrOfColumns);
 
-          // The synchronization with cell meta is not desired here. For `minSpareRows` option,
+          // The synchronization with cell meta is not desired here. For `minSpareCols` option,
           // we don't want to touch/shift cell meta objects.
           datamap.createCol(nrOfColumns, colsToCreate, {
             source: 'auto'
           });
         }
       }
-      if (instance.view) {
-        instance.view.adjustElementsSize();
-      }
     },
     /**
      * Populate the data from the provided 2d array from the given cell coordinates.

package/dist/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-71bce98-20241210
- * Release date: 17/10/2024 (built at 10/12/2024 16:44:47)
+ * Version: 0.0.0-next-cd0001d-20241212
+ * Release date: 17/10/2024 (built at 12/12/2024 09:48:31)
  */
 /**
  * Fix for bootstrap styles

package/dist/handsontable.full.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-71bce98-20241210
- * Release date: 17/10/2024 (built at 10/12/2024 16:44:47)
+ * Version: 0.0.0-next-cd0001d-20241212
+ * Release date: 17/10/2024 (built at 12/12/2024 09:48:31)
  */
 /**
  * Fix for bootstrap styles

package/dist/handsontable.full.js

@@ -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-71bce98-20241210
- * Release date: 17/10/2024 (built at 10/12/2024 16:44:31)
+ * Version: 0.0.0-next-cd0001d-20241212
+ * Release date: 17/10/2024 (built at 12/12/2024 09:48:12)
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -42676,8 +42676,8 @@ Handsontable.hooks = _hooks.Hooks.getSingleton();
 Handsontable.CellCoords = _src.CellCoords;
 Handsontable.CellRange = _src.CellRange;
 Handsontable.packageName = 'handsontable';
-Handsontable.buildDate = "10/12/2024 16:44:31";
-Handsontable.version = "0.0.0-next-71bce98-20241210";
+Handsontable.buildDate = "12/12/2024 09:48:12";
+Handsontable.version = "0.0.0-next-cd0001d-20241212";
 Handsontable.languages = {
   dictionaryKeys: _registry.dictionaryKeys,
   getLanguageDictionary: _registry.getLanguageDictionary,
@@ -43411,10 +43411,11 @@ function Core(rootElement, userSettings) {
         default:
           throw new Error(`There is no such action "${action}"`);
       }
-      instance.view.render();
       if (!keepEmptyRows) {
         grid.adjustRowsAndCols(); // makes sure that we did not add rows that will be removed in next refresh
       }
+      instance.view.render();
+      instance.view.adjustElementsSize();
     },
     /**
      * Makes sure there are empty rows at the bottom of the table.
@@ -43463,7 +43464,7 @@ function Core(rootElement, userSettings) {
 
         // should I add empty cols to meet minCols?
         if (minCols && !tableMeta.columns && nrOfColumns < minCols) {
-          // The synchronization with cell meta is not desired here. For `minSpareRows` option,
+          // The synchronization with cell meta is not desired here. For `minCols` option,
           // we don't want to touch/shift cell meta objects.
           const colsToCreate = minCols - nrOfColumns;
           emptyCols += colsToCreate;
@@ -43477,16 +43478,13 @@ function Core(rootElement, userSettings) {
           const emptyColsMissing = minSpareCols - emptyCols;
           const colsToCreate = Math.min(emptyColsMissing, tableMeta.maxCols - nrOfColumns);
 
-          // The synchronization with cell meta is not desired here. For `minSpareRows` option,
+          // The synchronization with cell meta is not desired here. For `minSpareCols` option,
           // we don't want to touch/shift cell meta objects.
           datamap.createCol(nrOfColumns, colsToCreate, {
             source: 'auto'
           });
         }
       }
-      if (instance.view) {
-        instance.view.adjustElementsSize();
-      }
     },
     /**
      * Populate the data from the provided 2d array from the given cell coordinates.
@@ -53964,7 +53962,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-71bce98-20241210";
+  const hotVersion = "0.0.0-next-cd0001d-20241212";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';
@@ -98616,6 +98614,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) {
@@ -98927,7 +98926,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) {
@@ -129198,8 +129198,10 @@ __webpack_require__(303);
 __webpack_require__(305);
 __webpack_require__(307);
 __webpack_require__(309);
+__webpack_require__(311);
+__webpack_require__(329);
+__webpack_require__(338);
 var _feature = __webpack_require__(502);
-var _array = __webpack_require__(495);
 const sortCompare = (0, _feature.getComparisonFunction)();
 
 /**
@@ -129230,8 +129232,6 @@ function toVisualValue(value, defaultEmptyValue) {
   }
   return visualValue;
 }
-const SUPPORT_SET_CONSTRUCTOR = new Set([1]).has(1);
-const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'function';
 
 /**
  * Create an array assertion to compare if an element exists in that array (in a more efficient way than .indexOf).
@@ -129240,19 +129240,9 @@ const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'fu
  * @returns {Function}
  */
 function createArrayAssertion(initialData) {
-  let dataset = initialData;
-  if (SUPPORT_SET_CONSTRUCTOR) {
-    dataset = new Set(dataset);
-  }
+  const dataset = new Set(initialData);
   return function (value) {
-    let result;
-    if (SUPPORT_SET_CONSTRUCTOR) {
-      result = dataset.has(value);
-    } else {
-      /* eslint-disable no-bitwise */
-      result = !!~dataset.indexOf(value);
-    }
-    return result;
+    return dataset.has(value);
   };
 }
 
@@ -129273,13 +129263,7 @@ function toEmptyString(value) {
  * @returns {Array}
  */
 function unifyColumnValues(values) {
-  let unifiedValues = values;
-  if (SUPPORT_FAST_DEDUPE) {
-    unifiedValues = Array.from(new Set(unifiedValues));
-  } else {
-    unifiedValues = (0, _array.arrayUnique)(unifiedValues);
-  }
-  unifiedValues = unifiedValues.sort((a, b) => {
+  return Array.from(new Set(values)).map(value => toEmptyString(value)).sort((a, b) => {
     if (typeof a === 'number' && typeof b === 'number') {
       return a - b;
     }
@@ -129288,7 +129272,6 @@ function unifyColumnValues(values) {
     }
     return a > b ? 1 : -1;
   });
-  return unifiedValues;
 }
 
 /**
@@ -129307,7 +129290,7 @@ function intersectValues(base, selected, defaultEmptyValue, callback) {
   if (!same) {
     selectedItemsAssertion = createArrayAssertion(selected);
   }
-  (0, _array.arrayEach)(base, value => {
+  base.forEach(value => {
     let checked = false;
     if (same || selectedItemsAssertion(value)) {
       checked = true;
@@ -131296,10 +131279,11 @@ exports.__esModule = true;
 __webpack_require__(201);
 __webpack_require__(283);
 __webpack_require__(311);
+__webpack_require__(329);
 __webpack_require__(338);
+__webpack_require__(530);
 __webpack_require__(623);
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(504));
-var _array = __webpack_require__(495);
 var _object = __webpack_require__(499);
 var _templateLiteralTag = __webpack_require__(494);
 var _localHooks = _interopRequireDefault(__webpack_require__(599));
@@ -131410,7 +131394,7 @@ class ConditionCollection {
     let operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _conjunction.OPERATION_ID;
     let position = arguments.length > 3 ? arguments[3] : undefined;
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
-    const args = (0, _array.arrayMap)(conditionDefinition.args, v => typeof v === 'string' ? v.toLocaleLowerCase(localeForColumn) : v);
+    const args = conditionDefinition.args.map(v => typeof v === 'string' ? v.toLocaleLowerCase(localeForColumn) : v);
     const name = conditionDefinition.name || conditionDefinition.command.key;
 
     // If there's no previous condition stack defined (which means the condition stack was not cleared after the
@@ -131504,7 +131488,7 @@ class ConditionCollection {
    * @returns {Array}
    */
   exportAllConditions() {
-    return (0, _array.arrayReduce)(this.filteringStates.getEntries(), (allConditions, _ref2) => {
+    return this.filteringStates.getEntries().reduce((allConditions, _ref2) => {
       let [column, {
         operation,
         conditions
@@ -131512,14 +131496,14 @@ class ConditionCollection {
       allConditions.push({
         column,
         operation,
-        conditions: (0, _array.arrayMap)(conditions, _ref3 => {
+        conditions: conditions.map(_ref3 => {
           let {
             name,
             args
           } = _ref3;
           return {
             name,
-            args
+            args: [...args]
           };
         })
       });
@@ -131534,8 +131518,8 @@ class ConditionCollection {
    */
   importAllConditions(conditions) {
     this.clean();
-    (0, _array.arrayEach)(conditions, stack => {
-      (0, _array.arrayEach)(stack.conditions, condition => this.addCondition(stack.column, condition));
+    conditions.forEach(stack => {
+      stack.conditions.forEach(condition => this.addCondition(stack.column, condition));
     });
   }
 
@@ -140160,8 +140144,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.
    */
 }
@@ -140545,23 +140529,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.
@@ -140873,18 +140853,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;
   }
 
@@ -140994,7 +140989,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;
   }
 
@@ -141758,6 +141755,8 @@ var _default = exports["default"] = MergedCellCoords;
 
 var _interopRequireDefault = __webpack_require__(197);
 exports.__esModule = true;
+__webpack_require__(311);
+__webpack_require__(619);
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(504));
 var _object = __webpack_require__(499);
 var _array = __webpack_require__(495);
@@ -141792,35 +141791,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';
@@ -141832,20 +141816,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;
@@ -141910,13 +141894,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;
@@ -141936,22 +141920,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;
     }
@@ -141962,17 +141954,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;
@@ -142047,7 +142039,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'down':
               this.plugin.mergedCellsCollection.add({
@@ -142055,7 +142047,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'left':
               this.plugin.mergedCellsCollection.add({
@@ -142063,7 +142055,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col - fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'right':
               this.plugin.mergedCellsCollection.add({
@@ -142071,7 +142063,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col + fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             default:
           }
@@ -142146,7 +142138,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();
+    });
   }
 }
 var _default = exports["default"] = AutofillCalculations;
@@ -152063,9 +152076,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();
   }