fix(modal): Skip ESC close when event is already handled by child#109556
Merged
fix(modal): Skip ESC close when event is already handled by child#109556
Conversation
When a CompactSelect dropdown is open inside a modal, pressing ESC should only close the dropdown, not the entire modal. React Aria's useOverlay calls preventDefault() on the native ESC event, so check defaultPrevented before closing the modal. Co-Authored-By: Claude <noreply@anthropic.com>
github-actions
bot
added
the
Scope: Frontend
JonasBa
approved these changes
Feb 27, 2026
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
When a
CompactSelectdropdown is open inside a modal, pressing ESC closes the entire modal instead of just closing the dropdown. In drawers, this already works correctly — ESC first closes the dropdown, then on a subsequent press, closes the drawer.The modal uses a raw
document.addEventListener('keydown', ...)that unconditionally closes on any ESC press. React Aria'suseOverlay(used by CompactSelect) handles ESC by callinge.preventDefault()on the native event before it reaches the document-level listener. Adding ane.defaultPreventedcheck to the modal's handler makes it respect events already consumed by child overlays.