handsontable 0.0.0-next-acb8c02-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-acb8c02-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-acb8c02-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-acb8c02-20230620",
+  "version": "0.0.0-next-af5139c-20230620",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/contextMenu/utils.js

@@ -5,7 +5,6 @@ exports.align = align;
 exports.checkSelectionConsistency = checkSelectionConsistency;
 exports.filterSeparators = filterSeparators;
 exports.getAlignmentClasses = getAlignmentClasses;
-exports.getDocumentOffsetByElement = getDocumentOffsetByElement;
 exports.getValidSelection = getValidSelection;
 exports.hasSubMenu = hasSubMenu;
 exports.isDisabled = isDisabled;
@@ -276,28 +275,4 @@ function filterSeparators(items) {
   result = popSeparators(result, separator);
   result = removeDuplicatedSeparators(result);
   return result;
-}
-
-/**
- * Returns document offset based on the passed element. If the document objects between element and the
- * base document are not the same the offset as top and left properties will be returned.
- *
- * @param {Element} elementToCheck The element to compare with Document object.
- * @param {Document} baseDocument The base Document object.
- * @returns {{ top: number, left: number }}
- */
-function getDocumentOffsetByElement(elementToCheck, baseDocument) {
-  var offset = {
-    top: 0,
-    left: 0
-  };
-  if (baseDocument !== elementToCheck.ownerDocument) {
-    var frameElement = baseDocument.defaultView.frameElement;
-    var _frameElement$getBoun = frameElement.getBoundingClientRect(),
-      top = _frameElement$getBoun.top,
-      left = _frameElement$getBoun.left;
-    offset.top = top;
-    offset.left = left;
-  }
-  return offset;
 }

package/plugins/contextMenu/utils.mjs

@@ -258,28 +258,4 @@ export function filterSeparators(items) {
   result = popSeparators(result, separator);
   result = removeDuplicatedSeparators(result);
   return result;
-}
-
-/**
- * Returns document offset based on the passed element. If the document objects between element and the
- * base document are not the same the offset as top and left properties will be returned.
- *
- * @param {Element} elementToCheck The element to compare with Document object.
- * @param {Document} baseDocument The base Document object.
- * @returns {{ top: number, left: number }}
- */
-export function getDocumentOffsetByElement(elementToCheck, baseDocument) {
-  var offset = {
-    top: 0,
-    left: 0
-  };
-  if (baseDocument !== elementToCheck.ownerDocument) {
-    var frameElement = baseDocument.defaultView.frameElement;
-    var _frameElement$getBoun = frameElement.getBoundingClientRect(),
-      top = _frameElement$getBoun.top,
-      left = _frameElement$getBoun.left;
-    offset.top = top;
-    offset.left = left;
-  }
-  return offset;
 }

package/plugins/dropdownMenu/dropdownMenu.js

@@ -23,7 +23,6 @@ require("core-js/modules/es.object.get-prototype-of.js");
 var _base = require("../base");
 var _array = require("../../helpers/array");
 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"));
@@ -55,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 */
 /**
@@ -184,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);
@@ -248,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,
-            width: rect.width,
-            height: rect.height
-          });
-          _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.
      *
@@ -321,27 +256,27 @@ 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 {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;
-      if ((_this$menu = this.menu) !== null && _this$menu !== void 0 && _this$menu.isOpened()) {
+      if (!this.menu) {
         return;
       }
       this.menu.open();
@@ -357,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();
     }
 
     /**
@@ -430,12 +367,21 @@ 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.left + offsetLeft,
+          top: rect.top + event.target.offsetHeight + 3 + offsetTop,
           width: rect.width,
           height: rect.height
         });

package/plugins/dropdownMenu/dropdownMenu.mjs

@@ -33,7 +33,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 import { BasePlugin } from "../base/index.mjs";
 import { arrayEach } from "../../helpers/array.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";
@@ -48,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 */
 /**
@@ -178,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);
@@ -242,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,
-            width: rect.width,
-            height: rect.height
-          });
-          _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.
      *
@@ -315,27 +250,27 @@ 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 {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;
-      if ((_this$menu = this.menu) !== null && _this$menu !== void 0 && _this$menu.isOpened()) {
+      if (!this.menu) {
         return;
       }
       this.menu.open();
@@ -351,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();
     }
 
     /**
@@ -424,12 +361,21 @@ 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.left + offsetLeft,
+          top: rect.top + event.target.offsetHeight + 3 + offsetTop,
           width: rect.width,
           height: rect.height
         });