fix(Modal): call close when pressing Esc#1374
Open
kimanhou wants to merge 1 commit into
Open
Conversation
Signed-off-by: Kim Anh Nguyen <4783194+kimanhou@users.noreply.github.com>
kimanhou
force-pushed
the
WD-36511-fix-modal-esc
branch
from
04a5d95 to
9f231dc
Compare
edlerd
reviewed
May 14, 2026
Comment on lines
116
to
+132
| useEffect(() => { | ||
| const keyListenersMap = new Map([ | ||
| ["Escape", handleEscKey], | ||
| ["Tab", handleTabKey], | ||
| ]); | ||
|
|
||
| const keyDown = (event: KeyboardEvent) => { | ||
| const listener = keyListenersMap.get(event.code); | ||
| return listener && listener(event); | ||
| if (event.key === "Escape") { | ||
| handleEscKey(event); | ||
| } | ||
|
|
||
| if (event.key === "Tab") { | ||
| handleTabKey(event as unknown as React.KeyboardEvent<HTMLDivElement>); | ||
| } | ||
| }; | ||
|
|
||
| document.addEventListener("keydown", keyDown); | ||
| document.addEventListener("keydown", keyDown, true); | ||
|
|
||
| return () => { | ||
| document.removeEventListener("keydown", keyDown); | ||
| document.removeEventListener("keydown", keyDown, true); | ||
| }; | ||
| }); | ||
| }, [close]); |
Contributor
There was a problem hiding this comment.
Isn't this logically equivalent to what was there before? Only change I see is the additional true parameter on the addEventListener and removeEventListener calls and the close dependency. If those two are the fix, shall we keep the rest as it was?
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Done
QA
Pinging @canonical/react-library-maintainers for a review.
Storybook
To see rendered examples of all react-components, run:
QA in your project
from
react-componentsrun:Install the resulting tarball in your project with:
QA steps
Percy steps
Fixes
Fixes: # .