Skip to content

Commit 04d2e64

Browse files
committed
fix: correct key combination logic in event handling
- Updated the logic for handling key combinations to ensure proper evaluation of modifier keys, improving the accuracy of event processing.
1 parent ec14886 commit 04d2e64

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

packages/react-grab/src/utils/is-target-key-combination.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ export const isTargetKeyCombination = (
5252
);
5353
}
5454

55-
const keyMatches =
56-
event.key?.toLowerCase() === key.toLowerCase() ||
57-
keyMatchesCode(key, event.code);
58-
const hasModifier = metaKey || ctrlKey || shiftKey || altKey;
59-
const modifiersMatch = hasModifier
60-
? (metaKey ? event.metaKey : true) &&
61-
(ctrlKey ? event.ctrlKey : true) &&
62-
(shiftKey ? event.shiftKey : true) &&
63-
(altKey ? event.altKey : true)
64-
: event.metaKey || event.ctrlKey;
65-
return keyMatches && modifiersMatch;
55+
const keyMatches =
56+
event.key?.toLowerCase() === key.toLowerCase() ||
57+
keyMatchesCode(key, event.code);
58+
const hasModifier = metaKey || ctrlKey || shiftKey || altKey;
59+
const modifiersMatch = hasModifier
60+
? (metaKey ? event.metaKey : true) &&
61+
(ctrlKey ? event.ctrlKey : true) &&
62+
(shiftKey ? event.shiftKey : true) &&
63+
(altKey ? event.altKey : true)
64+
: !event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey;
65+
return keyMatches && modifiersMatch;
6666
}
6767

6868
const hasOnlyMetaOrCtrl =

0 commit comments

Comments
 (0)