handsontable 0.0.0-next-6812ce6-20221122 → 0.0.0-next-1b1acbd-20221123

package/helpers/mixed.js

@@ -152,7 +152,7 @@ var domMessages = {
 function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-6812ce6-20221122";
+  var hotVersion = "0.0.0-next-1b1acbd-20221123";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -142,7 +142,7 @@ var domMessages = {
 export function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-6812ce6-20221122";
+  var hotVersion = "0.0.0-next-1b1acbd-20221123";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/helpers/object.js

@@ -1,5 +1,11 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.iterator.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 exports.__esModule = true;
 exports.clone = clone;
 exports.createObjectPropListener = createObjectPropListener;
@@ -17,16 +23,11 @@ exports.isObjectEqual = isObjectEqual;
 exports.mixin = mixin;
 exports.objectEach = objectEach;
 exports.setProperty = setProperty;
+require("core-js/modules/es.array.fill.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/web.dom-collections.for-each.js");
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.symbol.iterator.js");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _array = require("./array");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -39,7 +40,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function duckSchema(object) {
   var schema;
   if (Array.isArray(object)) {
-    schema = [];
+    schema = object.length ? new Array(object.length).fill(null) : [];
   } else {
     schema = {};
     objectEach(object, function (value, key) {

package/helpers/object.mjs

@@ -1,4 +1,6 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+import "core-js/modules/es.array.fill.js";
 import "core-js/modules/es.array.includes.js";
 import "core-js/modules/es.string.includes.js";
 import "core-js/modules/es.object.to-string.js";
@@ -9,7 +11,6 @@ import "core-js/modules/es.symbol.iterator.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { arrayEach } from "./array.mjs";
 /**
  * Generate schema for passed object.
@@ -20,7 +21,7 @@ import { arrayEach } from "./array.mjs";
 export function duckSchema(object) {
   var schema;
   if (Array.isArray(object)) {
-    schema = [];
+    schema = object.length ? new Array(object.length).fill(null) : [];
   } else {
     schema = {};
     objectEach(object, function (value, key) {

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-6812ce6-20221122",
+  "version": "0.0.0-next-1b1acbd-20221123",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/undoRedo/undoRedo.js

@@ -20,6 +20,8 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.array.reduce.js");
 require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.array.splice.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.index-of.js");
 require("core-js/modules/es.array.filter.js");
@@ -109,11 +111,9 @@ function UndoRedo(instance) {
   });
   instance.addHook('beforeRemoveRow', function (index, amount, logicRows, source) {
     var wrappedAction = function wrappedAction() {
-      var originalData = plugin.instance.getSourceDataArray();
-      var rowIndex = (originalData.length + index) % originalData.length;
-      var physicalRowIndex = instance.toPhysicalRow(rowIndex);
-      var removedData = (0, _object.deepClone)(originalData.slice(physicalRowIndex, physicalRowIndex + amount));
-      return new UndoRedo.RemoveRowAction(rowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop);
+      var physicalRowIndex = instance.toPhysicalRow(index);
+      var 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());
     };
     plugin.done(wrappedAction, source);
   });
@@ -477,24 +477,37 @@ UndoRedo.CreateRowAction.prototype.redo = function (instance, redoneCallback) {
  * @param {Array} data The removed data.
  * @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.
  */
-UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop) {
+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;
 };
 (0, _object.inherit)(UndoRedo.RemoveRowAction, UndoRedo.Action);
 UndoRedo.RemoveRowAction.prototype.undo = function (instance, undoneCallback) {
+  var _this2 = this;
   var settings = instance.getSettings();
+  var changes = [];
 
   // Changing by the reference as `updateSettings` doesn't work the best.
   settings.fixedRowsBottom = this.fixedRowsBottom;
   settings.fixedRowsTop = this.fixedRowsTop;
+
+  // Prepare the change list to fill the source data.
+  this.data.forEach(function (dataRow, rowIndexDelta) {
+    Object.keys(dataRow).forEach(function (columnProp) {
+      var columnIndex = parseInt(columnProp, 10);
+      changes.push([_this2.index + rowIndexDelta, isNaN(columnIndex) ? columnProp : columnIndex, dataRow[columnProp]]);
+    });
+  });
   instance.alter('insert_row_above', this.index, this.data.length, 'UndoRedo.undo');
   instance.addHookOnce('afterViewRender', undoneCallback);
-  instance.populateFromArray(this.index, 0, this.data, void 0, void 0, 'UndoRedo.undo');
+  instance.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
+  instance.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
 };
 UndoRedo.RemoveRowAction.prototype.redo = function (instance, redoneCallback) {
   instance.addHookOnce('afterRemoveRow', redoneCallback);
@@ -549,14 +562,14 @@ UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPos
 };
 (0, _object.inherit)(UndoRedo.RemoveColumnAction, UndoRedo.Action);
 UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback) {
-  var _this2 = this;
+  var _this3 = this;
   var settings = instance.getSettings();
 
   // Changing by the reference as `updateSettings` doesn't work the best.
   settings.fixedColumnsStart = this.fixedColumnsStart;
   var ascendingIndexes = this.indexes.slice(0).sort();
   var sortByIndexes = function sortByIndexes(elem, j, arr) {
-    return arr[_this2.indexes.indexOf(ascendingIndexes[j])];
+    return arr[_this3.indexes.indexOf(ascendingIndexes[j])];
   };
   var removedDataLength = this.data.length;
   var sortedData = [];
@@ -582,8 +595,8 @@ UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback)
   instance.batchExecution(function () {
     // Restore row sequence in a case when all columns are removed. the original
     // row sequence is lost in that case.
-    instance.rowIndexMapper.setIndexesSequence(_this2.rowPositions);
-    instance.columnIndexMapper.setIndexesSequence(_this2.columnPositions);
+    instance.rowIndexMapper.setIndexesSequence(_this3.rowPositions);
+    instance.columnIndexMapper.setIndexesSequence(_this3.columnPositions);
   }, true);
   instance.addHookOnce('afterViewRender', undoneCallback);
   instance.render();
@@ -609,12 +622,12 @@ UndoRedo.CellAlignmentAction = function (stateBefore, range, type, alignment) {
   this.alignment = alignment;
 };
 UndoRedo.CellAlignmentAction.prototype.undo = function (instance, undoneCallback) {
-  var _this3 = this;
+  var _this4 = this;
   (0, _array.arrayEach)(this.range, function (range) {
     range.forAll(function (row, col) {
       // Alignment classes should only collected within cell ranges. We skip header coordinates.
       if (row >= 0 && col >= 0) {
-        instance.setCellMeta(row, col, 'className', _this3.stateBefore[row][col] || ' htLeft');
+        instance.setCellMeta(row, col, 'className', _this4.stateBefore[row][col] || ' htLeft');
       }
     });
   });
@@ -664,14 +677,14 @@ var MergeCellsAction = /*#__PURE__*/function (_UndoRedo$Action) {
   _inherits(MergeCellsAction, _UndoRedo$Action);
   var _super = _createSuper(MergeCellsAction);
   function MergeCellsAction(instance, cellRange) {
-    var _this4;
+    var _this5;
     _classCallCheck(this, MergeCellsAction);
-    _this4 = _super.call(this);
-    _this4.cellRange = cellRange;
-    var topStartCorner = _this4.cellRange.getTopStartCorner();
-    var bottomEndCorner = _this4.cellRange.getBottomEndCorner();
-    _this4.rangeData = instance.getData(topStartCorner.row, topStartCorner.col, bottomEndCorner.row, bottomEndCorner.col);
-    return _this4;
+    _this5 = _super.call(this);
+    _this5.cellRange = cellRange;
+    var topStartCorner = _this5.cellRange.getTopStartCorner();
+    var bottomEndCorner = _this5.cellRange.getBottomEndCorner();
+    _this5.rangeData = instance.getData(topStartCorner.row, topStartCorner.col, bottomEndCorner.row, bottomEndCorner.col);
+    return _this5;
   }
   _createClass(MergeCellsAction, [{
     key: "undo",
@@ -703,11 +716,11 @@ var UnmergeCellsAction = /*#__PURE__*/function (_UndoRedo$Action2) {
   _inherits(UnmergeCellsAction, _UndoRedo$Action2);
   var _super2 = _createSuper(UnmergeCellsAction);
   function UnmergeCellsAction(instance, cellRange) {
-    var _this5;
+    var _this6;
     _classCallCheck(this, UnmergeCellsAction);
-    _this5 = _super2.call(this);
-    _this5.cellRange = cellRange;
-    return _this5;
+    _this6 = _super2.call(this);
+    _this6.cellRange = cellRange;
+    return _this6;
   }
   _createClass(UnmergeCellsAction, [{
     key: "undo",
@@ -744,14 +757,14 @@ UndoRedo.RowMoveAction = function (rows, finalIndex) {
 };
 (0, _object.inherit)(UndoRedo.RowMoveAction, UndoRedo.Action);
 UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
-  var _this6 = this;
+  var _this7 = this;
   var manualRowMove = instance.getPlugin('manualRowMove');
   var copyOfRows = [].concat(this.rows);
   var rowsMovedUp = copyOfRows.filter(function (a) {
-    return a > _this6.finalIndex;
+    return a > _this7.finalIndex;
   });
   var rowsMovedDown = copyOfRows.filter(function (a) {
-    return a <= _this6.finalIndex;
+    return a <= _this7.finalIndex;
   });
   var allMovedRows = rowsMovedUp.sort(function (a, b) {
     return b - a;
@@ -803,7 +816,7 @@ UndoRedo.prototype.init = function () {
  * @private
  */
 UndoRedo.prototype.registerShortcuts = function () {
-  var _this7 = this;
+  var _this8 = this;
   var shortcutManager = this.instance.getShortcutManager();
   var gridContext = shortcutManager.getContext('grid');
   var runOnlyIf = function runOnlyIf(event) {
@@ -817,12 +830,12 @@ UndoRedo.prototype.registerShortcuts = function () {
   gridContext.addShortcuts([{
     keys: [['Control/Meta', 'z']],
     callback: function callback() {
-      _this7.undo();
+      _this8.undo();
     }
   }, {
     keys: [['Control/Meta', 'y'], ['Control/Meta', 'Shift', 'z']],
     callback: function callback() {
-      _this7.redo();
+      _this8.redo();
     }
   }], config);
 };

package/plugins/undoRedo/undoRedo.mjs

@@ -24,6 +24,8 @@ import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.array.reduce.js";
 import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.array.splice.js";
+import "core-js/modules/web.dom-collections.for-each.js";
+import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.array.sort.js";
 import "core-js/modules/es.array.index-of.js";
 import "core-js/modules/es.array.filter.js";
@@ -103,11 +105,9 @@ function UndoRedo(instance) {
   });
   instance.addHook('beforeRemoveRow', function (index, amount, logicRows, source) {
     var wrappedAction = function wrappedAction() {
-      var originalData = plugin.instance.getSourceDataArray();
-      var rowIndex = (originalData.length + index) % originalData.length;
-      var physicalRowIndex = instance.toPhysicalRow(rowIndex);
-      var removedData = deepClone(originalData.slice(physicalRowIndex, physicalRowIndex + amount));
-      return new UndoRedo.RemoveRowAction(rowIndex, removedData, instance.getSettings().fixedRowsBottom, instance.getSettings().fixedRowsTop);
+      var physicalRowIndex = instance.toPhysicalRow(index);
+      var 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());
     };
     plugin.done(wrappedAction, source);
   });
@@ -471,24 +471,37 @@ UndoRedo.CreateRowAction.prototype.redo = function (instance, redoneCallback) {
  * @param {Array} data The removed data.
  * @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.
  */
-UndoRedo.RemoveRowAction = function (index, data, fixedRowsBottom, fixedRowsTop) {
+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;
 };
 inherit(UndoRedo.RemoveRowAction, UndoRedo.Action);
 UndoRedo.RemoveRowAction.prototype.undo = function (instance, undoneCallback) {
+  var _this2 = this;
   var settings = instance.getSettings();
+  var changes = [];
 
   // Changing by the reference as `updateSettings` doesn't work the best.
   settings.fixedRowsBottom = this.fixedRowsBottom;
   settings.fixedRowsTop = this.fixedRowsTop;
+
+  // Prepare the change list to fill the source data.
+  this.data.forEach(function (dataRow, rowIndexDelta) {
+    Object.keys(dataRow).forEach(function (columnProp) {
+      var columnIndex = parseInt(columnProp, 10);
+      changes.push([_this2.index + rowIndexDelta, isNaN(columnIndex) ? columnProp : columnIndex, dataRow[columnProp]]);
+    });
+  });
   instance.alter('insert_row_above', this.index, this.data.length, 'UndoRedo.undo');
   instance.addHookOnce('afterViewRender', undoneCallback);
-  instance.populateFromArray(this.index, 0, this.data, void 0, void 0, 'UndoRedo.undo');
+  instance.setSourceDataAtCell(changes, null, null, 'UndoRedo.undo');
+  instance.rowIndexMapper.setIndexesSequence(this.rowIndexesSequence);
 };
 UndoRedo.RemoveRowAction.prototype.redo = function (instance, redoneCallback) {
   instance.addHookOnce('afterRemoveRow', redoneCallback);
@@ -543,14 +556,14 @@ UndoRedo.RemoveColumnAction = function (index, indexes, data, headers, columnPos
 };
 inherit(UndoRedo.RemoveColumnAction, UndoRedo.Action);
 UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback) {
-  var _this2 = this;
+  var _this3 = this;
   var settings = instance.getSettings();
 
   // Changing by the reference as `updateSettings` doesn't work the best.
   settings.fixedColumnsStart = this.fixedColumnsStart;
   var ascendingIndexes = this.indexes.slice(0).sort();
   var sortByIndexes = function sortByIndexes(elem, j, arr) {
-    return arr[_this2.indexes.indexOf(ascendingIndexes[j])];
+    return arr[_this3.indexes.indexOf(ascendingIndexes[j])];
   };
   var removedDataLength = this.data.length;
   var sortedData = [];
@@ -576,8 +589,8 @@ UndoRedo.RemoveColumnAction.prototype.undo = function (instance, undoneCallback)
   instance.batchExecution(function () {
     // Restore row sequence in a case when all columns are removed. the original
     // row sequence is lost in that case.
-    instance.rowIndexMapper.setIndexesSequence(_this2.rowPositions);
-    instance.columnIndexMapper.setIndexesSequence(_this2.columnPositions);
+    instance.rowIndexMapper.setIndexesSequence(_this3.rowPositions);
+    instance.columnIndexMapper.setIndexesSequence(_this3.columnPositions);
   }, true);
   instance.addHookOnce('afterViewRender', undoneCallback);
   instance.render();
@@ -603,12 +616,12 @@ UndoRedo.CellAlignmentAction = function (stateBefore, range, type, alignment) {
   this.alignment = alignment;
 };
 UndoRedo.CellAlignmentAction.prototype.undo = function (instance, undoneCallback) {
-  var _this3 = this;
+  var _this4 = this;
   arrayEach(this.range, function (range) {
     range.forAll(function (row, col) {
       // Alignment classes should only collected within cell ranges. We skip header coordinates.
       if (row >= 0 && col >= 0) {
-        instance.setCellMeta(row, col, 'className', _this3.stateBefore[row][col] || ' htLeft');
+        instance.setCellMeta(row, col, 'className', _this4.stateBefore[row][col] || ' htLeft');
       }
     });
   });
@@ -658,14 +671,14 @@ var MergeCellsAction = /*#__PURE__*/function (_UndoRedo$Action) {
   _inherits(MergeCellsAction, _UndoRedo$Action);
   var _super = _createSuper(MergeCellsAction);
   function MergeCellsAction(instance, cellRange) {
-    var _this4;
+    var _this5;
     _classCallCheck(this, MergeCellsAction);
-    _this4 = _super.call(this);
-    _this4.cellRange = cellRange;
-    var topStartCorner = _this4.cellRange.getTopStartCorner();
-    var bottomEndCorner = _this4.cellRange.getBottomEndCorner();
-    _this4.rangeData = instance.getData(topStartCorner.row, topStartCorner.col, bottomEndCorner.row, bottomEndCorner.col);
-    return _this4;
+    _this5 = _super.call(this);
+    _this5.cellRange = cellRange;
+    var topStartCorner = _this5.cellRange.getTopStartCorner();
+    var bottomEndCorner = _this5.cellRange.getBottomEndCorner();
+    _this5.rangeData = instance.getData(topStartCorner.row, topStartCorner.col, bottomEndCorner.row, bottomEndCorner.col);
+    return _this5;
   }
   _createClass(MergeCellsAction, [{
     key: "undo",
@@ -697,11 +710,11 @@ var UnmergeCellsAction = /*#__PURE__*/function (_UndoRedo$Action2) {
   _inherits(UnmergeCellsAction, _UndoRedo$Action2);
   var _super2 = _createSuper(UnmergeCellsAction);
   function UnmergeCellsAction(instance, cellRange) {
-    var _this5;
+    var _this6;
     _classCallCheck(this, UnmergeCellsAction);
-    _this5 = _super2.call(this);
-    _this5.cellRange = cellRange;
-    return _this5;
+    _this6 = _super2.call(this);
+    _this6.cellRange = cellRange;
+    return _this6;
   }
   _createClass(UnmergeCellsAction, [{
     key: "undo",
@@ -738,14 +751,14 @@ UndoRedo.RowMoveAction = function (rows, finalIndex) {
 };
 inherit(UndoRedo.RowMoveAction, UndoRedo.Action);
 UndoRedo.RowMoveAction.prototype.undo = function (instance, undoneCallback) {
-  var _this6 = this;
+  var _this7 = this;
   var manualRowMove = instance.getPlugin('manualRowMove');
   var copyOfRows = [].concat(this.rows);
   var rowsMovedUp = copyOfRows.filter(function (a) {
-    return a > _this6.finalIndex;
+    return a > _this7.finalIndex;
   });
   var rowsMovedDown = copyOfRows.filter(function (a) {
-    return a <= _this6.finalIndex;
+    return a <= _this7.finalIndex;
   });
   var allMovedRows = rowsMovedUp.sort(function (a, b) {
     return b - a;
@@ -797,7 +810,7 @@ UndoRedo.prototype.init = function () {
  * @private
  */
 UndoRedo.prototype.registerShortcuts = function () {
-  var _this7 = this;
+  var _this8 = this;
   var shortcutManager = this.instance.getShortcutManager();
   var gridContext = shortcutManager.getContext('grid');
   var runOnlyIf = function runOnlyIf(event) {
@@ -811,12 +824,12 @@ UndoRedo.prototype.registerShortcuts = function () {
   gridContext.addShortcuts([{
     keys: [['Control/Meta', 'z']],
     callback: function callback() {
-      _this7.undo();
+      _this8.undo();
     }
   }, {
     keys: [['Control/Meta', 'y'], ['Control/Meta', 'Shift', 'z']],
     callback: function callback() {
-      _this7.redo();
+      _this8.redo();
     }
   }], config);
 };