Fix inspector reporting wrong frames when using DrawerLayoutAndroid on the new arch
#44426
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
facebook-github-bot
added
CLA Signed
Base commit: 362abb9 |
tomekzaw
reviewed
May 6, 2024
...act-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
Show resolved
Hide resolved
...act-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
Outdated
Show resolved
Hide resolved
|
|
||
| if (isOpen != stateDrawerOpened || onLeft != stateOnLeft || Math.abs(stateContainerWidth - containerWidth) > delta || Math.abs(stateDrawerWidth - drawerWidth) > delta) { | ||
| WritableNativeMap newState = new WritableNativeMap(); | ||
| newState.putBoolean("drawerOnLeft", onLeft); |
There was a problem hiding this comment.
How about assigning these strings to private final static fields to eliminate risk of typos?
There was a problem hiding this comment.
I'm not sure what's the convention, in other places plain strings are used as well:
|
|
||
| folly::dynamic getDynamic() const; | ||
| MapBuffer getMapBuffer() const { | ||
| return MapBufferBuilder::EMPTY(); |
There was a problem hiding this comment.
Is it really safe to remove an empty map buffer here?
There was a problem hiding this comment.
I think it is, as long as we're not calling stateWrapper.getStateDataMapBuffer(), which we're not doing, instead calling getStateData which returns the dynamic.
There was a problem hiding this comment.
I believe it's done exactly the same way in modal component:
...nents/drawerlayout/android/react/renderer/components/drawerlayout/AndroidDrawerLayoutState.h
Outdated
Show resolved
Hide resolved
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.
Summary:
Due to
getContentOriginOffsetnot being overridden byAndroidDrawerLayoutShadowNode,findNodeAtPointfunction fromUIManagerBindingwas also taking into account the content of the drawer even if it was closed. This was also causing the frames always to be reported as if the drawer was on the left side.This PR adds a custom shadow node and native state, so that
getContentOriginOffsetcan return the correct values depending on the state of the drawer.Fixes #44425
Changelog:
[ANDROID] [FIXED] - Fixed layout inspector reporting wrong frames when using
DrawerLayoutAndroidon the new archTest Plan:
Tested on the reproducer from the issue.