handsontable 14.1.0 → 14.2.0-next-7ae341f-20240229

package/plugins/formulas/indexSyncer/axisSyncer.js

@@ -4,6 +4,7 @@ exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.error.cause.js");
 var _string = require("../../../helpers/string");
+var _moves = require("../../../helpers/moves");
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
@@ -176,79 +177,6 @@ class AxisSyncer {
     _classPrivateFieldSet(this, _finalIndex, this.getHfIndexFromVisualIndex(visualFinalIndex));
   }
 
-  /**
-   * Gets first position where to move element (respecting the fact that some element will be sooner or later
-   * taken out of the dataset in order to move them).
-   *
-   * @param {Array<number>} movedHfIndexes Sequence of moved HF indexes for certain axis.
-   * @param {number} finalHfIndex Final HF place where to move rows.
-   * @returns {number} HF's index informing where to move the first element.
-   * @private
-   */
-  getMoveLine(movedHfIndexes, finalHfIndex) {
-    const numberOfElements = _classPrivateFieldGet(this, _indexMapper).getNumberOfIndexes();
-    const notMovedElements = Array.from(Array(numberOfElements).keys()).filter(index => movedHfIndexes.includes(index) === false);
-    if (finalHfIndex === 0) {
-      var _notMovedElements$fin;
-      return (_notMovedElements$fin = notMovedElements[finalHfIndex]) !== null && _notMovedElements$fin !== void 0 ? _notMovedElements$fin : 0; // Moving before the first dataset's element.
-    }
-    return notMovedElements[finalHfIndex - 1] + 1; // Moving before another element.
-  }
-
-  /**
-   * Gets initially calculated HF's move positions.
-   *
-   * @private
-   * @param {Array<number>} movedHfIndexes Sequence of moved HF indexes for certain axis.
-   * @param {number} finalHfIndex Final HF place where to move rows.
-   * @returns {Array<{from: number, to: number}>} Initially calculated HF's move positions.
-   */
-  getInitiallyCalculatedMoves(movedHfIndexes, finalHfIndex) {
-    let moveLine = this.getMoveLine(movedHfIndexes, finalHfIndex);
-    const moves = [];
-    movedHfIndexes.forEach(movedHfIndex => {
-      const move = {
-        from: movedHfIndex,
-        to: moveLine
-      };
-      moves.forEach(previouslyMovedIndex => {
-        const isMovingFromEndToStart = previouslyMovedIndex.from > previouslyMovedIndex.to;
-        const isMovingElementBefore = previouslyMovedIndex.to <= move.from;
-        const isMovingAfterElement = previouslyMovedIndex.from > move.from;
-        if (isMovingAfterElement && isMovingElementBefore && isMovingFromEndToStart) {
-          move.from += 1;
-        }
-      });
-
-      // Moved element from right to left (or bottom to top).
-      if (move.from >= moveLine) {
-        moveLine += 1;
-      }
-      moves.push(move);
-    });
-    return moves;
-  }
-
-  /**
-   * Gets finally calculated HF's move positions (after adjusting).
-   *
-   * @private
-   * @param {Array<{from: number, to: number}>} moves Initially calculated HF's move positions.
-   * @returns {Array<{from: number, to: number}>} Finally calculated HF's move positions (after adjusting).
-   */
-  adjustedCalculatedMoves(moves) {
-    moves.forEach((move, index) => {
-      const nextMoved = moves.slice(index + 1);
-      nextMoved.forEach(nextMovedIndex => {
-        const isMovingFromStartToEnd = nextMovedIndex.from < nextMovedIndex.to;
-        if (nextMovedIndex.from > move.from && isMovingFromStartToEnd) {
-          nextMovedIndex.from -= 1;
-        }
-      });
-    });
-    return moves;
-  }
-
   /**
    * Calculating where to move HF elements and performing already calculated moves.
    *
@@ -262,7 +190,7 @@ class AxisSyncer {
     if (movePossible === false || orderChanged === false) {
       return;
     }
-    const calculatedMoves = this.adjustedCalculatedMoves(this.getInitiallyCalculatedMoves(_classPrivateFieldGet(this, _movedIndexes), _classPrivateFieldGet(this, _finalIndex)));
+    const calculatedMoves = (0, _moves.getMoves)(_classPrivateFieldGet(this, _movedIndexes), _classPrivateFieldGet(this, _finalIndex), _classPrivateFieldGet(this, _indexMapper).getNumberOfIndexes());
     if (_classPrivateFieldGet(this, _indexSyncer).getSheetId() === null) {
       _classPrivateFieldGet(this, _indexSyncer).getPostponeAction(() => this.syncMoves(calculatedMoves));
     } else {
@@ -282,7 +210,7 @@ class AxisSyncer {
         return;
       }
       const newSequence = _classPrivateFieldGet(this, _indexMapper).getIndexesSequence();
-      if (source === 'update') {
+      if (source === 'update' && newSequence.length > 0) {
         const relativeTransformation = _classPrivateFieldGet(this, _indexesSequence).map(index => newSequence.indexOf(index));
         const sheetDimensions = _classPrivateFieldGet(this, _indexSyncer).getEngine().getSheetDimensions(_classPrivateFieldGet(this, _indexSyncer).getSheetId());
         let sizeForAxis;

package/plugins/formulas/indexSyncer/axisSyncer.mjs

@@ -8,6 +8,7 @@ function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _
 function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
 function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
 import { toUpperCaseFirst } from "../../../helpers/string.mjs";
+import { getMoves } from "../../../helpers/moves.mjs";
 /**
  * @private
  * @class IndexSyncer
@@ -173,79 +174,6 @@ class AxisSyncer {
     _classPrivateFieldSet(this, _finalIndex, this.getHfIndexFromVisualIndex(visualFinalIndex));
   }
 
-  /**
-   * Gets first position where to move element (respecting the fact that some element will be sooner or later
-   * taken out of the dataset in order to move them).
-   *
-   * @param {Array<number>} movedHfIndexes Sequence of moved HF indexes for certain axis.
-   * @param {number} finalHfIndex Final HF place where to move rows.
-   * @returns {number} HF's index informing where to move the first element.
-   * @private
-   */
-  getMoveLine(movedHfIndexes, finalHfIndex) {
-    const numberOfElements = _classPrivateFieldGet(this, _indexMapper).getNumberOfIndexes();
-    const notMovedElements = Array.from(Array(numberOfElements).keys()).filter(index => movedHfIndexes.includes(index) === false);
-    if (finalHfIndex === 0) {
-      var _notMovedElements$fin;
-      return (_notMovedElements$fin = notMovedElements[finalHfIndex]) !== null && _notMovedElements$fin !== void 0 ? _notMovedElements$fin : 0; // Moving before the first dataset's element.
-    }
-    return notMovedElements[finalHfIndex - 1] + 1; // Moving before another element.
-  }
-
-  /**
-   * Gets initially calculated HF's move positions.
-   *
-   * @private
-   * @param {Array<number>} movedHfIndexes Sequence of moved HF indexes for certain axis.
-   * @param {number} finalHfIndex Final HF place where to move rows.
-   * @returns {Array<{from: number, to: number}>} Initially calculated HF's move positions.
-   */
-  getInitiallyCalculatedMoves(movedHfIndexes, finalHfIndex) {
-    let moveLine = this.getMoveLine(movedHfIndexes, finalHfIndex);
-    const moves = [];
-    movedHfIndexes.forEach(movedHfIndex => {
-      const move = {
-        from: movedHfIndex,
-        to: moveLine
-      };
-      moves.forEach(previouslyMovedIndex => {
-        const isMovingFromEndToStart = previouslyMovedIndex.from > previouslyMovedIndex.to;
-        const isMovingElementBefore = previouslyMovedIndex.to <= move.from;
-        const isMovingAfterElement = previouslyMovedIndex.from > move.from;
-        if (isMovingAfterElement && isMovingElementBefore && isMovingFromEndToStart) {
-          move.from += 1;
-        }
-      });
-
-      // Moved element from right to left (or bottom to top).
-      if (move.from >= moveLine) {
-        moveLine += 1;
-      }
-      moves.push(move);
-    });
-    return moves;
-  }
-
-  /**
-   * Gets finally calculated HF's move positions (after adjusting).
-   *
-   * @private
-   * @param {Array<{from: number, to: number}>} moves Initially calculated HF's move positions.
-   * @returns {Array<{from: number, to: number}>} Finally calculated HF's move positions (after adjusting).
-   */
-  adjustedCalculatedMoves(moves) {
-    moves.forEach((move, index) => {
-      const nextMoved = moves.slice(index + 1);
-      nextMoved.forEach(nextMovedIndex => {
-        const isMovingFromStartToEnd = nextMovedIndex.from < nextMovedIndex.to;
-        if (nextMovedIndex.from > move.from && isMovingFromStartToEnd) {
-          nextMovedIndex.from -= 1;
-        }
-      });
-    });
-    return moves;
-  }
-
   /**
    * Calculating where to move HF elements and performing already calculated moves.
    *
@@ -259,7 +187,7 @@ class AxisSyncer {
     if (movePossible === false || orderChanged === false) {
       return;
     }
-    const calculatedMoves = this.adjustedCalculatedMoves(this.getInitiallyCalculatedMoves(_classPrivateFieldGet(this, _movedIndexes), _classPrivateFieldGet(this, _finalIndex)));
+    const calculatedMoves = getMoves(_classPrivateFieldGet(this, _movedIndexes), _classPrivateFieldGet(this, _finalIndex), _classPrivateFieldGet(this, _indexMapper).getNumberOfIndexes());
     if (_classPrivateFieldGet(this, _indexSyncer).getSheetId() === null) {
       _classPrivateFieldGet(this, _indexSyncer).getPostponeAction(() => this.syncMoves(calculatedMoves));
     } else {
@@ -279,7 +207,7 @@ class AxisSyncer {
         return;
       }
       const newSequence = _classPrivateFieldGet(this, _indexMapper).getIndexesSequence();
-      if (source === 'update') {
+      if (source === 'update' && newSequence.length > 0) {
         const relativeTransformation = _classPrivateFieldGet(this, _indexesSequence).map(index => newSequence.indexOf(index));
         const sheetDimensions = _classPrivateFieldGet(this, _indexSyncer).getEngine().getSheetDimensions(_classPrivateFieldGet(this, _indexSyncer).getSheetId());
         let sizeForAxis;

package/plugins/manualColumnResize/manualColumnResize.js

@@ -609,6 +609,9 @@ function _onMouseOver2(event) {
   }
 }
 function _onMouseDown2(event) {
+  if (event.target.parentNode !== this.hot.rootElement) {
+    return;
+  }
   if ((0, _element.hasClass)(event.target, 'manualColumnResizer')) {
     this.setupHandlePosition(_classPrivateFieldGet(this, _currentTH));
     this.setupGuidePosition();

package/plugins/manualColumnResize/manualColumnResize.mjs

@@ -603,6 +603,9 @@ function _onMouseOver2(event) {
   }
 }
 function _onMouseDown2(event) {
+  if (event.target.parentNode !== this.hot.rootElement) {
+    return;
+  }
   if (hasClass(event.target, 'manualColumnResizer')) {
     this.setupHandlePosition(_classPrivateFieldGet(this, _currentTH));
     this.setupGuidePosition();

package/plugins/mergeCells/cellsCollection.js

@@ -77,7 +77,7 @@ class MergedCellsCollection {
   }
 
   /**
-   * Get a merged cell containing the provided range.
+   * Get the first-found merged cell containing the provided range.
    *
    * @param {CellRange|object} range The range to search merged cells for.
    * @returns {MergedCellCoords|boolean}

package/plugins/mergeCells/cellsCollection.mjs

@@ -73,7 +73,7 @@ class MergedCellsCollection {
   }
 
   /**
-   * Get a merged cell containing the provided range.
+   * Get the first-found merged cell containing the provided range.
    *
    * @param {CellRange|object} range The range to search merged cells for.
    * @returns {MergedCellCoords|boolean}

package/plugins/mergeCells/mergeCells.js

@@ -98,9 +98,20 @@ var _onBeforeDrawAreaBorders = /*#__PURE__*/new WeakSet();
 var _onAfterModifyTransformStart = /*#__PURE__*/new WeakSet();
 var _onAfterDrawSelection = /*#__PURE__*/new WeakSet();
 var _onBeforeRemoveCellClassNames = /*#__PURE__*/new WeakSet();
+var _onBeforeBeginEditing = /*#__PURE__*/new WeakSet();
 class MergeCells extends _base.BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Allows to prevent opening the editor while more than one merged cell is selected.
+     *
+     * @param {number} row Visual row index of the edited cell.
+     * @param {number} column Visual column index of the edited cell.
+     * @param {string | null} initialValue The initial editor value.
+     * @param {MouseEvent | KeyboardEvent} event The event which was responsible for opening the editor.
+     * @returns {boolean | undefined}
+     */
+    _classPrivateMethodInitSpec(this, _onBeforeBeginEditing);
     /**
      * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
      *
@@ -459,6 +470,12 @@ class MergeCells extends _base.BasePlugin {
       }
       return _classPrivateMethodGet(_this, _onBeforeRemoveCellClassNames, _onBeforeRemoveCellClassNames2).call(_this, ...args);
     });
+    this.addHook('beforeBeginEditing', function () {
+      for (var _len24 = arguments.length, args = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
+        args[_key24] = arguments[_key24];
+      }
+      return _classPrivateMethodGet(_this, _onBeforeBeginEditing, _onBeforeBeginEditing2).call(_this, ...args);
+    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -1290,4 +1307,17 @@ function _onAfterDrawSelection2(currentRow, currentColumn, cornersOfSelection, l
 }
 function _onBeforeRemoveCellClassNames2() {
   return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+}
+function _onBeforeBeginEditing2(row, column, initialValue, event) {
+  if (!(event instanceof MouseEvent)) {
+    return;
+  }
+  const selection = this.hot.getSelectedRangeLast();
+  const mergeCell = this.mergedCellsCollection.getByRange(selection);
+  if (!mergeCell) {
+    return;
+  }
+  const from = this.hot._createCellCoords(mergeCell.row, mergeCell.col);
+  const to = this.hot._createCellCoords(mergeCell.row + mergeCell.rowspan - 1, mergeCell.col + mergeCell.colspan - 1);
+  return this.hot.selection.getLayerLevel() === 0 && selection.isEqual(this.hot._createCellRange(from, from, to));
 }

package/plugins/mergeCells/mergeCells.mjs

@@ -94,9 +94,20 @@ var _onBeforeDrawAreaBorders = /*#__PURE__*/new WeakSet();
 var _onAfterModifyTransformStart = /*#__PURE__*/new WeakSet();
 var _onAfterDrawSelection = /*#__PURE__*/new WeakSet();
 var _onBeforeRemoveCellClassNames = /*#__PURE__*/new WeakSet();
+var _onBeforeBeginEditing = /*#__PURE__*/new WeakSet();
 export class MergeCells extends BasePlugin {
   constructor() {
     super(...arguments);
+    /**
+     * Allows to prevent opening the editor while more than one merged cell is selected.
+     *
+     * @param {number} row Visual row index of the edited cell.
+     * @param {number} column Visual column index of the edited cell.
+     * @param {string | null} initialValue The initial editor value.
+     * @param {MouseEvent | KeyboardEvent} event The event which was responsible for opening the editor.
+     * @returns {boolean | undefined}
+     */
+    _classPrivateMethodInitSpec(this, _onBeforeBeginEditing);
     /**
      * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
      *
@@ -455,6 +466,12 @@ export class MergeCells extends BasePlugin {
       }
       return _classPrivateMethodGet(_this, _onBeforeRemoveCellClassNames, _onBeforeRemoveCellClassNames2).call(_this, ...args);
     });
+    this.addHook('beforeBeginEditing', function () {
+      for (var _len24 = arguments.length, args = new Array(_len24), _key24 = 0; _key24 < _len24; _key24++) {
+        args[_key24] = arguments[_key24];
+      }
+      return _classPrivateMethodGet(_this, _onBeforeBeginEditing, _onBeforeBeginEditing2).call(_this, ...args);
+    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -1285,4 +1302,17 @@ function _onAfterDrawSelection2(currentRow, currentColumn, cornersOfSelection, l
 }
 function _onBeforeRemoveCellClassNames2() {
   return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+}
+function _onBeforeBeginEditing2(row, column, initialValue, event) {
+  if (!(event instanceof MouseEvent)) {
+    return;
+  }
+  const selection = this.hot.getSelectedRangeLast();
+  const mergeCell = this.mergedCellsCollection.getByRange(selection);
+  if (!mergeCell) {
+    return;
+  }
+  const from = this.hot._createCellCoords(mergeCell.row, mergeCell.col);
+  const to = this.hot._createCellCoords(mergeCell.row + mergeCell.rowspan - 1, mergeCell.col + mergeCell.colspan - 1);
+  return this.hot.selection.getLayerLevel() === 0 && selection.isEqual(this.hot._createCellRange(from, from, to));
 }

package/plugins/undoRedo/undoRedo.js

@@ -8,6 +8,7 @@ var _array = require("../../helpers/array");
 var _number = require("../../helpers/number");
 var _object = require("../../helpers/object");
 var _utils = require("../contextMenu/utils");
+var _moves = require("../../helpers/moves");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SHORTCUTS_GROUP = 'undoRedo';
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'undoRedo';
@@ -132,6 +133,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,24 +721,24 @@ 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 allMovedRows = rowsMovedUp.sort((a, b) => b - a).concat(rowsMovedDown.sort((a, b) => a - b));
   instance.addHookOnce('afterViewRender', undoneCallback);
-
-  // Moving rows from those with higher indexes to those with lower indexes when action was performed from bottom to top
-  // Moving rows from those with lower indexes to those with higher indexes when action was performed from top to bottom
-  for (let i = 0; i < allMovedRows.length; i += 1) {
-    const newPhysicalRow = instance.toVisualRow(allMovedRows[i]);
-    manualRowMove.moveRow(newPhysicalRow, allMovedRows[i]);
-  }
+  const rowMoves = (0, _moves.getMoves)(this.rows, this.finalRowIndex, instance.rowIndexMapper.getNumberOfIndexes());
+  rowMoves.reverse().forEach(_ref4 => {
+    let {
+      from,
+      to
+    } = _ref4;
+    if (from < to) {
+      to -= 1;
+    }
+    manualRowMove.moveRow(to, from);
+  });
   instance.render();
   instance.deselectCell();
   instance.selectRows(this.rows[0], this.rows[0] + this.rows.length - 1);
@@ -739,10 +746,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');
+  instance.addHookOnce('afterViewRender', undoneCallback);
+  const columnMoves = (0, _moves.getMoves)(this.columns, this.finalColumnIndex, instance.columnIndexMapper.getNumberOfIndexes());
+  columnMoves.reverse().forEach(_ref5 => {
+    let {
+      from,
+      to
+    } = _ref5;
+    if (from < to) {
+      to -= 1;
+    }
+    manualColumnMove.moveColumn(to, from);
+  });
+  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

@@ -5,6 +5,7 @@ import { arrayMap, arrayEach } from "../../helpers/array.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { inherit, deepClone } from "../../helpers/object.mjs";
 import { align } from "../contextMenu/utils.mjs";
+import { getMoves } from "../../helpers/moves.mjs";
 const SHORTCUTS_GROUP = 'undoRedo';
 export const PLUGIN_KEY = 'undoRedo';
 
@@ -128,6 +129,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,24 +717,24 @@ 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 allMovedRows = rowsMovedUp.sort((a, b) => b - a).concat(rowsMovedDown.sort((a, b) => a - b));
   instance.addHookOnce('afterViewRender', undoneCallback);
-
-  // Moving rows from those with higher indexes to those with lower indexes when action was performed from bottom to top
-  // Moving rows from those with lower indexes to those with higher indexes when action was performed from top to bottom
-  for (let i = 0; i < allMovedRows.length; i += 1) {
-    const newPhysicalRow = instance.toVisualRow(allMovedRows[i]);
-    manualRowMove.moveRow(newPhysicalRow, allMovedRows[i]);
-  }
+  const rowMoves = getMoves(this.rows, this.finalRowIndex, instance.rowIndexMapper.getNumberOfIndexes());
+  rowMoves.reverse().forEach(_ref4 => {
+    let {
+      from,
+      to
+    } = _ref4;
+    if (from < to) {
+      to -= 1;
+    }
+    manualRowMove.moveRow(to, from);
+  });
   instance.render();
   instance.deselectCell();
   instance.selectRows(this.rows[0], this.rows[0] + this.rows.length - 1);
@@ -735,10 +742,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');
+  instance.addHookOnce('afterViewRender', undoneCallback);
+  const columnMoves = getMoves(this.columns, this.finalColumnIndex, instance.columnIndexMapper.getNumberOfIndexes());
+  columnMoves.reverse().forEach(_ref5 => {
+    let {
+      from,
+      to
+    } = _ref5;
+    if (from < to) {
+      to -= 1;
+    }
+    manualColumnMove.moveColumn(to, from);
+  });
+  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/renderers/autocompleteRenderer/autocompleteRenderer.js

@@ -20,7 +20,7 @@ const RENDERER_TYPE = exports.RENDERER_TYPE = 'autocomplete';
  * @param {number} col The visual column index.
  * @param {number|string} prop The column property (passed when datasource is an array of objects).
  * @param {*} value The rendered value.
- * @param {object} cellProperties The cell meta object ({@see Core#getCellMeta}).
+ * @param {object} cellProperties The cell meta object (see {@link Core#getCellMeta}).
  */
 function autocompleteRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   const {

package/renderers/autocompleteRenderer/autocompleteRenderer.mjs

@@ -15,7 +15,7 @@ export const RENDERER_TYPE = 'autocomplete';
  * @param {number} col The visual column index.
  * @param {number|string} prop The column property (passed when datasource is an array of objects).
  * @param {*} value The rendered value.
- * @param {object} cellProperties The cell meta object ({@see Core#getCellMeta}).
+ * @param {object} cellProperties The cell meta object (see {@link Core#getCellMeta}).
  */
 export function autocompleteRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   const {

package/renderers/baseRenderer/baseRenderer.js

@@ -18,7 +18,7 @@ const RENDERER_TYPE = exports.RENDERER_TYPE = 'base';
  * @param {number} col The visual column index.
  * @param {number|string} prop The column property (passed when datasource is an array of objects).
  * @param {*} value The rendered value.
- * @param {object} cellProperties The cell meta object ({@see Core#getCellMeta}).
+ * @param {object} cellProperties The cell meta object (see {@link Core#getCellMeta}).
  */
 function baseRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   const ariaEnabled = cellProperties.ariaTags;

package/renderers/baseRenderer/baseRenderer.mjs

@@ -13,7 +13,7 @@ export const RENDERER_TYPE = 'base';
  * @param {number} col The visual column index.
  * @param {number|string} prop The column property (passed when datasource is an array of objects).
  * @param {*} value The rendered value.
- * @param {object} cellProperties The cell meta object ({@see Core#getCellMeta}).
+ * @param {object} cellProperties The cell meta object (see {@link Core#getCellMeta}).
  */
 export function baseRenderer(hotInstance, TD, row, col, prop, value, cellProperties) {
   const ariaEnabled = cellProperties.ariaTags;