handsontable 0.0.0-next-aebdd36-20240821 → 0.0.0-next-9891faa-20240822

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-9891faa-20240822";
   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-9891faa-20240822";
   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-9891faa-20240822",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

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);
+    });
   }
 
   /**