handsontable 15.0.0 → 15.1.0-next-dfdf994-20250206

package/plugins/filters/filters.js

@@ -101,8 +101,10 @@ class Filters extends _base.BasePlugin {
    */
 
   constructor(hotInstance) {
-    super(hotInstance);
+    var _this;
     // One listener for the enable/disable functionality
+    super(hotInstance);
+    _this = this;
     /**
      * `afterChange` listener.
      *
@@ -150,7 +152,12 @@ class Filters extends _base.BasePlugin {
      * @type {WeakSet<Menu>}
      */
     _classPrivateFieldInitSpec(this, _dropdownMenuTraces, new WeakSet());
-    this.hot.addHook('afterGetColHeader', (col, TH) => _assertClassBrand(_Filters_brand, this, _onAfterGetColHeader).call(this, col, TH));
+    this.hot.addHook('afterGetColHeader', function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return _assertClassBrand(_Filters_brand, _this, _onAfterGetColHeader).call(_this, ...args);
+    });
   }
 
   /**
@@ -168,7 +175,7 @@ class Filters extends _base.BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    var _this = this;
+    var _this2 = this;
     if (this.enabled) {
       return;
     }
@@ -231,10 +238,10 @@ class Filters extends _base.BasePlugin {
     }
     this.components.forEach(component => component.show());
     this.addHook('afterDropdownMenuDefaultOptions', function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
-      return _assertClassBrand(_Filters_brand, _this, _onAfterDropdownMenuDefaultOptions).call(_this, ...args);
+      return _assertClassBrand(_Filters_brand, _this2, _onAfterDropdownMenuDefaultOptions).call(_this2, ...args);
     });
     this.addHook('beforeDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onBeforeDropdownMenuShow).call(this));
     this.addHook('afterDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onAfterDropdownMenuShow).call(this));
@@ -689,6 +696,9 @@ class Filters extends _base.BasePlugin {
    *
    * @param {number} col Visual column index.
    * @param {HTMLTableCellElement} TH Header's TH element.
+   * @param {number} headerLevel The index of header level counting from the top (positive
+   *                             values counting from 0 to N).
+   *
    */
 
   /**
@@ -724,8 +734,8 @@ class Filters extends _base.BasePlugin {
       return indexes;
     }
     const menu = this.dropdownMenuPlugin.menu;
-    for (var _len2 = arguments.length, components = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      components[_key2] = arguments[_key2];
+    for (var _len3 = arguments.length, components = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      components[_key3] = arguments[_key3];
     }
     (0, _array.arrayEach)(components, component => {
       (0, _array.arrayEach)(menu.menuItems, (item, index) => {
@@ -752,8 +762,8 @@ class Filters extends _base.BasePlugin {
     const menu = this.dropdownMenuPlugin.menu;
     const hotMenu = menu.hotMenu;
     const hiddenRows = hotMenu.getPlugin('hiddenRows');
-    for (var _len3 = arguments.length, components = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      components[_key3 - 1] = arguments[_key3];
+    for (var _len4 = arguments.length, components = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+      components[_key4 - 1] = arguments[_key4];
     }
     const indexes = this.getIndexesOfComponents(...components);
     if (visible) {
@@ -771,8 +781,8 @@ class Filters extends _base.BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   hideComponents() {
-    for (var _len4 = arguments.length, components = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      components[_key4] = arguments[_key4];
+    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      components[_key5] = arguments[_key5];
     }
     this.changeComponentsVisibility(false, ...components);
   }
@@ -784,8 +794,8 @@ class Filters extends _base.BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   showComponents() {
-    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-      components[_key5] = arguments[_key5];
+    for (var _len6 = arguments.length, components = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+      components[_key6] = arguments[_key6];
     }
     this.changeComponentsVisibility(true, ...components);
   }
@@ -913,9 +923,9 @@ function _onComponentChange(component, command) {
 function _onSelectUIClosed() {
   this.setListeningDropdownMenu();
 }
-function _onAfterGetColHeader(col, TH) {
+function _onAfterGetColHeader(col, TH, headerLevel) {
   const physicalColumn = this.hot.toPhysicalColumn(col);
-  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn)) {
+  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn) && headerLevel === this.hot.view.getColumnHeadersCount() - 1) {
     (0, _element.addClass)(TH, 'htFiltersActive');
   } else {
     (0, _element.removeClass)(TH, 'htFiltersActive');

package/plugins/filters/filters.mjs

@@ -95,8 +95,10 @@ export class Filters extends BasePlugin {
    */
 
   constructor(hotInstance) {
-    super(hotInstance);
+    var _this;
     // One listener for the enable/disable functionality
+    super(hotInstance);
+    _this = this;
     /**
      * `afterChange` listener.
      *
@@ -144,7 +146,12 @@ export class Filters extends BasePlugin {
      * @type {WeakSet<Menu>}
      */
     _classPrivateFieldInitSpec(this, _dropdownMenuTraces, new WeakSet());
-    this.hot.addHook('afterGetColHeader', (col, TH) => _assertClassBrand(_Filters_brand, this, _onAfterGetColHeader).call(this, col, TH));
+    this.hot.addHook('afterGetColHeader', function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return _assertClassBrand(_Filters_brand, _this, _onAfterGetColHeader).call(_this, ...args);
+    });
   }
 
   /**
@@ -162,7 +169,7 @@ export class Filters extends BasePlugin {
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    var _this = this;
+    var _this2 = this;
     if (this.enabled) {
       return;
     }
@@ -225,10 +232,10 @@ export class Filters extends BasePlugin {
     }
     this.components.forEach(component => component.show());
     this.addHook('afterDropdownMenuDefaultOptions', function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
-      return _assertClassBrand(_Filters_brand, _this, _onAfterDropdownMenuDefaultOptions).call(_this, ...args);
+      return _assertClassBrand(_Filters_brand, _this2, _onAfterDropdownMenuDefaultOptions).call(_this2, ...args);
     });
     this.addHook('beforeDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onBeforeDropdownMenuShow).call(this));
     this.addHook('afterDropdownMenuShow', () => _assertClassBrand(_Filters_brand, this, _onAfterDropdownMenuShow).call(this));
@@ -683,6 +690,9 @@ export class Filters extends BasePlugin {
    *
    * @param {number} col Visual column index.
    * @param {HTMLTableCellElement} TH Header's TH element.
+   * @param {number} headerLevel The index of header level counting from the top (positive
+   *                             values counting from 0 to N).
+   *
    */
 
   /**
@@ -718,8 +728,8 @@ export class Filters extends BasePlugin {
       return indexes;
     }
     const menu = this.dropdownMenuPlugin.menu;
-    for (var _len2 = arguments.length, components = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      components[_key2] = arguments[_key2];
+    for (var _len3 = arguments.length, components = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      components[_key3] = arguments[_key3];
     }
     arrayEach(components, component => {
       arrayEach(menu.menuItems, (item, index) => {
@@ -746,8 +756,8 @@ export class Filters extends BasePlugin {
     const menu = this.dropdownMenuPlugin.menu;
     const hotMenu = menu.hotMenu;
     const hiddenRows = hotMenu.getPlugin('hiddenRows');
-    for (var _len3 = arguments.length, components = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      components[_key3 - 1] = arguments[_key3];
+    for (var _len4 = arguments.length, components = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+      components[_key4 - 1] = arguments[_key4];
     }
     const indexes = this.getIndexesOfComponents(...components);
     if (visible) {
@@ -765,8 +775,8 @@ export class Filters extends BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   hideComponents() {
-    for (var _len4 = arguments.length, components = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-      components[_key4] = arguments[_key4];
+    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      components[_key5] = arguments[_key5];
     }
     this.changeComponentsVisibility(false, ...components);
   }
@@ -778,8 +788,8 @@ export class Filters extends BasePlugin {
    * @param {...BaseComponent} components List of components.
    */
   showComponents() {
-    for (var _len5 = arguments.length, components = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-      components[_key5] = arguments[_key5];
+    for (var _len6 = arguments.length, components = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+      components[_key6] = arguments[_key6];
     }
     this.changeComponentsVisibility(true, ...components);
   }
@@ -906,9 +916,9 @@ function _onComponentChange(component, command) {
 function _onSelectUIClosed() {
   this.setListeningDropdownMenu();
 }
-function _onAfterGetColHeader(col, TH) {
+function _onAfterGetColHeader(col, TH, headerLevel) {
   const physicalColumn = this.hot.toPhysicalColumn(col);
-  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn)) {
+  if (this.enabled && this.conditionCollection.hasConditions(physicalColumn) && headerLevel === this.hot.view.getColumnHeadersCount() - 1) {
     addClass(TH, 'htFiltersActive');
   } else {
     removeClass(TH, 'htFiltersActive');

package/plugins/filters/utils.js

@@ -15,8 +15,10 @@ require("core-js/modules/es.set.is-subset-of.v2.js");
 require("core-js/modules/es.set.is-superset-of.v2.js");
 require("core-js/modules/es.set.symmetric-difference.v2.js");
 require("core-js/modules/es.set.union.v2.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _feature = require("../../helpers/feature");
-var _array = require("../../helpers/array");
 const sortCompare = (0, _feature.getComparisonFunction)();
 
 /**
@@ -47,8 +49,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).
@@ -57,19 +57,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);
   };
 }
 
@@ -90,13 +80,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;
     }
@@ -105,7 +89,6 @@ function unifyColumnValues(values) {
     }
     return a > b ? 1 : -1;
   });
-  return unifiedValues;
 }
 
 /**
@@ -124,7 +107,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;

package/plugins/filters/utils.mjs

@@ -6,8 +6,10 @@ import "core-js/modules/es.set.is-subset-of.v2.js";
 import "core-js/modules/es.set.is-superset-of.v2.js";
 import "core-js/modules/es.set.symmetric-difference.v2.js";
 import "core-js/modules/es.set.union.v2.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.iterator.map.js";
 import { getComparisonFunction } from "../../helpers/feature.mjs";
-import { arrayUnique, arrayEach } from "../../helpers/array.mjs";
 const sortCompare = getComparisonFunction();
 
 /**
@@ -38,8 +40,6 @@ export 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).
@@ -48,19 +48,9 @@ const SUPPORT_FAST_DEDUPE = SUPPORT_SET_CONSTRUCTOR && typeof Array.from === 'fu
  * @returns {Function}
  */
 export 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);
   };
 }
 
@@ -81,13 +71,7 @@ export function toEmptyString(value) {
  * @returns {Array}
  */
 export function unifyColumnValues(values) {
-  let unifiedValues = values;
-  if (SUPPORT_FAST_DEDUPE) {
-    unifiedValues = Array.from(new Set(unifiedValues));
-  } else {
-    unifiedValues = 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;
     }
@@ -96,7 +80,6 @@ export function unifyColumnValues(values) {
     }
     return a > b ? 1 : -1;
   });
-  return unifiedValues;
 }
 
 /**
@@ -115,7 +98,7 @@ export function intersectValues(base, selected, defaultEmptyValue, callback) {
   if (!same) {
     selectedItemsAssertion = createArrayAssertion(selected);
   }
-  arrayEach(base, value => {
+  base.forEach(value => {
     let checked = false;
     if (same || selectedItemsAssertion(value)) {
       checked = true;

package/plugins/hiddenColumns/hiddenColumns.js

@@ -368,9 +368,7 @@ class HiddenColumns extends _base.BasePlugin {
    */
   resetCellsMeta() {
     (0, _array.arrayEach)(this.hot.getCellsMeta(), meta => {
-      if (meta) {
-        meta.skipColumnOnPaste = false;
-      }
+      meta.skipColumnOnPaste = false;
     });
   }
   /**

package/plugins/hiddenColumns/hiddenColumns.mjs

@@ -364,9 +364,7 @@ export class HiddenColumns extends BasePlugin {
    */
   resetCellsMeta() {
     arrayEach(this.hot.getCellsMeta(), meta => {
-      if (meta) {
-        meta.skipColumnOnPaste = false;
-      }
+      meta.skipColumnOnPaste = false;
     });
   }
   /**

package/plugins/hiddenRows/hiddenRows.js

@@ -365,9 +365,7 @@ class HiddenRows extends _base.BasePlugin {
    */
   resetCellsMeta() {
     (0, _array.arrayEach)(this.hot.getCellsMeta(), meta => {
-      if (meta) {
-        meta.skipRowOnPaste = false;
-      }
+      meta.skipRowOnPaste = false;
     });
   }
   /**

package/plugins/hiddenRows/hiddenRows.mjs

@@ -361,9 +361,7 @@ export class HiddenRows extends BasePlugin {
    */
   resetCellsMeta() {
     arrayEach(this.hot.getCellsMeta(), meta => {
-      if (meta) {
-        meta.skipRowOnPaste = false;
-      }
+      meta.skipRowOnPaste = false;
     });
   }
   /**

package/plugins/manualRowMove/manualRowMove.js

@@ -555,7 +555,7 @@ function _onBeforeOnCellMouseDown(event, coords, TD, controller) {
     _classPrivateFieldGet(_target, this).TD = TD;
     _classPrivateFieldSet(_rowsToMove, this, this.prepareRowsToMoving());
     const leftPos = wtTable.holder.scrollLeft + wtViewport.getRowHeaderWidth();
-    const topOffset = this.getRowsHeight(start, coords.row - 1) + event.offsetY;
+    const topOffset = this.getRowsHeight(start, coords.row - 1) + (event.clientY - TD.getBoundingClientRect().top);
     _classPrivateFieldGet(_backlight, this).setPosition(null, leftPos);
     _classPrivateFieldGet(_backlight, this).setSize(wtTable.hider.offsetWidth - leftPos, this.getRowsHeight(start, end));
     _classPrivateFieldGet(_backlight, this).setOffset(-topOffset, null);

package/plugins/manualRowMove/manualRowMove.mjs

@@ -550,7 +550,7 @@ function _onBeforeOnCellMouseDown(event, coords, TD, controller) {
     _classPrivateFieldGet(_target, this).TD = TD;
     _classPrivateFieldSet(_rowsToMove, this, this.prepareRowsToMoving());
     const leftPos = wtTable.holder.scrollLeft + wtViewport.getRowHeaderWidth();
-    const topOffset = this.getRowsHeight(start, coords.row - 1) + event.offsetY;
+    const topOffset = this.getRowsHeight(start, coords.row - 1) + (event.clientY - TD.getBoundingClientRect().top);
     _classPrivateFieldGet(_backlight, this).setPosition(null, leftPos);
     _classPrivateFieldGet(_backlight, this).setSize(wtTable.hider.offsetWidth - leftPos, this.getRowsHeight(start, end));
     _classPrivateFieldGet(_backlight, this).setOffset(-topOffset, null);

package/plugins/mergeCells/calculations/autofill.js

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.every.js");
 var _object = require("../../../helpers/object");
 var _array = require("../../../helpers/array");
 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; }
@@ -38,35 +40,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';
@@ -78,20 +65,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;
@@ -156,13 +143,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;
@@ -182,22 +169,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;
     }
@@ -208,17 +203,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;
@@ -293,7 +288,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'down':
               this.plugin.mergedCellsCollection.add({
@@ -301,7 +296,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'left':
               this.plugin.mergedCellsCollection.add({
@@ -309,7 +304,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col - fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             case 'right':
               this.plugin.mergedCellsCollection.add({
@@ -317,7 +312,7 @@ class AutofillCalculations {
                 rowspan: current.rowspan,
                 col: current.col + fillOffset,
                 colspan: current.colspan
-              });
+              }, true);
               break;
             default:
           }
@@ -392,7 +387,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;