fix(Android): jumping content on fabric #2313
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
alduzy
changed the title
alduzy
changed the title
|
Why do we want to merge this into |
|
Is there a reason you removed the checks for if the calculated values are the same as the ones returned by the system later? It is important source of information for if we do the calculations right. |
alduzy
force-pushed
the
@alduzy/android-fabric-jumping-content-fix
branch
from
a69ae08
to
87097ea
Compare
|
@tboba You're right, we can merge it independently. |
alduzy
force-pushed
the
@alduzy/android-fabric-jumping-content-fix
branch
from
87097ea
to
f9a647c
Compare
This comment was marked as outdated.
This comment was marked as outdated.
tboba
approved these changes
Aug 23, 2024
Comment on lines
18
to
85
| std::optional<std::reference_wrapper<const ShadowNode::Shared>> | ||
| findHeaderConfigChild( | ||
| const YogaLayoutableShadowNode &screenShadowNode) { | ||
| for (const ShadowNode::Shared &child : screenShadowNode.getChildren()) { | ||
| if (std::strcmp( | ||
| child->getComponentName(), "RNSScreenStackHeaderConfig") == 0) { | ||
| return {std::cref(child)}; | ||
| } | ||
| } | ||
| return {}; | ||
| } | ||
|
|
||
| static constexpr const char *kScreenDummyLayoutHelperClass = | ||
| "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper"; | ||
|
|
||
| #ifdef ANDROID | ||
| std::optional<float> findHeaderHeight( | ||
| const int fontSize, | ||
| const bool isTitleEmpty) { | ||
| JNIEnv *env = facebook::jni::Environment::current(); | ||
|
|
||
| if (env == nullptr) { | ||
| LOG(ERROR) << "[RNScreens] Failed to retrieve env\n"; | ||
| return {}; | ||
| } | ||
|
|
||
| jclass layoutHelperClass = env->FindClass(kScreenDummyLayoutHelperClass); | ||
|
|
||
| if (layoutHelperClass == nullptr) { | ||
| LOG(ERROR) << "[RNScreens] Failed to find class with id " | ||
| << kScreenDummyLayoutHelperClass; | ||
| return {}; | ||
| } | ||
|
|
||
| jmethodID computeDummyLayoutID = | ||
| env->GetMethodID(layoutHelperClass, "computeDummyLayout", "(IZ)F"); | ||
|
|
||
| if (computeDummyLayoutID == nullptr) { | ||
| LOG(ERROR) | ||
| << "[RNScreens] Failed to retrieve computeDummyLayout method ID"; | ||
| return {}; | ||
| } | ||
|
|
||
| jmethodID getInstanceMethodID = env->GetStaticMethodID( | ||
| layoutHelperClass, | ||
| "getInstance", | ||
| "()Lcom/swmansion/rnscreens/utils/ScreenDummyLayoutHelper;"); | ||
|
|
||
| if (getInstanceMethodID == nullptr) { | ||
| LOG(ERROR) << "[RNScreens] Failed to retrieve getInstanceMethodID"; | ||
| return {}; | ||
| } | ||
|
|
||
| jobject packageInstance = | ||
| env->CallStaticObjectMethod(layoutHelperClass, getInstanceMethodID); | ||
|
|
||
| if (packageInstance == nullptr) { | ||
| LOG(ERROR) | ||
| << "[RNScreens] Failed to retrieve packageInstance or the package instance was null on JVM side"; | ||
| return {}; | ||
| } | ||
|
|
||
| jfloat headerHeight = env->CallFloatMethod( | ||
| packageInstance, computeDummyLayoutID, fontSize, isTitleEmpty); | ||
|
|
||
| return {headerHeight}; | ||
| } | ||
| #endif // ANDROID |
There was a problem hiding this comment.
Let's move these methods below appendChild
There was a problem hiding this comment.
@tboba I'm afraid those methods have to be declared before they're used in cpp
There was a problem hiding this comment.
@alduzy But didn't we achieve different order, but in RNSScreenComponentDescriptor.h? 😄
It's not a big deal to have them here though, so if it's really not possible, I think we can proceed with what we have right now.
alduzy
force-pushed
the
@alduzy/android-fabric-jumping-content-fix
branch
from
fdb1834
to
aee2a1f
Compare
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
This PR applies modifications to a previous fix: #2169 for fabric only, which has stopped working since RN
0.75.In RN
0.74theadoptinRNSScreenComponentDescriptior.hwas once called withoutstateDatabut with children and we could then check if theScreenStackHeaderConfigis present among them and make adjustments based on it.When working on #2292 it became clear that the fix does not work anymore. Now the
adoptis called either with no children and nostateDataor with both.The solution is to move the code to
appendChildinRNSScreenShadowNode.cppso we can perform the adjustments as soon as the children append.Changes
adoptinRNSScreenComponentDescriptior.hto newly addedappendChildoverride inRNSScreenShadowNode.cppScreenshots / GIFs
Before
Screen.Recording.2024-08-22.at.17.45.41.mov
After
Screen.Recording.2024-08-22.at.17.48.01.mov
Test code and steps to reproduce
TestHeaderto test this changeChecklist