handsontable 11.1.0 → 12.1.0

package/plugins/mergeCells/cellsCollection.js

@@ -33,8 +33,6 @@ require("core-js/modules/es.array.splice.js");
 
 var _cellCoords = _interopRequireDefault(require("./cellCoords"));
 
-var _index = require("../../3rdparty/walkontable/src/index");
-
 var _number = require("../../helpers/number");
 
 var _console = require("../../helpers/console");
@@ -165,21 +163,27 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "getWithinRange",
     value: function getWithinRange(range) {
+      var _this = this;
+
       var countPartials = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var mergedCells = this.mergedCells;
       var foundMergedCells = [];
       var testedRange = range;
 
       if (!testedRange.includesRange) {
-        var from = new _index.CellCoords(testedRange.from.row, testedRange.from.col);
-        var to = new _index.CellCoords(testedRange.to.row, testedRange.to.col);
-        testedRange = new _index.CellRange(from, from, to);
+        var from = this.hot._createCellCoords(testedRange.from.row, testedRange.from.col);
+
+        var to = this.hot._createCellCoords(testedRange.to.row, testedRange.to.col);
+
+        testedRange = this.hot._createCellRange(from, from, to);
       }
 
       (0, _array.arrayEach)(mergedCells, function (mergedCell) {
-        var mergedCellTopLeft = new _index.CellCoords(mergedCell.row, mergedCell.col);
-        var mergedCellBottomRight = new _index.CellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1);
-        var mergedCellRange = new _index.CellRange(mergedCellTopLeft, mergedCellTopLeft, mergedCellBottomRight);
+        var mergedCellTopLeft = _this.hot._createCellCoords(mergedCell.row, mergedCell.col);
+
+        var mergedCellBottomRight = _this.hot._createCellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1);
+
+        var mergedCellRange = _this.hot._createCellRange(mergedCellTopLeft, mergedCellTopLeft, mergedCellBottomRight);
 
         if (countPartials) {
           if (testedRange.overlaps(mergedCellRange)) {
@@ -206,7 +210,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
       var column = mergedCellInfo.col;
       var rowspan = mergedCellInfo.rowspan;
       var colspan = mergedCellInfo.colspan;
-      var newMergedCell = new _cellCoords.default(row, column, rowspan, colspan);
+      var newMergedCell = new _cellCoords.default(row, column, rowspan, colspan, this.hot._createCellCoords, this.hot._createCellRange);
       var alreadyExists = this.get(row, column);
       var isOverlapping = this.isOverlapping(newMergedCell);
 
@@ -252,16 +256,16 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "clear",
     value: function clear() {
-      var _this = this;
+      var _this2 = this;
 
       var mergedCells = this.mergedCells;
       var mergedCellParentsToClear = [];
       var hiddenCollectionElements = [];
       (0, _array.arrayEach)(mergedCells, function (mergedCell) {
-        var TD = _this.hot.getCell(mergedCell.row, mergedCell.col);
+        var TD = _this2.hot.getCell(mergedCell.row, mergedCell.col);
 
         if (TD) {
-          mergedCellParentsToClear.push([TD, _this.get(mergedCell.row, mergedCell.col), mergedCell.row, mergedCell.col]);
+          mergedCellParentsToClear.push([TD, _this2.get(mergedCell.row, mergedCell.col), mergedCell.row, mergedCell.col]);
         }
       });
       this.mergedCells.length = 0;
@@ -269,7 +273,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
         (0, _number.rangeEach)(0, mergedCell.rowspan - 1, function (j) {
           (0, _number.rangeEach)(0, mergedCell.colspan - 1, function (k) {
             if (k !== 0 || j !== 0) {
-              var TD = _this.hot.getCell(mergedCell.row + j, mergedCell.col + k);
+              var TD = _this2.hot.getCell(mergedCell.row + j, mergedCell.col + k);
 
               if (TD) {
                 hiddenCollectionElements.push([TD, null, null, null]);
@@ -296,10 +300,13 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "isOverlapping",
     value: function isOverlapping(mergedCell) {
-      var mergedCellRange = new _index.CellRange(new _index.CellCoords(0, 0), new _index.CellCoords(mergedCell.row, mergedCell.col), new _index.CellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1));
+      var _this3 = this;
+
+      var mergedCellRange = this.hot._createCellRange(this.hot._createCellCoords(0, 0), this.hot._createCellCoords(mergedCell.row, mergedCell.col), this.hot._createCellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1));
+
       var result = false;
       (0, _array.arrayEach)(this.mergedCells, function (col) {
-        var currentRange = new _index.CellRange(new _index.CellCoords(0, 0), new _index.CellCoords(col.row, col.col), new _index.CellCoords(col.row + col.rowspan - 1, col.col + col.colspan - 1));
+        var currentRange = _this3.hot._createCellRange(_this3.hot._createCellCoords(0, 0), _this3.hot._createCellCoords(col.row, col.col), _this3.hot._createCellCoords(col.row + col.rowspan - 1, col.col + col.colspan - 1));
 
         if (currentRange.overlaps(mergedCellRange)) {
           result = true;
@@ -323,7 +330,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
     value: function isFirstRenderableMergedCell(row, column) {
       var mergeParent = this.get(row, column); // Return if row and column indexes are within merge area and if they are first rendered indexes within the area.
 
-      return mergeParent && this.hot.rowIndexMapper.getFirstNotHiddenIndex(mergeParent.row, 1) === row && this.hot.columnIndexMapper.getFirstNotHiddenIndex(mergeParent.col, 1) === column;
+      return mergeParent && this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1) === row && this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1) === column;
     }
     /**
      * Get the first renderable coords of the merged cell at the provided coordinates.
@@ -340,12 +347,12 @@ var MergedCellsCollection = /*#__PURE__*/function () {
       var mergeParent = this.get(row, column);
 
       if (!mergeParent || this.isFirstRenderableMergedCell(row, column)) {
-        return new _index.CellCoords(row, column);
+        return this.hot._createCellCoords(row, column);
       }
 
-      var firstRenderableRow = this.hot.rowIndexMapper.getFirstNotHiddenIndex(mergeParent.row, 1);
-      var firstRenderableColumn = this.hot.columnIndexMapper.getFirstNotHiddenIndex(mergeParent.col, 1);
-      return new _index.CellCoords(firstRenderableRow, firstRenderableColumn);
+      var firstRenderableRow = this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1);
+      var firstRenderableColumn = this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1);
+      return this.hot._createCellCoords(firstRenderableRow, firstRenderableColumn);
     }
     /**
      * Shift the merged cell in the direction and by an offset defined in the arguments.
@@ -358,7 +365,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "shiftCollections",
     value: function shiftCollections(direction, index, count) {
-      var _this2 = this;
+      var _this4 = this;
 
       var shiftVector = [0, 0];
 
@@ -386,10 +393,10 @@ var MergedCellsCollection = /*#__PURE__*/function () {
         currentMerge.shift(shiftVector, index);
       });
       (0, _number.rangeEachReverse)(this.mergedCells.length - 1, 0, function (i) {
-        var currentMerge = _this2.mergedCells[i];
+        var currentMerge = _this4.mergedCells[i];
 
         if (currentMerge && currentMerge.removed) {
-          _this2.mergedCells.splice(_this2.mergedCells.indexOf(currentMerge), 1);
+          _this4.mergedCells.splice(_this4.mergedCells.indexOf(currentMerge), 1);
         }
       });
     }

package/plugins/mergeCells/cellsCollection.mjs

@@ -36,7 +36,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 import MergedCellCoords from "./cellCoords.mjs";
-import { CellCoords, CellRange } from "../../3rdparty/walkontable/src/index.mjs";
 import { rangeEach, rangeEachReverse } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
@@ -139,21 +138,27 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "getWithinRange",
     value: function getWithinRange(range) {
+      var _this = this;
+
       var countPartials = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var mergedCells = this.mergedCells;
       var foundMergedCells = [];
       var testedRange = range;
 
       if (!testedRange.includesRange) {
-        var from = new CellCoords(testedRange.from.row, testedRange.from.col);
-        var to = new CellCoords(testedRange.to.row, testedRange.to.col);
-        testedRange = new CellRange(from, from, to);
+        var from = this.hot._createCellCoords(testedRange.from.row, testedRange.from.col);
+
+        var to = this.hot._createCellCoords(testedRange.to.row, testedRange.to.col);
+
+        testedRange = this.hot._createCellRange(from, from, to);
       }
 
       arrayEach(mergedCells, function (mergedCell) {
-        var mergedCellTopLeft = new CellCoords(mergedCell.row, mergedCell.col);
-        var mergedCellBottomRight = new CellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1);
-        var mergedCellRange = new CellRange(mergedCellTopLeft, mergedCellTopLeft, mergedCellBottomRight);
+        var mergedCellTopLeft = _this.hot._createCellCoords(mergedCell.row, mergedCell.col);
+
+        var mergedCellBottomRight = _this.hot._createCellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1);
+
+        var mergedCellRange = _this.hot._createCellRange(mergedCellTopLeft, mergedCellTopLeft, mergedCellBottomRight);
 
         if (countPartials) {
           if (testedRange.overlaps(mergedCellRange)) {
@@ -180,7 +185,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
       var column = mergedCellInfo.col;
       var rowspan = mergedCellInfo.rowspan;
       var colspan = mergedCellInfo.colspan;
-      var newMergedCell = new MergedCellCoords(row, column, rowspan, colspan);
+      var newMergedCell = new MergedCellCoords(row, column, rowspan, colspan, this.hot._createCellCoords, this.hot._createCellRange);
       var alreadyExists = this.get(row, column);
       var isOverlapping = this.isOverlapping(newMergedCell);
 
@@ -226,16 +231,16 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "clear",
     value: function clear() {
-      var _this = this;
+      var _this2 = this;
 
       var mergedCells = this.mergedCells;
       var mergedCellParentsToClear = [];
       var hiddenCollectionElements = [];
       arrayEach(mergedCells, function (mergedCell) {
-        var TD = _this.hot.getCell(mergedCell.row, mergedCell.col);
+        var TD = _this2.hot.getCell(mergedCell.row, mergedCell.col);
 
         if (TD) {
-          mergedCellParentsToClear.push([TD, _this.get(mergedCell.row, mergedCell.col), mergedCell.row, mergedCell.col]);
+          mergedCellParentsToClear.push([TD, _this2.get(mergedCell.row, mergedCell.col), mergedCell.row, mergedCell.col]);
         }
       });
       this.mergedCells.length = 0;
@@ -243,7 +248,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
         rangeEach(0, mergedCell.rowspan - 1, function (j) {
           rangeEach(0, mergedCell.colspan - 1, function (k) {
             if (k !== 0 || j !== 0) {
-              var TD = _this.hot.getCell(mergedCell.row + j, mergedCell.col + k);
+              var TD = _this2.hot.getCell(mergedCell.row + j, mergedCell.col + k);
 
               if (TD) {
                 hiddenCollectionElements.push([TD, null, null, null]);
@@ -270,10 +275,13 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "isOverlapping",
     value: function isOverlapping(mergedCell) {
-      var mergedCellRange = new CellRange(new CellCoords(0, 0), new CellCoords(mergedCell.row, mergedCell.col), new CellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1));
+      var _this3 = this;
+
+      var mergedCellRange = this.hot._createCellRange(this.hot._createCellCoords(0, 0), this.hot._createCellCoords(mergedCell.row, mergedCell.col), this.hot._createCellCoords(mergedCell.row + mergedCell.rowspan - 1, mergedCell.col + mergedCell.colspan - 1));
+
       var result = false;
       arrayEach(this.mergedCells, function (col) {
-        var currentRange = new CellRange(new CellCoords(0, 0), new CellCoords(col.row, col.col), new CellCoords(col.row + col.rowspan - 1, col.col + col.colspan - 1));
+        var currentRange = _this3.hot._createCellRange(_this3.hot._createCellCoords(0, 0), _this3.hot._createCellCoords(col.row, col.col), _this3.hot._createCellCoords(col.row + col.rowspan - 1, col.col + col.colspan - 1));
 
         if (currentRange.overlaps(mergedCellRange)) {
           result = true;
@@ -297,7 +305,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
     value: function isFirstRenderableMergedCell(row, column) {
       var mergeParent = this.get(row, column); // Return if row and column indexes are within merge area and if they are first rendered indexes within the area.
 
-      return mergeParent && this.hot.rowIndexMapper.getFirstNotHiddenIndex(mergeParent.row, 1) === row && this.hot.columnIndexMapper.getFirstNotHiddenIndex(mergeParent.col, 1) === column;
+      return mergeParent && this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1) === row && this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1) === column;
     }
     /**
      * Get the first renderable coords of the merged cell at the provided coordinates.
@@ -314,12 +322,12 @@ var MergedCellsCollection = /*#__PURE__*/function () {
       var mergeParent = this.get(row, column);
 
       if (!mergeParent || this.isFirstRenderableMergedCell(row, column)) {
-        return new CellCoords(row, column);
+        return this.hot._createCellCoords(row, column);
       }
 
-      var firstRenderableRow = this.hot.rowIndexMapper.getFirstNotHiddenIndex(mergeParent.row, 1);
-      var firstRenderableColumn = this.hot.columnIndexMapper.getFirstNotHiddenIndex(mergeParent.col, 1);
-      return new CellCoords(firstRenderableRow, firstRenderableColumn);
+      var firstRenderableRow = this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1);
+      var firstRenderableColumn = this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1);
+      return this.hot._createCellCoords(firstRenderableRow, firstRenderableColumn);
     }
     /**
      * Shift the merged cell in the direction and by an offset defined in the arguments.
@@ -332,7 +340,7 @@ var MergedCellsCollection = /*#__PURE__*/function () {
   }, {
     key: "shiftCollections",
     value: function shiftCollections(direction, index, count) {
-      var _this2 = this;
+      var _this4 = this;
 
       var shiftVector = [0, 0];
 
@@ -360,10 +368,10 @@ var MergedCellsCollection = /*#__PURE__*/function () {
         currentMerge.shift(shiftVector, index);
       });
       rangeEachReverse(this.mergedCells.length - 1, 0, function (i) {
-        var currentMerge = _this2.mergedCells[i];
+        var currentMerge = _this4.mergedCells[i];
 
         if (currentMerge && currentMerge.removed) {
-          _this2.mergedCells.splice(_this2.mergedCells.indexOf(currentMerge), 1);
+          _this4.mergedCells.splice(_this4.mergedCells.indexOf(currentMerge), 1);
         }
       });
     }

package/plugins/mergeCells/mergeCells.js

@@ -53,10 +53,6 @@ var _base = require("../base");
 
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 
-var _event = require("../../helpers/dom/event");
-
-var _src = require("../../3rdparty/walkontable/src");
-
 var _cellsCollection = _interopRequireDefault(require("./cellsCollection"));
 
 var _cellCoords = _interopRequireDefault(require("./cellCoords"));
@@ -105,13 +101,13 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -121,7 +117,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 _pluginHooks.default.getSingleton().register('beforeMergeCells');
 
@@ -136,6 +132,9 @@ exports.PLUGIN_KEY = PLUGIN_KEY;
 var PLUGIN_PRIORITY = 150;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 var privatePool = new WeakMap();
+var SHORTCUTS_GROUP = PLUGIN_KEY;
+/* eslint-disable jsdoc/require-description-complete-sentence */
+
 /**
  * @plugin MergeCells
  * @class MergeCells
@@ -228,9 +227,6 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterInit', function () {
         return _this2.onAfterInit.apply(_this2, arguments);
       });
-      this.addHook('beforeKeyDown', function () {
-        return _this2.onBeforeKeyDown.apply(_this2, arguments);
-      });
       this.addHook('modifyTransformStart', function () {
         return _this2.onModifyTransformStart.apply(_this2, arguments);
       });
@@ -302,6 +298,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
           return false;
         }
       });
+      this.registerShortcuts();
 
       _get(_getPrototypeOf(MergeCells.prototype), "enablePlugin", this).call(this);
     }
@@ -313,12 +310,16 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     key: "disablePlugin",
     value: function disablePlugin() {
       this.clearCollections();
+      this.unregisterShortcuts();
       this.hot.render();
 
       _get(_getPrototypeOf(MergeCells.prototype), "disablePlugin", this).call(this);
     }
     /**
-     * Updates the plugin state. This method is executed when {@link Core#updateSettings} is invoked.
+     * Updates the plugin's state.
+     *
+     * This method is executed when [`updateSettings()`](@/api/core.md#updatesettings) is invoked with any of the following configuration options:
+     *  - [`mergeCells`](@/api/options.md#mergecells)
      */
 
   }, {
@@ -385,9 +386,12 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
             return;
           }
 
-          var highlight = new _src.CellCoords(setting.row, setting.col);
-          var rangeEnd = new _src.CellCoords(setting.row + setting.rowspan - 1, setting.col + setting.colspan - 1);
-          var mergeRange = new _src.CellRange(highlight, highlight, rangeEnd);
+          var highlight = _this3.hot._createCellCoords(setting.row, setting.col);
+
+          var rangeEnd = _this3.hot._createCellCoords(setting.row + setting.rowspan - 1, setting.col + setting.colspan - 1);
+
+          var mergeRange = _this3.hot._createCellRange(highlight, highlight, rangeEnd);
+
           populationArgumentsList.push(_this3.mergeRange(mergeRange, true, true));
         }); // remove 'empty' setting objects, caused by improper merge range declarations
 
@@ -497,7 +501,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         return;
       }
 
-      currentRange.setDirection('NW-SE');
+      currentRange.setDirection(this.hot.isRtl() ? 'NE-SW' : 'NW-SE');
       var from = currentRange.from,
           to = currentRange.to;
       this.toggleMerge(currentRange);
@@ -518,7 +522,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         return;
       }
 
-      cellRange.setDirection('NW-SE');
+      cellRange.setDirection(this.hot.isRtl() ? 'NE-SW' : 'NW-SE');
       var from = cellRange.from,
           to = cellRange.to;
       this.unmergeRange(cellRange, true);
@@ -564,13 +568,13 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
 
       var auto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var preventPopulation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      var topLeft = cellRange.getTopLeftCorner();
-      var bottomRight = cellRange.getBottomRightCorner();
+      var topStart = cellRange.getTopStartCorner();
+      var bottomEnd = cellRange.getBottomEndCorner();
       var mergeParent = {
-        row: topLeft.row,
-        col: topLeft.col,
-        rowspan: bottomRight.row - topLeft.row + 1,
-        colspan: bottomRight.col - topLeft.col + 1
+        row: topStart.row,
+        col: topStart.col,
+        rowspan: bottomEnd.row - topStart.row + 1,
+        colspan: bottomEnd.col - topStart.col + 1
       };
       var clearedData = [];
       var populationInfo = null;
@@ -684,9 +688,11 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "merge",
     value: function merge(startRow, startColumn, endRow, endColumn) {
-      var start = new _src.CellCoords(startRow, startColumn);
-      var end = new _src.CellCoords(endRow, endColumn);
-      this.mergeRange(new _src.CellRange(start, start, end));
+      var start = this.hot._createCellCoords(startRow, startColumn);
+
+      var end = this.hot._createCellCoords(endRow, endColumn);
+
+      this.mergeRange(this.hot._createCellRange(start, start, end));
     }
     /**
      * Unmerges the merged cell in the provided range.
@@ -702,9 +708,11 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "unmerge",
     value: function unmerge(startRow, startColumn, endRow, endColumn) {
-      var start = new _src.CellCoords(startRow, startColumn);
-      var end = new _src.CellCoords(endRow, endColumn);
-      this.unmergeRange(new _src.CellRange(start, start, end));
+      var start = this.hot._createCellCoords(startRow, startColumn);
+
+      var end = this.hot._createCellCoords(endRow, endColumn);
+
+      this.unmergeRange(this.hot._createCellRange(start, start, end));
     }
     /**
      * `afterInit` hook callback.
@@ -719,23 +727,44 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       this.hot.render();
     }
     /**
-     * `beforeKeyDown` hook callback.
+     * Register shortcuts responsible for toggling a merge.
      *
      * @private
-     * @param {KeyboardEvent} event The `keydown` event object.
      */
 
   }, {
-    key: "onBeforeKeyDown",
-    value: function onBeforeKeyDown(event) {
-      var ctrlDown = (event.ctrlKey || event.metaKey) && !event.altKey;
-
-      if (ctrlDown && event.keyCode === 77) {
-        // CTRL + M
-        this.toggleMerge(this.hot.getSelectedRangeLast());
-        this.hot.render();
-        (0, _event.stopImmediatePropagation)(event);
-      }
+    key: "registerShortcuts",
+    value: function registerShortcuts() {
+      var _this6 = this;
+
+      var shortcutManager = this.hot.getShortcutManager();
+      var gridContext = shortcutManager.getContext('grid');
+      gridContext.addShortcut({
+        keys: [['Control', 'm']],
+        callback: function callback() {
+          _this6.toggleMerge(_this6.hot.getSelectedRangeLast());
+
+          _this6.hot.render();
+        },
+        runOnlyIf: function runOnlyIf(event) {
+          return !event.altKey;
+        },
+        // right ALT in some systems triggers ALT+CTRL
+        group: SHORTCUTS_GROUP
+      });
+    }
+    /**
+     * Unregister shortcuts responsible for toggling a merge.
+     *
+     * @private
+     */
+
+  }, {
+    key: "unregisterShortcuts",
+    value: function unregisterShortcuts() {
+      var shortcutManager = this.hot.getShortcutManager();
+      var gridContext = shortcutManager.getContext('grid');
+      gridContext.removeShortcutsByGroup(SHORTCUTS_GROUP);
     }
     /**
      * Modifies the information on whether the current selection contains multiple cells. The `afterIsMultipleSelection` hook callback.
@@ -778,21 +807,25 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         col: delta.col
       };
       var nextPosition = null;
-      var currentPosition = new _src.CellCoords(currentlySelectedRange.highlight.row, currentlySelectedRange.highlight.col);
+
+      var currentPosition = this.hot._createCellCoords(currentlySelectedRange.highlight.row, currentlySelectedRange.highlight.col);
+
       var mergedParent = this.mergedCellsCollection.get(currentPosition.row, currentPosition.col);
 
       if (!priv.lastDesiredCoords) {
-        priv.lastDesiredCoords = new _src.CellCoords(null, null);
+        priv.lastDesiredCoords = this.hot._createCellCoords(null, null);
       }
 
       if (mergedParent) {
         // only merge selected
-        var mergeTopLeft = new _src.CellCoords(mergedParent.row, mergedParent.col);
-        var mergeBottomRight = new _src.CellCoords(mergedParent.row + mergedParent.rowspan - 1, mergedParent.col + mergedParent.colspan - 1);
-        var mergeRange = new _src.CellRange(mergeTopLeft, mergeTopLeft, mergeBottomRight);
+        var mergeTopLeft = this.hot._createCellCoords(mergedParent.row, mergedParent.col);
+
+        var mergeBottomRight = this.hot._createCellCoords(mergedParent.row + mergedParent.rowspan - 1, mergedParent.col + mergedParent.colspan - 1);
+
+        var mergeRange = this.hot._createCellRange(mergeTopLeft, mergeTopLeft, mergeBottomRight);
 
         if (!mergeRange.includes(priv.lastDesiredCoords)) {
-          priv.lastDesiredCoords = new _src.CellCoords(null, null); // reset outdated version of lastDesiredCoords
+          priv.lastDesiredCoords = this.hot._createCellCoords(null, null); // reset outdated version of lastDesiredCoords
         }
 
         newDelta.row = priv.lastDesiredCoords.row ? priv.lastDesiredCoords.row - currentPosition.row : newDelta.row;
@@ -815,7 +848,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         }
       }
 
-      nextPosition = new _src.CellCoords(currentlySelectedRange.highlight.row + newDelta.row, currentlySelectedRange.highlight.col + newDelta.col);
+      nextPosition = this.hot._createCellCoords(currentlySelectedRange.highlight.row + newDelta.row, currentlySelectedRange.highlight.col + newDelta.col);
       var nextPositionMergedCell = this.mergedCellsCollection.get(nextPosition.row, nextPosition.col);
 
       if (nextPositionMergedCell) {
@@ -846,7 +879,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onModifyTransformEnd",
     value: function onModifyTransformEnd(delta) {
-      var _this6 = this;
+      var _this7 = this;
 
       var currentSelectionRange = this.hot.getSelectedRangeLast();
       var newDelta = (0, _object.clone)(delta);
@@ -858,7 +891,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         tempDelta = (0, _object.clone)(newDelta);
         this.selectionCalculations.getUpdatedSelectionRange(currentSelectionRange, newDelta);
         (0, _array.arrayEach)(mergedCellsWithinRange, function (mergedCell) {
-          _this6.selectionCalculations.snapDelta(newDelta, currentSelectionRange, mergedCell);
+          _this7.selectionCalculations.snapDelta(newDelta, currentSelectionRange, mergedCell);
         });
       } while (newDelta.row !== tempDelta.row || newDelta.col !== tempDelta.col);
 
@@ -946,9 +979,9 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         var maxColSpan = lastMergedColumnIndex - renderedColumnIndex + 1; // Number of rendered columns.
         // We just try to determine some values basing on the actual number of rendered indexes (some columns may be hidden).
 
-        mergedCellCopy.row = rowMapper.getFirstNotHiddenIndex(mergedCellCopy.row, 1); // We just try to determine some values basing on the actual number of rendered indexes (some columns may be hidden).
+        mergedCellCopy.row = rowMapper.getNearestNotHiddenIndex(mergedCellCopy.row, 1); // We just try to determine some values basing on the actual number of rendered indexes (some columns may be hidden).
 
-        mergedCellCopy.col = columnMapper.getFirstNotHiddenIndex(mergedCellCopy.col, 1); // The `rowSpan` property for a `TD` element should be at most equal to number of rendered rows in the merge area.
+        mergedCellCopy.col = columnMapper.getNearestNotHiddenIndex(mergedCellCopy.col, 1); // The `rowSpan` property for a `TD` element should be at most equal to number of rendered rows in the merge area.
 
         mergedCellCopy.rowspan = Math.min(mergedCellCopy.rowspan, maxRowSpan); // The `colSpan` property for a `TD` element should be at most equal to number of rendered columns in the merge area.
 
@@ -994,7 +1027,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
     key: "onBeforeSetRangeEnd",
     value: function onBeforeSetRangeEnd(coords) {
       var selRange = this.hot.getSelectedRangeLast();
-      selRange.highlight = new _src.CellCoords(selRange.highlight.row, selRange.highlight.col); // clone in case we will modify its reference
+      selRange.highlight = this.hot._createCellCoords(selRange.highlight.row, selRange.highlight.col); // clone in case we will modify its reference
 
       selRange.to = coords;
       var rangeExpanded = false;
@@ -1073,7 +1106,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         var mergeParentForViewportStart = this.mergedCellsCollection.get(visualStartRow, visualColumnIndex);
 
         if ((0, _object.isObject)(mergeParentForViewportStart)) {
-          var renderableIndexAtMergeStart = rowMapper.getRenderableFromVisualIndex(rowMapper.getFirstNotHiddenIndex(mergeParentForViewportStart.row, 1)); // Merge start is out of the viewport (i.e. when we scrolled to the bottom and we can see just part of a merge).
+          var renderableIndexAtMergeStart = rowMapper.getRenderableFromVisualIndex(rowMapper.getNearestNotHiddenIndex(mergeParentForViewportStart.row, 1)); // Merge start is out of the viewport (i.e. when we scrolled to the bottom and we can see just part of a merge).
 
           if (renderableIndexAtMergeStart < calc.startRow) {
             // We extend viewport when some rows have been merged.
@@ -1105,7 +1138,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
 
         if ((0, _object.isObject)(mergeParentForViewportEnd)) {
           var mergeEnd = mergeParentForViewportEnd.row + mergeParentForViewportEnd.rowspan - 1;
-          var renderableIndexAtMergeEnd = rowMapper.getRenderableFromVisualIndex(rowMapper.getFirstNotHiddenIndex(mergeEnd, -1)); // Merge end is out of the viewport.
+          var renderableIndexAtMergeEnd = rowMapper.getRenderableFromVisualIndex(rowMapper.getNearestNotHiddenIndex(mergeEnd, -1)); // Merge end is out of the viewport.
 
           if (renderableIndexAtMergeEnd > calc.endRow) {
             // We extend the viewport when some rows have been merged.
@@ -1150,7 +1183,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         var mergeParentForViewportStart = this.mergedCellsCollection.get(visualRowIndex, visualStartCol);
 
         if ((0, _object.isObject)(mergeParentForViewportStart)) {
-          var renderableIndexAtMergeStart = columnMapper.getRenderableFromVisualIndex(columnMapper.getFirstNotHiddenIndex(mergeParentForViewportStart.col, 1)); // Merge start is out of the viewport (i.e. when we scrolled to the right and we can see just part of a merge).
+          var renderableIndexAtMergeStart = columnMapper.getRenderableFromVisualIndex(columnMapper.getNearestNotHiddenIndex(mergeParentForViewportStart.col, 1)); // Merge start is out of the viewport (i.e. when we scrolled to the right and we can see just part of a merge).
 
           if (renderableIndexAtMergeStart < calc.startColumn) {
             // We extend viewport when some columns have been merged.
@@ -1182,7 +1215,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
 
         if ((0, _object.isObject)(mergeParentForViewportEnd)) {
           var mergeEnd = mergeParentForViewportEnd.col + mergeParentForViewportEnd.colspan - 1;
-          var renderableIndexAtMergeEnd = columnMapper.getRenderableFromVisualIndex(columnMapper.getFirstNotHiddenIndex(mergeEnd, -1)); // Merge end is out of the viewport.
+          var renderableIndexAtMergeEnd = columnMapper.getRenderableFromVisualIndex(columnMapper.getNearestNotHiddenIndex(mergeEnd, -1)); // Merge end is out of the viewport.
 
           if (renderableIndexAtMergeEnd > calc.endColumn) {
             // We extend the viewport when some columns have been merged.
@@ -1222,15 +1255,15 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       var firstNonHiddenColumn;
 
       if (rowspan === 0) {
-        firstNonHiddenRow = rowMapper.getFirstNotHiddenIndex(parentRow, 1);
+        firstNonHiddenRow = rowMapper.getNearestNotHiddenIndex(parentRow, 1);
       } else {
-        firstNonHiddenRow = rowMapper.getFirstNotHiddenIndex(parentRow + rowspan - 1, -1);
+        firstNonHiddenRow = rowMapper.getNearestNotHiddenIndex(parentRow + rowspan - 1, -1);
       }
 
       if (colspan === 0) {
-        firstNonHiddenColumn = columnMapper.getFirstNotHiddenIndex(parentColumn, 1);
+        firstNonHiddenColumn = columnMapper.getNearestNotHiddenIndex(parentColumn, 1);
       } else {
-        firstNonHiddenColumn = columnMapper.getFirstNotHiddenIndex(parentColumn + colspan - 1, -1);
+        firstNonHiddenColumn = columnMapper.getNearestNotHiddenIndex(parentColumn + colspan - 1, -1);
       }
 
       var renderableRow = parentRow >= 0 ? rowMapper.getRenderableFromVisualIndex(firstNonHiddenRow) : parentRow;
@@ -1365,7 +1398,7 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
         var selectedRange = this.hot.getSelectedRangeLast();
         var mergedCellsWithinRange = this.mergedCellsCollection.getWithinRange(selectedRange);
         (0, _array.arrayEach)(mergedCellsWithinRange, function (mergedCell) {
-          if (selectedRange.getBottomRightCorner().row === mergedCell.getLastRow() && selectedRange.getBottomRightCorner().col === mergedCell.getLastColumn()) {
+          if (selectedRange.getBottomEndCorner().row === mergedCell.getLastRow() && selectedRange.getBottomEndCorner().col === mergedCell.getLastColumn()) {
             corners[2] = mergedCell.row;
             corners[3] = mergedCell.col;
           }