Fix focus scope with changing children #2791
Merged
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
Keep focus scope up to date with changing children and auto focus children
|
Build successful! 🎉 |
majornista
reviewed
Feb 1, 2022
| {showNew && ( | ||
| <div role="dialog" onKeyDown={onKeyDown}> | ||
| <input /> | ||
| <input autoFocus /> |
There was a problem hiding this comment.
autoFocus on this input means that focus will be maintained within the FocusScope when the children change, however, without the autoFocus prop, focus will be lost to the document.body. #2763 has been opened to account for this and keep focus within the FocusScope when contain is true.
There was a problem hiding this comment.
yep, #2763 is the reason we aren't addressing this issue here
majornista
approved these changes
Feb 1, 2022
ktabors
reviewed
Feb 1, 2022
|
|
||
| rerender(<Test />); | ||
|
|
||
| expect(document.activeElement).toBe(outside); |
There was a problem hiding this comment.
Do we care about proving the focus scope doesn't goto .outside when it isn't focused before we rerender it twice?
|
Build successful! 🎉 |
|
Build successful! 🎉 |
ktabors
approved these changes
Feb 1, 2022
|
Build successful! 🎉 |
5 tasks
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.
Closes #2415
Keep focus scope up to date with changing children and auto focus children.
The two cases observed are:
This was fixed by using scopeRef.current as pointed out in the issue description because the scope was out of date.
This was fixed by changing when nodeToRestore is set so that it runs before autoFocus takes place.
We are preferring this PR over #2416 right now because it's difficult to review due to the refactor. Not that the refactor is bad, but by breaking this up, we can make sure we know what the fix is, and we can refactor it separately such that no changes to behavior occur.
Thank you @kherock for your hard work on this!
✅ Pull Request Checklist:
📝 Test Instructions:
Test steps (case 1):
Case 2 is covered by the unit test
🧢 Your Project:
RSP