handsontable 0.0.0-next-08765b9-20230809 → 0.0.0-next-7e1ba35-20230821

package/plugins/contextMenu/contextMenu.d.ts

@@ -60,7 +60,7 @@ export class ContextMenu extends BasePlugin {
 
   constructor(hotInstance: Core);
   isEnabled(): boolean;
-  open(position: { left: number, top: number } | Event, offset?: { above?: number, below?: number, left?: number, right?: number }): void;
+  open(event: Event): void;
   close(): void;
   executeCommand(commandName: string, ...params: any): void;
 }

package/plugins/contextMenu/contextMenu.js

@@ -4,12 +4,10 @@ exports.__esModule = true;
 var _base = require("../base");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _array = require("../../helpers/array");
-var _object = require("../../helpers/object");
 var _commandExecutor = _interopRequireDefault(require("./commandExecutor"));
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _itemsFactory = _interopRequireDefault(require("./itemsFactory"));
 var _menu = _interopRequireDefault(require("./menu"));
-var _utils = require("./utils");
 var _element = require("../../helpers/dom/element");
 var _predefinedItems = require("./predefinedItems");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -17,7 +15,6 @@ const PLUGIN_KEY = 'contextMenu';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 70;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 _pluginHooks.default.getSingleton().register('afterContextMenuDefaultOptions');
 _pluginHooks.default.getSingleton().register('beforeContextMenuShow');
 _pluginHooks.default.getSingleton().register('afterContextMenuShow');
@@ -140,7 +137,6 @@ class ContextMenu extends _base.BasePlugin {
       return _this.executeCommand.call(_this, ...params);
     });
     this.addHook('afterOnCellContextMenu', event => this.onAfterOnCellContextMenu(event));
-    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -153,7 +149,6 @@ class ContextMenu extends _base.BasePlugin {
   updatePlugin() {
     this.disablePlugin();
     this.enablePlugin();
-    this.unregisterShortcuts();
     super.updatePlugin();
   }
 
@@ -169,83 +164,50 @@ class ContextMenu extends _base.BasePlugin {
     super.disablePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for toggling context menu.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Control/Meta', 'Shift', '\\'], ['Shift', 'F10']],
-      callback: () => {
-        const {
-          highlight
-        } = this.hot.getSelectedRangeLast();
-        this.hot.scrollToFocusedCell();
-        const rect = this.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
-        const offset = (0, _utils.getDocumentOffsetByElement)(this.menu.container, this.hot.rootDocument);
-        this.open({
-          left: rect.left + offset.left,
-          top: rect.top + offset.top - 1 + rect.height
-        }, {
-          left: rect.width,
-          above: -rect.height
-        });
-        this.hot._registerTimeout(() => {
-          this.menu.selectFirstCell();
-        });
-      },
-      runOnlyIf: () => this.hot.getSelectedRangeLast() && !this.menu.isOpened(),
-      group: SHORTCUTS_GROUP
-    });
-  }
-
-  /**
-   * Unregister shortcuts responsible for toggling context menu.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /**
    * 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.
-   * @fires Hooks#beforeContextMenuShow
-   * @fires Hooks#afterContextMenuShow
+   * @param {Event} event The mouse event object.
    */
-  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()) {
+  open(event) {
+    if (!this.menu) {
       return;
     }
     this.prepareMenuItems();
     this.menu.open();
-    (0, _object.objectEach)(offset, (value, key) => {
-      this.menu.setOffset(key, value);
+    if (!this.menu.isOpened()) {
+      return;
+    }
+    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 - (0, _element.getWindowScrollTop)(event.view);
+      offsetLeft = left - (0, _element.getWindowScrollLeft)(event.view);
+    } else {
+      offsetTop = -1 * (0, _element.getWindowScrollTop)(this.menu.hotMenu.rootWindow);
+      offsetLeft = -1 * (0, _element.getWindowScrollLeft)(this.menu.hotMenu.rootWindow);
+    }
+    this.menu.setPosition({
+      top: parseInt(event.pageY, 10) + offsetTop,
+      left: parseInt(event.pageX, 10) + offsetLeft
     });
-    this.menu.setPosition(position);
   }
 
   /**
    * Closes the menu.
    */
   close() {
-    var _this$menu2;
-    (_this$menu2 = this.menu) === null || _this$menu2 === void 0 ? void 0 : _this$menu2.close();
+    if (!this.menu) {
+      return;
+    }
+    this.menu.close();
     this.itemsFactory = null;
   }
 
@@ -343,11 +305,7 @@ class ContextMenu extends _base.BasePlugin {
         return;
       }
     }
-    const offset = (0, _utils.getDocumentOffsetByElement)(this.menu.container, this.hot.rootDocument);
-    this.open({
-      top: event.clientY + offset.top,
-      left: event.clientX + offset.left
-    });
+    this.open(event);
   }
 
   /**

package/plugins/contextMenu/contextMenu.mjs

@@ -1,17 +1,14 @@
 import { BasePlugin } from "../base/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
-import { objectEach } from "../../helpers/object.mjs";
 import CommandExecutor from "./commandExecutor.mjs";
 import EventManager from "../../eventManager.mjs";
 import ItemsFactory from "./itemsFactory.mjs";
 import Menu from "./menu.mjs";
-import { getDocumentOffsetByElement } from "./utils.mjs";
-import { hasClass } from "../../helpers/dom/element.mjs";
+import { getWindowScrollLeft, getWindowScrollTop, hasClass } from "../../helpers/dom/element.mjs";
 import { ROW_ABOVE, ROW_BELOW, COLUMN_LEFT, COLUMN_RIGHT, REMOVE_ROW, REMOVE_COLUMN, UNDO, REDO, READ_ONLY, ALIGNMENT, SEPARATOR } from "./predefinedItems.mjs";
 export const PLUGIN_KEY = 'contextMenu';
 export const PLUGIN_PRIORITY = 70;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 Hooks.getSingleton().register('afterContextMenuDefaultOptions');
 Hooks.getSingleton().register('beforeContextMenuShow');
 Hooks.getSingleton().register('afterContextMenuShow');
@@ -134,7 +131,6 @@ export class ContextMenu extends BasePlugin {
       return _this.executeCommand.call(_this, ...params);
     });
     this.addHook('afterOnCellContextMenu', event => this.onAfterOnCellContextMenu(event));
-    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -147,7 +143,6 @@ export class ContextMenu extends BasePlugin {
   updatePlugin() {
     this.disablePlugin();
     this.enablePlugin();
-    this.unregisterShortcuts();
     super.updatePlugin();
   }
 
@@ -163,83 +158,50 @@ export class ContextMenu extends BasePlugin {
     super.disablePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for toggling context menu.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Control/Meta', 'Shift', '\\'], ['Shift', 'F10']],
-      callback: () => {
-        const {
-          highlight
-        } = this.hot.getSelectedRangeLast();
-        this.hot.scrollToFocusedCell();
-        const rect = this.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
-        const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
-        this.open({
-          left: rect.left + offset.left,
-          top: rect.top + offset.top - 1 + rect.height
-        }, {
-          left: rect.width,
-          above: -rect.height
-        });
-        this.hot._registerTimeout(() => {
-          this.menu.selectFirstCell();
-        });
-      },
-      runOnlyIf: () => this.hot.getSelectedRangeLast() && !this.menu.isOpened(),
-      group: SHORTCUTS_GROUP
-    });
-  }
-
-  /**
-   * Unregister shortcuts responsible for toggling context menu.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /**
    * 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.
-   * @fires Hooks#beforeContextMenuShow
-   * @fires Hooks#afterContextMenuShow
+   * @param {Event} event The mouse event object.
    */
-  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()) {
+  open(event) {
+    if (!this.menu) {
       return;
     }
     this.prepareMenuItems();
     this.menu.open();
-    objectEach(offset, (value, key) => {
-      this.menu.setOffset(key, value);
+    if (!this.menu.isOpened()) {
+      return;
+    }
+    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 - getWindowScrollTop(event.view);
+      offsetLeft = left - getWindowScrollLeft(event.view);
+    } else {
+      offsetTop = -1 * getWindowScrollTop(this.menu.hotMenu.rootWindow);
+      offsetLeft = -1 * getWindowScrollLeft(this.menu.hotMenu.rootWindow);
+    }
+    this.menu.setPosition({
+      top: parseInt(event.pageY, 10) + offsetTop,
+      left: parseInt(event.pageX, 10) + offsetLeft
     });
-    this.menu.setPosition(position);
   }
 
   /**
    * Closes the menu.
    */
   close() {
-    var _this$menu2;
-    (_this$menu2 = this.menu) === null || _this$menu2 === void 0 ? void 0 : _this$menu2.close();
+    if (!this.menu) {
+      return;
+    }
+    this.menu.close();
     this.itemsFactory = null;
   }
 
@@ -337,11 +299,7 @@ export class ContextMenu extends BasePlugin {
         return;
       }
     }
-    const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
-    this.open({
-      top: event.clientY + offset.top,
-      left: event.clientX + offset.left
-    });
+    this.open(event);
   }
 
   /**

package/plugins/contextMenu/predefinedItems/alignment.js

@@ -23,13 +23,6 @@ function alignmentItem() {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       return !(this.getSelectedRange() && !this.selection.isSelectedByCorner());
     },
     submenu: {

package/plugins/contextMenu/predefinedItems/alignment.mjs

@@ -16,13 +16,6 @@ export default function alignmentItem() {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       return !(this.getSelectedRange() && !this.selection.isSelectedByCorner());
     },
     submenu: {

package/plugins/contextMenu/predefinedItems/clearColumn.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = clearColumnItem;
+var _utils = require("../utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 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; }
@@ -25,11 +26,8 @@ function clearColumnItem() {
       }
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       return !this.selection.isSelectedByColumnHeader();

package/plugins/contextMenu/predefinedItems/clearColumn.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'clear_column';
 
@@ -18,11 +19,8 @@ export default function clearColumnItem() {
       }
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       return !this.selection.isSelectedByColumnHeader();

package/plugins/contextMenu/predefinedItems/columnLeft.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = columnLeftItem;
+var _utils = require("../utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 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; }
@@ -26,11 +27,8 @@ function columnLeftItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/columnLeft.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'col_left';
 
@@ -19,11 +20,8 @@ export default function columnLeftItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/columnRight.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = columnRightItem;
+var _utils = require("../utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 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; }
@@ -26,11 +27,8 @@ function columnRightItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/columnRight.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'col_right';
 
@@ -19,11 +20,8 @@ export default function columnRightItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/readOnly.js

@@ -37,13 +37,6 @@ function readOnlyItem() {
       this.render();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       if (this.selection.isSelectedByCorner()) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/readOnly.mjs

@@ -30,13 +30,6 @@ export default function readOnlyItem() {
       this.render();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader()) {
-        return true;
-      }
       if (this.selection.isSelectedByCorner()) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/removeColumn.js

@@ -2,7 +2,8 @@
 
 exports.__esModule = true;
 exports.default = removeColumnItem;
-var _utils = require("../../../selection/utils");
+var _utils = require("../utils");
+var _utils2 = require("../../../selection/utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 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; }
@@ -31,17 +32,14 @@ function removeColumnItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_REMOVE_COLUMN, pluralForm);
     },
     callback() {
-      this.alter('remove_col', (0, _utils.transformSelectionToColumnDistance)(this.getSelected()), null, 'ContextMenu.removeColumn');
+      this.alter('remove_col', (0, _utils2.transformSelectionToColumnDistance)(this.getSelected()), null, 'ContextMenu.removeColumn');
     },
     disabled() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       const totalColumns = this.countCols();

package/plugins/contextMenu/predefinedItems/removeColumn.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import { transformSelectionToColumnDistance } from "../../../selection/utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'remove_col';
@@ -30,11 +31,8 @@ export default function removeColumnItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       const totalColumns = this.countCols();

package/plugins/contextMenu/predefinedItems/removeRow.js

@@ -2,7 +2,8 @@
 
 exports.__esModule = true;
 exports.default = removeRowItem;
-var _utils = require("../../../selection/utils");
+var _utils = require("../utils");
+var _utils2 = require("../../../selection/utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 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; }
@@ -33,14 +34,11 @@ function removeRowItem() {
     callback() {
       // TODO: Please keep in mind that below `1` may be improper. The table's way of work, before change `f1747b3912ea3b21fe423fd102ca94c87db81379` was restored.
       // There is still problem when removing more than one row.
-      this.alter('remove_row', (0, _utils.transformSelectionToRowDistance)(this.getSelected()), 1, 'ContextMenu.removeRow');
+      this.alter('remove_row', (0, _utils2.transformSelectionToRowDistance)(this.getSelected()), 1, 'ContextMenu.removeRow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       const totalRows = this.countRows();

package/plugins/contextMenu/predefinedItems/removeRow.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import { transformSelectionToRowDistance } from "../../../selection/utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'remove_row';
@@ -29,11 +30,8 @@ export default function removeRowItem() {
       this.alter('remove_row', transformSelectionToRowDistance(this.getSelected()), 1, 'ContextMenu.removeRow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       const totalRows = this.countRows();

package/plugins/contextMenu/predefinedItems/rowAbove.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = rowAboveItem;
+var _utils = require("../utils");
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 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; }
@@ -22,11 +23,8 @@ function rowAboveItem() {
       this.alter('insert_row_above', latestSelection.row, 1, 'ContextMenu.rowAbove');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      const selected = (0, _utils.getValidSelection)(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/rowAbove.mjs

@@ -1,3 +1,4 @@
+import { getValidSelection } from "../utils.mjs";
 import * as C from "../../../i18n/constants.mjs";
 export const KEY = 'row_above';
 
@@ -15,11 +16,8 @@ export default function rowAboveItem() {
       this.alter('insert_row_above', latestSelection.row, 1, 'ContextMenu.rowAbove');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.row < 0) {
+      const selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {