Components: Trigger focus return by tracking focus events #2321
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.
Partially addresses #2306
This pull request seeks to refactor the
withFocusReturnhigher-order component to track an instance property reflecting whether the rendered element currently has focus. This proves to be more reliable when the disposable component is portaled to another location in the DOM (#2306), since the previouselement.containstest will not match said content. Instead, the implementation here leverages event bubbling (and event bubbling of portaled content) to track at all times whether the wrapped component has focus. Then, the focus return condition is simply a matter of: Is the component unmounting while it has focus?Testing instructions:
Verify that focus is returned to initial active element after dismissing a
withFocusReturncomponent: