[TreeView] Simplify focus logic #22098
Merged
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
focusin is not cancelable: https://developer.mozilla.org/en-US/docs/Web/API/Element/focusin_event
It's not a ref but the actual element
eps1lon
added
bug 🐛
joshwooding
reviewed
Aug 7, 2020
| React.useEffect(() => { | ||
| if (nodeRef && treeId) { | ||
| const handleFocusIn = (event) => { | ||
| event.preventDefault(); |
There was a problem hiding this comment.
Nice, I feel like I’ve removed this so many times 😂 But I keep somehow adding it back.
eps1lon
commented
Aug 7, 2020
| function handleFocus(event) { | ||
| // DOM focus stays on the tree which manages focus with aria-activedescendant | ||
| if (event.target === event.currentTarget) { | ||
| ownerDocument(event.target).getElementById(treeId).focus(); |
There was a problem hiding this comment.
Just realized that I no longer guard against falsy treeId. What was the intention behind that @joshwooding ?
There was a problem hiding this comment.
And if (ownerDocument(nodeRef).activeElement !== tree) guarded against tree being null. I'm not so sure anymore if we should crash or issue a console error (which might be missed).
There was a problem hiding this comment.
@eps1lon If the context isn't there it would error but probably not worth guarding against. I think it's fine if it crashed, I didn't intend to guard against a null tree.
joshwooding
approved these changes
Aug 7, 2020
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.
react@experimentalchanged how focus events are handled (they're listening to focusin/focusout now internally) which broke some TreeItem tests. It seems like we can simplify this by relying on React's event system which should be more robust long term.focusinis not cancelablenodeRef->treeitemElementbecause it is not a ref (a ref has a{ current: T | null }shape)Verified that this PR indeed fixes tests on
react@experimentalwith eps1lon/material-ui@test/fix-react-next...eps1lon:test/fix-react-experimental