fix(useMagicKeys): prevent incorrect clearing of other keys after releasing shift (#4916)

keeplearning66 · web-flow · commit d7f284af152d · 2025-07-28T04:29:58.000Z
diff --git a/packages/core/useMagicKeys/index.test.ts b/packages/core/useMagicKeys/index.test.ts
@@ -63,4 +63,34 @@ describe('useMagicKeys', () => {
     }))
     expect(Ctrl_Shift_Period.value).toBe(true)
   })
+  it('prevent incorrect clearing of other keys after releasing shift', async () => {
+    const { v, u, e, shift } = useMagicKeys({ target })
+
+    target.dispatchEvent(new KeyboardEvent('keydown', {
+      key: 'v',
+    }))
+    target.dispatchEvent(new KeyboardEvent('keydown', {
+      key: 'u',
+    }))
+    target.dispatchEvent(new KeyboardEvent('keydown', {
+      key: 'e',
+    }))
+    target.dispatchEvent(new KeyboardEvent('keydown', {
+      key: 'shift',
+    }))
+
+    expect(v.value).toBe(true)
+    expect(u.value).toBe(true)
+    expect(e.value).toBe(true)
+    expect(shift.value).toBe(true)
+
+    target.dispatchEvent(new KeyboardEvent('keyup', {
+      key: 'shift',
+    }))
+
+    expect(v.value).toBe(true)
+    expect(u.value).toBe(true)
+    expect(e.value).toBe(true)
+    expect(shift.value).toBe(false)
+  })
 })
diff --git a/packages/core/useMagicKeys/index.ts b/packages/core/useMagicKeys/index.ts
@@ -121,9 +121,13 @@ export function useMagicKeys(options: UseMagicKeysOptions<boolean> = {}): any {
       setRefs(key, value)
     }
     if (key === 'shift' && !value) {
-      shiftDeps.forEach((key) => {
-        current.delete(key)
-        setRefs(key, false)
+      const shiftDepsArray = Array.from(shiftDeps)
+      const shiftIndex = shiftDepsArray.indexOf('shift')
+      shiftDepsArray.forEach((key, index) => {
+        if (index >= shiftIndex) {
+          current.delete(key)
+          setRefs(key, false)
+        }
       })
       shiftDeps.clear()
     }
