handsontable 0.0.0-next-bfaf0f9-20230613 → 0.0.0-next-ea1e0b3-20230620

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/manualColumnResize/manualColumnResize.js

@@ -87,6 +87,7 @@ var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
     _this.guide = rootDocument.createElement('DIV');
     _this.eventManager = new _eventManager.default(_assertThisInitialized(_this));
     _this.pressed = null;
+    _this.isTriggeredByRMB = false;
     _this.dblclick = 0;
     _this.autoresizeTimeout = null;
 
@@ -437,6 +438,11 @@ var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
       if ((0, _element.isDetached)(event.target)) {
         return;
       }
+
+      // A "mouseover" action is triggered right after executing "contextmenu" event. It should be ignored.
+      if (this.isTriggeredByRMB === true) {
+        return;
+      }
       if (this.checkIfColumnHeader(event.target)) {
         var th = this.getClosestTHParent(event.target);
         if (!th) {
@@ -593,6 +599,28 @@ var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
       }
     }
 
+    /**
+     * Callback for "contextmenu" event triggered on element showing move handle. It removes handle and guide elements.
+     *
+     * @private
+     */
+  }, {
+    key: "onContextMenu",
+    value: function onContextMenu() {
+      var _this9 = this;
+      this.hideHandleAndGuide();
+      this.hot.rootElement.removeChild(this.handle);
+      this.hot.rootElement.removeChild(this.guide);
+      this.pressed = false;
+      this.isTriggeredByRMB = true;
+
+      // There is thrown "mouseover" event right after opening a context menu. This flag inform that handle
+      // shouldn't be drawn just after removing it.
+      this.hot._registerImmediate(function () {
+        _this9.isTriggeredByRMB = false;
+      });
+    }
+
     /**
      * Binds the mouse events.
      *
@@ -601,21 +629,24 @@ var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "bindEvents",
     value: function bindEvents() {
-      var _this9 = this;
+      var _this10 = this;
       var _this$hot = this.hot,
         rootWindow = _this$hot.rootWindow,
         rootElement = _this$hot.rootElement;
       this.eventManager.addEventListener(rootElement, 'mouseover', function (e) {
-        return _this9.onMouseOver(e);
+        return _this10.onMouseOver(e);
       });
       this.eventManager.addEventListener(rootElement, 'mousedown', function (e) {
-        return _this9.onMouseDown(e);
+        return _this10.onMouseDown(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mousemove', function (e) {
-        return _this9.onMouseMove(e);
+        return _this10.onMouseMove(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mouseup', function () {
-        return _this9.onMouseUp();
+        return _this10.onMouseUp();
+      });
+      this.eventManager.addEventListener(this.handle, 'contextmenu', function () {
+        return _this10.onContextMenu();
       });
     }
 

package/plugins/manualColumnResize/manualColumnResize.mjs

@@ -78,6 +78,7 @@ export var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
     _this.guide = rootDocument.createElement('DIV');
     _this.eventManager = new EventManager(_assertThisInitialized(_this));
     _this.pressed = null;
+    _this.isTriggeredByRMB = false;
     _this.dblclick = 0;
     _this.autoresizeTimeout = null;
 
@@ -428,6 +429,11 @@ export var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
       if (isDetached(event.target)) {
         return;
       }
+
+      // A "mouseover" action is triggered right after executing "contextmenu" event. It should be ignored.
+      if (this.isTriggeredByRMB === true) {
+        return;
+      }
       if (this.checkIfColumnHeader(event.target)) {
         var th = this.getClosestTHParent(event.target);
         if (!th) {
@@ -584,6 +590,28 @@ export var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
       }
     }
 
+    /**
+     * Callback for "contextmenu" event triggered on element showing move handle. It removes handle and guide elements.
+     *
+     * @private
+     */
+  }, {
+    key: "onContextMenu",
+    value: function onContextMenu() {
+      var _this9 = this;
+      this.hideHandleAndGuide();
+      this.hot.rootElement.removeChild(this.handle);
+      this.hot.rootElement.removeChild(this.guide);
+      this.pressed = false;
+      this.isTriggeredByRMB = true;
+
+      // There is thrown "mouseover" event right after opening a context menu. This flag inform that handle
+      // shouldn't be drawn just after removing it.
+      this.hot._registerImmediate(function () {
+        _this9.isTriggeredByRMB = false;
+      });
+    }
+
     /**
      * Binds the mouse events.
      *
@@ -592,21 +620,24 @@ export var ManualColumnResize = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "bindEvents",
     value: function bindEvents() {
-      var _this9 = this;
+      var _this10 = this;
       var _this$hot = this.hot,
         rootWindow = _this$hot.rootWindow,
         rootElement = _this$hot.rootElement;
       this.eventManager.addEventListener(rootElement, 'mouseover', function (e) {
-        return _this9.onMouseOver(e);
+        return _this10.onMouseOver(e);
       });
       this.eventManager.addEventListener(rootElement, 'mousedown', function (e) {
-        return _this9.onMouseDown(e);
+        return _this10.onMouseDown(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mousemove', function (e) {
-        return _this9.onMouseMove(e);
+        return _this10.onMouseMove(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mouseup', function () {
-        return _this9.onMouseUp();
+        return _this10.onMouseUp();
+      });
+      this.eventManager.addEventListener(this.handle, 'contextmenu', function () {
+        return _this10.onContextMenu();
       });
     }
 

package/plugins/manualRowResize/manualRowResize.js

@@ -88,6 +88,7 @@ var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
     _this.guide = rootDocument.createElement('DIV');
     _this.eventManager = new _eventManager.default(_assertThisInitialized(_this));
     _this.pressed = null;
+    _this.isTriggeredByRMB = false;
     _this.dblclick = 0;
     _this.autoresizeTimeout = null;
 
@@ -409,6 +410,11 @@ var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
       if ((0, _element.isDetached)(event.target)) {
         return;
       }
+
+      // A "mouseover" action is triggered right after executing "contextmenu" event. It should be ignored.
+      if (this.isTriggeredByRMB === true) {
+        return;
+      }
       if (this.checkIfRowHeader(event.target)) {
         var th = this.getClosestTHParent(event.target);
         if (th) {
@@ -555,6 +561,28 @@ var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
       }
     }
 
+    /**
+     * Callback for "contextmenu" event triggered on element showing move handle. It removes handle and guide elements.
+     *
+     * @private
+     */
+  }, {
+    key: "onContextMenu",
+    value: function onContextMenu() {
+      var _this8 = this;
+      this.hideHandleAndGuide();
+      this.hot.rootElement.removeChild(this.handle);
+      this.hot.rootElement.removeChild(this.guide);
+      this.pressed = false;
+      this.isTriggeredByRMB = true;
+
+      // There is thrown "mouseover" event right after opening a context menu. This flag inform that handle
+      // shouldn't be drawn just after removing it.
+      this.hot._registerImmediate(function () {
+        _this8.isTriggeredByRMB = false;
+      });
+    }
+
     /**
      * Binds the mouse events.
      *
@@ -563,21 +591,24 @@ var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "bindEvents",
     value: function bindEvents() {
-      var _this8 = this;
+      var _this9 = this;
       var _this$hot = this.hot,
         rootElement = _this$hot.rootElement,
         rootWindow = _this$hot.rootWindow;
       this.eventManager.addEventListener(rootElement, 'mouseover', function (e) {
-        return _this8.onMouseOver(e);
+        return _this9.onMouseOver(e);
       });
       this.eventManager.addEventListener(rootElement, 'mousedown', function (e) {
-        return _this8.onMouseDown(e);
+        return _this9.onMouseDown(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mousemove', function (e) {
-        return _this8.onMouseMove(e);
+        return _this9.onMouseMove(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mouseup', function () {
-        return _this8.onMouseUp();
+        return _this9.onMouseUp();
+      });
+      this.eventManager.addEventListener(this.handle, 'contextmenu', function () {
+        return _this9.onContextMenu();
       });
     }
 
@@ -611,23 +642,23 @@ var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onMapInit",
     value: function onMapInit() {
-      var _this9 = this;
+      var _this10 = this;
       var priv = privatePool.get(this);
       var initialSetting = this.hot.getSettings()[PLUGIN_KEY];
       var loadedManualRowHeights = this.loadManualRowHeights();
       this.hot.batchExecution(function () {
         if (typeof loadedManualRowHeights !== 'undefined') {
           loadedManualRowHeights.forEach(function (height, index) {
-            _this9.rowHeightsMap.setValueAtIndex(index, height);
+            _this10.rowHeightsMap.setValueAtIndex(index, height);
           });
         } else if (Array.isArray(initialSetting)) {
           initialSetting.forEach(function (height, index) {
-            _this9.rowHeightsMap.setValueAtIndex(index, height);
+            _this10.rowHeightsMap.setValueAtIndex(index, height);
           });
           priv.config = initialSetting;
         } else if (initialSetting === true && Array.isArray(priv.config)) {
           priv.config.forEach(function (height, index) {
-            _this9.rowHeightsMap.setValueAtIndex(index, height);
+            _this10.rowHeightsMap.setValueAtIndex(index, height);
           });
         }
       }, true);

package/plugins/manualRowResize/manualRowResize.mjs

@@ -79,6 +79,7 @@ export var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
     _this.guide = rootDocument.createElement('DIV');
     _this.eventManager = new EventManager(_assertThisInitialized(_this));
     _this.pressed = null;
+    _this.isTriggeredByRMB = false;
     _this.dblclick = 0;
     _this.autoresizeTimeout = null;
 
@@ -400,6 +401,11 @@ export var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
       if (isDetached(event.target)) {
         return;
       }
+
+      // A "mouseover" action is triggered right after executing "contextmenu" event. It should be ignored.
+      if (this.isTriggeredByRMB === true) {
+        return;
+      }
       if (this.checkIfRowHeader(event.target)) {
         var th = this.getClosestTHParent(event.target);
         if (th) {
@@ -546,6 +552,28 @@ export var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
       }
     }
 
+    /**
+     * Callback for "contextmenu" event triggered on element showing move handle. It removes handle and guide elements.
+     *
+     * @private
+     */
+  }, {
+    key: "onContextMenu",
+    value: function onContextMenu() {
+      var _this8 = this;
+      this.hideHandleAndGuide();
+      this.hot.rootElement.removeChild(this.handle);
+      this.hot.rootElement.removeChild(this.guide);
+      this.pressed = false;
+      this.isTriggeredByRMB = true;
+
+      // There is thrown "mouseover" event right after opening a context menu. This flag inform that handle
+      // shouldn't be drawn just after removing it.
+      this.hot._registerImmediate(function () {
+        _this8.isTriggeredByRMB = false;
+      });
+    }
+
     /**
      * Binds the mouse events.
      *
@@ -554,21 +582,24 @@ export var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "bindEvents",
     value: function bindEvents() {
-      var _this8 = this;
+      var _this9 = this;
       var _this$hot = this.hot,
         rootElement = _this$hot.rootElement,
         rootWindow = _this$hot.rootWindow;
       this.eventManager.addEventListener(rootElement, 'mouseover', function (e) {
-        return _this8.onMouseOver(e);
+        return _this9.onMouseOver(e);
       });
       this.eventManager.addEventListener(rootElement, 'mousedown', function (e) {
-        return _this8.onMouseDown(e);
+        return _this9.onMouseDown(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mousemove', function (e) {
-        return _this8.onMouseMove(e);
+        return _this9.onMouseMove(e);
       });
       this.eventManager.addEventListener(rootWindow, 'mouseup', function () {
-        return _this8.onMouseUp();
+        return _this9.onMouseUp();
+      });
+      this.eventManager.addEventListener(this.handle, 'contextmenu', function () {
+        return _this9.onContextMenu();
       });
     }
 
@@ -602,23 +633,23 @@ export var ManualRowResize = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "onMapInit",
     value: function onMapInit() {
-      var _this9 = this;
+      var _this10 = this;
       var priv = privatePool.get(this);
       var initialSetting = this.hot.getSettings()[PLUGIN_KEY];
       var loadedManualRowHeights = this.loadManualRowHeights();
       this.hot.batchExecution(function () {
         if (typeof loadedManualRowHeights !== 'undefined') {
           loadedManualRowHeights.forEach(function (height, index) {
-            _this9.rowHeightsMap.setValueAtIndex(index, height);
+            _this10.rowHeightsMap.setValueAtIndex(index, height);
           });
         } else if (Array.isArray(initialSetting)) {
           initialSetting.forEach(function (height, index) {
-            _this9.rowHeightsMap.setValueAtIndex(index, height);
+            _this10.rowHeightsMap.setValueAtIndex(index, height);
           });
           priv.config = initialSetting;
         } else if (initialSetting === true && Array.isArray(priv.config)) {
           priv.config.forEach(function (height, index) {
-            _this9.rowHeightsMap.setValueAtIndex(index, height);
+            _this10.rowHeightsMap.setValueAtIndex(index, height);
           });
         }
       }, true);

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() {

package/plugins/mergeCells/mergeCells.mjs

@@ -236,6 +236,9 @@ export 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;
@@ -652,11 +655,8 @@ export 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;
@@ -1333,6 +1333,19 @@ export 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() {