diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index a3ca8d369b3..6d693d76185 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -223,6 +223,8 @@ void Binding::installFabricUIManager( contextContainer->insert("ReactNativeConfig", config); contextContainer->insert("FabricUIManager", javaUIManager_); + reactNativeConfig_ = config; + auto toolbox = SchedulerToolbox{}; toolbox.contextContainer = contextContainer; toolbox.componentRegistryFactory = componentsRegistry->buildRegistryFunction; @@ -240,6 +242,7 @@ void Binding::uninstallFabricUIManager() { scheduler_ = nullptr; javaUIManager_ = nullptr; + reactNativeConfig_ = nullptr; } inline local_ref castReadableMap( diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index c4c65e5f602..1f9f448fa47 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -26,16 +26,6 @@ class Binding : public jni::HybridClass, public SchedulerDelegate { static void registerNatives(); - jni::global_ref javaUIManager_; - std::mutex javaUIManagerMutex_; - - std::shared_ptr scheduler_; - std::mutex schedulerMutex_; - - std::recursive_mutex commitMutex_; - - float pointScaleFactor_ = 1; - private: jni::global_ref getJavaUIManager(); std::shared_ptr getScheduler(); @@ -98,6 +88,19 @@ class Binding : public jni::HybridClass, public SchedulerDelegate { void schedulerDidClearJSResponder(); void uninstallFabricUIManager(); + + // Private member variables + jni::global_ref javaUIManager_; + std::mutex javaUIManagerMutex_; + + std::shared_ptr scheduler_; + std::mutex schedulerMutex_; + + std::recursive_mutex commitMutex_; + + float pointScaleFactor_ = 1; + + std::shared_ptr reactNativeConfig_; }; } // namespace react