fix: correct focus order for non-autofocusable modals, fixes #340 #350
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
theKashey
commented
Dec 15, 2024
| if ( | ||
| // it was removed | ||
| !document.body.contains(lastActiveFocus) | ||
| // or not focusable (this is expensive operation)! | ||
| || isNotFocusable(lastActiveFocus) | ||
| ) { | ||
| lastActiveFocus = null; |
theKashey
commented
Dec 15, 2024
| @@ -104,15 +104,13 @@ const activateTrap = () => { | |||
| const workingNode = observed || (lastPortaledElement && lastPortaledElement.portaledElement); | |||
|
|
|||
| // check if lastActiveFocus is still reachable | |||
| if (focusOnBody() && lastActiveFocus) { | |||
| if (focusOnBody() && lastActiveFocus && lastActiveFocus !== document.body) { | |||
There was a problem hiding this comment.
focus on the body and the last element is body?
Can happen.
Unfortunately lastActiveFocus is used to hold the state of the Trap, and it is not just "last active element within trap", it's just "last active element recorded".
For autoFocus:false cases it will be body
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.
There is a race conditions non reproducible via unit test where focus event can happen when the old and the new focus points at the body.
The focus restoration logic will try to "reset" itself, but will do it as many times, as many times body can be focused.
autoFocus:falsecases