handsontable 15.1.0 → 15.2.0-next-8670a33-20250312

package/plugins/filters/filters.mjs

@@ -75,6 +75,7 @@ const SHORTCUTS_GROUP = PLUGIN_KEY;
  */
 var _menuFocusNavigator = /*#__PURE__*/new WeakMap();
 var _dropdownMenuTraces = /*#__PURE__*/new WeakMap();
+var _previousConditionStack = /*#__PURE__*/new WeakMap();
 var _Filters_brand = /*#__PURE__*/new WeakSet();
 export class Filters extends BasePlugin {
   static get PLUGIN_KEY() {
@@ -146,6 +147,13 @@ export class Filters extends BasePlugin {
      * @type {WeakSet<Menu>}
      */
     _classPrivateFieldInitSpec(this, _dropdownMenuTraces, new WeakSet());
+    /**
+     * Stores the previous state of the condition stack before the latest filter operation.
+     * This is used in the `beforeFilter` plugin to allow performing the undo operation.
+     *
+     * @type {Array}
+     */
+    _classPrivateFieldInitSpec(this, _previousConditionStack, []);
     this.hot.addHook('afterGetColHeader', function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
@@ -488,6 +496,51 @@ export class Filters extends BasePlugin {
     }
   }
 
+  /**
+   * Imports filter conditions to all columns to the plugin. The method accepts
+   * the array of conditions with the same structure as the {@link Filters#exportConditions} method returns.
+   * Importing conditions will replace the current conditions. Once replaced, the state of the condition
+   * will be reflected in the UI. To apply the changes and filter the table, call
+   * the {@link Filters#filter} method eventually.
+   *
+   * @param {Array} conditions Array of conditions.
+   */
+  importConditions(conditions) {
+    this.conditionCollection.importAllConditions(conditions);
+  }
+
+  /* eslint-disable jsdoc/require-description-complete-sentence */
+  /**
+   * Exports filter conditions for all columns from the plugin.
+   * The array represents the filter state for each column. For example:
+   *
+   * ```js
+   * [
+   *   {
+   *     column: 1,
+   *     operation: 'conjunction',
+   *     conditions: [
+   *       { name: 'gt', args: [95] },
+   *     ]
+   *   },
+   *   {
+   *     column: 7,
+   *     operation: 'conjunction',
+   *     conditions: [
+   *       { name: 'contains', args: ['mike'] },
+   *       { name: 'begins_with', args: ['m'] },
+   *     ]
+   *   },
+   * ]
+   * ```
+   *
+   * @returns {Array}
+   */
+  /* eslint-enable jsdoc/require-description-complete-sentence */
+  exportConditions() {
+    return this.conditionCollection.exportAllConditions();
+  }
+
   /**
    * Filters data based on added filter conditions.
    *
@@ -501,8 +554,8 @@ export class Filters extends BasePlugin {
     const dataFilter = this._createDataFilter();
     const needToFilter = !this.conditionCollection.isEmpty();
     let visibleVisualRows = [];
-    const conditions = this.conditionCollection.exportAllConditions();
-    const allowFiltering = this.hot.runHooks('beforeFilter', conditions, this.conditionCollection.previousConditionStack);
+    const conditions = this.exportConditions();
+    const allowFiltering = this.hot.runHooks('beforeFilter', conditions, _classPrivateFieldGet(_previousConditionStack, this));
     if (allowFiltering !== false) {
       if (needToFilter) {
         const trimmedRows = [];
@@ -525,11 +578,13 @@ export class Filters extends BasePlugin {
       } else {
         this.filtersRowsMap.clear();
       }
+      _classPrivateFieldSet(_previousConditionStack, this, this.exportConditions());
+      this.hot.runHooks('afterFilter', conditions);
+      this.hot.view.adjustElementsSize();
+      this.hot.render();
+    } else {
+      this.importConditions(_classPrivateFieldGet(_previousConditionStack, this));
     }
-    this.hot.runHooks('afterFilter', conditions);
-    this.conditionCollection.setPreviousConditionStack(null);
-    this.hot.view.adjustElementsSize();
-    this.hot.render();
     if (this.hot.selection.isSelected()) {
       this.hot.selectCell(navigableHeaders ? -1 : 0, this.hot.getSelectedRangeLast().highlight.col);
     }
@@ -891,7 +946,6 @@ function _onActionBarSubmit(submitType) {
     }
     this.conditionUpdateObserver.flush();
     this.components.forEach(component => component.saveState(physicalIndex));
-    this.filtersRowsMap.clear();
     this.filter();
   }
   (_this$dropdownMenuPlu3 = this.dropdownMenuPlugin) === null || _this$dropdownMenuPlu3 === void 0 || _this$dropdownMenuPlu3.close();
@@ -933,8 +987,23 @@ function _updateComponents(conditionsState) {
     editedConditionStack: {
       conditions,
       column
-    }
+    },
+    conditionArgsChange
   } = conditionsState;
+  if (Array.isArray(conditionArgsChange)) {
+    // update the previous condition stack (only for 'by_value' condition) on each dataset
+    // change to make the undo/redo work properly
+    _classPrivateFieldSet(_previousConditionStack, this, _classPrivateFieldGet(_previousConditionStack, this).map(stack => {
+      if (stack.column === column && conditions.length > 0) {
+        stack.conditions.forEach(condition => {
+          if (condition.name === 'by_value') {
+            condition.args = [[...conditionArgsChange]];
+          }
+        });
+      }
+      return stack;
+    }));
+  }
   const conditionsByValue = conditions.filter(condition => condition.name === CONDITION_BY_VALUE);
   const conditionsWithoutByValue = conditions.filter(condition => condition.name !== CONDITION_BY_VALUE);
   if (conditionsByValue.length >= 2 || conditionsWithoutByValue.length >= 3) {

package/plugins/mergeCells/mergeCells.js

@@ -1491,14 +1491,17 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
  * @returns {number}
  */
 function _sumCellsHeights(row, rowspan) {
-  const stylesHandler = this.hot.view.getStylesHandler();
-  const defaultHeight = this.hot.view.getDefaultRowHeight();
-  const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
+  const {
+    view,
+    rowIndexMapper
+  } = this.hot;
+  const stylesHandler = view.getStylesHandler();
+  const defaultHeight = view.getDefaultRowHeight();
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {
-    if (!this.hot.rowIndexMapper.isHidden(i)) {
-      var _autoRowSizePlugin$ge;
-      height += (_autoRowSizePlugin$ge = autoRowSizePlugin === null || autoRowSizePlugin === void 0 ? void 0 : autoRowSizePlugin.getRowHeight(i)) !== null && _autoRowSizePlugin$ge !== void 0 ? _autoRowSizePlugin$ge : defaultHeight;
+    if (!rowIndexMapper.isHidden(i)) {
+      var _this$hot$getRowHeigh;
+      height += (_this$hot$getRowHeigh = this.hot.getRowHeight(i)) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : defaultHeight;
       if (i === 0 && !stylesHandler.isClassicTheme()) {
         height += 1; // border-top-width
       }

package/plugins/mergeCells/mergeCells.mjs

@@ -1486,14 +1486,17 @@ function _onModifyRowHeightByOverlayName(height, row, overlayType) {
  * @returns {number}
  */
 function _sumCellsHeights(row, rowspan) {
-  const stylesHandler = this.hot.view.getStylesHandler();
-  const defaultHeight = this.hot.view.getDefaultRowHeight();
-  const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
+  const {
+    view,
+    rowIndexMapper
+  } = this.hot;
+  const stylesHandler = view.getStylesHandler();
+  const defaultHeight = view.getDefaultRowHeight();
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {
-    if (!this.hot.rowIndexMapper.isHidden(i)) {
-      var _autoRowSizePlugin$ge;
-      height += (_autoRowSizePlugin$ge = autoRowSizePlugin === null || autoRowSizePlugin === void 0 ? void 0 : autoRowSizePlugin.getRowHeight(i)) !== null && _autoRowSizePlugin$ge !== void 0 ? _autoRowSizePlugin$ge : defaultHeight;
+    if (!rowIndexMapper.isHidden(i)) {
+      var _this$hot$getRowHeigh;
+      height += (_this$hot$getRowHeigh = this.hot.getRowHeight(i)) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : defaultHeight;
       if (i === 0 && !stylesHandler.isClassicTheme()) {
         height += 1; // border-top-width
       }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -7,7 +7,6 @@ var _sortService = require("../columnSorting/sortService");
 var _utils = require("../columnSorting/utils");
 var _element = require("../../helpers/dom/element");
 var _rootComparator = require("./rootComparator");
-var _utils2 = require("./utils");
 var _domHelpers = require("./domHelpers");
 var _shortcutContexts = require("../../shortcutContexts");
 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; }
@@ -15,7 +14,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'multiColumnSorting';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 170;
-const CONFLICTED_PLUGIN_KEY = 'columnSorting';
 const SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 
@@ -95,17 +93,13 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
    * @returns {boolean}
    */
   isEnabled() {
-    return super.isEnabled();
+    return !!this.hot.getSettings()[this.pluginKey];
   }
 
   /**
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    if (!this.enabled && this.hot.getSettings()[this.pluginKey] && this.hot.getSettings()[CONFLICTED_PLUGIN_KEY]) {
-      (0, _utils2.warnAboutPluginsConflict)();
-      this.hot.getPlugin(CONFLICTED_PLUGIN_KEY).disablePlugin();
-    }
     super.enablePlugin();
   }
 
@@ -277,20 +271,6 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
     }
   }
 
-  /**
-   * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
-   * for `updateSettings` in specific situations.
-   *
-   * @private
-   * @param {object} newSettings New settings object.
-   */
-  onUpdateSettings(newSettings) {
-    if (this.hot.getSettings()[this.pluginKey] && this.hot.getSettings()[CONFLICTED_PLUGIN_KEY]) {
-      (0, _utils2.warnAboutPluginsConflict)();
-    }
-    super.onUpdateSettings(newSettings);
-  }
-
   /**
    * Callback for the `onAfterOnCellMouseDown` hook.
    *

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -7,12 +7,10 @@ import { registerRootComparator } from "../columnSorting/sortService/index.mjs";
 import { wasHeaderClickedProperly } from "../columnSorting/utils.mjs";
 import { addClass, removeClass } from "../../helpers/dom/element.mjs";
 import { rootComparator } from "./rootComparator.mjs";
-import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
 import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
-const CONFLICTED_PLUGIN_KEY = 'columnSorting';
 const SHORTCUTS_GROUP = PLUGIN_KEY;
 registerRootComparator(PLUGIN_KEY, rootComparator);
 
@@ -92,17 +90,13 @@ export class MultiColumnSorting extends ColumnSorting {
    * @returns {boolean}
    */
   isEnabled() {
-    return super.isEnabled();
+    return !!this.hot.getSettings()[this.pluginKey];
   }
 
   /**
    * Enables the plugin functionality for this Handsontable instance.
    */
   enablePlugin() {
-    if (!this.enabled && this.hot.getSettings()[this.pluginKey] && this.hot.getSettings()[CONFLICTED_PLUGIN_KEY]) {
-      warnAboutPluginsConflict();
-      this.hot.getPlugin(CONFLICTED_PLUGIN_KEY).disablePlugin();
-    }
     super.enablePlugin();
   }
 
@@ -274,20 +268,6 @@ export class MultiColumnSorting extends ColumnSorting {
     }
   }
 
-  /**
-   * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
-   * for `updateSettings` in specific situations.
-   *
-   * @private
-   * @param {object} newSettings New settings object.
-   */
-  onUpdateSettings(newSettings) {
-    if (this.hot.getSettings()[this.pluginKey] && this.hot.getSettings()[CONFLICTED_PLUGIN_KEY]) {
-      warnAboutPluginsConflict();
-    }
-    super.onUpdateSettings(newSettings);
-  }
-
   /**
    * Callback for the `onAfterOnCellMouseDown` hook.
    *

package/plugins/nestedHeaders/nestedHeaders.js

@@ -902,9 +902,11 @@ function _onBeforeSelectColumns(from, to, highlight) {
  * @param {Array} renderersArray Array of renderers.
  */
 function _onAfterGetColumnHeaderRenderers(renderersArray) {
-  renderersArray.length = 0;
-  for (let headerLayer = 0; headerLayer < _classPrivateFieldGet(_stateManager, this).getLayersCount(); headerLayer++) {
-    renderersArray.push(this.headerRendererFactory(headerLayer));
+  if (_classPrivateFieldGet(_stateManager, this).getLayersCount() > 0) {
+    renderersArray.length = 0;
+    for (let headerLayer = 0; headerLayer < _classPrivateFieldGet(_stateManager, this).getLayersCount(); headerLayer++) {
+      renderersArray.push(this.headerRendererFactory(headerLayer));
+    }
   }
 }
 /**

package/plugins/nestedHeaders/nestedHeaders.mjs

@@ -897,9 +897,11 @@ function _onBeforeSelectColumns(from, to, highlight) {
  * @param {Array} renderersArray Array of renderers.
  */
 function _onAfterGetColumnHeaderRenderers(renderersArray) {
-  renderersArray.length = 0;
-  for (let headerLayer = 0; headerLayer < _classPrivateFieldGet(_stateManager, this).getLayersCount(); headerLayer++) {
-    renderersArray.push(this.headerRendererFactory(headerLayer));
+  if (_classPrivateFieldGet(_stateManager, this).getLayersCount() > 0) {
+    renderersArray.length = 0;
+    for (let headerLayer = 0; headerLayer < _classPrivateFieldGet(_stateManager, this).getLayersCount(); headerLayer++) {
+      renderersArray.push(this.headerRendererFactory(headerLayer));
+    }
   }
 }
 /**

package/plugins/nestedHeaders/stateManager/index.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _array = require("../../../helpers/array");
 var _sourceSettings2 = _interopRequireDefault(require("./sourceSettings"));

package/plugins/nestedHeaders/stateManager/index.mjs

@@ -1,5 +1,6 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }

package/plugins/undoRedo/actions/_base.js

@@ -2,6 +2,9 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.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); }
 /**
  * An abstract class that defines the structure of an undo/redo action.
  *
@@ -9,6 +12,13 @@ require("core-js/modules/es.error.cause.js");
  * @private
  */
 class BaseAction {
+  constructor(actionType) {
+    /**
+     * @param {string} actionType The action type.
+     */
+    _defineProperty(this, "actionType", '');
+    this.actionType = actionType;
+  }
   undo() {
     throw new Error('Not implemented');
   }

package/plugins/undoRedo/actions/_base.mjs

@@ -1,4 +1,7 @@
 import "core-js/modules/es.error.cause.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); }
 /**
  * An abstract class that defines the structure of an undo/redo action.
  *
@@ -6,6 +9,13 @@ import "core-js/modules/es.error.cause.js";
  * @private
  */
 export class BaseAction {
+  constructor(actionType) {
+    /**
+     * @param {string} actionType The action type.
+     */
+    _defineProperty(this, "actionType", '');
+    this.actionType = actionType;
+  }
   undo() {
     throw new Error('Not implemented');
   }

package/plugins/undoRedo/actions/cellAlignment.js

@@ -22,7 +22,7 @@ class CellAlignmentAction extends _base.BaseAction {
       type,
       alignment
     } = _ref;
-    super();
+    super('cell_alignment');
     /**
      * @param {Array} stateBefore The previous state.
      */

package/plugins/undoRedo/actions/cellAlignment.mjs

@@ -19,7 +19,7 @@ export class CellAlignmentAction extends BaseAction {
       type,
       alignment
     } = _ref;
-    super();
+    super('cell_alignment');
     /**
      * @param {Array} stateBefore The previous state.
      */

package/plugins/undoRedo/actions/columnMove.js

@@ -21,7 +21,7 @@ class ColumnMoveAction extends _base.BaseAction {
       columns,
       finalIndex
     } = _ref;
-    super();
+    super('col_move');
     /**
      * @param {number[]} columns An array with moved columns.
      */

package/plugins/undoRedo/actions/columnMove.mjs

@@ -18,7 +18,7 @@ export class ColumnMoveAction extends BaseAction {
       columns,
       finalIndex
     } = _ref;
-    super();
+    super('col_move');
     /**
      * @param {number[]} columns An array with moved columns.
      */

package/plugins/undoRedo/actions/columnSort.js

@@ -18,7 +18,7 @@ class ColumnSortAction extends _base.BaseAction {
       currentSortState,
       newSortState
     } = _ref;
-    super();
+    super('col_sort');
     /**
      * @param {Array} currentSortState The current sort state.
      */

package/plugins/undoRedo/actions/columnSort.mjs

@@ -15,7 +15,7 @@ export class ColumnSortAction extends BaseAction {
       currentSortState,
       newSortState
     } = _ref;
-    super();
+    super('col_sort');
     /**
      * @param {Array} currentSortState The current sort state.
      */

package/plugins/undoRedo/actions/createColumn.js

@@ -18,7 +18,7 @@ class CreateColumnAction extends _base.BaseAction {
       index,
       amount
     } = _ref;
-    super();
+    super('insert_col');
     /**
      * @param {number} index The visual column index.
      */

package/plugins/undoRedo/actions/createColumn.mjs

@@ -15,7 +15,7 @@ export class CreateColumnAction extends BaseAction {
       index,
       amount
     } = _ref;
-    super();
+    super('insert_col');
     /**
      * @param {number} index The visual column index.
      */

package/plugins/undoRedo/actions/createRow.js

@@ -18,7 +18,7 @@ class CreateRowAction extends _base.BaseAction {
       index,
       amount
     } = _ref;
-    super();
+    super('insert_row');
     /**
      * @param {number} index The visual row index.
      */

package/plugins/undoRedo/actions/createRow.mjs

@@ -15,7 +15,7 @@ export class CreateRowAction extends BaseAction {
       index,
       amount
     } = _ref;
-    super();
+    super('insert_row');
     /**
      * @param {number} index The visual row index.
      */

package/plugins/undoRedo/actions/dataChange.js

@@ -26,7 +26,7 @@ class DataChangeAction extends _base.BaseAction {
       countCols,
       countRows
     } = _ref;
-    super();
+    super('change');
     /**
      * @param {Array} changes 2D array containing information about each of the edited cells.
      */

package/plugins/undoRedo/actions/dataChange.mjs

@@ -23,7 +23,7 @@ export class DataChangeAction extends BaseAction {
       countCols,
       countRows
     } = _ref;
-    super();
+    super('change');
     /**
      * @param {Array} changes 2D array containing information about each of the edited cells.
      */

package/plugins/undoRedo/actions/filters.js

@@ -20,7 +20,7 @@ class FiltersAction extends _base.BaseAction {
       conditionsStack,
       previousConditionsStack
     } = _ref;
-    super();
+    super('filter');
     /**
      * @param {Array} previousConditionsStack An array of the previous filter conditions.
      */
@@ -48,7 +48,7 @@ class FiltersAction extends _base.BaseAction {
   undo(hot, undoneCallback) {
     const filters = hot.getPlugin('filters');
     hot.addHookOnce('afterViewRender', undoneCallback);
-    filters.conditionCollection.importAllConditions(this.previousConditionsStack);
+    filters.importConditions(this.previousConditionsStack);
     filters.filter();
   }
 
@@ -59,7 +59,7 @@ class FiltersAction extends _base.BaseAction {
   redo(hot, redoneCallback) {
     const filters = hot.getPlugin('filters');
     hot.addHookOnce('afterViewRender', redoneCallback);
-    filters.conditionCollection.importAllConditions(this.conditionsStack);
+    filters.importConditions(this.conditionsStack);
     filters.filter();
   }
 }

package/plugins/undoRedo/actions/filters.mjs

@@ -17,7 +17,7 @@ export class FiltersAction extends BaseAction {
       conditionsStack,
       previousConditionsStack
     } = _ref;
-    super();
+    super('filter');
     /**
      * @param {Array} previousConditionsStack An array of the previous filter conditions.
      */
@@ -45,7 +45,7 @@ export class FiltersAction extends BaseAction {
   undo(hot, undoneCallback) {
     const filters = hot.getPlugin('filters');
     hot.addHookOnce('afterViewRender', undoneCallback);
-    filters.conditionCollection.importAllConditions(this.previousConditionsStack);
+    filters.importConditions(this.previousConditionsStack);
     filters.filter();
   }
 
@@ -56,7 +56,7 @@ export class FiltersAction extends BaseAction {
   redo(hot, redoneCallback) {
     const filters = hot.getPlugin('filters');
     hot.addHookOnce('afterViewRender', redoneCallback);
-    filters.conditionCollection.importAllConditions(this.conditionsStack);
+    filters.importConditions(this.conditionsStack);
     filters.filter();
   }
 }

package/plugins/undoRedo/actions/mergeCells.js

@@ -18,7 +18,10 @@ class MergeCellsAction extends _base.BaseAction {
       data,
       cellRange
     } = _ref;
-    super();
+    super('merge_cells');
+    /**
+     * @param {CellRange} cellRange The merged cell range.
+     */
     _defineProperty(this, "cellRange", void 0);
     this.cellRange = cellRange;
     this.data = data;

package/plugins/undoRedo/actions/mergeCells.mjs

@@ -15,7 +15,10 @@ export class MergeCellsAction extends BaseAction {
       data,
       cellRange
     } = _ref;
-    super();
+    super('merge_cells');
+    /**
+     * @param {CellRange} cellRange The merged cell range.
+     */
     _defineProperty(this, "cellRange", void 0);
     this.cellRange = cellRange;
     this.data = data;

package/plugins/undoRedo/actions/removeColumn.js

@@ -24,13 +24,14 @@ class RemoveColumnAction extends _base.BaseAction {
       index,
       indexes,
       data,
+      amount,
       headers,
       columnPositions,
       rowPositions,
       fixedColumnsStart,
       removedCellMetas
     } = _ref;
-    super();
+    super('remove_col');
     /**
      * @param {number} index The visual column index.
      */
@@ -70,7 +71,7 @@ class RemoveColumnAction extends _base.BaseAction {
     this.index = index;
     this.indexes = indexes;
     this.data = data;
-    this.amount = this.data[0].length;
+    this.amount = amount;
     this.headers = headers;
     this.columnPositions = columnPositions.slice(0);
     this.rowPositions = rowPositions.slice(0);
@@ -108,6 +109,7 @@ class RemoveColumnAction extends _base.BaseAction {
           index: columnIndex,
           indexes,
           data: removedData,
+          amount,
           headers,
           columnPositions: columnsMap,
           rowPositions: rowsMap,

package/plugins/undoRedo/actions/removeColumn.mjs

@@ -21,13 +21,14 @@ export class RemoveColumnAction extends BaseAction {
       index,
       indexes,
       data,
+      amount,
       headers,
       columnPositions,
       rowPositions,
       fixedColumnsStart,
       removedCellMetas
     } = _ref;
-    super();
+    super('remove_col');
     /**
      * @param {number} index The visual column index.
      */
@@ -67,7 +68,7 @@ export class RemoveColumnAction extends BaseAction {
     this.index = index;
     this.indexes = indexes;
     this.data = data;
-    this.amount = this.data[0].length;
+    this.amount = amount;
     this.headers = headers;
     this.columnPositions = columnPositions.slice(0);
     this.rowPositions = rowPositions.slice(0);
@@ -105,6 +106,7 @@ export class RemoveColumnAction extends BaseAction {
           index: columnIndex,
           indexes,
           data: removedData,
+          amount,
           headers,
           columnPositions: columnsMap,
           rowPositions: rowsMap,