Merge pull request #914 from animify/main

Fix repeated actions, and modifier check
JohannesKlauss · Jan 28, 2023 · b71cdbf · b71cdbf · vercel · Jan 28, 2023
2 parents 89e355a + 1bc401d
commit b71cdbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/useHotkeys.ts b/src/useHotkeys.ts
@@ -65,7 +65,9 @@ export default function useHotkeys<T extends HTMLElement>(
       parseKeysHookInput(keys, memoisedOptions?.splitKey).forEach((key) => {
         const hotkey = parseHotkey(key, memoisedOptions?.combinationKey)
 
-        if ((isHotkeyMatchingKeyboardEvent(e, hotkey, memoisedOptions?.ignoreModifiers) || hotkey.keys?.includes('*')) && !hasTriggeredRef.current) {
+        if (isHotkeyMatchingKeyboardEvent(e, hotkey, memoisedOptions?.ignoreModifiers) || hotkey.keys?.includes('*')) {
+          if (isKeyUp && hasTriggeredRef.current) return
+
           maybePreventDefault(e, hotkey, memoisedOptions?.preventDefault)
 
           if (!isHotkeyEnabled(e, hotkey, memoisedOptions?.enabled)) {

diff --git a/src/validators.ts b/src/validators.ts
@@ -73,7 +73,7 @@ export const isHotkeyMatchingKeyboardEvent = (e: KeyboardEvent, hotkey: Hotkey,
         return false
       }
     } else {
-      if (metaKey !== meta && ctrlKey !== meta && keyCode !== 'meta' && keyCode !== 'ctrl') {
+      if (metaKey !== meta && ctrlKey !== meta) {
         return false
       }
     }