react-hotkeys-hook 4.0.0-3 → 4.0.0-4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hotkeys-hook",
-  "version": "4.0.0-3",
+  "version": "4.0.0-4",
   "repository": "https://JohannesKlauss@github.com/JohannesKlauss/react-keymap-hook.git",
   "homepage": "https://johannesklauss.github.io/react-hotkeys-hook/",
   "author": "Johannes Klauss",

package/src/parseHotkeys.ts

@@ -14,7 +14,8 @@ export function parseHotkey(hotkey: string, combinationKey: string = '+'): Hotke
   const keys = hotkey
     .toLocaleLowerCase()
     .split(combinationKey)
-    .map((k) => k.trim())
+    .map(k => k.trim())
+    .map(k => k === 'esc' ? 'escape' : k)
 
   const modifiers: KeyboardModifiers = {
     alt: keys.includes('alt'),

package/src/useHotkeys.ts

@@ -47,7 +47,7 @@ export default function useHotkeys<T extends HTMLElement>(
         return
       }
 
-      // TODO: SINCE THE EVENT IS NOW ATTACHED TO THE REF THE ACTIVE ELEMENT CAN NEVER BE INSIDE THE REF. THE HOTKEY ONLY TRIGGERS IF THE
+      // TODO: SINCE THE EVENT IS NOW ATTACHED TO THE REF, THE ACTIVE ELEMENT CAN NEVER BE INSIDE THE REF. THE HOTKEY ONLY TRIGGERS IF THE
       // REF IS THE ACTIVE ELEMENT. THIS IS A PROBLEM SINCE FOCUSED SUB COMPONENTS WONT TRIGGER THE HOTKEY.
 
       if (ref.current !== null && document.activeElement !== ref.current && !ref.current.contains(document.activeElement)) {
@@ -86,7 +86,12 @@ export default function useHotkeys<T extends HTMLElement>(
     }
 
     const handleKeyUp = (event: KeyboardEvent) => {
-      pressedDownKeys.delete(event.key.toLowerCase())
+      if (event.key.toLowerCase() !== 'meta') {
+        pressedDownKeys.delete(event.key.toLowerCase())
+      } else {
+        // On macOS pressing down the meta key prevents triggering the keyup event for any other key https://stackoverflow.com/a/57153300/735226.
+        pressedDownKeys.clear()
+      }
 
       if (memoisedOptions?.keyup) {
         listener(event)