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

package/plugins/contextMenu/commandExecutor.js

@@ -85,7 +85,6 @@ class CommandExecutor {
  * @param {string[]} subCommands The collection of the commands.
  * @returns {boolean}
  */
-exports.CommandExecutor = CommandExecutor;
 function findSubCommand(subCommandName, subCommands) {
   let command;
   (0, _array.arrayEach)(subCommands, cmd => {
@@ -96,4 +95,6 @@ function findSubCommand(subCommandName, subCommands) {
     }
   });
   return command;
-}
+}
+var _default = CommandExecutor;
+exports.default = _default;

package/plugins/contextMenu/commandExecutor.mjs

@@ -9,7 +9,7 @@ import { hasOwnProperty } from "../../helpers/object.mjs";
  * @private
  * @class CommandExecutor
  */
-export class CommandExecutor {
+class CommandExecutor {
   constructor(hotInstance) {
     this.hot = hotInstance;
     this.commands = {};
@@ -92,4 +92,5 @@ function findSubCommand(subCommandName, subCommands) {
     }
   });
   return command;
-}
+}
+export default CommandExecutor;

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 = require("./commandExecutor");
+var _commandExecutor = _interopRequireDefault(require("./commandExecutor"));
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
-var _itemsFactory = require("./itemsFactory");
-var _menu = require("./menu");
-var _utils = require("./utils");
+var _itemsFactory = _interopRequireDefault(require("./itemsFactory"));
+var _menu = _interopRequireDefault(require("./menu"));
 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');
@@ -86,7 +83,7 @@ class ContextMenu extends _base.BasePlugin {
      * @private
      * @type {CommandExecutor}
      */
-    this.commandExecutor = new _commandExecutor.CommandExecutor(this.hot);
+    this.commandExecutor = new _commandExecutor.default(this.hot);
     /**
      * Instance of {@link ItemsFactory}.
      *
@@ -125,7 +122,7 @@ class ContextMenu extends _base.BasePlugin {
     if (typeof settings.callback === 'function') {
       this.commandExecutor.setCommonCallback(settings.callback);
     }
-    this.menu = new _menu.Menu(this.hot, {
+    this.menu = new _menu.default(this.hot, {
       className: 'htContextMenu',
       keepInViewport: true,
       container: settings.uiContainer || this.hot.rootDocument.body
@@ -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,80 +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
-        });
-      },
-      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 || _this$menu2.close();
+    if (!this.menu) {
+      return;
+    }
+    this.menu.close();
     this.itemsFactory = null;
   }
 
@@ -294,7 +259,7 @@ class ContextMenu extends _base.BasePlugin {
    * @fires Hooks#beforeContextMenuSetItems
    */
   prepareMenuItems() {
-    this.itemsFactory = new _itemsFactory.ItemsFactory(this.hot, ContextMenu.DEFAULT_ITEMS);
+    this.itemsFactory = new _itemsFactory.default(this.hot, ContextMenu.DEFAULT_ITEMS);
     const settings = this.hot.getSettings()[PLUGIN_KEY];
     const predefinedItems = {
       items: this.itemsFactory.getItems(settings)
@@ -340,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 CommandExecutor from "./commandExecutor.mjs";
 import EventManager from "../../eventManager.mjs";
-import { ItemsFactory } from "./itemsFactory.mjs";
-import { Menu } from "./menu/index.mjs";
-import { getDocumentOffsetByElement } from "./utils.mjs";
-import { 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/index.mjs";
+import ItemsFactory from "./itemsFactory.mjs";
+import Menu from "./menu.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,80 +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
-        });
-      },
-      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 || _this$menu2.close();
+    if (!this.menu) {
+      return;
+    }
+    this.menu.close();
     this.itemsFactory = null;
   }
 
@@ -334,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/{menu/cursor.mjs → cursor.js}

@@ -1,13 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+var _element = require("../../helpers/dom/element");
 /**
  * Helper class for checking if element will fit at the desired side of cursor.
  *
  * @private
  * @class Cursor
  */
-export class Cursor {
+class Cursor {
   constructor(object, rootWindow) {
-    const windowScrollTop = rootWindow.scrollY;
-    const windowScrollLeft = rootWindow.scrollX;
+    const windowScrollTop = (0, _element.getWindowScrollTop)(rootWindow);
+    const windowScrollLeft = (0, _element.getWindowScrollLeft)(rootWindow);
     let top;
     let topRelative;
     let left;
@@ -100,4 +104,6 @@ export class Cursor {
   fitsOnLeft(element) {
     return this.leftRelative >= element.offsetWidth;
   }
-}
+}
+var _default = Cursor;
+exports.default = _default;

package/plugins/contextMenu/{menu/cursor.js → cursor.mjs}

@@ -1,6 +1,4 @@
-"use strict";
-
-exports.__esModule = true;
+import { getWindowScrollLeft, getWindowScrollTop } from "../../helpers/dom/element.mjs";
 /**
  * Helper class for checking if element will fit at the desired side of cursor.
  *
@@ -9,8 +7,8 @@ exports.__esModule = true;
  */
 class Cursor {
   constructor(object, rootWindow) {
-    const windowScrollTop = rootWindow.scrollY;
-    const windowScrollLeft = rootWindow.scrollX;
+    const windowScrollTop = getWindowScrollTop(rootWindow);
+    const windowScrollLeft = getWindowScrollLeft(rootWindow);
     let top;
     let topRelative;
     let left;
@@ -104,4 +102,4 @@ class Cursor {
     return this.leftRelative >= element.offsetWidth;
   }
 }
-exports.Cursor = Cursor;
+export default Cursor;

package/plugins/contextMenu/itemsFactory.js

@@ -66,7 +66,6 @@ class ItemsFactory {
  * @param {object} items Additional options.
  * @returns {object[]} Returns parsed and merged menu items collection ready to render.
  */
-exports.ItemsFactory = ItemsFactory;
 function getItems() {
   let itemsPattern = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   let defaultPattern = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -120,4 +119,6 @@ function getItems() {
     });
   }
   return result;
-}
+}
+var _default = ItemsFactory;
+exports.default = _default;

package/plugins/contextMenu/itemsFactory.mjs

@@ -1,14 +1,14 @@
 import "core-js/modules/es.array.push.js";
 import { objectEach, isObject, extend } from "../../helpers/object.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
-import { SEPARATOR, ITEMS, predefinedItems } from "./predefinedItems/index.mjs";
+import { SEPARATOR, ITEMS, predefinedItems } from "./predefinedItems.mjs";
 /**
  * Predefined items class factory for menu items.
  *
  * @private
  * @class ItemsFactory
  */
-export class ItemsFactory {
+class ItemsFactory {
   constructor(hotInstance) {
     let orderPattern = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     this.hot = hotInstance;
@@ -116,4 +116,5 @@ function getItems() {
     });
   }
   return result;
-}
+}
+export default ItemsFactory;