handsontable 0.0.0-next-be250b6-20230621 → 0.0.0-next-dcd0acc-20230621

package/plugins/columnSorting/columnSorting.js

@@ -19,7 +19,7 @@ require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.regexp.exec.js");
 exports.__esModule = true;
-exports.REPLACE_COLUMN_CONFIG_STRATEGY = exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.ColumnSorting = exports.APPEND_COLUMN_CONFIG_STRATEGY = void 0;
+exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.ColumnSorting = void 0;
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.object.to-string.js");
@@ -79,10 +79,7 @@ exports.PLUGIN_KEY = PLUGIN_KEY;
 var PLUGIN_PRIORITY = 50;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 var APPEND_COLUMN_CONFIG_STRATEGY = 'append';
-exports.APPEND_COLUMN_CONFIG_STRATEGY = APPEND_COLUMN_CONFIG_STRATEGY;
 var REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
-exports.REPLACE_COLUMN_CONFIG_STRATEGY = REPLACE_COLUMN_CONFIG_STRATEGY;
-var SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 _pluginHooks.default.getSingleton().register('beforeColumnSort');
 _pluginHooks.default.getSingleton().register('afterColumnSort');
@@ -226,7 +223,6 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       if (this.hot.view) {
         this.loadOrSortBySettings();
       }
-      this.registerShortcuts();
       _get(_getPrototypeOf(ColumnSorting.prototype), "enablePlugin", this).call(this);
     }
 
@@ -260,47 +256,9 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       this.columnStatesManager.destroy();
       this.columnMetaCache = null;
       this.columnStatesManager = null;
-      this.unregisterShortcuts();
       _get(_getPrototypeOf(ColumnSorting.prototype), "disablePlugin", this).call(this);
     }
 
-    /**
-     * Register shortcuts responsible for toggling column sorting functionality.
-     *
-     * @private
-     */
-  }, {
-    key: "registerShortcuts",
-    value: function registerShortcuts() {
-      var _this4 = this;
-      this.hot.getShortcutManager().getContext('grid').addShortcut({
-        keys: [['Enter']],
-        callback: function callback() {
-          var _this4$hot$getSelecte = _this4.hot.getSelectedRangeLast(),
-            highlight = _this4$hot$getSelecte.highlight;
-          if (highlight.row === -1 && highlight.col >= 0) {
-            _this4.sort(_this4.getColumnNextConfig(highlight.col));
-          }
-        },
-        runOnlyIf: function runOnlyIf() {
-          var _this4$hot$getSelecte2;
-          return (_this4$hot$getSelecte2 = _this4.hot.getSelectedRangeLast()) === null || _this4$hot$getSelecte2 === void 0 ? void 0 : _this4$hot$getSelecte2.highlight.isHeader();
-        },
-        group: SHORTCUTS_GROUP
-      });
-    }
-
-    /**
-     * Unregister shortcuts responsible for toggling column sorting functionality.
-     *
-     * @private
-     */
-  }, {
-    key: "unregisterShortcuts",
-    value: function unregisterShortcuts() {
-      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-    }
-
     // DIFF - MultiColumnSorting & ColumnSorting: changed function documentation.
     /**
      * Sorts the table by chosen columns and orders.
@@ -470,13 +428,13 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "saveAllSortSettings",
     value: function saveAllSortSettings(sortConfigs) {
-      var _this5 = this;
+      var _this4 = this;
       var allSortSettings = this.columnStatesManager.getAllColumnsProperties();
       var translateColumnToPhysical = function translateColumnToPhysical(_ref2) {
         var visualColumn = _ref2.column,
           restOfProperties = _objectWithoutProperties(_ref2, _excluded);
         return _objectSpread({
-          column: _this5.hot.toPhysicalColumn(visualColumn)
+          column: _this4.hot.toPhysicalColumn(visualColumn)
         }, restOfProperties);
       };
       allSortSettings.initialConfig = (0, _array.arrayMap)(sortConfigs, translateColumnToPhysical);
@@ -494,7 +452,7 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "getAllSavedSortSettings",
     value: function getAllSavedSortSettings() {
-      var _this6 = this;
+      var _this5 = this;
       var storedAllSortSettings = {};
       this.hot.runHooks('persistentStateLoad', 'columnSorting', storedAllSortSettings);
       var allSortSettings = storedAllSortSettings.value;
@@ -502,7 +460,7 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
         var physicalColumn = _ref3.column,
           restOfProperties = _objectWithoutProperties(_ref3, _excluded2);
         return _objectSpread({
-          column: _this6.hot.toVisualColumn(physicalColumn)
+          column: _this5.hot.toVisualColumn(physicalColumn)
         }, restOfProperties);
       };
       if ((0, _mixed.isDefined)(allSortSettings) && Array.isArray(allSortSettings.initialConfig)) {
@@ -667,7 +625,7 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "sortByPresetSortStates",
     value: function sortByPresetSortStates(sortConfigs) {
-      var _this7 = this;
+      var _this6 = this;
       if (sortConfigs.length === 0) {
         this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
         return;
@@ -676,7 +634,7 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       var numberOfRows = this.hot.countRows();
       var getDataForSortedColumns = function getDataForSortedColumns(visualRowIndex) {
         return (0, _array.arrayMap)(sortConfigs, function (sortConfig) {
-          return _this7.hot.getDataAtCell(visualRowIndex, sortConfig.column);
+          return _this6.hot.getDataAtCell(visualRowIndex, sortConfig.column);
         });
       };
       for (var visualRowIndex = 0; visualRowIndex < this.getNumberOfRowsToSort(numberOfRows); visualRowIndex += 1) {
@@ -688,7 +646,7 @@ var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       (0, _sortService.sort)(indexesWithData, this.pluginKey, (0, _array.arrayMap)(sortConfigs, function (sortConfig) {
         return sortConfig.sortOrder;
       }), (0, _array.arrayMap)(sortConfigs, function (sortConfig) {
-        return _this7.getFirstCellSettings(sortConfig.column);
+        return _this6.getFirstCellSettings(sortConfig.column);
       }));
 
       // Append spareRows

package/plugins/columnSorting/columnSorting.mjs

@@ -71,9 +71,8 @@ import { rootComparator } from "./rootComparator.mjs";
 import { registerRootComparator, sort } from "./sortService/index.mjs";
 export var PLUGIN_KEY = 'columnSorting';
 export var PLUGIN_PRIORITY = 50;
-export var APPEND_COLUMN_CONFIG_STRATEGY = 'append';
-export var REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
-var SHORTCUTS_GROUP = PLUGIN_KEY;
+var APPEND_COLUMN_CONFIG_STRATEGY = 'append';
+var REPLACE_COLUMN_CONFIG_STRATEGY = 'replace';
 registerRootComparator(PLUGIN_KEY, rootComparator);
 Hooks.getSingleton().register('beforeColumnSort');
 Hooks.getSingleton().register('afterColumnSort');
@@ -217,7 +216,6 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       if (this.hot.view) {
         this.loadOrSortBySettings();
       }
-      this.registerShortcuts();
       _get(_getPrototypeOf(ColumnSorting.prototype), "enablePlugin", this).call(this);
     }
 
@@ -251,47 +249,9 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       this.columnStatesManager.destroy();
       this.columnMetaCache = null;
       this.columnStatesManager = null;
-      this.unregisterShortcuts();
       _get(_getPrototypeOf(ColumnSorting.prototype), "disablePlugin", this).call(this);
     }
 
-    /**
-     * Register shortcuts responsible for toggling column sorting functionality.
-     *
-     * @private
-     */
-  }, {
-    key: "registerShortcuts",
-    value: function registerShortcuts() {
-      var _this4 = this;
-      this.hot.getShortcutManager().getContext('grid').addShortcut({
-        keys: [['Enter']],
-        callback: function callback() {
-          var _this4$hot$getSelecte = _this4.hot.getSelectedRangeLast(),
-            highlight = _this4$hot$getSelecte.highlight;
-          if (highlight.row === -1 && highlight.col >= 0) {
-            _this4.sort(_this4.getColumnNextConfig(highlight.col));
-          }
-        },
-        runOnlyIf: function runOnlyIf() {
-          var _this4$hot$getSelecte2;
-          return (_this4$hot$getSelecte2 = _this4.hot.getSelectedRangeLast()) === null || _this4$hot$getSelecte2 === void 0 ? void 0 : _this4$hot$getSelecte2.highlight.isHeader();
-        },
-        group: SHORTCUTS_GROUP
-      });
-    }
-
-    /**
-     * Unregister shortcuts responsible for toggling column sorting functionality.
-     *
-     * @private
-     */
-  }, {
-    key: "unregisterShortcuts",
-    value: function unregisterShortcuts() {
-      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-    }
-
     // DIFF - MultiColumnSorting & ColumnSorting: changed function documentation.
     /**
      * Sorts the table by chosen columns and orders.
@@ -461,13 +421,13 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "saveAllSortSettings",
     value: function saveAllSortSettings(sortConfigs) {
-      var _this5 = this;
+      var _this4 = this;
       var allSortSettings = this.columnStatesManager.getAllColumnsProperties();
       var translateColumnToPhysical = function translateColumnToPhysical(_ref2) {
         var visualColumn = _ref2.column,
           restOfProperties = _objectWithoutProperties(_ref2, _excluded);
         return _objectSpread({
-          column: _this5.hot.toPhysicalColumn(visualColumn)
+          column: _this4.hot.toPhysicalColumn(visualColumn)
         }, restOfProperties);
       };
       allSortSettings.initialConfig = arrayMap(sortConfigs, translateColumnToPhysical);
@@ -485,7 +445,7 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "getAllSavedSortSettings",
     value: function getAllSavedSortSettings() {
-      var _this6 = this;
+      var _this5 = this;
       var storedAllSortSettings = {};
       this.hot.runHooks('persistentStateLoad', 'columnSorting', storedAllSortSettings);
       var allSortSettings = storedAllSortSettings.value;
@@ -493,7 +453,7 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
         var physicalColumn = _ref3.column,
           restOfProperties = _objectWithoutProperties(_ref3, _excluded2);
         return _objectSpread({
-          column: _this6.hot.toVisualColumn(physicalColumn)
+          column: _this5.hot.toVisualColumn(physicalColumn)
         }, restOfProperties);
       };
       if (isDefined(allSortSettings) && Array.isArray(allSortSettings.initialConfig)) {
@@ -658,7 +618,7 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "sortByPresetSortStates",
     value: function sortByPresetSortStates(sortConfigs) {
-      var _this7 = this;
+      var _this6 = this;
       if (sortConfigs.length === 0) {
         this.hot.rowIndexMapper.setIndexesSequence(this.indexesSequenceCache.getValues());
         return;
@@ -667,7 +627,7 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       var numberOfRows = this.hot.countRows();
       var getDataForSortedColumns = function getDataForSortedColumns(visualRowIndex) {
         return arrayMap(sortConfigs, function (sortConfig) {
-          return _this7.hot.getDataAtCell(visualRowIndex, sortConfig.column);
+          return _this6.hot.getDataAtCell(visualRowIndex, sortConfig.column);
         });
       };
       for (var visualRowIndex = 0; visualRowIndex < this.getNumberOfRowsToSort(numberOfRows); visualRowIndex += 1) {
@@ -679,7 +639,7 @@ export var ColumnSorting = /*#__PURE__*/function (_BasePlugin) {
       sort(indexesWithData, this.pluginKey, arrayMap(sortConfigs, function (sortConfig) {
         return sortConfig.sortOrder;
       }), arrayMap(sortConfigs, function (sortConfig) {
-        return _this7.getFirstCellSettings(sortConfig.column);
+        return _this6.getFirstCellSettings(sortConfig.column);
       }));
 
       // Append spareRows

package/plugins/columnSorting/index.js

@@ -1,10 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.REPLACE_COLUMN_CONFIG_STRATEGY = exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.ColumnSorting = exports.APPEND_COLUMN_CONFIG_STRATEGY = void 0;
+exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.ColumnSorting = void 0;
 var _columnSorting = require("./columnSorting");
 exports.PLUGIN_KEY = _columnSorting.PLUGIN_KEY;
 exports.PLUGIN_PRIORITY = _columnSorting.PLUGIN_PRIORITY;
-exports.ColumnSorting = _columnSorting.ColumnSorting;
-exports.APPEND_COLUMN_CONFIG_STRATEGY = _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY;
-exports.REPLACE_COLUMN_CONFIG_STRATEGY = _columnSorting.REPLACE_COLUMN_CONFIG_STRATEGY;
+exports.ColumnSorting = _columnSorting.ColumnSorting;

package/plugins/columnSorting/index.mjs

@@ -1 +1 @@
-export { PLUGIN_KEY, PLUGIN_PRIORITY, ColumnSorting, APPEND_COLUMN_CONFIG_STRATEGY, REPLACE_COLUMN_CONFIG_STRATEGY } from "./columnSorting.mjs";
+export { PLUGIN_KEY, PLUGIN_PRIORITY, ColumnSorting } from "./columnSorting.mjs";

package/plugins/copyPaste/copyPaste.js

@@ -528,10 +528,6 @@ var CopyPaste = /*#__PURE__*/function (_BasePlugin) {
       if (!selectionRange) {
         return;
       }
-      if (selectionRange.isSingleHeader()) {
-        this.copyableRanges = [];
-        return;
-      }
       _classPrivateFieldGet(this, _copyableRangesFactory).setSelectedRange(selectionRange);
       var groupedRanges = new Map([['headers', null], ['cells', null]]);
       if (_classPrivateFieldGet(this, _copyMode) === 'column-headers-only') {
@@ -760,7 +756,7 @@ var CopyPaste = /*#__PURE__*/function (_BasePlugin) {
       if (typeof pastedData === 'string') {
         pastedData = (0, _SheetClip.parse)(pastedData);
       }
-      if (pastedData === void 0 || pastedData && pastedData.length === 0) {
+      if (pastedData && pastedData.length === 0) {
         return;
       }
       if (this.hot.runHooks('beforePaste', pastedData, this.copyableRanges) === false) {

package/plugins/copyPaste/copyPaste.mjs

@@ -521,10 +521,6 @@ export var CopyPaste = /*#__PURE__*/function (_BasePlugin) {
       if (!selectionRange) {
         return;
       }
-      if (selectionRange.isSingleHeader()) {
-        this.copyableRanges = [];
-        return;
-      }
       _classPrivateFieldGet(this, _copyableRangesFactory).setSelectedRange(selectionRange);
       var groupedRanges = new Map([['headers', null], ['cells', null]]);
       if (_classPrivateFieldGet(this, _copyMode) === 'column-headers-only') {
@@ -753,7 +749,7 @@ export var CopyPaste = /*#__PURE__*/function (_BasePlugin) {
       if (typeof pastedData === 'string') {
         pastedData = parse(pastedData);
       }
-      if (pastedData === void 0 || pastedData && pastedData.length === 0) {
+      if (pastedData && pastedData.length === 0) {
         return;
       }
       if (this.hot.runHooks('beforePaste', pastedData, this.copyableRanges) === false) {

package/plugins/customBorders/customBorders.js

@@ -9,6 +9,11 @@ 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");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.regexp.to-string.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.weak-map.js");
 exports.__esModule = true;
 exports.PLUGIN_PRIORITY = exports.PLUGIN_KEY = exports.CustomBorders = void 0;
@@ -34,6 +39,12 @@ var _selection = require("../../selection");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -219,11 +230,25 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionType = (0, _selection.detectSelectionType)(selectionRanges);
       var selectionSchemaNormalizer = (0, _selection.normalizeSelectionFactory)(selectionType);
       (0, _array.arrayEach)(selectionRanges, function (selection) {
-        selectionSchemaNormalizer(selection).forAll(function (row, col) {
-          (0, _array.arrayEach)(borderKeys, function (borderKey) {
-            _this3.prepareBorderFromCustomAdded(row, col, normBorder, (0, _utils.toInlinePropName)(borderKey));
-          });
-        });
+        var _selectionSchemaNorma = selectionSchemaNormalizer(selection),
+          _selectionSchemaNorma2 = _slicedToArray(_selectionSchemaNorma, 4),
+          rowStart = _selectionSchemaNorma2[0],
+          columnStart = _selectionSchemaNorma2[1],
+          rowEnd = _selectionSchemaNorma2[2],
+          columnEnd = _selectionSchemaNorma2[3];
+        var _loop = function _loop(row) {
+          var _loop2 = function _loop2(col) {
+            (0, _array.arrayEach)(borderKeys, function (borderKey) {
+              _this3.prepareBorderFromCustomAdded(row, col, normBorder, (0, _utils.toInlinePropName)(borderKey));
+            });
+          };
+          for (var col = columnStart; col <= columnEnd; col += 1) {
+            _loop2(col);
+          }
+        };
+        for (var row = rowStart; row <= rowEnd; row += 1) {
+          _loop(row);
+        }
       });
 
       /*
@@ -266,13 +291,27 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionSchemaNormalizer = (0, _selection.normalizeSelectionFactory)(selectionType);
       var selectedBorders = [];
       (0, _array.arrayEach)(selectionRanges, function (selection) {
-        selectionSchemaNormalizer(selection).forAll(function (row, col) {
-          (0, _array.arrayEach)(_this4.savedBorders, function (border) {
-            if (border.row === row && border.col === col) {
-              selectedBorders.push((0, _utils.denormalizeBorder)(border));
-            }
-          });
-        });
+        var _selectionSchemaNorma3 = selectionSchemaNormalizer(selection),
+          _selectionSchemaNorma4 = _slicedToArray(_selectionSchemaNorma3, 4),
+          rowStart = _selectionSchemaNorma4[0],
+          columnStart = _selectionSchemaNorma4[1],
+          rowEnd = _selectionSchemaNorma4[2],
+          columnEnd = _selectionSchemaNorma4[3];
+        var _loop3 = function _loop3(row) {
+          var _loop4 = function _loop4(col) {
+            (0, _array.arrayEach)(_this4.savedBorders, function (border) {
+              if (border.row === row && border.col === col) {
+                selectedBorders.push((0, _utils.denormalizeBorder)(border));
+              }
+            });
+          };
+          for (var col = columnStart; col <= columnEnd; col += 1) {
+            _loop4(col);
+          }
+        };
+        for (var row = rowStart; row <= rowEnd; row += 1) {
+          _loop3(row);
+        }
       });
       return selectedBorders;
     }
@@ -697,12 +736,10 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelectionsFromContextMenu",
     value: function checkCustomSelectionsFromContextMenu(border, place, remove) {
-      var _this12 = this;
       var check = false;
       (0, _array.arrayEach)(this.hot.selection.highlight.customSelections, function (customSelection) {
         if (border.id === customSelection.settings.id) {
-          var borders = _this12.hot.view._wt.selectionManager.getBorderInstances(customSelection);
-          (0, _array.arrayEach)(borders, function (borderObject) {
+          (0, _object.objectEach)(customSelection.instanceBorders, function (borderObject) {
             borderObject.toggleHiddenClass(place, remove); // TODO this also bad?
           });
 
@@ -727,7 +764,6 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelections",
     value: function checkCustomSelections(border, cellRange, place) {
-      var _this13 = this;
       var hideCount = this.countHide(border);
       var check = false;
       if (hideCount === 4) {
@@ -739,8 +775,7 @@ var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
             customSelection.visualCellRange = cellRange;
             customSelection.commit();
             if (place) {
-              var borders = _this13.hot.view._wt.selectionManager.getBorderInstances(customSelection);
-              (0, _array.arrayEach)(borders, function (borderObject) {
+              (0, _object.objectEach)(customSelection.instanceBorders, function (borderObject) {
                 borderObject.changeBorderStyle(place, border);
               });
             }

package/plugins/customBorders/customBorders.mjs

@@ -1,4 +1,10 @@
 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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.object.assign.js";
@@ -19,6 +25,11 @@ 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";
+import "core-js/modules/es.array.slice.js";
+import "core-js/modules/es.regexp.to-string.js";
+import "core-js/modules/es.function.name.js";
+import "core-js/modules/es.array.from.js";
+import "core-js/modules/es.regexp.exec.js";
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -35,7 +46,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { BasePlugin } from "../base/index.mjs";
-import { hasOwnProperty, deepClone } from "../../helpers/object.mjs";
+import { hasOwnProperty, objectEach, deepClone } from "../../helpers/object.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayReduce, arrayMap } from "../../helpers/array.mjs";
 import * as C from "../../i18n/constants.mjs";
@@ -210,11 +221,25 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionType = detectSelectionType(selectionRanges);
       var selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
       arrayEach(selectionRanges, function (selection) {
-        selectionSchemaNormalizer(selection).forAll(function (row, col) {
-          arrayEach(borderKeys, function (borderKey) {
-            _this3.prepareBorderFromCustomAdded(row, col, normBorder, toInlinePropName(borderKey));
-          });
-        });
+        var _selectionSchemaNorma = selectionSchemaNormalizer(selection),
+          _selectionSchemaNorma2 = _slicedToArray(_selectionSchemaNorma, 4),
+          rowStart = _selectionSchemaNorma2[0],
+          columnStart = _selectionSchemaNorma2[1],
+          rowEnd = _selectionSchemaNorma2[2],
+          columnEnd = _selectionSchemaNorma2[3];
+        var _loop = function _loop(row) {
+          var _loop2 = function _loop2(col) {
+            arrayEach(borderKeys, function (borderKey) {
+              _this3.prepareBorderFromCustomAdded(row, col, normBorder, toInlinePropName(borderKey));
+            });
+          };
+          for (var col = columnStart; col <= columnEnd; col += 1) {
+            _loop2(col);
+          }
+        };
+        for (var row = rowStart; row <= rowEnd; row += 1) {
+          _loop(row);
+        }
       });
 
       /*
@@ -257,13 +282,27 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
       var selectionSchemaNormalizer = normalizeSelectionFactory(selectionType);
       var selectedBorders = [];
       arrayEach(selectionRanges, function (selection) {
-        selectionSchemaNormalizer(selection).forAll(function (row, col) {
-          arrayEach(_this4.savedBorders, function (border) {
-            if (border.row === row && border.col === col) {
-              selectedBorders.push(denormalizeBorder(border));
-            }
-          });
-        });
+        var _selectionSchemaNorma3 = selectionSchemaNormalizer(selection),
+          _selectionSchemaNorma4 = _slicedToArray(_selectionSchemaNorma3, 4),
+          rowStart = _selectionSchemaNorma4[0],
+          columnStart = _selectionSchemaNorma4[1],
+          rowEnd = _selectionSchemaNorma4[2],
+          columnEnd = _selectionSchemaNorma4[3];
+        var _loop3 = function _loop3(row) {
+          var _loop4 = function _loop4(col) {
+            arrayEach(_this4.savedBorders, function (border) {
+              if (border.row === row && border.col === col) {
+                selectedBorders.push(denormalizeBorder(border));
+              }
+            });
+          };
+          for (var col = columnStart; col <= columnEnd; col += 1) {
+            _loop4(col);
+          }
+        };
+        for (var row = rowStart; row <= rowEnd; row += 1) {
+          _loop3(row);
+        }
       });
       return selectedBorders;
     }
@@ -688,12 +727,10 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelectionsFromContextMenu",
     value: function checkCustomSelectionsFromContextMenu(border, place, remove) {
-      var _this12 = this;
       var check = false;
       arrayEach(this.hot.selection.highlight.customSelections, function (customSelection) {
         if (border.id === customSelection.settings.id) {
-          var borders = _this12.hot.view._wt.selectionManager.getBorderInstances(customSelection);
-          arrayEach(borders, function (borderObject) {
+          objectEach(customSelection.instanceBorders, function (borderObject) {
             borderObject.toggleHiddenClass(place, remove); // TODO this also bad?
           });
 
@@ -718,7 +755,6 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "checkCustomSelections",
     value: function checkCustomSelections(border, cellRange, place) {
-      var _this13 = this;
       var hideCount = this.countHide(border);
       var check = false;
       if (hideCount === 4) {
@@ -730,8 +766,7 @@ export var CustomBorders = /*#__PURE__*/function (_BasePlugin) {
             customSelection.visualCellRange = cellRange;
             customSelection.commit();
             if (place) {
-              var borders = _this13.hot.view._wt.selectionManager.getBorderInstances(customSelection);
-              arrayEach(borders, function (borderObject) {
+              objectEach(customSelection.instanceBorders, function (borderObject) {
                 borderObject.changeBorderStyle(place, border);
               });
             }

package/plugins/mergeCells/mergeCells.js

@@ -243,6 +243,9 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterDrawSelection', function () {
         return _this2.onAfterDrawSelection.apply(_this2, arguments);
       });
+      this.addHook('beforeRemoveCellClassNames', function () {
+        return _this2.onBeforeRemoveCellClassNames.apply(_this2, arguments);
+      });
       this.addHook('beforeUndoStackChange', function (action, source) {
         if (source === 'MergeCells') {
           return false;
@@ -659,11 +662,8 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       gridContext.addShortcut({
         keys: [['Control', 'm']],
         callback: function callback() {
-          var range = _this7.hot.getSelectedRangeLast();
-          if (range && !range.isSingleHeader()) {
-            _this7.toggleMerge(range);
-            _this7.hot.render();
-          }
+          _this7.toggleMerge(_this7.hot.getSelectedRangeLast());
+          _this7.hot.render();
         },
         runOnlyIf: function runOnlyIf(event) {
           return !event.altKey;
@@ -1340,6 +1340,19 @@ var MergeCells = /*#__PURE__*/function (_BasePlugin) {
       }
       return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
     }
+
+    /**
+     * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
+     *
+     * @private
+     * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
+     *   all the cells in the table.
+     */
+  }, {
+    key: "onBeforeRemoveCellClassNames",
+    value: function onBeforeRemoveCellClassNames() {
+      return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+    }
   }], [{
     key: "PLUGIN_KEY",
     get: function get() {