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

package/plugins/dropdownMenu/dropdownMenu.js

@@ -22,9 +22,7 @@ require("core-js/modules/es.object.set-prototype-of.js");
 require("core-js/modules/es.object.get-prototype-of.js");
 var _base = require("../base");
 var _array = require("../../helpers/array");
-var _object = require("../../helpers/object");
 var _commandExecutor = _interopRequireDefault(require("../contextMenu/commandExecutor"));
-var _utils = require("../contextMenu/utils");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _element = require("../../helpers/dom/element");
 var _itemsFactory = _interopRequireDefault(require("../contextMenu/itemsFactory"));
@@ -56,7 +54,6 @@ exports.PLUGIN_KEY = PLUGIN_KEY;
 var PLUGIN_PRIORITY = 230;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 var BUTTON_CLASS_NAME = 'changeType';
-var SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**
@@ -185,7 +182,6 @@ var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
       if (typeof settings.callback === 'function') {
         this.commandExecutor.setCommonCallback(settings.callback);
       }
-      this.registerShortcuts();
       _get(_getPrototypeOf(DropdownMenu.prototype), "enablePlugin", this).call(this);
       this.callOnPluginsReady(function () {
         _this2.hot.runHooks('afterDropdownMenuDefaultOptions', predefinedItems);
@@ -249,71 +245,9 @@ var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
       if (this.menu) {
         this.menu.destroy();
       }
-      this.unregisterShortcuts();
       _get(_getPrototypeOf(DropdownMenu.prototype), "disablePlugin", this).call(this);
     }
 
-    /**
-     * Register shortcuts responsible for toggling dropdown menu.
-     *
-     * @private
-     */
-  }, {
-    key: "registerShortcuts",
-    value: function registerShortcuts() {
-      var _this3 = this;
-      var context = this.hot.getShortcutManager().getContext('grid');
-      var callback = function callback() {
-        var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
-          highlight = _this3$hot$getSelecte.highlight;
-        if ((highlight.isHeader() && highlight.row === -1 || highlight.isCell()) && highlight.col >= 0) {
-          _this3.hot.selectColumns(highlight.col, highlight.col, -1);
-          var _this3$hot$getSelecte2 = _this3.hot.getSelectedRangeLast(),
-            from = _this3$hot$getSelecte2.from;
-          var offset = (0, _utils.getDocumentOffsetByElement)(_this3.menu.container, _this3.hot.rootDocument);
-          var target = _this3.hot.getCell(-1, from.col, true);
-          var rect = target.getBoundingClientRect();
-          _this3.open({
-            left: rect.left + offset.left,
-            top: rect.top + target.offsetHeight + offset.top
-          }, {
-            left: rect.width
-          });
-          _this3.hot._registerTimeout(function () {
-            _this3.menu.selectFirstCell();
-          });
-        }
-      };
-      context.addShortcuts([{
-        keys: [['Shift', 'Alt', 'ArrowDown'], ['Shift', 'Enter']],
-        callback: callback,
-        runOnlyIf: function runOnlyIf() {
-          var _this3$hot$getSelecte3;
-          return ((_this3$hot$getSelecte3 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte3 === void 0 ? void 0 : _this3$hot$getSelecte3.highlight.isHeader()) && !_this3.menu.isOpened();
-        },
-        group: SHORTCUTS_GROUP
-      }, {
-        keys: [['Shift', 'Alt', 'ArrowDown']],
-        callback: callback,
-        runOnlyIf: function runOnlyIf() {
-          var _this3$hot$getSelecte4;
-          return ((_this3$hot$getSelecte4 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte4 === void 0 ? void 0 : _this3$hot$getSelecte4.highlight.isCell()) && !_this3.menu.isOpened();
-        },
-        group: SHORTCUTS_GROUP
-      }]);
-    }
-
-    /**
-     * Unregister shortcuts responsible for toggling dropdown menu.
-     *
-     * @private
-     */
-  }, {
-    key: "unregisterShortcuts",
-    value: function unregisterShortcuts() {
-      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-    }
-
     /**
      * Registers the DOM listeners.
      *
@@ -322,42 +256,33 @@ var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "registerEvents",
     value: function registerEvents() {
-      var _this4 = this;
+      var _this3 = this;
       this.eventManager.addEventListener(this.hot.rootElement, 'click', function (event) {
-        return _this4.onTableClick(event);
+        return _this3.onTableClick(event);
       });
     }
 
     /**
      * 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
      */
   }, {
     key: "open",
     value: function open(position) {
-      var _this$menu,
-        _this5 = 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()) {
+      if (!this.menu) {
         return;
       }
       this.menu.open();
-      (0, _object.objectEach)(offset, function (value, key) {
-        _this5.menu.setOffset(key, value);
-      });
+      if (position.width) {
+        this.menu.setOffset('left', position.width);
+      }
       this.menu.setPosition(position);
     }
 
@@ -367,8 +292,10 @@ var DropdownMenu = /*#__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();
     }
 
     /**
@@ -440,14 +367,23 @@ var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
     key: "onTableClick",
     value: function onTableClick(event) {
       event.stopPropagation();
-      if ((0, _element.hasClass)(event.target, BUTTON_CLASS_NAME)) {
-        var offset = (0, _utils.getDocumentOffsetByElement)(this.menu.container, this.hot.rootDocument);
+      if ((0, _element.hasClass)(event.target, BUTTON_CLASS_NAME) && !this.menu.isOpened()) {
+        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;
+          offsetLeft = left;
+        }
         var 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
         });
       }
     }

package/plugins/dropdownMenu/dropdownMenu.mjs

@@ -32,9 +32,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 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 EventManager from "../../eventManager.mjs";
 import { hasClass } from "../../helpers/dom/element.mjs";
 import ItemsFactory from "../contextMenu/itemsFactory.mjs";
@@ -49,7 +47,6 @@ Hooks.getSingleton().register('afterDropdownMenuExecute');
 export var PLUGIN_KEY = 'dropdownMenu';
 export var PLUGIN_PRIORITY = 230;
 var BUTTON_CLASS_NAME = 'changeType';
-var SHORTCUTS_GROUP = PLUGIN_KEY;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 /**
@@ -179,7 +176,6 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
       if (typeof settings.callback === 'function') {
         this.commandExecutor.setCommonCallback(settings.callback);
       }
-      this.registerShortcuts();
       _get(_getPrototypeOf(DropdownMenu.prototype), "enablePlugin", this).call(this);
       this.callOnPluginsReady(function () {
         _this2.hot.runHooks('afterDropdownMenuDefaultOptions', predefinedItems);
@@ -243,71 +239,9 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
       if (this.menu) {
         this.menu.destroy();
       }
-      this.unregisterShortcuts();
       _get(_getPrototypeOf(DropdownMenu.prototype), "disablePlugin", this).call(this);
     }
 
-    /**
-     * Register shortcuts responsible for toggling dropdown menu.
-     *
-     * @private
-     */
-  }, {
-    key: "registerShortcuts",
-    value: function registerShortcuts() {
-      var _this3 = this;
-      var context = this.hot.getShortcutManager().getContext('grid');
-      var callback = function callback() {
-        var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
-          highlight = _this3$hot$getSelecte.highlight;
-        if ((highlight.isHeader() && highlight.row === -1 || highlight.isCell()) && highlight.col >= 0) {
-          _this3.hot.selectColumns(highlight.col, highlight.col, -1);
-          var _this3$hot$getSelecte2 = _this3.hot.getSelectedRangeLast(),
-            from = _this3$hot$getSelecte2.from;
-          var offset = getDocumentOffsetByElement(_this3.menu.container, _this3.hot.rootDocument);
-          var target = _this3.hot.getCell(-1, from.col, true);
-          var rect = target.getBoundingClientRect();
-          _this3.open({
-            left: rect.left + offset.left,
-            top: rect.top + target.offsetHeight + offset.top
-          }, {
-            left: rect.width
-          });
-          _this3.hot._registerTimeout(function () {
-            _this3.menu.selectFirstCell();
-          });
-        }
-      };
-      context.addShortcuts([{
-        keys: [['Shift', 'Alt', 'ArrowDown'], ['Shift', 'Enter']],
-        callback: callback,
-        runOnlyIf: function runOnlyIf() {
-          var _this3$hot$getSelecte3;
-          return ((_this3$hot$getSelecte3 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte3 === void 0 ? void 0 : _this3$hot$getSelecte3.highlight.isHeader()) && !_this3.menu.isOpened();
-        },
-        group: SHORTCUTS_GROUP
-      }, {
-        keys: [['Shift', 'Alt', 'ArrowDown']],
-        callback: callback,
-        runOnlyIf: function runOnlyIf() {
-          var _this3$hot$getSelecte4;
-          return ((_this3$hot$getSelecte4 = _this3.hot.getSelectedRangeLast()) === null || _this3$hot$getSelecte4 === void 0 ? void 0 : _this3$hot$getSelecte4.highlight.isCell()) && !_this3.menu.isOpened();
-        },
-        group: SHORTCUTS_GROUP
-      }]);
-    }
-
-    /**
-     * Unregister shortcuts responsible for toggling dropdown menu.
-     *
-     * @private
-     */
-  }, {
-    key: "unregisterShortcuts",
-    value: function unregisterShortcuts() {
-      this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-    }
-
     /**
      * Registers the DOM listeners.
      *
@@ -316,42 +250,33 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
   }, {
     key: "registerEvents",
     value: function registerEvents() {
-      var _this4 = this;
+      var _this3 = this;
       this.eventManager.addEventListener(this.hot.rootElement, 'click', function (event) {
-        return _this4.onTableClick(event);
+        return _this3.onTableClick(event);
       });
     }
 
     /**
      * 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
      */
   }, {
     key: "open",
     value: function open(position) {
-      var _this$menu,
-        _this5 = 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()) {
+      if (!this.menu) {
         return;
       }
       this.menu.open();
-      objectEach(offset, function (value, key) {
-        _this5.menu.setOffset(key, value);
-      });
+      if (position.width) {
+        this.menu.setOffset('left', position.width);
+      }
       this.menu.setPosition(position);
     }
 
@@ -361,8 +286,10 @@ export var DropdownMenu = /*#__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();
     }
 
     /**
@@ -434,14 +361,23 @@ export var DropdownMenu = /*#__PURE__*/function (_BasePlugin) {
     key: "onTableClick",
     value: function onTableClick(event) {
       event.stopPropagation();
-      if (hasClass(event.target, BUTTON_CLASS_NAME)) {
-        var offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
+      if (hasClass(event.target, BUTTON_CLASS_NAME) && !this.menu.isOpened()) {
+        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;
+          offsetLeft = left;
+        }
         var 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
         });
       }
     }

package/shortcuts/recorder.js

@@ -88,7 +88,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     if (event.keyCode === 229 || result === false || (0, _event.isImmediatePropagationStopped)(event)) {
       return;
     }
-    var pressedKey = (0, _utils.normalizeEventKey)(event);
+    var pressedKey = (0, _utils.normalizeEventKey)(event.key);
     var extraModifierKeys = [];
     if (isModifierKey(pressedKey)) {
       modifierKeysObserver.press(pressedKey);
@@ -114,7 +114,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     if (handleEvent(event) === false) {
       return;
     }
-    var pressedKey = (0, _utils.normalizeEventKey)(event);
+    var pressedKey = (0, _utils.normalizeEventKey)(event.key);
     if (isModifierKey(pressedKey) === false) {
       return;
     }

package/shortcuts/recorder.mjs

@@ -84,7 +84,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     if (event.keyCode === 229 || result === false || isImmediatePropagationStopped(event)) {
       return;
     }
-    var pressedKey = normalizeEventKey(event);
+    var pressedKey = normalizeEventKey(event.key);
     var extraModifierKeys = [];
     if (isModifierKey(pressedKey)) {
       modifierKeysObserver.press(pressedKey);
@@ -110,7 +110,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     if (handleEvent(event) === false) {
       return;
     }
-    var pressedKey = normalizeEventKey(event);
+    var pressedKey = normalizeEventKey(event.key);
     if (isModifierKey(pressedKey) === false) {
       return;
     }

package/shortcuts/utils.js

@@ -10,10 +10,6 @@ require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.regexp.constructor.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/es.string.replace.js");
 // This file handles key-name discrepancies between browsers.
 // For the list of discrepancies, go to: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values.
 var mappings = new Map([[' ', 'space'],
@@ -50,25 +46,13 @@ var getKeysList = function getKeysList(normalizedKeys) {
 };
 
 /**
- * The regex tests if the event.code matches to the pattern and it's used to extract letters and digits from
- * the string.
- */
-exports.getKeysList = getKeysList;
-var codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
-
-/**
- * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
- * is triggered with Alt, Control or Shift keys the `key` property contains modified key e.g. for Alt+L
- * it will be `ł`. But that value is only valid for polish keyboard layout. To fix that limitations, for
- * letters and digits the value is taken from the `code` property which holds original value before
- * transformation.
+ * Normalize a `KeyboardEvent.key` property, to use it for keyboard shortcuts.
  *
- * @param {Event} event The KeyboardEvent object.
+ * @param {string} key KeyboardEvent's key property.
  * @returns {string}
  */
-var normalizeEventKey = function normalizeEventKey(_ref) {
-  var key = _ref.key,
-    code = _ref.code;
-  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
+exports.getKeysList = getKeysList;
+var normalizeEventKey = function normalizeEventKey(key) {
+  return key.toLowerCase();
 };
 exports.normalizeEventKey = normalizeEventKey;

package/shortcuts/utils.mjs

@@ -6,10 +6,6 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.join.js";
 import "core-js/modules/es.array.sort.js";
 import "core-js/modules/es.array.map.js";
-import "core-js/modules/es.regexp.constructor.js";
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.regexp.to-string.js";
-import "core-js/modules/es.string.replace.js";
 // This file handles key-name discrepancies between browsers.
 // For the list of discrepancies, go to: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values.
 var mappings = new Map([[' ', 'space'],
@@ -45,23 +41,11 @@ export var getKeysList = function getKeysList(normalizedKeys) {
 };
 
 /**
- * The regex tests if the event.code matches to the pattern and it's used to extract letters and digits from
- * the string.
- */
-var codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
-
-/**
- * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
- * is triggered with Alt, Control or Shift keys the `key` property contains modified key e.g. for Alt+L
- * it will be `ł`. But that value is only valid for polish keyboard layout. To fix that limitations, for
- * letters and digits the value is taken from the `code` property which holds original value before
- * transformation.
+ * Normalize a `KeyboardEvent.key` property, to use it for keyboard shortcuts.
  *
- * @param {Event} event The KeyboardEvent object.
+ * @param {string} key KeyboardEvent's key property.
  * @returns {string}
  */
-export var normalizeEventKey = function normalizeEventKey(_ref) {
-  var key = _ref.key,
-    code = _ref.code;
-  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
+export var normalizeEventKey = function normalizeEventKey(key) {
+  return key.toLowerCase();
 };