From 11138a6d9a43f949b519176ce42b3a41557dd575 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 19 Oct 2023 11:15:54 +0200
Subject: [PATCH] fix(core): create predicate for string key filters

---
 packages/core/src/composables/useKeyPress.ts | 42 ++++++++++++--------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/composables/useKeyPress.ts b/packages/core/src/composables/useKeyPress.ts
index fa682b3c..3062a74d 100644
--- a/packages/core/src/composables/useKeyPress.ts
+++ b/packages/core/src/composables/useKeyPress.ts
@@ -24,32 +24,42 @@ function isKeyMatch(pressedKey: string, keyToMatch: string, pressedKeys: Set<str
   const keyCombination = keyToMatch.split('+').map((k) => k.trim().toLowerCase())
 
   if (keyCombination.length === 1) {
-    return pressedKey === keyToMatch
-  } else {
-    if (isKeyUp) {
-      pressedKeys.delete(pressedKey.toLowerCase())
-    } else {
-      pressedKeys.add(pressedKey.toLowerCase())
-    }
-
-    return keyCombination.every(
-      (key, index) => pressedKeys.has(key) && Array.from(pressedKeys.values())[index] === keyCombination[index],
-    )
+    return pressedKey.toLowerCase() === keyToMatch.toLowerCase()
   }
+
+  if (isKeyUp) {
+    pressedKeys.delete(pressedKey.toLowerCase())
+  } else {
+    pressedKeys.add(pressedKey.toLowerCase())
+  }
+
+  return keyCombination.every(
+    (key, index) => pressedKeys.has(key) && Array.from(pressedKeys.values())[index] === keyCombination[index],
+  )
 }
 
 function createKeyPredicate(keyFilter: string | string[], pressedKeys: Set<string>): KeyPredicate {
   return (event: KeyboardEvent) => {
+    const keyOrCode = useKeyOrCode(event.code, keyFilter)
+
     // if the keyFilter is an array of multiple keys, we need to check each possible key combination
     if (Array.isArray(keyFilter)) {
-      return keyFilter.some((key) => isKeyMatch(event.key, key, pressedKeys, event.type === 'keyup'))
+      return keyFilter.some((key) => isKeyMatch(event[keyOrCode], key, pressedKeys, event.type === 'keyup'))
     }
 
     // if the keyFilter is a string, we need to check if the key matches the string
-    return isKeyMatch(event.key, keyFilter, pressedKeys, event.type === 'keyup')
+    return isKeyMatch(event[keyOrCode], keyFilter, pressedKeys, event.type === 'keyup')
   }
 }
 
+function useKeyOrCode(code: string, keysToWatch: string | string[]) {
+  if (typeof keysToWatch === 'string') {
+    return code === keysToWatch ? 'code' : 'key'
+  }
+
+  return keysToWatch.includes(code) ? 'code' : 'key'
+}
+
 /**
  * Reactive key press state
  *
@@ -65,8 +75,8 @@ export function useKeyPress(keyFilter: MaybeRefOrGetter<KeyFilter | null>, onCha
 
   const pressedKeys = new Set<string>()
 
-  watch(isPressed, () => {
-    onChange?.(isPressed.value)
+  watch(isPressed, (isKeyPressed) => {
+    onChange?.(isKeyPressed)
   })
 
   watch(
@@ -93,7 +103,7 @@ export function useKeyPress(keyFilter: MaybeRefOrGetter<KeyFilter | null>, onCha
         return
       }
 
-      if (Array.isArray(nextKeyFilter) || (isString(nextKeyFilter) && nextKeyFilter.includes('+'))) {
+      if (Array.isArray(nextKeyFilter) || isString(nextKeyFilter)) {
         nextKeyFilter = createKeyPredicate(nextKeyFilter, pressedKeys)
       }