handsontable 0.0.0-next-6d7bdba-20230620 → 0.0.0-next-af5139c-20230620

package/helpers/mixed.js

@@ -152,7 +152,7 @@ var domMessages = {
 function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-6d7bdba-20230620";
+  var hotVersion = "0.0.0-next-af5139c-20230620";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -142,7 +142,7 @@ var domMessages = {
 export function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-6d7bdba-20230620";
+  var hotVersion = "0.0.0-next-af5139c-20230620";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-6d7bdba-20230620",
+  "version": "0.0.0-next-af5139c-20230620",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/comments/comments.js

@@ -835,14 +835,7 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
     key: "addToContextMenu",
     value: function addToContextMenu(defaultOptions) {
       var _this6 = this;
-      var isThereAnySelectedCellToProcess = function isThereAnySelectedCellToProcess() {
-        var range = _this6.hot.getSelectedRangeLast();
-        if (!range) {
-          return false;
-        }
-        if (range.isSingleHeader() || range.highlight.isHeader()) {
-          return false;
-        }
+      var isThereAnyCellRendered = function isThereAnyCellRendered() {
         return _this6.hot.rowIndexMapper.getRenderableIndexesLength() > 0 && _this6.hot.columnIndexMapper.getRenderableIndexesLength() > 0;
       };
       defaultOptions.items.push({
@@ -859,7 +852,7 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
           return _this6.onContextMenuAddComment();
         },
         disabled: function disabled() {
-          if (!isThereAnySelectedCellToProcess()) {
+          if (!isThereAnyCellRendered()) {
             return true;
           }
           return !(_this6.hot.getSelectedLast() && !_this6.hot.selection.isSelectedByCorner());
@@ -873,7 +866,7 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
           return _this6.onContextMenuRemoveComment();
         },
         disabled: function disabled() {
-          if (!isThereAnySelectedCellToProcess()) {
+          if (!isThereAnyCellRendered()) {
             return true;
           }
           return !(_this6.hot.getSelectedLast() && !_this6.hot.selection.isSelectedByCorner());
@@ -901,7 +894,7 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
           return _this6.onContextMenuMakeReadOnly();
         },
         disabled: function disabled() {
-          if (!isThereAnySelectedCellToProcess()) {
+          if (!isThereAnyCellRendered()) {
             return true;
           }
           return !(_this6.hot.getSelectedLast() && !_this6.hot.selection.isSelectedByCorner()) || !_this6.checkSelectionCommentsConsistency();

package/plugins/comments/comments.mjs

@@ -826,14 +826,7 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
     key: "addToContextMenu",
     value: function addToContextMenu(defaultOptions) {
       var _this6 = this;
-      var isThereAnySelectedCellToProcess = function isThereAnySelectedCellToProcess() {
-        var range = _this6.hot.getSelectedRangeLast();
-        if (!range) {
-          return false;
-        }
-        if (range.isSingleHeader() || range.highlight.isHeader()) {
-          return false;
-        }
+      var isThereAnyCellRendered = function isThereAnyCellRendered() {
         return _this6.hot.rowIndexMapper.getRenderableIndexesLength() > 0 && _this6.hot.columnIndexMapper.getRenderableIndexesLength() > 0;
       };
       defaultOptions.items.push({
@@ -850,7 +843,7 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
           return _this6.onContextMenuAddComment();
         },
         disabled: function disabled() {
-          if (!isThereAnySelectedCellToProcess()) {
+          if (!isThereAnyCellRendered()) {
             return true;
           }
           return !(_this6.hot.getSelectedLast() && !_this6.hot.selection.isSelectedByCorner());
@@ -864,7 +857,7 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
           return _this6.onContextMenuRemoveComment();
         },
         disabled: function disabled() {
-          if (!isThereAnySelectedCellToProcess()) {
+          if (!isThereAnyCellRendered()) {
             return true;
           }
           return !(_this6.hot.getSelectedLast() && !_this6.hot.selection.isSelectedByCorner());
@@ -892,7 +885,7 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
           return _this6.onContextMenuMakeReadOnly();
         },
         disabled: function disabled() {
-          if (!isThereAnySelectedCellToProcess()) {
+          if (!isThereAnyCellRendered()) {
             return true;
           }
           return !(_this6.hot.getSelectedLast() && !_this6.hot.selection.isSelectedByCorner()) || !_this6.checkSelectionCommentsConsistency();

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

@@ -22,12 +22,10 @@ require("core-js/modules/es.object.get-prototype-of.js");
 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 }; }
@@ -49,7 +47,6 @@ var PLUGIN_KEY = 'contextMenu';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 var PLUGIN_PRIORITY = 70;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-var SHORTCUTS_GROUP = PLUGIN_KEY;
 _pluginHooks.default.getSingleton().register('afterContextMenuDefaultOptions');
 _pluginHooks.default.getSingleton().register('beforeContextMenuShow');
 _pluginHooks.default.getSingleton().register('afterContextMenuShow');
@@ -171,7 +168,6 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterOnCellContextMenu', function (event) {
         return _this2.onAfterOnCellContextMenu(event);
       });
-      this.registerShortcuts();
       _get(_getPrototypeOf(ContextMenu.prototype), "enablePlugin", this).call(this);
     }
 
@@ -186,7 +182,6 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
     value: function updatePlugin() {
       this.disablePlugin();
       this.enablePlugin();
-      this.unregisterShortcuts();
       _get(_getPrototypeOf(ContextMenu.prototype), "updatePlugin", this).call(this);
     }
 
@@ -204,83 +199,39 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
       _get(_getPrototypeOf(ContextMenu.prototype), "disablePlugin", this).call(this);
     }
 
-    /**
-     * Register shortcuts responsible for toggling context menu.
-     *
-     * @private
-     */
-  }, {
-    key: "registerShortcuts",
-    value: function registerShortcuts() {
-      var _this3 = this;
-      this.hot.getShortcutManager().getContext('grid').addShortcut({
-        keys: [['Control/Meta', 'Shift', '\\'], ['Shift', 'F10']],
-        callback: function callback() {
-          var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
-            highlight = _this3$hot$getSelecte.highlight;
-          var rect = _this3.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
-          var offset = (0, _utils.getDocumentOffsetByElement)(_this3.menu.container, _this3.hot.rootDocument);
-          _this3.open({
-            left: rect.left + offset.left,
-            top: rect.top + offset.top - 1 + rect.height
-          }, {
-            left: rect.width,
-            above: -rect.height
-          });
-          _this3.hot._registerTimeout(function () {
-            _this3.menu.selectFirstCell();
-          });
-        },
-        runOnlyIf: function runOnlyIf() {
-          return _this3.hot.getSelectedRangeLast() && !_this3.menu.isOpened();
-        },
-        group: SHORTCUTS_GROUP
-      });
-    }
-
-    /**
-     * Unregister shortcuts responsible for toggling context menu.
-     *
-     * @private
-     */
-  }, {
-    key: "unregisterShortcuts",
-    value: function 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.
      */
   }, {
     key: "open",
-    value: function open(position) {
-      var _this$menu,
-        _this4 = this;
-      var 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()) {
+    value: function open(event) {
+      if (!this.menu) {
         return;
       }
       this.prepareMenuItems();
       this.menu.open();
-      (0, _object.objectEach)(offset, function (value, key) {
-        _this4.menu.setOffset(key, value);
+      if (!this.menu.isOpened()) {
+        return;
+      }
+      var offsetTop = 0;
+      var offsetLeft = 0;
+      if (this.hot.rootDocument !== this.menu.container.ownerDocument) {
+        var frameElement = this.hot.rootWindow.frameElement;
+        var _frameElement$getBoun = frameElement.getBoundingClientRect(),
+          top = _frameElement$getBoun.top,
+          left = _frameElement$getBoun.left;
+        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);
     }
 
     /**
@@ -289,8 +240,10 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "close",
     value: function 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;
     }
 
@@ -347,7 +300,7 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "prepareMenuItems",
     value: function prepareMenuItems() {
-      var _this5 = this;
+      var _this3 = this;
       this.itemsFactory = new _itemsFactory.default(this.hot, ContextMenu.DEFAULT_ITEMS);
       var settings = this.hot.getSettings()[PLUGIN_KEY];
       var predefinedItems = {
@@ -361,7 +314,7 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
 
       // Register all commands. Predefined and added by user or by plugins
       (0, _array.arrayEach)(menuItems, function (command) {
-        return _this5.commandExecutor.registerCommand(command.key, command);
+        return _this3.commandExecutor.registerCommand(command.key, command);
       });
     }
 
@@ -398,11 +351,7 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
           return;
         }
       }
-      var 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

@@ -32,17 +32,14 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 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 var PLUGIN_KEY = 'contextMenu';
 export var PLUGIN_PRIORITY = 70;
-var SHORTCUTS_GROUP = PLUGIN_KEY;
 Hooks.getSingleton().register('afterContextMenuDefaultOptions');
 Hooks.getSingleton().register('beforeContextMenuShow');
 Hooks.getSingleton().register('afterContextMenuShow');
@@ -164,7 +161,6 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterOnCellContextMenu', function (event) {
         return _this2.onAfterOnCellContextMenu(event);
       });
-      this.registerShortcuts();
       _get(_getPrototypeOf(ContextMenu.prototype), "enablePlugin", this).call(this);
     }
 
@@ -179,7 +175,6 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
     value: function updatePlugin() {
       this.disablePlugin();
       this.enablePlugin();
-      this.unregisterShortcuts();
       _get(_getPrototypeOf(ContextMenu.prototype), "updatePlugin", this).call(this);
     }
 
@@ -197,83 +192,39 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
       _get(_getPrototypeOf(ContextMenu.prototype), "disablePlugin", this).call(this);
     }
 
-    /**
-     * Register shortcuts responsible for toggling context menu.
-     *
-     * @private
-     */
-  }, {
-    key: "registerShortcuts",
-    value: function registerShortcuts() {
-      var _this3 = this;
-      this.hot.getShortcutManager().getContext('grid').addShortcut({
-        keys: [['Control/Meta', 'Shift', '\\'], ['Shift', 'F10']],
-        callback: function callback() {
-          var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
-            highlight = _this3$hot$getSelecte.highlight;
-          var rect = _this3.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
-          var offset = getDocumentOffsetByElement(_this3.menu.container, _this3.hot.rootDocument);
-          _this3.open({
-            left: rect.left + offset.left,
-            top: rect.top + offset.top - 1 + rect.height
-          }, {
-            left: rect.width,
-            above: -rect.height
-          });
-          _this3.hot._registerTimeout(function () {
-            _this3.menu.selectFirstCell();
-          });
-        },
-        runOnlyIf: function runOnlyIf() {
-          return _this3.hot.getSelectedRangeLast() && !_this3.menu.isOpened();
-        },
-        group: SHORTCUTS_GROUP
-      });
-    }
-
-    /**
-     * Unregister shortcuts responsible for toggling context menu.
-     *
-     * @private
-     */
-  }, {
-    key: "unregisterShortcuts",
-    value: function 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.
      */
   }, {
     key: "open",
-    value: function open(position) {
-      var _this$menu,
-        _this4 = this;
-      var 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()) {
+    value: function open(event) {
+      if (!this.menu) {
         return;
       }
       this.prepareMenuItems();
       this.menu.open();
-      objectEach(offset, function (value, key) {
-        _this4.menu.setOffset(key, value);
+      if (!this.menu.isOpened()) {
+        return;
+      }
+      var offsetTop = 0;
+      var offsetLeft = 0;
+      if (this.hot.rootDocument !== this.menu.container.ownerDocument) {
+        var frameElement = this.hot.rootWindow.frameElement;
+        var _frameElement$getBoun = frameElement.getBoundingClientRect(),
+          top = _frameElement$getBoun.top,
+          left = _frameElement$getBoun.left;
+        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);
     }
 
     /**
@@ -282,8 +233,10 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "close",
     value: function 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;
     }
 
@@ -340,7 +293,7 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "prepareMenuItems",
     value: function prepareMenuItems() {
-      var _this5 = this;
+      var _this3 = this;
       this.itemsFactory = new ItemsFactory(this.hot, ContextMenu.DEFAULT_ITEMS);
       var settings = this.hot.getSettings()[PLUGIN_KEY];
       var predefinedItems = {
@@ -354,7 +307,7 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
 
       // Register all commands. Predefined and added by user or by plugins
       arrayEach(menuItems, function (command) {
-        return _this5.commandExecutor.registerCommand(command.key, command);
+        return _this3.commandExecutor.registerCommand(command.key, command);
       });
     }
 
@@ -391,11 +344,7 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
           return;
         }
       }
-      var 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

@@ -35,13 +35,6 @@ function alignmentItem() {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      var 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

@@ -17,13 +17,6 @@ export default function alignmentItem() {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      var 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

@@ -13,6 +13,7 @@ require("core-js/modules/es.symbol.iterator.js");
 exports.__esModule = true;
 exports.KEY = void 0;
 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 _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; }
@@ -36,11 +37,8 @@ function clearColumnItem() {
       }
     },
     disabled: function disabled() {
-      var range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      var 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 var KEY = 'clear_column';
 
@@ -18,11 +19,8 @@ export default function clearColumnItem() {
       }
     },
     disabled: function disabled() {
-      var range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      var selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       return !this.selection.isSelectedByColumnHeader();

package/plugins/contextMenu/predefinedItems/columnLeft.js

@@ -13,6 +13,7 @@ require("core-js/modules/es.symbol.iterator.js");
 exports.__esModule = true;
 exports.KEY = void 0;
 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 _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; }
@@ -37,11 +38,8 @@ function columnLeftItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      var range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      var 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 var KEY = 'col_left';
 
@@ -19,11 +20,8 @@ export default function columnLeftItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      var range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      var selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/columnRight.js

@@ -13,6 +13,7 @@ require("core-js/modules/es.symbol.iterator.js");
 exports.__esModule = true;
 exports.KEY = void 0;
 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 _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; }
@@ -37,11 +38,8 @@ function columnRightItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      var range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      var 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 var KEY = 'col_right';
 
@@ -19,11 +20,8 @@ export default function columnRightItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      var range = this.getSelectedRangeLast();
-      if (!range) {
-        return true;
-      }
-      if (range.isSingleHeader() && range.highlight.col < 0) {
+      var selected = getValidSelection(this);
+      if (!selected) {
         return true;
       }
       if (this.selection.isSelectedByCorner()) {

package/plugins/contextMenu/predefinedItems/readOnly.js

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