[DropdownMenu] Prevent passing keydown event to the focused MenuItem from MenuTrigger #1647
Conversation
This file contains hidden or 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
…Item from Trigger
Comment on lines
129
to
136
| if (['Enter', ' '].includes(event.key)) { | ||
| context.onOpenToggle(); | ||
| // prevent passing keydown event to the focused MenuItem element in Firefox | ||
| if (!context.open) event.preventDefault(); | ||
| } | ||
| if (event.key === 'ArrowDown') context.onOpenChange(true); | ||
| // prevent keypresses from scrolling window | ||
| if ([' ', 'ArrowDown'].includes(event.key)) event.preventDefault(); |
There was a problem hiding this comment.
I think this would be enough no?
I don't think we need the extra if (!context.open)
Suggested change
| if (['Enter', ' '].includes(event.key)) { | |
| context.onOpenToggle(); | |
| // prevent passing keydown event to the focused MenuItem element in Firefox | |
| if (!context.open) event.preventDefault(); | |
| } | |
| if (event.key === 'ArrowDown') context.onOpenChange(true); | |
| // prevent keypresses from scrolling window | |
| if ([' ', 'ArrowDown'].includes(event.key)) event.preventDefault(); | |
| if (['Enter', ' '].includes(event.key)) context.onOpenToggle(); | |
| if (event.key === 'ArrowDown') context.onOpenChange(true); | |
| // prevent keydown from scrolling window / first focused item to execute | |
| // that keydown (inadvertently closing the menu) | |
| if (['Enter', ' ', 'ArrowDown'].includes(event.key)) event.preventDefault(); |
There was a problem hiding this comment.
Yes, looks like you are right, we can get rid of unnecessary check for open menu
andy-hook
approved these changes
Sep 21, 2022
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.
Description
This fix should prevent passing
onKeyDownto the focusedDropdownMenuItemfromDropdownMenuTriggerwhich triggeredonClickevent onaorbuttonelements.Closes #1268
Closes #1397
Closes #1622
Closes #1655