handsontable 0.0.0-next-549d023-20240119 → 0.0.0-next-f3514b0-20240124

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-549d023-20240119";
+  const hotVersion = "0.0.0-next-f3514b0-20240124";
   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-549d023-20240119";
+  const hotVersion = "0.0.0-next-f3514b0-20240124";
   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-549d023-20240119",
+  "version": "0.0.0-next-f3514b0-20240124",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/undoRedo/undoRedo.js

@@ -132,6 +132,12 @@ function UndoRedo(instance) {
     }
     plugin.done(() => new UndoRedo.RowMoveAction(rows, finalIndex));
   });
+  instance.addHook('beforeColumnMove', (columns, finalIndex) => {
+    if (columns === false) {
+      return;
+    }
+    plugin.done(() => new UndoRedo.ColumnMoveAction(columns, finalIndex));
+  });
   instance.addHook('beforeMergeCells', (cellRange, auto) => {
     if (auto) {
       return;
@@ -714,15 +720,15 @@ UndoRedo.UnmergeCellsAction = UnmergeCellsAction;
  */
 UndoRedo.RowMoveAction = function (rows, finalIndex) {
   this.rows = rows.slice();
-  this.finalIndex = finalIndex;
+  this.finalRowIndex = finalIndex;
   this.actionType = 'row_move';
 };
 (0, _object.inherit)(UndoRedo.RowMoveAction, UndoRedo.Action);
 UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   const copyOfRows = [].concat(this.rows);
-  const rowsMovedUp = copyOfRows.filter(a => a > this.finalIndex);
-  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalIndex);
+  const rowsMovedUp = copyOfRows.filter(a => a > this.finalRowIndex);
+  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalRowIndex);
   const allMovedRows = rowsMovedUp.sort((a, b) => b - a).concat(rowsMovedDown.sort((a, b) => a - b));
   instance.addHookOnce('afterViewRender', undoneCallback);
 
@@ -739,10 +745,50 @@ UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
 UndoRedo.RowMoveAction.prototype.redo = function (instance, redoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   instance.addHookOnce('afterViewRender', redoneCallback);
-  manualRowMove.moveRows(this.rows.slice(), this.finalIndex);
+  manualRowMove.moveRows(this.rows.slice(), this.finalRowIndex);
+  instance.render();
+  instance.deselectCell();
+  instance.selectRows(this.finalRowIndex, this.finalRowIndex + this.rows.length - 1);
+};
+
+/**
+ * ManualColumnMove action.
+ *
+ * @private
+ * @param {number[]} columns An array with moved columns.
+ * @param {number} finalIndex The destination index.
+ */
+UndoRedo.ColumnMoveAction = function (columns, finalIndex) {
+  this.columns = columns.slice();
+  this.finalColumnIndex = finalIndex;
+  this.actionType = 'col_move';
+};
+(0, _object.inherit)(UndoRedo.ColumnMoveAction, UndoRedo.Action);
+UndoRedo.ColumnMoveAction.prototype.undo = function (instance, undoneCallback) {
+  const manualColumnMove = instance.getPlugin('manualColumnMove');
+  const copyOfColumns = [].concat(this.columns);
+  const columnsMovedLeft = copyOfColumns.filter(a => a > this.finalColumnIndex);
+  const rowsMovedRight = copyOfColumns.filter(a => a <= this.finalColumnIndex);
+  const allMovedColumns = columnsMovedLeft.sort((a, b) => b - a).concat(rowsMovedRight.sort((a, b) => a - b));
+  instance.addHookOnce('afterViewRender', undoneCallback);
+
+  // Moving columns from those with higher indexes to those with lower indexes when action was performed from right to left
+  // Moving columns from those with lower indexes to those with higher indexes when action was performed from left to right
+  for (let i = 0; i < allMovedColumns.length; i += 1) {
+    const newPhysicalColumn = instance.toVisualColumn(allMovedColumns[i]);
+    manualColumnMove.moveColumn(newPhysicalColumn, allMovedColumns[i]);
+  }
+  instance.render();
+  instance.deselectCell();
+  instance.selectColumns(this.columns[0], this.columns[0] + this.columns.length - 1);
+};
+UndoRedo.ColumnMoveAction.prototype.redo = function (instance, redoneCallback) {
+  const manualColumnMove = instance.getPlugin('manualColumnMove');
+  instance.addHookOnce('afterViewRender', redoneCallback);
+  manualColumnMove.moveColumns(this.columns.slice(), this.finalColumnIndex);
   instance.render();
   instance.deselectCell();
-  instance.selectRows(this.finalIndex, this.finalIndex + this.rows.length - 1);
+  instance.selectColumns(this.finalColumnIndex, this.finalColumnIndex + this.columns.length - 1);
 };
 
 /**

package/plugins/undoRedo/undoRedo.mjs

@@ -128,6 +128,12 @@ function UndoRedo(instance) {
     }
     plugin.done(() => new UndoRedo.RowMoveAction(rows, finalIndex));
   });
+  instance.addHook('beforeColumnMove', (columns, finalIndex) => {
+    if (columns === false) {
+      return;
+    }
+    plugin.done(() => new UndoRedo.ColumnMoveAction(columns, finalIndex));
+  });
   instance.addHook('beforeMergeCells', (cellRange, auto) => {
     if (auto) {
       return;
@@ -710,15 +716,15 @@ UndoRedo.UnmergeCellsAction = UnmergeCellsAction;
  */
 UndoRedo.RowMoveAction = function (rows, finalIndex) {
   this.rows = rows.slice();
-  this.finalIndex = finalIndex;
+  this.finalRowIndex = finalIndex;
   this.actionType = 'row_move';
 };
 inherit(UndoRedo.RowMoveAction, UndoRedo.Action);
 UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   const copyOfRows = [].concat(this.rows);
-  const rowsMovedUp = copyOfRows.filter(a => a > this.finalIndex);
-  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalIndex);
+  const rowsMovedUp = copyOfRows.filter(a => a > this.finalRowIndex);
+  const rowsMovedDown = copyOfRows.filter(a => a <= this.finalRowIndex);
   const allMovedRows = rowsMovedUp.sort((a, b) => b - a).concat(rowsMovedDown.sort((a, b) => a - b));
   instance.addHookOnce('afterViewRender', undoneCallback);
 
@@ -735,10 +741,50 @@ UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
 UndoRedo.RowMoveAction.prototype.redo = function (instance, redoneCallback) {
   const manualRowMove = instance.getPlugin('manualRowMove');
   instance.addHookOnce('afterViewRender', redoneCallback);
-  manualRowMove.moveRows(this.rows.slice(), this.finalIndex);
+  manualRowMove.moveRows(this.rows.slice(), this.finalRowIndex);
+  instance.render();
+  instance.deselectCell();
+  instance.selectRows(this.finalRowIndex, this.finalRowIndex + this.rows.length - 1);
+};
+
+/**
+ * ManualColumnMove action.
+ *
+ * @private
+ * @param {number[]} columns An array with moved columns.
+ * @param {number} finalIndex The destination index.
+ */
+UndoRedo.ColumnMoveAction = function (columns, finalIndex) {
+  this.columns = columns.slice();
+  this.finalColumnIndex = finalIndex;
+  this.actionType = 'col_move';
+};
+inherit(UndoRedo.ColumnMoveAction, UndoRedo.Action);
+UndoRedo.ColumnMoveAction.prototype.undo = function (instance, undoneCallback) {
+  const manualColumnMove = instance.getPlugin('manualColumnMove');
+  const copyOfColumns = [].concat(this.columns);
+  const columnsMovedLeft = copyOfColumns.filter(a => a > this.finalColumnIndex);
+  const rowsMovedRight = copyOfColumns.filter(a => a <= this.finalColumnIndex);
+  const allMovedColumns = columnsMovedLeft.sort((a, b) => b - a).concat(rowsMovedRight.sort((a, b) => a - b));
+  instance.addHookOnce('afterViewRender', undoneCallback);
+
+  // Moving columns from those with higher indexes to those with lower indexes when action was performed from right to left
+  // Moving columns from those with lower indexes to those with higher indexes when action was performed from left to right
+  for (let i = 0; i < allMovedColumns.length; i += 1) {
+    const newPhysicalColumn = instance.toVisualColumn(allMovedColumns[i]);
+    manualColumnMove.moveColumn(newPhysicalColumn, allMovedColumns[i]);
+  }
+  instance.render();
+  instance.deselectCell();
+  instance.selectColumns(this.columns[0], this.columns[0] + this.columns.length - 1);
+};
+UndoRedo.ColumnMoveAction.prototype.redo = function (instance, redoneCallback) {
+  const manualColumnMove = instance.getPlugin('manualColumnMove');
+  instance.addHookOnce('afterViewRender', redoneCallback);
+  manualColumnMove.moveColumns(this.columns.slice(), this.finalColumnIndex);
   instance.render();
   instance.deselectCell();
-  instance.selectRows(this.finalIndex, this.finalIndex + this.rows.length - 1);
+  instance.selectColumns(this.finalColumnIndex, this.finalColumnIndex + this.columns.length - 1);
 };
 
 /**