handsontable 0.0.0-next-9379dd1-20231020 → 0.0.0-next-9059914-20231025

package/plugins/dropdownMenu/dropdownMenu.mjs

@@ -1,15 +1,12 @@
 import { BasePlugin } from "../base/index.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
-import { objectEach } from "../../helpers/object.mjs";
-import { CommandExecutor } from "../contextMenu/commandExecutor.mjs";
-import { getDocumentOffsetByElement } from "../contextMenu/utils.mjs";
+import CommandExecutor from "../contextMenu/commandExecutor.mjs";
 import EventManager from "../../eventManager.mjs";
-import { hasClass, setAttribute } from "../../helpers/dom/element.mjs";
-import { ItemsFactory } from "../contextMenu/itemsFactory.mjs";
-import { Menu } from "../contextMenu/menu/index.mjs";
+import { hasClass } from "../../helpers/dom/element.mjs";
+import ItemsFactory from "../contextMenu/itemsFactory.mjs";
+import Menu from "../contextMenu/menu.mjs";
 import Hooks from "../../pluginHooks.mjs";
-import { COLUMN_LEFT, COLUMN_RIGHT, REMOVE_COLUMN, CLEAR_COLUMN, READ_ONLY, ALIGNMENT, SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
-import { A11Y_HIDDEN } from "../../helpers/a11y.mjs";
+import { COLUMN_LEFT, COLUMN_RIGHT, REMOVE_COLUMN, CLEAR_COLUMN, READ_ONLY, ALIGNMENT, SEPARATOR } from "../contextMenu/predefinedItems.mjs";
 Hooks.getSingleton().register('afterDropdownMenuDefaultOptions');
 Hooks.getSingleton().register('beforeDropdownMenuShow');
 Hooks.getSingleton().register('afterDropdownMenuShow');
@@ -18,7 +15,6 @@ Hooks.getSingleton().register('afterDropdownMenuExecute');
 export const PLUGIN_KEY = 'dropdownMenu';
 export const PLUGIN_PRIORITY = 230;
 const BUTTON_CLASS_NAME = 'changeType';
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**
@@ -155,7 +151,6 @@ export class DropdownMenu extends BasePlugin {
     if (typeof settings.callback === 'function') {
       this.commandExecutor.setCommonCallback(settings.callback);
     }
-    this.registerShortcuts();
     super.enablePlugin();
     this.callOnPluginsReady(() => {
       this.hot.runHooks('afterDropdownMenuDefaultOptions', predefinedItems);
@@ -206,66 +201,9 @@ export class DropdownMenu extends BasePlugin {
     if (this.menu) {
       this.menu.destroy();
     }
-    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for toggling dropdown menu.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    const context = this.hot.getShortcutManager().getContext('grid');
-    const callback = () => {
-      const {
-        highlight
-      } = this.hot.getSelectedRangeLast();
-      if ((highlight.isHeader() && highlight.row === -1 || highlight.isCell()) && highlight.col >= 0) {
-        this.hot.selectColumns(highlight.col, highlight.col, -1);
-        const {
-          from
-        } = this.hot.getSelectedRangeLast();
-        const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
-        const target = this.hot.getCell(-1, from.col, true);
-        const rect = target.getBoundingClientRect();
-        this.open({
-          left: rect.left + offset.left,
-          top: rect.top + target.offsetHeight + offset.top
-        }, {
-          left: rect.width
-        });
-      }
-    };
-    context.addShortcuts([{
-      keys: [['Shift', 'Alt', 'ArrowDown'], ['Control/Meta', 'Enter']],
-      callback,
-      runOnlyIf: () => {
-        var _this$hot$getSelected;
-        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader()) && !this.menu.isOpened();
-      },
-      captureCtrl: true,
-      group: SHORTCUTS_GROUP
-    }, {
-      keys: [['Shift', 'Alt', 'ArrowDown']],
-      callback,
-      runOnlyIf: () => {
-        var _this$hot$getSelected2;
-        return ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isCell()) && !this.menu.isOpened();
-      },
-      group: SHORTCUTS_GROUP
-    }]);
-  }
-
-  /**
-   * Unregister shortcuts responsible for toggling dropdown menu.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /**
    * Registers the DOM listeners.
    *
@@ -278,30 +216,23 @@ export class DropdownMenu extends BasePlugin {
   /**
    * Opens menu and re-position it based on the passed coordinates.
    *
-   * @param {{ top: number, left: number }|Event} position An object with `top` and `left` properties
-   * which contains coordinates relative to the browsers viewport (without included scroll offsets).
-   * Or if the native event is passed the menu will be positioned based on the `pageX` and `pageY`
-   * coordinates.
-   * @param {{ above: number, below: number, left: number, right: number }} offset An object allows applying
-   * the offset to the menu position.
+   * @param {object|Event} position An object with `pageX` and `pageY` properties which contains values relative to
+   *                                the top left of the fully rendered content area in the browser or with `clientX`
+   *                                and `clientY`  properties which contains values relative to the upper left edge
+   *                                of the content area (the viewport) of the browser window. This object is structurally
+   *                                compatible with native mouse event so it can be used either.
    * @fires Hooks#beforeDropdownMenuShow
    * @fires Hooks#afterDropdownMenuShow
    */
+
   open(position) {
-    var _this$menu;
-    let offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      above: 0,
-      below: 0,
-      left: 0,
-      right: 0
-    };
-    if ((_this$menu = this.menu) !== null && _this$menu !== void 0 && _this$menu.isOpened()) {
+    if (!this.menu) {
       return;
     }
     this.menu.open();
-    objectEach(offset, (value, key) => {
-      this.menu.setOffset(key, value);
-    });
+    if (position.width) {
+      this.menu.setOffset('left', position.width);
+    }
     this.menu.setPosition(position);
   }
 
@@ -309,8 +240,10 @@ export class DropdownMenu extends BasePlugin {
    * Closes dropdown menu.
    */
   close() {
-    var _this$menu2;
-    (_this$menu2 = this.menu) === null || _this$menu2 === void 0 || _this$menu2.close();
+    if (!this.menu) {
+      return;
+    }
+    this.menu.close();
   }
 
   /**
@@ -375,14 +308,26 @@ export class DropdownMenu extends BasePlugin {
    */
   onTableClick(event) {
     event.stopPropagation();
-    if (hasClass(event.target, BUTTON_CLASS_NAME)) {
-      const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
+    if (hasClass(event.target, BUTTON_CLASS_NAME) && !this.menu.isOpened()) {
+      let offsetTop = 0;
+      let offsetLeft = 0;
+      if (this.hot.rootDocument !== this.menu.container.ownerDocument) {
+        const {
+          frameElement
+        } = this.hot.rootWindow;
+        const {
+          top,
+          left
+        } = frameElement.getBoundingClientRect();
+        offsetTop = top;
+        offsetLeft = left;
+      }
       const rect = event.target.getBoundingClientRect();
       this.open({
-        left: rect.left + offset.left,
-        top: rect.top + event.target.offsetHeight + 3 + offset.top
-      }, {
-        left: rect.width
+        left: rect.left + offsetLeft,
+        top: rect.top + event.target.offsetHeight + 3 + offsetTop,
+        width: rect.width,
+        height: rect.height
       });
     }
   }
@@ -421,10 +366,6 @@ export class DropdownMenu extends BasePlugin {
     const button = this.hot.rootDocument.createElement('button');
     button.className = BUTTON_CLASS_NAME;
     button.type = 'button';
-    button.tabIndex = -1;
-    if (this.hot.getSettings().ariaTags) {
-      setAttribute(button, [A11Y_HIDDEN()]);
-    }
 
     // prevent page reload on button click
     button.onclick = function () {

package/plugins/filters/constants.mjs

@@ -1,7 +1,7 @@
 import "core-js/modules/es.array.push.js";
 import { clone } from "../../helpers/object.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
 import { getConditionDescriptor } from "./conditionRegisterer.mjs";
 import { CONDITION_NAME as CONDITION_NONE } from "./condition/none.mjs";
 import { CONDITION_NAME as CONDITION_EMPTY } from "./condition/empty.mjs";

package/plugins/filters/filters.js

@@ -27,8 +27,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const PLUGIN_KEY = 'filters';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 250;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -65,6 +63,7 @@ const SHORTCUTS_GROUP = PLUGIN_KEY;
  * ```
  * :::
  */
+exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 class Filters extends _base.BasePlugin {
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -211,7 +210,6 @@ class Filters extends _base.BasePlugin {
       this.dropdownMenuPlugin.disablePlugin();
       this.dropdownMenuPlugin.enablePlugin();
     }
-    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -232,36 +230,9 @@ class Filters extends _base.BasePlugin {
       this.conditionCollection = null;
       this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     }
-    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for clearing the filters.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Alt', 'A']],
-      stopPropagation: true,
-      callback: () => {
-        this.clearConditions();
-        this.filter();
-      },
-      group: SHORTCUTS_GROUP
-    });
-  }
-
-  /**
-   * Unregister shortcuts responsible for clearing the filters.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /* eslint-disable jsdoc/require-description-complete-sentence */
   /**
    * @memberof Filters#
@@ -451,6 +422,7 @@ class Filters extends _base.BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
+    this.clearColumnSelection();
   }
 
   /**
@@ -472,6 +444,18 @@ class Filters extends _base.BasePlugin {
     };
   }
 
+  /**
+   * Clears column selection.
+   *
+   * @private
+   */
+  clearColumnSelection() {
+    const selectedColumn = this.getSelectedColumn();
+    if (selectedColumn !== null) {
+      this.hot.selectCell(0, selectedColumn.visualIndex);
+    }
+  }
+
   /**
    * Returns handsontable source data with cell meta based on current selection.
    *
@@ -671,7 +655,6 @@ class Filters extends _base.BasePlugin {
       this.components.forEach(component => component.saveState(physicalIndex));
       this.filtersRowsMap.clear();
       this.filter();
-      this.hot.selectCell(0, selectedColumn.visualIndex);
     }
     (_this$dropdownMenuPlu3 = this.dropdownMenuPlugin) === null || _this$dropdownMenuPlu3 === void 0 || _this$dropdownMenuPlu3.close();
   }

package/plugins/filters/filters.mjs

@@ -6,7 +6,7 @@ import { warn } from "../../helpers/console.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import EventManager from "../../eventManager.mjs";
 import { addClass, removeClass } from "../../helpers/dom/element.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
 import * as constants from "../../i18n/constants.mjs";
 import ConditionComponent from "./component/condition.mjs";
 import OperatorsComponent from "./component/operators.mjs";
@@ -20,7 +20,6 @@ import { CONDITION_NONE, CONDITION_BY_VALUE, OPERATION_AND, OPERATION_OR, OPERAT
 import { TrimmingMap } from "../../translations/index.mjs";
 export const PLUGIN_KEY = 'filters';
 export const PLUGIN_PRIORITY = 250;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /**
  * @plugin Filters
@@ -203,7 +202,6 @@ export class Filters extends BasePlugin {
       this.dropdownMenuPlugin.disablePlugin();
       this.dropdownMenuPlugin.enablePlugin();
     }
-    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -224,36 +222,9 @@ export class Filters extends BasePlugin {
       this.conditionCollection = null;
       this.hot.rowIndexMapper.unregisterMap(this.pluginName);
     }
-    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for clearing the filters.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Alt', 'A']],
-      stopPropagation: true,
-      callback: () => {
-        this.clearConditions();
-        this.filter();
-      },
-      group: SHORTCUTS_GROUP
-    });
-  }
-
-  /**
-   * Unregister shortcuts responsible for clearing the filters.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /* eslint-disable jsdoc/require-description-complete-sentence */
   /**
    * @memberof Filters#
@@ -443,6 +414,7 @@ export class Filters extends BasePlugin {
     this.hot.runHooks('afterFilter', conditions);
     this.hot.view.adjustElementsSize(true);
     this.hot.render();
+    this.clearColumnSelection();
   }
 
   /**
@@ -464,6 +436,18 @@ export class Filters extends BasePlugin {
     };
   }
 
+  /**
+   * Clears column selection.
+   *
+   * @private
+   */
+  clearColumnSelection() {
+    const selectedColumn = this.getSelectedColumn();
+    if (selectedColumn !== null) {
+      this.hot.selectCell(0, selectedColumn.visualIndex);
+    }
+  }
+
   /**
    * Returns handsontable source data with cell meta based on current selection.
    *
@@ -663,7 +647,6 @@ export class Filters extends BasePlugin {
       this.components.forEach(component => component.saveState(physicalIndex));
       this.filtersRowsMap.clear();
       this.filter();
-      this.hot.selectCell(0, selectedColumn.visualIndex);
     }
     (_this$dropdownMenuPlu3 = this.dropdownMenuPlugin) === null || _this$dropdownMenuPlu3 === void 0 || _this$dropdownMenuPlu3.close();
   }

package/plugins/filters/ui/select.js

@@ -1,15 +1,15 @@
 "use strict";
 
 exports.__esModule = true;
-var _menu = require("../../../plugins/contextMenu/menu");
+var _menu = _interopRequireDefault(require("../../../plugins/contextMenu/menu"));
 var _object = require("../../../helpers/object");
 var _array = require("../../../helpers/array");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 var _predefinedItems = require("../../../plugins/contextMenu/predefinedItems");
 var _base = _interopRequireDefault(require("./_base"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const privatePool = new WeakMap();
 
 /**
@@ -78,7 +78,7 @@ class SelectUI extends _base.default {
    */
   build() {
     super.build();
-    this.menu = new _menu.Menu(this.hot, {
+    this.menu = new _menu.default(this.hot, {
       className: 'htSelectUI htFiltersConditionsMenu',
       keepInViewport: false,
       standalone: true,

package/plugins/filters/ui/select.mjs

@@ -1,8 +1,8 @@
-import { Menu } from "../../../plugins/contextMenu/menu/index.mjs";
+import Menu from "../../../plugins/contextMenu/menu.mjs";
 import { clone, extend } from "../../../helpers/object.mjs";
 import { arrayEach } from "../../../helpers/array.mjs";
 import * as C from "../../../i18n/constants.mjs";
-import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems/index.mjs";
+import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems.mjs";
 import BaseUI from "./_base.mjs";
 const privatePool = new WeakMap();
 

package/plugins/hiddenColumns/hiddenColumns.mjs

@@ -13,7 +13,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
 import { isUndefined } from "../../helpers/mixed.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import hideColumnItem from "./contextMenuItem/hideColumn.mjs";
 import showColumnItem from "./contextMenuItem/showColumn.mjs";

package/plugins/hiddenRows/hiddenRows.mjs

@@ -13,7 +13,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
 import { isUndefined } from "../../helpers/mixed.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import hideRowItem from "./contextMenuItem/hideRow.mjs";
 import showRowItem from "./contextMenuItem/showRow.mjs";

package/plugins/manualColumnMove/manualColumnMove.js

@@ -387,9 +387,7 @@ class ManualColumnMove extends _base.BasePlugin {
     const priv = privatePool.get(this);
     const firstVisible = this.hot.view.getFirstFullyVisibleColumn();
     if (this.isFixedColumnsStart(priv.hoveredColumn) && firstVisible > 0) {
-      this.hot.scrollViewportTo({
-        col: this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1)
-      });
+      this.hot.scrollViewportTo(void 0, this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1));
     }
     const wtTable = this.hot.view._wt.wtTable;
     const scrollableElement = this.hot.view._wt.wtOverlays.scrollableElement;

package/plugins/manualColumnMove/manualColumnMove.mjs

@@ -381,9 +381,7 @@ export class ManualColumnMove extends BasePlugin {
     const priv = privatePool.get(this);
     const firstVisible = this.hot.view.getFirstFullyVisibleColumn();
     if (this.isFixedColumnsStart(priv.hoveredColumn) && firstVisible > 0) {
-      this.hot.scrollViewportTo({
-        col: this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1)
-      });
+      this.hot.scrollViewportTo(void 0, this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1));
     }
     const wtTable = this.hot.view._wt.wtTable;
     const scrollableElement = this.hot.view._wt.wtOverlays.scrollableElement;

package/plugins/mergeCells/mergeCells.js

@@ -188,6 +188,9 @@ class MergeCells extends _base.BasePlugin {
     this.addHook('afterDrawSelection', function () {
       return _this.onAfterDrawSelection(...arguments);
     });
+    this.addHook('beforeRemoveCellClassNames', function () {
+      return _this.onBeforeRemoveCellClassNames(...arguments);
+    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -572,11 +575,8 @@ class MergeCells extends _base.BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        const range = this.hot.getSelectedRangeLast();
-        if (range && !range.isSingleHeader()) {
-          this.toggleMerge(range);
-          this.hot.render();
-        }
+        this.toggleMerge(this.hot.getSelectedRangeLast());
+        this.hot.render();
       },
       runOnlyIf: event => !event.altKey,
       // right ALT in some systems triggers ALT+CTRL
@@ -1199,5 +1199,16 @@ class MergeCells extends _base.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.
+   */
+  onBeforeRemoveCellClassNames() {
+    return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+  }
 }
 exports.MergeCells = MergeCells;

package/plugins/mergeCells/mergeCells.mjs

@@ -182,6 +182,9 @@ export class MergeCells extends BasePlugin {
     this.addHook('afterDrawSelection', function () {
       return _this.onAfterDrawSelection(...arguments);
     });
+    this.addHook('beforeRemoveCellClassNames', function () {
+      return _this.onBeforeRemoveCellClassNames(...arguments);
+    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -566,11 +569,8 @@ export class MergeCells extends BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        const range = this.hot.getSelectedRangeLast();
-        if (range && !range.isSingleHeader()) {
-          this.toggleMerge(range);
-          this.hot.render();
-        }
+        this.toggleMerge(this.hot.getSelectedRangeLast());
+        this.hot.render();
       },
       runOnlyIf: event => !event.altKey,
       // right ALT in some systems triggers ALT+CTRL
@@ -1193,4 +1193,15 @@ export class MergeCells extends 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.
+   */
+  onBeforeRemoveCellClassNames() {
+    return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
+  }
 }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -12,8 +12,8 @@ const PLUGIN_KEY = 'multiColumnSorting';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 170;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 
 /**
@@ -113,41 +113,6 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
     super.disablePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for toggling column sorting functionality.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    super.registerShortcuts();
-    this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Shift', 'Enter']],
-      callback: () => {
-        const {
-          highlight
-        } = this.hot.getSelectedRangeLast();
-        if (highlight.row === -1 && highlight.col >= 0) {
-          this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
-        }
-      },
-      runOnlyIf: () => {
-        var _this$hot$getSelected;
-        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
-      },
-      group: SHORTCUTS_GROUP
-    });
-  }
-
-  /**
-   * Unregister shortcuts responsible for toggling column sorting functionality.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    super.unregisterShortcuts();
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /**
    * Sorts the table by chosen columns and orders.
    *
@@ -297,7 +262,7 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
       if (this.hot.getShortcutManager().isCtrlPressed()) {
         this.hot.deselectCell();
         this.hot.selectColumns(coords.col);
-        this.sort(this.getNextSortConfig(coords.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
+        this.sort(this.getNextSortConfig(coords.col, APPEND_COLUMN_CONFIG_STRATEGY));
       } else {
         this.sort(this.getColumnNextConfig(coords.col));
       }