compose: Add types to useFocusReturn
#31949
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
sarayourfriend
added
[Type] Code Quality
|
Size Change: +3.04 kB (0%) Total Size: 1.62 MB
ℹ️ View Unchanged
|
tyxla
reviewed
May 19, 2021
| const isFocused = ref.current.contains( | ||
| ref.current.ownerDocument.activeElement | ||
| const isFocused = ref.current?.contains( | ||
| ref.current?.ownerDocument.activeElement ?? null |
Member
There was a problem hiding this comment.
Can we pass null to Node.contains()? In any case this case feels weird.
Contributor
Author
There was a problem hiding this comment.
You can, it accepts Node | null but not undefined.
Member
There was a problem hiding this comment.
👍 Gotcha. Checking if a node contains null sounds like an oxymoron to me, but that's beyond the scale of this PR anyway.
| focusedBeforeMount.current = node.ownerDocument.activeElement; | ||
| focusedBeforeMount.current = | ||
| /** @type {HTMLElement | null} */ ( node.ownerDocument | ||
| .activeElement ) || undefined; |
Member
There was a problem hiding this comment.
Is there a reason to prefer || undefined here than ?? undefined? Also, why prefer undefined than potentially null here?
Contributor
Author
There was a problem hiding this comment.
None, I can change it to ?? just fine.
I used undefined because it matches the original default value on line 34. We could change it to null if we change the default value to null as well. Do you think that would be better?
Contributor
Author
There was a problem hiding this comment.
After speaking to @ciampo I'm going to go ahead and make the change to the default value of null instead of using undefined here. Should clean up the code a bit 🙂
sarayourfriend
force-pushed
the
add/types-compose-focus-return
branch
from
9ac5467 to
487570f
Compare
ciampo
reviewed
May 20, 2021
Contributor
Just added a minor comment but otherwise, I don't have anything else to add PS: looks like the CI checks are not running? |
Co-authored-by: Marco Ciampini <[email protected]>
fullofcaffeine
added a commit
that referenced
this pull request
May 22, 2021
…-take-2 * trunk: (57 commits) Image block: fix cover transform and excessive re-rendering (#32102) compose: Add types to useMergeRefs (#31939) Navigation: Fix collapsing regression. (#32081) components: Promote Elevation (#31614) compose: Add types to useReducedMotion and useMediaQuery (#31941) Update the graphic that appears in the Template Editor welcome guide (#32055) Block Navigation: use CSS for indentation with known max indent instead of spacer divs (#32063) Fix broken template part converter modal styles. (#32097) compose: Add types to `usePrevious` (#31944) components: Add ZStack (#31613) components: Fix Shortcut polymorphism (#31555) compose: Add types to `useFocusReturn` (#31949) compose: Add types to `useDebounce` (#32015) List View: Simplify the BlockNavigation component (#31290) Remove query context leftovers (#32093) Remove filter_var from blocks (#32046) Templates: Remove now-obsolete gutenberg_get_template_paths() (#32066) [RNMobile] Enable reusable block only in WP.com sites (#31744) Rename ViewOwnProps to PolymorphicComponentProps (#32053) Rich text: remove inline display warning (#32013) ...
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.
Description
Adds types to
useFocusReturn.It's a little messy I think and I'm unsure of the return type, whether it should be
HTMLElementor potentially even just generic. I don't think it can beNodethough otherwise you'll get a type error when you actually try to apply therefthat's returned 🤔Part of #18838
How has this been tested?
Type checks pass. Also tested inline with a component that just uses the function and it works fine:
The above produces no errors when typechecked.
Types of changes
New feature
Checklist:
*.native.jsfiles for terms that need renaming or removal).