Repository navigation
fix(UnlockModal): keep focus trapped when modal content changes - #664
Merged
ritaifeoluwa merged 1 commit intoOct 20, 2026
Merged
ritaifeoluwa merged 1 commit into
ritaifeoluwa merged 1 commit into
Conversation
Chakra's trapFocus catches focus that moves out of the dialog, but not focus that is lost when the focused element is unmounted (form swapped for the success view) or disabled (controls locking mid-transaction or when the lock period changes). The browser then drops focus to <body> and the next Tab escapes the modal. Add useDynamicFocusTrap, which observes the dialog's DOM and, when focus has been lost this way, moves it to the first tabbable element inside the dialog (or the dialog itself). Focus deliberately elsewhere, such as the nested TransactionConfirmModal, is left alone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
@Enchanterme Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
❌ Deploy Preview for spiffy-melomakarona-eb1e8a failed.
|
❌ Deploy Preview for smart-drop failed.
|
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
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.
Chakra's trapFocus catches focus that moves out of the dialog, but not focus that is lost when the focused element is unmounted (form swapped for the success view) or disabled (controls locking mid-transaction or when the lock period changes). The browser then drops focus to and the next Tab escapes the modal.
Add useDynamicFocusTrap, which observes the dialog's DOM and, when focus has been lost this way, moves it to the first tabbable element inside the dialog (or the dialog itself). Focus deliberately elsewhere, such as the nested TransactionConfirmModal, is left alone.
Closes #645
Closes #646
Closes #648
Closes #649