handsontable 0.0.0-next-e2b07e5-20231213 → 0.0.0-next-9327dd7-20231213

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-e2b07e5-20231213";
+  const hotVersion = "0.0.0-next-9327dd7-20231213";
   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-e2b07e5-20231213";
+  const hotVersion = "0.0.0-next-9327dd7-20231213";
   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-e2b07e5-20231213",
+  "version": "0.0.0-next-9327dd7-20231213",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/undoRedo/undoRedo.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.from-entries.js");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _array = require("../../helpers/array");
 var _number = require("../../helpers/number");
@@ -59,11 +60,30 @@ function UndoRedo(instance) {
   instance.addHook('afterCreateRow', (index, amount, source) => {
     plugin.done(() => new UndoRedo.CreateRowAction(index, amount), source);
   });
+  const getCellMetas = (fromRow, toRow, fromColumn, toColumn) => {
+    const genericKeys = ['visualRow', 'visualCol', 'row', 'col', 'prop'];
+    const genericKeysLength = genericKeys.length;
+    const cellMetas = [];
+    (0, _number.rangeEach)(fromColumn, toColumn, columnIndex => {
+      (0, _number.rangeEach)(fromRow, toRow, rowIndex => {
+        const cellMeta = instance.getCellMeta(rowIndex, columnIndex);
+        if (Object.keys(cellMeta).length !== genericKeysLength) {
+          const uniqueMeta = Object.fromEntries(Object.entries(cellMeta).filter(_ref => {
+            let [key] = _ref;
+            return genericKeys.includes(key) === false;
+          }));
+          cellMetas.push([cellMeta.visualRow, cellMeta.visualCol, uniqueMeta]);
+        }
+      });
+    });
+    return cellMetas;
+  };
   instance.addHook('beforeRemoveRow', (index, amount, logicRows, source) => {
     const wrappedAction = () => {
       const physicalRowIndex = instance.toPhysicalRow(index);
+      const lastRowIndex = physicalRowIndex + amount - 1;
       const removedData = (0, _object.deepClone)(plugin.instance.getSourceData(physicalRowIndex, 0, physicalRowIndex + amount - 1, plugin.instance.countSourceCols() - 1));
-      return new UndoRedo.RemoveRowAction(physicalRowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop, instance.rowIndexMapper.getIndexesSequence());
+      return new UndoRedo.RemoveRowAction(physicalRowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop, instance.rowIndexMapper.getIndexesSequence(), getCellMetas(physicalRowIndex, lastRowIndex, 0, instance.countCols() - 1));
     };
     plugin.done(wrappedAction, source);
   });
@@ -74,13 +94,14 @@ function UndoRedo(instance) {
     const wrappedAction = () => {
       const originalData = plugin.instance.getSourceDataArray();
       const columnIndex = (plugin.instance.countCols() + index) % plugin.instance.countCols();
+      const lastColumnIndex = columnIndex + amount - 1;
       const removedData = [];
       const headers = [];
       const indexes = [];
       (0, _number.rangeEach)(originalData.length - 1, i => {
         const column = [];
         const origRow = originalData[i];
-        (0, _number.rangeEach)(columnIndex, columnIndex + (amount - 1), j => {
+        (0, _number.rangeEach)(columnIndex, lastColumnIndex, j => {
           column.push(origRow[instance.toPhysicalColumn(j)]);
         });
         removedData.push(column);
@@ -95,7 +116,7 @@ function UndoRedo(instance) {
       }
       const columnsMap = instance.columnIndexMapper.getIndexesSequence();
       const rowsMap = instance.rowIndexMapper.getIndexesSequence();
-      return new UndoRedo.RemoveColumnAction(columnIndex, indexes, removedData, headers, columnsMap, rowsMap, instance.getSettings().fixedColumnsStart);
+      return new UndoRedo.RemoveColumnAction(columnIndex, indexes, removedData, headers, columnsMap, rowsMap, instance.getSettings().fixedColumnsStart, getCellMetas(0, instance.countRows(), columnIndex, lastColumnIndex));
     };
     plugin.done(wrappedAction, source);
   });
@@ -413,14 +434,16 @@ UndoRedo.CreateRowAction.prototype.redo = function (instance, redoneCallback) {
  * @param {number} fixedRowsBottom Number of fixed rows on the bottom. Remove row action change it sometimes.
  * @param {number} fixedRowsTop Number of fixed rows on the top. Remove row action change it sometimes.
  * @param {Array} rowIndexesSequence Row index sequence taken from the row index mapper.
+ * @param {Array} removedCellMetas List of removed cell metas.
  */
-UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop, rowIndexesSequence) {
+UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop, rowIndexesSequence, removedCellMetas) {
   this.index = index;
   this.data = data;
   this.actionType = 'remove_row';
   this.fixedRowsBottom = fixedRowsBottom;
   this.fixedRowsTop = fixedRowsTop;
   this.rowIndexesSequence = rowIndexesSequence;
+  this.removedCellMetas = removedCellMetas;
 };
 (0, _object.inherit)(UndoRedo.RemoveRowAction, UndoRedo.Action);
 UndoRedo.RemoveRowAction.prototype.undo = function (instance, undoneCallback) {
@@ -439,6 +462,10 @@ UndoRedo.RemoveRowAction.prototype.undo = function (instance, undoneCallback) {
     });
   });
   instance.alter('insert_row_above', this.index, this.data.length, 'UndoRedo.undo');
+  this.removedCellMetas.forEach(_ref2 => {
+    let [rowIndex, columnIndex, cellMeta] = _ref2;
+    instance.setCellMetaObject(rowIndex, columnIndex, cellMeta);
+  });
   instance.addHookOnce('afterViewRender', undoneCallback);
   instance.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
   instance.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
@@ -481,8 +508,9 @@ UndoRedo.CreateColumnAction.prototype.redo = function (instance, redoneCallback)
  * @param {number[]} columnPositions The column position.
  * @param {number[]} rowPositions The row position.
  * @param {number} fixedColumnsStart Number of fixed columns on the left. Remove column action change it sometimes.
+ * @param {Array} removedCellMetas List of removed cell metas.
  */
-UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPositions, rowPositions, fixedColumnsStart) {
+UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPositions, rowPositions, fixedColumnsStart, removedCellMetas) {
   // eslint-disable-line max-len
   this.index = index;
   this.indexes = indexes;
@@ -493,6 +521,7 @@ UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPos
   this.rowPositions = rowPositions.slice(0);
   this.actionType = 'remove_col';
   this.fixedColumnsStart = fixedColumnsStart;
+  this.removedCellMetas = removedCellMetas;
 };
 (0, _object.inherit)(UndoRedo.RemoveColumnAction, UndoRedo.Action);
 UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback) {
@@ -522,6 +551,10 @@ UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback)
       instance.getSettings().colHeaders[ascendingIndexes[columnIndex]] = headerData;
     });
   }
+  this.removedCellMetas.forEach(_ref3 => {
+    let [rowIndex, columnIndex, cellMeta] = _ref3;
+    instance.setCellMetaObject(rowIndex, columnIndex, cellMeta);
+  });
   instance.batchExecution(() => {
     // Restore row sequence in a case when all columns are removed. the original
     // row sequence is lost in that case.

package/plugins/undoRedo/undoRedo.mjs

@@ -1,4 +1,5 @@
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.object.from-entries.js";
 import Hooks from "../../pluginHooks.mjs";
 import { arrayMap, arrayEach } from "../../helpers/array.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
@@ -55,11 +56,30 @@ function UndoRedo(instance) {
   instance.addHook('afterCreateRow', (index, amount, source) => {
     plugin.done(() => new UndoRedo.CreateRowAction(index, amount), source);
   });
+  const getCellMetas = (fromRow, toRow, fromColumn, toColumn) => {
+    const genericKeys = ['visualRow', 'visualCol', 'row', 'col', 'prop'];
+    const genericKeysLength = genericKeys.length;
+    const cellMetas = [];
+    rangeEach(fromColumn, toColumn, columnIndex => {
+      rangeEach(fromRow, toRow, rowIndex => {
+        const cellMeta = instance.getCellMeta(rowIndex, columnIndex);
+        if (Object.keys(cellMeta).length !== genericKeysLength) {
+          const uniqueMeta = Object.fromEntries(Object.entries(cellMeta).filter(_ref => {
+            let [key] = _ref;
+            return genericKeys.includes(key) === false;
+          }));
+          cellMetas.push([cellMeta.visualRow, cellMeta.visualCol, uniqueMeta]);
+        }
+      });
+    });
+    return cellMetas;
+  };
   instance.addHook('beforeRemoveRow', (index, amount, logicRows, source) => {
     const wrappedAction = () => {
       const physicalRowIndex = instance.toPhysicalRow(index);
+      const lastRowIndex = physicalRowIndex + amount - 1;
       const removedData = deepClone(plugin.instance.getSourceData(physicalRowIndex, 0, physicalRowIndex + amount - 1, plugin.instance.countSourceCols() - 1));
-      return new UndoRedo.RemoveRowAction(physicalRowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop, instance.rowIndexMapper.getIndexesSequence());
+      return new UndoRedo.RemoveRowAction(physicalRowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop, instance.rowIndexMapper.getIndexesSequence(), getCellMetas(physicalRowIndex, lastRowIndex, 0, instance.countCols() - 1));
     };
     plugin.done(wrappedAction, source);
   });
@@ -70,13 +90,14 @@ function UndoRedo(instance) {
     const wrappedAction = () => {
       const originalData = plugin.instance.getSourceDataArray();
       const columnIndex = (plugin.instance.countCols() + index) % plugin.instance.countCols();
+      const lastColumnIndex = columnIndex + amount - 1;
       const removedData = [];
       const headers = [];
       const indexes = [];
       rangeEach(originalData.length - 1, i => {
         const column = [];
         const origRow = originalData[i];
-        rangeEach(columnIndex, columnIndex + (amount - 1), j => {
+        rangeEach(columnIndex, lastColumnIndex, j => {
           column.push(origRow[instance.toPhysicalColumn(j)]);
         });
         removedData.push(column);
@@ -91,7 +112,7 @@ function UndoRedo(instance) {
       }
       const columnsMap = instance.columnIndexMapper.getIndexesSequence();
       const rowsMap = instance.rowIndexMapper.getIndexesSequence();
-      return new UndoRedo.RemoveColumnAction(columnIndex, indexes, removedData, headers, columnsMap, rowsMap, instance.getSettings().fixedColumnsStart);
+      return new UndoRedo.RemoveColumnAction(columnIndex, indexes, removedData, headers, columnsMap, rowsMap, instance.getSettings().fixedColumnsStart, getCellMetas(0, instance.countRows(), columnIndex, lastColumnIndex));
     };
     plugin.done(wrappedAction, source);
   });
@@ -409,14 +430,16 @@ UndoRedo.CreateRowAction.prototype.redo = function (instance, redoneCallback) {
  * @param {number} fixedRowsBottom Number of fixed rows on the bottom. Remove row action change it sometimes.
  * @param {number} fixedRowsTop Number of fixed rows on the top. Remove row action change it sometimes.
  * @param {Array} rowIndexesSequence Row index sequence taken from the row index mapper.
+ * @param {Array} removedCellMetas List of removed cell metas.
  */
-UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop, rowIndexesSequence) {
+UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop, rowIndexesSequence, removedCellMetas) {
   this.index = index;
   this.data = data;
   this.actionType = 'remove_row';
   this.fixedRowsBottom = fixedRowsBottom;
   this.fixedRowsTop = fixedRowsTop;
   this.rowIndexesSequence = rowIndexesSequence;
+  this.removedCellMetas = removedCellMetas;
 };
 inherit(UndoRedo.RemoveRowAction, UndoRedo.Action);
 UndoRedo.RemoveRowAction.prototype.undo = function (instance, undoneCallback) {
@@ -435,6 +458,10 @@ UndoRedo.RemoveRowAction.prototype.undo = function (instance, undoneCallback) {
     });
   });
   instance.alter('insert_row_above', this.index, this.data.length, 'UndoRedo.undo');
+  this.removedCellMetas.forEach(_ref2 => {
+    let [rowIndex, columnIndex, cellMeta] = _ref2;
+    instance.setCellMetaObject(rowIndex, columnIndex, cellMeta);
+  });
   instance.addHookOnce('afterViewRender', undoneCallback);
   instance.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
   instance.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
@@ -477,8 +504,9 @@ UndoRedo.CreateColumnAction.prototype.redo = function (instance, redoneCallback)
  * @param {number[]} columnPositions The column position.
  * @param {number[]} rowPositions The row position.
  * @param {number} fixedColumnsStart Number of fixed columns on the left. Remove column action change it sometimes.
+ * @param {Array} removedCellMetas List of removed cell metas.
  */
-UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPositions, rowPositions, fixedColumnsStart) {
+UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPositions, rowPositions, fixedColumnsStart, removedCellMetas) {
   // eslint-disable-line max-len
   this.index = index;
   this.indexes = indexes;
@@ -489,6 +517,7 @@ UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPos
   this.rowPositions = rowPositions.slice(0);
   this.actionType = 'remove_col';
   this.fixedColumnsStart = fixedColumnsStart;
+  this.removedCellMetas = removedCellMetas;
 };
 inherit(UndoRedo.RemoveColumnAction, UndoRedo.Action);
 UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback) {
@@ -518,6 +547,10 @@ UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback)
       instance.getSettings().colHeaders[ascendingIndexes[columnIndex]] = headerData;
     });
   }
+  this.removedCellMetas.forEach(_ref3 => {
+    let [rowIndex, columnIndex, cellMeta] = _ref3;
+    instance.setCellMetaObject(rowIndex, columnIndex, cellMeta);
+  });
   instance.batchExecution(() => {
     // Restore row sequence in a case when all columns are removed. the original
     // row sequence is lost in that case.