Fix repeated actions, and modifier check #914
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
animify
commented
Jan 17, 2023
| @@ -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) { | |||
There was a problem hiding this comment.
Fixes #909 - combinations such as meta+k end up in keyCode equalling k rather than the modifier
animify
commented
Jan 17, 2023
| @@ -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 | |||
There was a problem hiding this comment.
Fixes #898 - the check now only runs during keyup, hence now allowing repeating keys to be pressed
|
Thank you so much for your work! I'll have a look through it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@JohannesKlauss did a brief run through the code and tested these changes against my expectations for the implementation in Amie.
Lemme know if there's anything else needed to get these changes in and a new version up!