handsontable 0.0.0-next-5c1663f-20230911 → 0.0.0-next-a262af5-20230913

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-5c1663f-20230911";
+  const hotVersion = "0.0.0-next-a262af5-20230913";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-5c1663f-20230911";
+  const hotVersion = "0.0.0-next-a262af5-20230913";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let 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-5c1663f-20230911",
+  "version": "0.0.0-next-a262af5-20230913",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/shortcuts/recorder.js

@@ -10,6 +10,7 @@ var _element = require("../helpers/dom/element");
 var _browser = require("../helpers/browser");
 const MODIFIER_KEYS = ['meta', 'alt', 'shift', 'control'];
 const modifierKeysObserver = (0, _keyObserver.createKeysObserver)();
+let instanceCounter = 0;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
@@ -88,9 +89,7 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
     }
     const pressedKey = (0, _utils.normalizeEventKey)(event.key);
     let extraModifierKeys = [];
-    if (isModifierKey(pressedKey)) {
-      modifierKeysObserver.press(pressedKey);
-    } else {
+    if (!isModifierKey(pressedKey)) {
       extraModifierKeys = getPressedModifierKeys(event);
     }
     const pressedKeys = [pressedKey].concat(extraModifierKeys);
@@ -103,20 +102,29 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
   };
 
   /**
-   * `KeyboardEvent`'s callback function
+   * `KeyboardEvent`'s callback function for observing the pressed state of the mod keys.
    *
    * @private
    * @param {KeyboardEvent} event The event object
    */
-  const onkeyup = event => {
-    if (handleEvent(event) === false) {
-      return;
+  const onkeydownForModKeys = event => {
+    const pressedKey = (0, _utils.normalizeEventKey)(event.key);
+    if (isModifierKey(pressedKey)) {
+      modifierKeysObserver.press(pressedKey);
     }
+  };
+
+  /**
+   * `KeyboardEvent`'s callback function for observing the pressed state of the mod keys.
+   *
+   * @private
+   * @param {KeyboardEvent} event The event object
+   */
+  const onkeyupForModKeys = event => {
     const pressedKey = (0, _utils.normalizeEventKey)(event.key);
-    if (isModifierKey(pressedKey) === false) {
-      return;
+    if (isModifierKey(pressedKey)) {
+      modifierKeysObserver.release(pressedKey);
     }
-    modifierKeysObserver.release(pressedKey);
   };
 
   /**
@@ -133,9 +141,13 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
    */
   const mount = () => {
     let eventTarget = ownerWindow;
+    instanceCounter += 1;
     while (eventTarget) {
+      if (instanceCounter === 1) {
+        eventTarget.document.documentElement.addEventListener('keydown', onkeydownForModKeys);
+        eventTarget.document.documentElement.addEventListener('keyup', onkeyupForModKeys);
+      }
       eventTarget.document.documentElement.addEventListener('keydown', onkeydown);
-      eventTarget.document.documentElement.addEventListener('keyup', onkeyup);
       eventTarget.document.documentElement.addEventListener('blur', onblur);
       eventTarget = (0, _element.getParentWindow)(eventTarget);
     }
@@ -146,9 +158,13 @@ function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDown, call
    */
   const unmount = () => {
     let eventTarget = ownerWindow;
+    instanceCounter -= 1;
     while (eventTarget) {
+      if (instanceCounter === 0) {
+        eventTarget.document.documentElement.removeEventListener('keydown', onkeydownForModKeys);
+        eventTarget.document.documentElement.removeEventListener('keyup', onkeyupForModKeys);
+      }
       eventTarget.document.documentElement.removeEventListener('keydown', onkeydown);
-      eventTarget.document.documentElement.removeEventListener('keyup', onkeyup);
       eventTarget.document.documentElement.removeEventListener('blur', onblur);
       eventTarget = (0, _element.getParentWindow)(eventTarget);
     }

package/shortcuts/recorder.mjs

@@ -6,6 +6,7 @@ import { getParentWindow } from "../helpers/dom/element.mjs";
 import { isMacOS } from "../helpers/browser.mjs";
 const MODIFIER_KEYS = ['meta', 'alt', 'shift', 'control'];
 const modifierKeysObserver = createKeysObserver();
+let instanceCounter = 0;
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
@@ -84,9 +85,7 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
     }
     const pressedKey = normalizeEventKey(event.key);
     let extraModifierKeys = [];
-    if (isModifierKey(pressedKey)) {
-      modifierKeysObserver.press(pressedKey);
-    } else {
+    if (!isModifierKey(pressedKey)) {
       extraModifierKeys = getPressedModifierKeys(event);
     }
     const pressedKeys = [pressedKey].concat(extraModifierKeys);
@@ -99,20 +98,29 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
   };
 
   /**
-   * `KeyboardEvent`'s callback function
+   * `KeyboardEvent`'s callback function for observing the pressed state of the mod keys.
    *
    * @private
    * @param {KeyboardEvent} event The event object
    */
-  const onkeyup = event => {
-    if (handleEvent(event) === false) {
-      return;
+  const onkeydownForModKeys = event => {
+    const pressedKey = normalizeEventKey(event.key);
+    if (isModifierKey(pressedKey)) {
+      modifierKeysObserver.press(pressedKey);
     }
+  };
+
+  /**
+   * `KeyboardEvent`'s callback function for observing the pressed state of the mod keys.
+   *
+   * @private
+   * @param {KeyboardEvent} event The event object
+   */
+  const onkeyupForModKeys = event => {
     const pressedKey = normalizeEventKey(event.key);
-    if (isModifierKey(pressedKey) === false) {
-      return;
+    if (isModifierKey(pressedKey)) {
+      modifierKeysObserver.release(pressedKey);
     }
-    modifierKeysObserver.release(pressedKey);
   };
 
   /**
@@ -129,9 +137,13 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
    */
   const mount = () => {
     let eventTarget = ownerWindow;
+    instanceCounter += 1;
     while (eventTarget) {
+      if (instanceCounter === 1) {
+        eventTarget.document.documentElement.addEventListener('keydown', onkeydownForModKeys);
+        eventTarget.document.documentElement.addEventListener('keyup', onkeyupForModKeys);
+      }
       eventTarget.document.documentElement.addEventListener('keydown', onkeydown);
-      eventTarget.document.documentElement.addEventListener('keyup', onkeyup);
       eventTarget.document.documentElement.addEventListener('blur', onblur);
       eventTarget = getParentWindow(eventTarget);
     }
@@ -142,9 +154,13 @@ export function useRecorder(ownerWindow, handleEvent, beforeKeyDown, afterKeyDow
    */
   const unmount = () => {
     let eventTarget = ownerWindow;
+    instanceCounter -= 1;
     while (eventTarget) {
+      if (instanceCounter === 0) {
+        eventTarget.document.documentElement.removeEventListener('keydown', onkeydownForModKeys);
+        eventTarget.document.documentElement.removeEventListener('keyup', onkeyupForModKeys);
+      }
       eventTarget.document.documentElement.removeEventListener('keydown', onkeydown);
-      eventTarget.document.documentElement.removeEventListener('keyup', onkeyup);
       eventTarget.document.documentElement.removeEventListener('blur', onblur);
       eventTarget = getParentWindow(eventTarget);
     }