-
Notifications
You must be signed in to change notification settings - Fork 46.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: use public instance in Fiber renderer and expose it from getInspectorDataForViewAtPoint #31068
Merged
hoxyq
merged 1 commit into
facebook:main
from
hoxyq:react-native/expose-public-instance-from-inspector-data-for-view-at-point
Sep 26, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -763,16 +763,30 @@ const hostResourceToDevToolsInstanceMap: Map< | |
Set<DevToolsInstance>, | ||
> = new Map(); | ||
|
||
// Ideally, this should be injected from Reconciler config | ||
function getPublicInstance(instance: HostInstance): HostInstance { | ||
// Typically the PublicInstance and HostInstance is the same thing but not in Fabric. | ||
// So we need to detect this and use that as the public instance. | ||
return typeof instance === 'object' && | ||
instance !== null && | ||
typeof instance.canonical === 'object' | ||
? (instance.canonical: any) | ||
: typeof instance._nativeTag === 'number' | ||
? instance._nativeTag | ||
: instance; | ||
|
||
// React Native. Modern. Fabric. | ||
if (typeof instance === 'object' && instance !== null) { | ||
if (typeof instance.canonical === 'object' && instance.canonical !== null) { | ||
if ( | ||
typeof instance.canonical.publicInstance === 'object' && | ||
instance.canonical.publicInstance !== null | ||
Comment on lines
+775
to
+776
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can this be a non-object? In Legacy Fabric, for example? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not AFAIK. And |
||
) { | ||
return instance.canonical.publicInstance; | ||
} | ||
} | ||
|
||
// React Native. Legacy. Paper. | ||
if (typeof instance._nativeTag === 'number') { | ||
return instance._nativeTag; | ||
} | ||
} | ||
|
||
// React Web. Usually a DOM element. | ||
return instance; | ||
} | ||
|
||
function aquireHostInstance( | ||
|
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
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
Oops, something went wrong.
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: you can reduce nesting here combining the conditions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I've decided to do nesting instead, because combining will produce a very long line, looks a bit uglier :(