handsontable 0.0.0-next-ae2e00f-20231213 → 0.0.0-next-0416ebd-20231214

package/eventManager.js

@@ -19,6 +19,7 @@ let listenersCounter = 0;
  * Event DOM manager for internal use in Handsontable.
  *
  * @class EventManager
+ * @util
  */
 class EventManager {
   /**
@@ -51,7 +52,6 @@ class EventManager {
   addEventListener(element, eventName, callback) {
     let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     /**
-     * @private
      * @param {Event} event The event object.
      */
     function callbackProxy(event) {
@@ -211,7 +211,6 @@ function extendEvent(event) {
 }
 var _default = exports.default = EventManager;
 /**
- * @private
  * @returns {number}
  */
 function getListenersCounter() {

package/eventManager.mjs

@@ -15,6 +15,7 @@ let listenersCounter = 0;
  * Event DOM manager for internal use in Handsontable.
  *
  * @class EventManager
+ * @util
  */
 class EventManager {
   /**
@@ -47,7 +48,6 @@ class EventManager {
   addEventListener(element, eventName, callback) {
     let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     /**
-     * @private
      * @param {Event} event The event object.
      */
     function callbackProxy(event) {
@@ -208,7 +208,6 @@ function extendEvent(event) {
 export default EventManager;
 
 /**
- * @private
  * @returns {number}
  */
 export function getListenersCounter() {

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-ae2e00f-20231213";
+  const hotVersion = "0.0.0-next-0416ebd-20231214";
   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-ae2e00f-20231213";
+  const hotVersion = "0.0.0-next-0416ebd-20231214";
   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-ae2e00f-20231213",
+  "version": "0.0.0-next-0416ebd-20231214",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/undoRedo/undoRedo.js

@@ -2,7 +2,6 @@
 
 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");
@@ -60,30 +59,11 @@ 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(), getCellMetas(physicalRowIndex, lastRowIndex, 0, instance.countCols() - 1));
+      return new UndoRedo.RemoveRowAction(physicalRowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop, instance.rowIndexMapper.getIndexesSequence());
     };
     plugin.done(wrappedAction, source);
   });
@@ -94,14 +74,13 @@ 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, lastColumnIndex, j => {
+        (0, _number.rangeEach)(columnIndex, columnIndex + (amount - 1), j => {
           column.push(origRow[instance.toPhysicalColumn(j)]);
         });
         removedData.push(column);
@@ -116,7 +95,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, getCellMetas(0, instance.countRows(), columnIndex, lastColumnIndex));
+      return new UndoRedo.RemoveColumnAction(columnIndex, indexes, removedData, headers, columnsMap, rowsMap, instance.getSettings().fixedColumnsStart);
     };
     plugin.done(wrappedAction, source);
   });
@@ -384,6 +363,32 @@ UndoRedo.ChangeAction.prototype.undo = function (instance, undoneCallback) {
       instance.undoRedo.doneActions.pop();
     }
   }
+  const selectedLast = instance.getSelectedLast();
+  if (selectedLast !== undefined) {
+    const [changedRow, changedColumn] = data[0];
+    const [selectedRow, selectedColumn] = selectedLast;
+    const firstFullyVisibleRow = instance.view.getFirstFullyVisibleRow();
+    const firstFullyVisibleColumn = instance.view.getFirstFullyVisibleColumn();
+    const isInVerticalViewPort = changedRow >= firstFullyVisibleRow;
+    const isInHorizontalViewPort = changedColumn >= firstFullyVisibleColumn;
+    const isInViewport = isInVerticalViewPort && isInHorizontalViewPort;
+    const isChangedSelection = selectedRow !== changedRow || selectedColumn !== changedColumn;
+
+    // Performing scroll only when selection has been changed right after editing a cell.
+    if (isInViewport === false && isChangedSelection === true) {
+      const scrollConfig = {
+        row: changedRow,
+        col: changedColumn
+      };
+      if (isInVerticalViewPort === false) {
+        scrollConfig.verticalSnap = 'top';
+      }
+      if (isInHorizontalViewPort === false) {
+        scrollConfig.horizontalSnap = 'start';
+      }
+      instance.scrollViewportTo(scrollConfig);
+    }
+  }
   instance.selectCells(this.selected, false, false);
 };
 UndoRedo.ChangeAction.prototype.redo = function (instance, onFinishCallback) {
@@ -434,16 +439,14 @@ 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, removedCellMetas) {
+UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop, rowIndexesSequence) {
   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) {
@@ -462,10 +465,6 @@ 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);
@@ -508,9 +507,8 @@ 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, removedCellMetas) {
+UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPositions, rowPositions, fixedColumnsStart) {
   // eslint-disable-line max-len
   this.index = index;
   this.indexes = indexes;
@@ -521,7 +519,6 @@ 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) {
@@ -551,10 +548,6 @@ 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,5 +1,4 @@
 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";
@@ -56,30 +55,11 @@ 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(), getCellMetas(physicalRowIndex, lastRowIndex, 0, instance.countCols() - 1));
+      return new UndoRedo.RemoveRowAction(physicalRowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop, instance.rowIndexMapper.getIndexesSequence());
     };
     plugin.done(wrappedAction, source);
   });
@@ -90,14 +70,13 @@ 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, lastColumnIndex, j => {
+        rangeEach(columnIndex, columnIndex + (amount - 1), j => {
           column.push(origRow[instance.toPhysicalColumn(j)]);
         });
         removedData.push(column);
@@ -112,7 +91,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, getCellMetas(0, instance.countRows(), columnIndex, lastColumnIndex));
+      return new UndoRedo.RemoveColumnAction(columnIndex, indexes, removedData, headers, columnsMap, rowsMap, instance.getSettings().fixedColumnsStart);
     };
     plugin.done(wrappedAction, source);
   });
@@ -380,6 +359,32 @@ UndoRedo.ChangeAction.prototype.undo = function (instance, undoneCallback) {
       instance.undoRedo.doneActions.pop();
     }
   }
+  const selectedLast = instance.getSelectedLast();
+  if (selectedLast !== undefined) {
+    const [changedRow, changedColumn] = data[0];
+    const [selectedRow, selectedColumn] = selectedLast;
+    const firstFullyVisibleRow = instance.view.getFirstFullyVisibleRow();
+    const firstFullyVisibleColumn = instance.view.getFirstFullyVisibleColumn();
+    const isInVerticalViewPort = changedRow >= firstFullyVisibleRow;
+    const isInHorizontalViewPort = changedColumn >= firstFullyVisibleColumn;
+    const isInViewport = isInVerticalViewPort && isInHorizontalViewPort;
+    const isChangedSelection = selectedRow !== changedRow || selectedColumn !== changedColumn;
+
+    // Performing scroll only when selection has been changed right after editing a cell.
+    if (isInViewport === false && isChangedSelection === true) {
+      const scrollConfig = {
+        row: changedRow,
+        col: changedColumn
+      };
+      if (isInVerticalViewPort === false) {
+        scrollConfig.verticalSnap = 'top';
+      }
+      if (isInHorizontalViewPort === false) {
+        scrollConfig.horizontalSnap = 'start';
+      }
+      instance.scrollViewportTo(scrollConfig);
+    }
+  }
   instance.selectCells(this.selected, false, false);
 };
 UndoRedo.ChangeAction.prototype.redo = function (instance, onFinishCallback) {
@@ -430,16 +435,14 @@ 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, removedCellMetas) {
+UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop, rowIndexesSequence) {
   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) {
@@ -458,10 +461,6 @@ 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);
@@ -504,9 +503,8 @@ 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, removedCellMetas) {
+UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPositions, rowPositions, fixedColumnsStart) {
   // eslint-disable-line max-len
   this.index = index;
   this.indexes = indexes;
@@ -517,7 +515,6 @@ 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) {
@@ -547,10 +544,6 @@ 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.