handsontable 15.1.0-next-7652ed7-20250219 → 15.2.0-next-8670a33-20250312

package/plugins/contextMenu/menu/menu.js

@@ -303,7 +303,6 @@ class Menu {
           this.openSubMenu(coords.row);
         }
       },
-      rowHeights: row => filteredItems[row].name === _predefinedItems.SEPARATOR ? 1 : undefined,
       afterOnCellContextMenu: event => {
         event.preventDefault();
 
@@ -574,6 +573,7 @@ class Menu {
    * and adjusts the width and height of the menu's holder and hider elements accordingly.
    */
   updateMenuDimensions() {
+    const stylesHandler = this.hotMenu.view.getStylesHandler();
     const {
       wtTable
     } = this.hotMenu.view._wt;
@@ -586,8 +586,14 @@ class Menu {
       const currentRowHeight = itemCell ? (0, _element.outerHeight)(this.hotMenu.getCell(index, 0)) : 0;
       return accumulator + (value.name === _predefinedItems.SEPARATOR ? 1 : currentRowHeight);
     }, 0);
-    holderStyle.width = `${currentHiderWidth}px`;
-    holderStyle.height = `${realHeight}px`;
+    if (stylesHandler.isClassicTheme()) {
+      // Additional 3px to menu's size because of additional border around its `table.htCore`.
+      holderStyle.width = `${currentHiderWidth + 3}px`;
+      holderStyle.height = `${realHeight + 3}px`;
+    } else {
+      holderStyle.width = `${currentHiderWidth}px`;
+      holderStyle.height = `${realHeight}px`;
+    }
     hiderStyle.height = holderStyle.height;
   }
 

package/plugins/contextMenu/menu/menu.mjs

@@ -299,7 +299,6 @@ export class Menu {
           this.openSubMenu(coords.row);
         }
       },
-      rowHeights: row => filteredItems[row].name === SEPARATOR ? 1 : undefined,
       afterOnCellContextMenu: event => {
         event.preventDefault();
 
@@ -570,6 +569,7 @@ export class Menu {
    * and adjusts the width and height of the menu's holder and hider elements accordingly.
    */
   updateMenuDimensions() {
+    const stylesHandler = this.hotMenu.view.getStylesHandler();
     const {
       wtTable
     } = this.hotMenu.view._wt;
@@ -582,8 +582,14 @@ export class Menu {
       const currentRowHeight = itemCell ? outerHeight(this.hotMenu.getCell(index, 0)) : 0;
       return accumulator + (value.name === SEPARATOR ? 1 : currentRowHeight);
     }, 0);
-    holderStyle.width = `${currentHiderWidth}px`;
-    holderStyle.height = `${realHeight}px`;
+    if (stylesHandler.isClassicTheme()) {
+      // Additional 3px to menu's size because of additional border around its `table.htCore`.
+      holderStyle.width = `${currentHiderWidth + 3}px`;
+      holderStyle.height = `${realHeight + 3}px`;
+    } else {
+      holderStyle.width = `${currentHiderWidth}px`;
+      holderStyle.height = `${realHeight}px`;
+    }
     hiderStyle.height = holderStyle.height;
   }
 

package/plugins/contextMenu/predefinedItems/columnLeft.js

@@ -26,19 +26,14 @@ function columnLeftItem() {
         return true;
       }
       const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {
-        const totalColumns = this.countCols();
-
         // Enable "Insert column left" only when there is at least one column.
-        return totalColumns === 0;
+        return this.countCols() === 0;
       }
-      return this.selection.isSelectedByRowHeader() || this.countCols() >= this.getSettings().maxCols;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertColumn;

package/plugins/contextMenu/predefinedItems/columnLeft.mjs

@@ -20,19 +20,14 @@ export default function columnLeftItem() {
         return true;
       }
       const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {
-        const totalColumns = this.countCols();
-
         // Enable "Insert column left" only when there is at least one column.
-        return totalColumns === 0;
+        return this.countCols() === 0;
       }
-      return this.selection.isSelectedByRowHeader() || this.countCols() >= this.getSettings().maxCols;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertColumn;

package/plugins/contextMenu/predefinedItems/columnRight.js

@@ -26,17 +26,10 @@ function columnRightItem() {
         return true;
       }
       const range = this.getSelectedRangeLast();
-      if (!range) {
+      if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
-        return true;
-      }
-      if (this.selection.isSelectedByCorner()) {
-        // Enable "Insert column right" always when the menu is triggered by corner click.
-        return false;
-      }
-      return this.selection.isSelectedByRowHeader() || this.countCols() >= this.getSettings().maxCols;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertColumn;

package/plugins/contextMenu/predefinedItems/columnRight.mjs

@@ -20,17 +20,10 @@ export default function columnRightItem() {
         return true;
       }
       const range = this.getSelectedRangeLast();
-      if (!range) {
+      if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
-        return true;
-      }
-      if (this.selection.isSelectedByCorner()) {
-        // Enable "Insert column right" always when the menu is triggered by corner click.
-        return false;
-      }
-      return this.selection.isSelectedByRowHeader() || this.countCols() >= this.getSettings().maxCols;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertColumn;

package/plugins/contextMenu/predefinedItems/rowAbove.js

@@ -22,19 +22,14 @@ function rowAboveItem() {
     },
     disabled() {
       const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {
-        const totalRows = this.countRows();
-
         // Enable "Insert row above" only when there is at least one row.
-        return totalRows === 0;
+        return this.countRows() === 0;
       }
-      return this.selection.isSelectedByColumnHeader() || this.countRows() >= this.getSettings().maxRows;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertRow;

package/plugins/contextMenu/predefinedItems/rowAbove.mjs

@@ -16,19 +16,14 @@ export default function rowAboveItem() {
     },
     disabled() {
       const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {
-        const totalRows = this.countRows();
-
         // Enable "Insert row above" only when there is at least one row.
-        return totalRows === 0;
+        return this.countRows() === 0;
       }
-      return this.selection.isSelectedByColumnHeader() || this.countRows() >= this.getSettings().maxRows;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertRow;

package/plugins/contextMenu/predefinedItems/rowBelow.js

@@ -22,17 +22,10 @@ function rowBelowItem() {
     },
     disabled() {
       const range = this.getSelectedRangeLast();
-      if (!range) {
+      if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
-        return true;
-      }
-      if (this.selection.isSelectedByCorner()) {
-        // Enable "Insert row below" always when the menu is triggered by corner click.
-        return false;
-      }
-      return this.selection.isSelectedByColumnHeader() || this.countRows() >= this.getSettings().maxRows;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertRow;

package/plugins/contextMenu/predefinedItems/rowBelow.mjs

@@ -16,17 +16,10 @@ export default function rowBelowItem() {
     },
     disabled() {
       const range = this.getSelectedRangeLast();
-      if (!range) {
+      if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
-        return true;
-      }
-      if (this.selection.isSelectedByCorner()) {
-        // Enable "Insert row below" always when the menu is triggered by corner click.
-        return false;
-      }
-      return this.selection.isSelectedByColumnHeader() || this.countRows() >= this.getSettings().maxRows;
+      return false;
     },
     hidden() {
       return !this.getSettings().allowInsertRow;

package/plugins/copyPaste/copyPaste.js

@@ -567,7 +567,7 @@ class CopyPaste extends _base.BasePlugin {
     const isHotInput = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.hasAttribute('data-hot-input');
     const selectedCell = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
     const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCopy, this) || this.isEditorOpened() || event.target instanceof HTMLElement && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCopy, this) || this.isEditorOpened() || (0, _element.isHTMLElement)(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
       return;
     }
     event.preventDefault();
@@ -602,7 +602,7 @@ class CopyPaste extends _base.BasePlugin {
     const isHotInput = (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.hasAttribute('data-hot-input');
     const selectedCell = (_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight;
     const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCut, this) || this.isEditorOpened() || event.target instanceof HTMLElement && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCut, this) || this.isEditorOpened() || (0, _element.isHTMLElement)(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
       return;
     }
     event.preventDefault();
@@ -636,7 +636,7 @@ class CopyPaste extends _base.BasePlugin {
     const isHotInput = (_event$target3 = event.target) === null || _event$target3 === void 0 ? void 0 : _event$target3.hasAttribute('data-hot-input');
     const selectedCell = (_this$hot$getSelected3 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected3 === void 0 ? void 0 : _this$hot$getSelected3.highlight;
     const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected() || event.target instanceof HTMLElement && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected() || (0, _element.isHTMLElement)(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
       return;
     }
     event.preventDefault();

package/plugins/copyPaste/copyPaste.mjs

@@ -17,7 +17,7 @@ import { Hooks } from "../../core/hooks/index.mjs";
 import { stringify, parse } from "../../3rdparty/SheetClip/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { sanitize } from "../../helpers/string.mjs";
-import { removeContentEditableFromElementAndDeselect, runWithSelectedContendEditableElement, makeElementContentEditableAndSelectItsContent } from "../../helpers/dom/element.mjs";
+import { removeContentEditableFromElementAndDeselect, runWithSelectedContendEditableElement, makeElementContentEditableAndSelectItsContent, isHTMLElement } from "../../helpers/dom/element.mjs";
 import { isSafari } from "../../helpers/browser.mjs";
 import copyItem from "./contextMenuItem/copy.mjs";
 import copyColumnHeadersOnlyItem from "./contextMenuItem/copyColumnHeadersOnly.mjs";
@@ -563,7 +563,7 @@ export class CopyPaste extends BasePlugin {
     const isHotInput = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.hasAttribute('data-hot-input');
     const selectedCell = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
     const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCopy, this) || this.isEditorOpened() || event.target instanceof HTMLElement && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCopy, this) || this.isEditorOpened() || isHTMLElement(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
       return;
     }
     event.preventDefault();
@@ -598,7 +598,7 @@ export class CopyPaste extends BasePlugin {
     const isHotInput = (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.hasAttribute('data-hot-input');
     const selectedCell = (_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight;
     const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCut, this) || this.isEditorOpened() || event.target instanceof HTMLElement && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    if (!this.hot.isListening() && !_classPrivateFieldGet(_isTriggeredByCut, this) || this.isEditorOpened() || isHTMLElement(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
       return;
     }
     event.preventDefault();
@@ -632,7 +632,7 @@ export class CopyPaste extends BasePlugin {
     const isHotInput = (_event$target3 = event.target) === null || _event$target3 === void 0 ? void 0 : _event$target3.hasAttribute('data-hot-input');
     const selectedCell = (_this$hot$getSelected3 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected3 === void 0 ? void 0 : _this$hot$getSelected3.highlight;
     const TD = selectedCell ? this.hot.getCell(selectedCell.row, selectedCell.col, true) : null;
-    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected() || event.target instanceof HTMLElement && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
+    if (!this.hot.isListening() || this.isEditorOpened() || !this.hot.getSelected() || isHTMLElement(event.target) && (isHotInput && event.target !== focusedElement || !isHotInput && event.target !== this.hot.rootDocument.body && TD !== event.target)) {
       return;
     }
     event.preventDefault();

package/plugins/exportFile/types/csv.js

@@ -1,6 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _array = require("../../../helpers/array");
 var _mixed = require("../../../helpers/mixed");

package/plugins/exportFile/types/csv.mjs

@@ -1,3 +1,4 @@
+import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import { arrayEach, arrayMap } from "../../../helpers/array.mjs";
 import { stringify } from "../../../helpers/mixed.mjs";

package/plugins/filters/conditionCollection.js

@@ -49,13 +49,6 @@ class ConditionCollection {
      * @type {LinkedPhysicalIndexToValueMap}
      */
     _defineProperty(this, "filteringStates", new _translations.LinkedPhysicalIndexToValueMap());
-    /**
-     * 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 {null|Array}
-     */
-    _defineProperty(this, "previousConditionStack", null);
     this.hot = hot;
     this.isMapRegistrable = isMapRegistrable;
     if (this.isMapRegistrable === true) {
@@ -124,13 +117,6 @@ class ConditionCollection {
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
     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
-    // previous filter operation or that there was no filter operation performed yet), store the current conditions as
-    // the previous condition stack.
-    if (this.previousConditionStack === null) {
-      this.setPreviousConditionStack(this.exportAllConditions());
-    }
     this.runLocalHooks('beforeAdd', column);
     const columnType = this.getOperation(column);
     if (columnType) {
@@ -259,8 +245,6 @@ class ConditionCollection {
    * @fires ConditionCollection#afterRemove
    */
   removeConditions(column) {
-    // Store the current conditions as the previous condition stack before it's cleared.
-    this.setPreviousConditionStack(this.exportAllConditions());
     this.runLocalHooks('beforeRemove', column);
     this.filteringStates.clearValue(column);
     this.runLocalHooks('afterRemove', column);
@@ -294,16 +278,6 @@ class ConditionCollection {
     return conditions.length > 0;
   }
 
-  /**
-   * Updates the `previousConditionStack` property with the provided stack.
-   * It is used to store the current conditions before they are modified, allowing for undo operations.
-   *
-   * @param {Array|null} previousConditionStack The stack of previous conditions.
-   */
-  setPreviousConditionStack(previousConditionStack) {
-    this.previousConditionStack = previousConditionStack;
-  }
-
   /**
    * Destroy object.
    */

package/plugins/filters/conditionCollection.mjs

@@ -45,13 +45,6 @@ class ConditionCollection {
      * @type {LinkedPhysicalIndexToValueMap}
      */
     _defineProperty(this, "filteringStates", new IndexToValueMap());
-    /**
-     * 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 {null|Array}
-     */
-    _defineProperty(this, "previousConditionStack", null);
     this.hot = hot;
     this.isMapRegistrable = isMapRegistrable;
     if (this.isMapRegistrable === true) {
@@ -120,13 +113,6 @@ class ConditionCollection {
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
     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
-    // previous filter operation or that there was no filter operation performed yet), store the current conditions as
-    // the previous condition stack.
-    if (this.previousConditionStack === null) {
-      this.setPreviousConditionStack(this.exportAllConditions());
-    }
     this.runLocalHooks('beforeAdd', column);
     const columnType = this.getOperation(column);
     if (columnType) {
@@ -255,8 +241,6 @@ class ConditionCollection {
    * @fires ConditionCollection#afterRemove
    */
   removeConditions(column) {
-    // Store the current conditions as the previous condition stack before it's cleared.
-    this.setPreviousConditionStack(this.exportAllConditions());
     this.runLocalHooks('beforeRemove', column);
     this.filteringStates.clearValue(column);
     this.runLocalHooks('afterRemove', column);
@@ -290,16 +274,6 @@ class ConditionCollection {
     return conditions.length > 0;
   }
 
-  /**
-   * Updates the `previousConditionStack` property with the provided stack.
-   * It is used to store the current conditions before they are modified, allowing for undo operations.
-   *
-   * @param {Array|null} previousConditionStack The stack of previous conditions.
-   */
-  setPreviousConditionStack(previousConditionStack) {
-    this.previousConditionStack = previousConditionStack;
-  }
-
   /**
    * Destroy object.
    */

package/plugins/filters/filters.d.ts

@@ -48,6 +48,8 @@ export declare class Filters extends BasePlugin {
   addCondition(column: number, name: string, args: any[], operationId?: OperationType): void;
   removeConditions(column: number): void;
   clearConditions(column?: number): void;
+  importConditions(conditions: ColumnConditions[]): void;
+  exportConditions(): ColumnConditions[];
   filter(): void;
   getSelectedColumn(): { physicalIndex: number, visualIndex: number } | null;
   getDataMapAtColumn(column?: number): CellLikeData[];

package/plugins/filters/filters.js

@@ -81,6 +81,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();
 class Filters extends _base.BasePlugin {
   static get PLUGIN_KEY() {
@@ -152,6 +153,13 @@ class Filters extends _base.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];
@@ -494,6 +502,51 @@ class Filters extends _base.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.
    *
@@ -507,8 +560,8 @@ class Filters extends _base.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 = [];
@@ -531,11 +584,13 @@ class Filters extends _base.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);
     }
@@ -898,7 +953,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();
@@ -940,8 +994,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 === _constants2.CONDITION_BY_VALUE);
   const conditionsWithoutByValue = conditions.filter(condition => condition.name !== _constants2.CONDITION_BY_VALUE);
   if (conditionsByValue.length >= 2 || conditionsWithoutByValue.length >= 3) {