handsontable 0.0.0-next-a4bd0c0-20250307 → 0.0.0-next-89e4f85-20250310

package/helpers/mixed.js

@@ -134,7 +134,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-a4bd0c0-20250307";
+  const hotVersion = "0.0.0-next-89e4f85-20250310";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export 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-a4bd0c0-20250307";
+  const hotVersion = "0.0.0-next-89e4f85-20250310";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-a4bd0c0-20250307",
+  "version": "0.0.0-next-89e4f85-20250310",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/columnSorting/columnSorting.js

@@ -35,6 +35,13 @@ const SHORTCUTS_GROUP = PLUGIN_KEY;
 _hooks.Hooks.getSingleton().register('beforeColumnSort');
 _hooks.Hooks.getSingleton().register('afterColumnSort');
 
+/**
+ * Tracks the conflicts between `columnSorting` and `multiColumnSorting` options.
+ * Only one plugin can be enabled for Handsontable instance. Once one of them is enabled,
+ * the other should remain disabled even if it's set to `true`.
+ */
+const pluginConflictsState = new WeakMap();
+
 // DIFF - MultiColumnSorting & ColumnSorting: changed configuration documentation.
 /**
  * @plugin ColumnSorting
@@ -143,9 +150,17 @@ class ColumnSorting extends _base.BasePlugin {
    */
   enablePlugin() {
     var _this = this;
+    if (pluginConflictsState.has(this.hot) && pluginConflictsState.get(this.hot) !== this.pluginKey) {
+      this.hot.updateSettings({
+        [this.pluginKey]: false
+      });
+      (0, _utils.warnAboutPluginsConflict)(pluginConflictsState.get(this.hot), this.pluginKey);
+      return;
+    }
     if (this.enabled) {
       return;
     }
+    pluginConflictsState.set(this.hot, this.pluginKey);
     this.columnStatesManager = new _columnStatesManager.ColumnStatesManager(this.hot, `${this.pluginKey}.sortingStates`);
     this.columnMetaCache = new _translations.PhysicalIndexToValueMap(physicalIndex => {
       let visualIndex = this.hot.toVisualColumn(physicalIndex);
@@ -190,6 +205,7 @@ class ColumnSorting extends _base.BasePlugin {
       }
       this.updateHeaderClasses(headerSpanElement);
     };
+    pluginConflictsState.delete(this.hot);
 
     // Changing header width and removing indicator.
     this.hot.addHook('afterGetColHeader', clearColHeader);
@@ -667,7 +683,7 @@ class ColumnSorting extends _base.BasePlugin {
    * @param {object} newSettings New settings object.
    */
   onUpdateSettings(newSettings) {
-    super.onUpdateSettings();
+    super.onUpdateSettings(newSettings);
     if (this.columnMetaCache !== null) {
       // Column meta cache base on settings, thus we should re-init the map.
       this.columnMetaCache.init(this.hot.columnIndexMapper.getNumberOfIndexes());

package/plugins/columnSorting/columnSorting.mjs

@@ -18,7 +18,7 @@ import { IndexesSequence, PhysicalIndexToValueMap as IndexToValueMap } from "../
 import { Hooks } from "../../core/hooks/index.mjs";
 import { ColumnStatesManager } from "./columnStatesManager.mjs";
 import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
-import { HEADER_SPAN_CLASS, getNextSortOrder, areValidSortStates, getHeaderSpanElement, isFirstLevelColumnHeader, wasHeaderClickedProperly } from "./utils.mjs";
+import { HEADER_SPAN_CLASS, getNextSortOrder, areValidSortStates, getHeaderSpanElement, isFirstLevelColumnHeader, wasHeaderClickedProperly, warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToRemove, getClassesToAdd } from "./domHelpers.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { registerRootComparator, sort } from "./sortService/index.mjs";
@@ -32,6 +32,13 @@ registerRootComparator(PLUGIN_KEY, rootComparator);
 Hooks.getSingleton().register('beforeColumnSort');
 Hooks.getSingleton().register('afterColumnSort');
 
+/**
+ * Tracks the conflicts between `columnSorting` and `multiColumnSorting` options.
+ * Only one plugin can be enabled for Handsontable instance. Once one of them is enabled,
+ * the other should remain disabled even if it's set to `true`.
+ */
+const pluginConflictsState = new WeakMap();
+
 // DIFF - MultiColumnSorting & ColumnSorting: changed configuration documentation.
 /**
  * @plugin ColumnSorting
@@ -140,9 +147,17 @@ export class ColumnSorting extends BasePlugin {
    */
   enablePlugin() {
     var _this = this;
+    if (pluginConflictsState.has(this.hot) && pluginConflictsState.get(this.hot) !== this.pluginKey) {
+      this.hot.updateSettings({
+        [this.pluginKey]: false
+      });
+      warnAboutPluginsConflict(pluginConflictsState.get(this.hot), this.pluginKey);
+      return;
+    }
     if (this.enabled) {
       return;
     }
+    pluginConflictsState.set(this.hot, this.pluginKey);
     this.columnStatesManager = new ColumnStatesManager(this.hot, `${this.pluginKey}.sortingStates`);
     this.columnMetaCache = new IndexToValueMap(physicalIndex => {
       let visualIndex = this.hot.toVisualColumn(physicalIndex);
@@ -187,6 +202,7 @@ export class ColumnSorting extends BasePlugin {
       }
       this.updateHeaderClasses(headerSpanElement);
     };
+    pluginConflictsState.delete(this.hot);
 
     // Changing header width and removing indicator.
     this.hot.addHook('afterGetColHeader', clearColHeader);
@@ -664,7 +680,7 @@ export class ColumnSorting extends BasePlugin {
    * @param {object} newSettings New settings object.
    */
   onUpdateSettings(newSettings) {
-    super.onUpdateSettings();
+    super.onUpdateSettings(newSettings);
     if (this.columnMetaCache !== null) {
       // Column meta cache base on settings, thus we should re-init the map.
       this.columnMetaCache.init(this.hot.columnIndexMapper.getNumberOfIndexes());

package/plugins/columnSorting/utils.js

@@ -6,6 +6,7 @@ exports.createDateTimeCompareFunction = createDateTimeCompareFunction;
 exports.getHeaderSpanElement = getHeaderSpanElement;
 exports.getNextSortOrder = getNextSortOrder;
 exports.isFirstLevelColumnHeader = isFirstLevelColumnHeader;
+exports.warnAboutPluginsConflict = warnAboutPluginsConflict;
 exports.wasHeaderClickedProperly = wasHeaderClickedProperly;
 require("core-js/modules/es.set.difference.v2.js");
 require("core-js/modules/es.set.intersection.v2.js");
@@ -22,6 +23,8 @@ var _object = require("../../helpers/object");
 var _event = require("../../helpers/dom/event");
 var _mixed = require("../../helpers/mixed");
 var _sortService = require("./sortService");
+var _console = require("../../helpers/console");
+var _templateLiteralTag = require("../../helpers/templateLiteralTag");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const ASC_SORT_STATE = exports.ASC_SORT_STATE = 'asc';
 const DESC_SORT_STATE = exports.DESC_SORT_STATE = 'desc';
@@ -173,4 +176,15 @@ function createDateTimeCompareFunction(sortOrder, format, columnPluginSettings)
     }
     return _sortService.DO_NOT_SWAP;
   };
+}
+
+/**
+ * Warn users about problems when using `columnSorting` and `multiColumnSorting` plugins simultaneously.
+ *
+ * @param {string} workingPlugin The plugin that will work.
+ * @param {string} disabledPlugin The plugin that will remain disabled.
+ */
+function warnAboutPluginsConflict(workingPlugin, disabledPlugin) {
+  (0, _console.warn)((0, _templateLiteralTag.toSingleLine)`Plugins \`columnSorting\` and \`multiColumnSorting\` should not be enabled simultaneously.\x20
+    Only \`${workingPlugin}\` will work. The \`${disabledPlugin}\` plugin will remain disabled.`);
 }

package/plugins/columnSorting/utils.mjs

@@ -13,6 +13,8 @@ import { isObject } from "../../helpers/object.mjs";
 import { isRightClick } from "../../helpers/dom/event.mjs";
 import { isEmpty } from "../../helpers/mixed.mjs";
 import { DO_NOT_SWAP, FIRST_BEFORE_SECOND, FIRST_AFTER_SECOND } from "./sortService/index.mjs";
+import { warn } from "../../helpers/console.mjs";
+import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
 export const ASC_SORT_STATE = 'asc';
 export const DESC_SORT_STATE = 'desc';
 export const HEADER_SPAN_CLASS = 'colHeader';
@@ -163,4 +165,15 @@ export function createDateTimeCompareFunction(sortOrder, format, columnPluginSet
     }
     return DO_NOT_SWAP;
   };
+}
+
+/**
+ * Warn users about problems when using `columnSorting` and `multiColumnSorting` plugins simultaneously.
+ *
+ * @param {string} workingPlugin The plugin that will work.
+ * @param {string} disabledPlugin The plugin that will remain disabled.
+ */
+export function warnAboutPluginsConflict(workingPlugin, disabledPlugin) {
+  warn(toSingleLine`Plugins \`columnSorting\` and \`multiColumnSorting\` should not be enabled simultaneously.\x20
+    Only \`${workingPlugin}\` will work. The \`${disabledPlugin}\` plugin will remain disabled.`);
 }

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) {

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

@@ -1497,12 +1497,11 @@ function _sumCellsHeights(row, rowspan) {
   } = this.hot;
   const stylesHandler = view.getStylesHandler();
   const defaultHeight = view.getDefaultRowHeight();
-  const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {
     if (!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;
+      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

@@ -1492,12 +1492,11 @@ function _sumCellsHeights(row, rowspan) {
   } = this.hot;
   const stylesHandler = view.getStylesHandler();
   const defaultHeight = view.getDefaultRowHeight();
-  const autoRowSizePlugin = this.hot.getPlugin('autoRowSize');
   let height = 0;
   for (let i = row; i < row + rowspan; i++) {
     if (!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;
+      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.
    *