feat: refactor snapshots when going back on Fabric #2134
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,83 @@ | ||
| cmake_minimum_required(VERSION 3.9.0) | ||
|
|
||
| project(rnscreens) | ||
| set(CMAKE_CXX_STANDARD 20) | ||
|
|
||
| if(${IS_NEW_ARCHITECTURE_ENABLED}) | ||
| string(APPEND CMAKE_CXX_FLAGS " -DRCT_NEW_ARCH_ENABLED") | ||
| endif() | ||
|
There was a problem hiding this comment. Why are we setting this? Is that because of some unmerged changes earlier for matching RN 0.74? |
||
|
|
||
| if(${IS_NEW_ARCHITECTURE_ENABLED}) | ||
| add_library(rnscreens | ||
| SHARED | ||
| ../cpp/RNScreensTurboModule.cpp | ||
| ../cpp/RNSScreenRemovalListener.cpp | ||
| ./src/main/cpp/jni-adapter.cpp | ||
| ./src/main/cpp/NativeProxy.cpp | ||
| ./src/main/cpp/OnLoad.cpp | ||
| ) | ||
| else() | ||
| add_library(rnscreens | ||
| SHARED | ||
| ../cpp/RNScreensTurboModule.cpp | ||
| ./src/main/cpp/jni-adapter.cpp | ||
| ) | ||
| endif() | ||
|
|
||
| include_directories( | ||
| ../cpp | ||
| ) | ||
|
|
||
|
There was a problem hiding this comment. Why do we replace setting properties on particular target with setting the non-target-scoped variable There was a problem hiding this comment. I'm not sure why I removed it, reverted. |
||
| target_compile_definitions( | ||
| rnscreens | ||
| PRIVATE | ||
| -DFOLLY_NO_CONFIG=1 | ||
| ) | ||
|
|
||
| find_package(ReactAndroid REQUIRED CONFIG) | ||
|
|
||
| if(${IS_NEW_ARCHITECTURE_ENABLED}) | ||
| target_include_directories( | ||
| rnscreens | ||
| PRIVATE | ||
| "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule" | ||
| "${REACT_NATIVE_DIR}/ReactCommon" | ||
| "${REACT_NATIVE_DIR}/ReactCommon/callinvoker" | ||
| "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/graphics/platform/cxx" | ||
| "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor" | ||
| "${REACT_NATIVE_DIR}/ReactCommon/yoga" | ||
| ) | ||
|
|
||
| find_package(fbjni REQUIRED CONFIG) | ||
|
|
||
| target_link_libraries( | ||
| rnscreens | ||
| ReactAndroid::jsi | ||
| ReactAndroid::folly_runtime | ||
| ReactAndroid::react_nativemodule_core | ||
| ReactAndroid::react_render_uimanager | ||
| ReactAndroid::react_render_scheduler | ||
| ReactAndroid::react_utils | ||
| ReactAndroid::reactnativejni | ||
| ReactAndroid::fabricjni | ||
| ReactAndroid::react_debug | ||
| ReactAndroid::react_render_core | ||
| ReactAndroid::react_render_mounting | ||
| ReactAndroid::runtimeexecutor | ||
| ReactAndroid::react_render_graphics | ||
| ReactAndroid::rrc_view | ||
| ReactAndroid::yoga | ||
| ReactAndroid::rrc_text | ||
| ReactAndroid::rrc_textinput | ||
| ReactAndroid::react_render_textlayoutmanager | ||
| ReactAndroid::glog | ||
| ReactAndroid::react_render_componentregistry | ||
| fbjni::fbjni | ||
| android | ||
| ) | ||
WoLewicki marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| else() | ||
| target_link_libraries(rnscreens | ||
| ReactAndroid::jsi | ||
| android | ||
| ) | ||
| endif() | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package com.swmansion.rnscreens | ||
|
|
||
| import com.facebook.jni.HybridData | ||
| import com.facebook.proguard.annotations.DoNotStrip | ||
| import com.facebook.react.bridge.ReactApplicationContext | ||
| import com.facebook.react.fabric.FabricUIManager | ||
| import com.facebook.react.uimanager.UIManagerHelper | ||
| import com.facebook.react.uimanager.common.UIManagerType | ||
| import com.facebook.soloader.SoLoader | ||
|
|
||
| class NativeProxy(private val reactContext: ReactApplicationContext) { | ||
| @DoNotStrip | ||
| @Suppress("unused") | ||
| private val mHybridData: HybridData | ||
|
|
||
| init { | ||
| mHybridData = initHybrid() | ||
| } | ||
|
|
||
| private external fun initHybrid(): HybridData | ||
| external fun nativeAddMutationsListener(fabricUIManager: FabricUIManager) | ||
|
|
||
| @DoNotStrip | ||
| public fun notifyScreenRemoved(screenTag: Int) { | ||
| val uiManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) | ||
| val screen = uiManager?.resolveView(screenTag) | ||
| if (screen is Screen) { | ||
| screen.startRemovalTransition() | ||
| } | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #include <fbjni/fbjni.h> | ||
| #include <react/fabric/Binding.h> | ||
| #include <react/renderer/scheduler/Scheduler.h> | ||
|
|
||
| #include <string> | ||
|
|
||
| #include "NativeProxy.h" | ||
|
|
||
|
|
||
| using namespace facebook; | ||
| using namespace react; | ||
|
|
||
| namespace rnscreens { | ||
|
|
||
| NativeProxy::NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis) | ||
| : javaPart_(jni::make_global(jThis)) {} | ||
|
|
||
| NativeProxy::~NativeProxy() {} | ||
|
|
||
| void NativeProxy::registerNatives() { | ||
| registerHybrid( | ||
| {makeNativeMethod("initHybrid", NativeProxy::initHybrid), | ||
| makeNativeMethod("nativeAddMutationsListener", NativeProxy::nativeAddMutationsListener)}); | ||
| } | ||
|
|
||
| void NativeProxy::nativeAddMutationsListener( | ||
| jni::alias_ref<facebook::react::JFabricUIManager::javaobject> | ||
| fabricUIManager) { | ||
| auto uiManager = fabricUIManager->getBinding()->getScheduler()->getUIManager(); | ||
| screenRemovalListener_ = std::make_shared<RNSScreenRemovalListener>( | ||
| [this](int tag) { | ||
| static const auto method = javaPart_->getClass()->getMethod<void(jint)>("notifyScreenRemoved"); | ||
| method(javaPart_, tag); | ||
| }); | ||
|
|
||
| uiManager->getShadowTreeRegistry().enumerate( | ||
| [this](const facebook::react::ShadowTree &shadowTree, bool &stop) { | ||
| shadowTree.getMountingCoordinator()->setMountingOverrideDelegate( | ||
| screenRemovalListener_); | ||
| }); | ||
| } | ||
|
|
||
| jni::local_ref<NativeProxy::jhybriddata> | ||
| NativeProxy::initHybrid(jni::alias_ref<jhybridobject> jThis) { | ||
| return makeCxxInstance(jThis); | ||
| } | ||
|
|
||
| } |
WoLewicki marked this conversation as resolved.
Show resolved
Hide resolved
|
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| #pragma once | ||
|
|
||
| #include <fbjni/fbjni.h> | ||
| #include <react/fabric/JFabricUIManager.h> | ||
| #include "RNSScreenRemovalListener.h" | ||
|
|
||
| #include <string> | ||
|
|
||
| namespace rnscreens { | ||
| using namespace facebook; | ||
| using namespace facebook::jni; | ||
|
|
||
| class NativeProxy : public jni::HybridClass<NativeProxy> { | ||
| public: | ||
| std::shared_ptr<RNSScreenRemovalListener> screenRemovalListener_; | ||
| static auto constexpr kJavaDescriptor = | ||
| "Lcom/swmansion/rnscreens/NativeProxy;"; | ||
| static jni::local_ref<jhybriddata> | ||
| initHybrid(jni::alias_ref<jhybridobject> jThis); | ||
| static void registerNatives(); | ||
|
|
||
| ~NativeProxy(); | ||
|
|
||
| private: | ||
| friend HybridBase; | ||
| jni::global_ref<NativeProxy::javaobject> javaPart_; | ||
|
|
||
| explicit NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis); | ||
|
|
||
| void | ||
| nativeAddMutationsListener(jni::alias_ref<facebook::react::JFabricUIManager::javaobject> | ||
| fabricUIManager); | ||
| }; | ||
|
|
||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| #include <fbjni/fbjni.h> | ||
|
|
||
| #include "NativeProxy.h" | ||
|
|
||
| JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { | ||
| return facebook::jni::initialize( | ||
| vm, [] { rnscreens::NativeProxy::registerNatives(); }); | ||
| } |
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 |
|---|---|---|
|
|
@@ -232,6 +232,27 @@ class Screen(context: ReactContext?) : FabricEnabledViewGroup(context) { | |
|
|
||
| var nativeBackButtonDismissalEnabled: Boolean = true | ||
|
|
||
| fun startRemovalTransition() { | ||
| startTransitionRecursive(this) | ||
| } | ||
|
|
||
| private fun startTransitionRecursive(parent: ViewGroup?) { | ||
| parent?.let { | ||
| for (i in 0 until it.childCount) { | ||
| val child = it.getChildAt(i) | ||
| child?.let { view -> it.startViewTransition(view) } | ||
| if (child is ScreenStackHeaderConfig) { | ||
| // we want to start transition on children of the toolbar too, | ||
| // which is not a child of ScreenStackHeaderConfig | ||
| startTransitionRecursive(child.toolbar) | ||
| } | ||
| if (child is ViewGroup) { | ||
| startTransitionRecursive(child) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun calculateHeaderHeight(): Pair<Double, Double> { | ||
| val actionBarTv = TypedValue() | ||
| val resolvedActionBarSize = context.theme.resolveAttribute(android.R.attr.actionBarSize, actionBarTv, true) | ||
|
|
||
Oops, something went wrong.
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.
What's going on here, why do we change that?