handsontable 0.0.0-next-aebdd36-20240821 → 0.0.0-next-eaf150e-20240823

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-aebdd36-20240821";
+  const hotVersion = "0.0.0-next-eaf150e-20240823";
   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-aebdd36-20240821";
+  const hotVersion = "0.0.0-next-eaf150e-20240823";
   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-aebdd36-20240821",
+  "version": "0.0.0-next-eaf150e-20240823",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/pluginHooks.d.ts

@@ -180,7 +180,7 @@ export interface Events {
   beforeDrawBorders?: (corners: number[], borderClassName: 'current' | 'area' | 'highlight' | undefined) => void;
   beforeDropdownMenuSetItems?: (menuItems: ContextMenuMenuItemConfig[]) => void;
   beforeDropdownMenuShow?: (instance: DropdownMenu) => void;
-  beforeFilter?: (conditionsStack: FiltersColumnConditions[]) => void | boolean;
+  beforeFilter?: (conditionsStack: FiltersColumnConditions[], previousConditionsStack: FiltersColumnConditions[]) => void | boolean;
   beforeGetCellMeta?: (row: number, column: number, cellProperties: CellProperties) => void;
   beforeHideColumns?: (currentHideConfig: number[], destinationHideConfig: number[], actionPossible: boolean) => void | boolean;
   beforeHideRows?: (currentHideConfig: number[], destinationHideConfig: number[], actionPossible: boolean) => void | boolean;

package/pluginHooks.js

@@ -2004,6 +2004,7 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  *
  * @event Hooks#beforeFilter
  * @param {object[]} conditionsStack An array of objects with your [column filters](@/api/filters.md#addcondition).
+ * @param {object[]|null} previousConditionsStack An array of objects with your previous [column filters](@/api/filters.md#addcondition). It can also be `null` if there was no previous filters applied or the conditions did not change between performing the `filter` action.
  * @returns {boolean} To perform server-side filtering (i.e., to not apply filtering to Handsontable's UI), return `false`.
  */
 'beforeFilter',

package/pluginHooks.mjs

@@ -2000,6 +2000,7 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  *
  * @event Hooks#beforeFilter
  * @param {object[]} conditionsStack An array of objects with your [column filters](@/api/filters.md#addcondition).
+ * @param {object[]|null} previousConditionsStack An array of objects with your previous [column filters](@/api/filters.md#addcondition). It can also be `null` if there was no previous filters applied or the conditions did not change between performing the `filter` action.
  * @returns {boolean} To perform server-side filtering (i.e., to not apply filtering to Handsontable's UI), return `false`.
  */
 'beforeFilter',

package/plugins/filters/conditionCollection.js

@@ -45,6 +45,13 @@ 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) {
@@ -113,6 +120,13 @@ class ConditionCollection {
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
     const args = (0, _array.arrayMap)(conditionDefinition.args, 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) {
@@ -241,6 +255,8 @@ 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);
@@ -274,6 +290,16 @@ 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

@@ -41,6 +41,13 @@ 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) {
@@ -109,6 +116,13 @@ class ConditionCollection {
     const localeForColumn = this.hot.getCellMeta(0, column).locale;
     const args = arrayMap(conditionDefinition.args, 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) {
@@ -237,6 +251,8 @@ 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);
@@ -270,6 +286,16 @@ 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.js

@@ -483,7 +483,7 @@ class Filters extends _base.BasePlugin {
     const needToFilter = !this.conditionCollection.isEmpty();
     let visibleVisualRows = [];
     const conditions = this.conditionCollection.exportAllConditions();
-    const allowFiltering = this.hot.runHooks('beforeFilter', conditions);
+    const allowFiltering = this.hot.runHooks('beforeFilter', conditions, this.conditionCollection.previousConditionStack);
     if (allowFiltering !== false) {
       if (needToFilter) {
         const trimmedRows = [];
@@ -508,6 +508,7 @@ class Filters extends _base.BasePlugin {
       }
     }
     this.hot.runHooks('afterFilter', conditions);
+    this.conditionCollection.setPreviousConditionStack(null);
     this.hot.view.adjustElementsSize();
     this.hot.render();
     if (this.hot.selection.isSelected()) {

package/plugins/filters/filters.mjs

@@ -477,7 +477,7 @@ export class Filters extends BasePlugin {
     const needToFilter = !this.conditionCollection.isEmpty();
     let visibleVisualRows = [];
     const conditions = this.conditionCollection.exportAllConditions();
-    const allowFiltering = this.hot.runHooks('beforeFilter', conditions);
+    const allowFiltering = this.hot.runHooks('beforeFilter', conditions, this.conditionCollection.previousConditionStack);
     if (allowFiltering !== false) {
       if (needToFilter) {
         const trimmedRows = [];
@@ -502,6 +502,7 @@ export class Filters extends BasePlugin {
       }
     }
     this.hot.runHooks('afterFilter', conditions);
+    this.conditionCollection.setPreviousConditionStack(null);
     this.hot.view.adjustElementsSize();
     this.hot.render();
     if (this.hot.selection.isSelected()) {

package/plugins/mergeCells/cellsCollection.js

@@ -424,18 +424,20 @@ class MergedCellsCollection {
         break;
       default:
     }
-    (0, _array.arrayEach)(this.mergedCells, currentMerge => {
-      _assertClassBrand(_MergedCellsCollection_brand, this, _removeMergedCellFromMatrix).call(this, currentMerge);
+    const removedMergedCells = [];
+    this.mergedCells.forEach(currentMerge => {
       currentMerge.shift(shiftVector, index);
-      _assertClassBrand(_MergedCellsCollection_brand, this, _addMergedCellToMatrix).call(this, currentMerge);
-    });
-    (0, _number.rangeEachReverse)(this.mergedCells.length - 1, 0, i => {
-      const currentMerge = this.mergedCells[i];
-      if (currentMerge && currentMerge.removed) {
-        this.mergedCells.splice(this.mergedCells.indexOf(currentMerge), 1);
-        _assertClassBrand(_MergedCellsCollection_brand, this, _removeMergedCellFromMatrix).call(this, currentMerge);
+      if (currentMerge.removed) {
+        removedMergedCells.push(currentMerge);
       }
     });
+    removedMergedCells.forEach(removedMerge => {
+      this.mergedCells.splice(this.mergedCells.indexOf(removedMerge), 1);
+    });
+    this.mergedCellsMatrix.clear();
+    this.mergedCells.forEach(currentMerge => {
+      _assertClassBrand(_MergedCellsCollection_brand, this, _addMergedCellToMatrix).call(this, currentMerge);
+    });
   }
 
   /**

package/plugins/mergeCells/cellsCollection.mjs

@@ -15,7 +15,7 @@ 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); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import MergedCellCoords from "./cellCoords.mjs";
-import { rangeEach, rangeEachReverse } from "../../helpers/number.mjs";
+import { rangeEach } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
@@ -420,18 +420,20 @@ class MergedCellsCollection {
         break;
       default:
     }
-    arrayEach(this.mergedCells, currentMerge => {
-      _assertClassBrand(_MergedCellsCollection_brand, this, _removeMergedCellFromMatrix).call(this, currentMerge);
+    const removedMergedCells = [];
+    this.mergedCells.forEach(currentMerge => {
       currentMerge.shift(shiftVector, index);
-      _assertClassBrand(_MergedCellsCollection_brand, this, _addMergedCellToMatrix).call(this, currentMerge);
-    });
-    rangeEachReverse(this.mergedCells.length - 1, 0, i => {
-      const currentMerge = this.mergedCells[i];
-      if (currentMerge && currentMerge.removed) {
-        this.mergedCells.splice(this.mergedCells.indexOf(currentMerge), 1);
-        _assertClassBrand(_MergedCellsCollection_brand, this, _removeMergedCellFromMatrix).call(this, currentMerge);
+      if (currentMerge.removed) {
+        removedMergedCells.push(currentMerge);
       }
     });
+    removedMergedCells.forEach(removedMerge => {
+      this.mergedCells.splice(this.mergedCells.indexOf(removedMerge), 1);
+    });
+    this.mergedCellsMatrix.clear();
+    this.mergedCells.forEach(currentMerge => {
+      _assertClassBrand(_MergedCellsCollection_brand, this, _addMergedCellToMatrix).call(this, currentMerge);
+    });
   }
 
   /**

package/plugins/undoRedo/undoRedo.js

@@ -124,8 +124,8 @@ function UndoRedo(instance) {
   instance.addHook('beforeCellAlignment', (stateBefore, range, type, alignment) => {
     plugin.done(() => new UndoRedo.CellAlignmentAction(stateBefore, range, type, alignment));
   });
-  instance.addHook('beforeFilter', conditionsStack => {
-    plugin.done(() => new UndoRedo.FiltersAction(conditionsStack));
+  instance.addHook('beforeFilter', (conditionsStack, previousConditionsStack) => {
+    plugin.done(() => new UndoRedo.FiltersAction(conditionsStack, previousConditionsStack));
   });
   instance.addHook('beforeRowMove', (rows, finalIndex) => {
     if (rows === false) {
@@ -645,9 +645,11 @@ UndoRedo.CellAlignmentAction.prototype.redo = function (instance, undoneCallback
  * Filters action.
  *
  * @private
- * @param {Array} conditionsStack An array of the filter condition.
+ * @param {Array} conditionsStack An array of the filter conditions.
+ * @param {Array} previousConditionsStack An array of the previous filter conditions.
  */
-UndoRedo.FiltersAction = function (conditionsStack) {
+UndoRedo.FiltersAction = function (conditionsStack, previousConditionsStack) {
+  this.previousConditionsStack = previousConditionsStack;
   this.conditionsStack = conditionsStack;
   this.actionType = 'filter';
 };
@@ -655,7 +657,9 @@ UndoRedo.FiltersAction = function (conditionsStack) {
 UndoRedo.FiltersAction.prototype.undo = function (instance, undoneCallback) {
   const filters = instance.getPlugin('filters');
   instance.addHookOnce('afterViewRender', undoneCallback);
-  filters.conditionCollection.importAllConditions(this.conditionsStack.slice(0, this.conditionsStack.length - 1));
+  if (this.previousConditionsStack) {
+    filters.conditionCollection.importAllConditions(this.previousConditionsStack);
+  }
   filters.filter();
 };
 UndoRedo.FiltersAction.prototype.redo = function (instance, redoneCallback) {

package/plugins/undoRedo/undoRedo.mjs

@@ -120,8 +120,8 @@ function UndoRedo(instance) {
   instance.addHook('beforeCellAlignment', (stateBefore, range, type, alignment) => {
     plugin.done(() => new UndoRedo.CellAlignmentAction(stateBefore, range, type, alignment));
   });
-  instance.addHook('beforeFilter', conditionsStack => {
-    plugin.done(() => new UndoRedo.FiltersAction(conditionsStack));
+  instance.addHook('beforeFilter', (conditionsStack, previousConditionsStack) => {
+    plugin.done(() => new UndoRedo.FiltersAction(conditionsStack, previousConditionsStack));
   });
   instance.addHook('beforeRowMove', (rows, finalIndex) => {
     if (rows === false) {
@@ -641,9 +641,11 @@ UndoRedo.CellAlignmentAction.prototype.redo = function (instance, undoneCallback
  * Filters action.
  *
  * @private
- * @param {Array} conditionsStack An array of the filter condition.
+ * @param {Array} conditionsStack An array of the filter conditions.
+ * @param {Array} previousConditionsStack An array of the previous filter conditions.
  */
-UndoRedo.FiltersAction = function (conditionsStack) {
+UndoRedo.FiltersAction = function (conditionsStack, previousConditionsStack) {
+  this.previousConditionsStack = previousConditionsStack;
   this.conditionsStack = conditionsStack;
   this.actionType = 'filter';
 };
@@ -651,7 +653,9 @@ inherit(UndoRedo.FiltersAction, UndoRedo.Action);
 UndoRedo.FiltersAction.prototype.undo = function (instance, undoneCallback) {
   const filters = instance.getPlugin('filters');
   instance.addHookOnce('afterViewRender', undoneCallback);
-  filters.conditionCollection.importAllConditions(this.conditionsStack.slice(0, this.conditionsStack.length - 1));
+  if (this.previousConditionsStack) {
+    filters.conditionCollection.importAllConditions(this.previousConditionsStack);
+  }
   filters.filter();
 };
 UndoRedo.FiltersAction.prototype.redo = function (instance, redoneCallback) {