react-native-screens 4.19.0-nightly-20251211-12e4eacaa → 4.19.0-nightly-20251212-c9b84ff7a

package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNodeCommitHook.cpp

@@ -7,17 +7,19 @@ namespace facebook {
 namespace react {
 
 RNSScreenShadowNodeCommitHook::RNSScreenShadowNodeCommitHook(
-    std::shared_ptr<const ContextContainer> contextContainer)
-    : contextContainer_(contextContainer) {
-  getUIManagerFromSharedContext(contextContainer)->registerCommitHook(*this);
+    const std::shared_ptr<const ContextContainer> &contextContainer) {
+  if (auto uiManager = getUIManagerFromSharedContext(contextContainer)) {
+    uiManager->registerCommitHook(*this);
+  }
 }
 
 RNSScreenShadowNodeCommitHook::~RNSScreenShadowNodeCommitHook() noexcept {
-  const auto contextContainer = contextContainer_.lock();
-  if (contextContainer) {
-    getUIManagerFromSharedContext(contextContainer)
-        ->unregisterCommitHook(*this);
-  }
+  // We intentionally don't unregister the commit hook here.
+  // During hot reload, the FabricUIManagerBinding may already be destroyed
+  // when this destructor is called, causing a JNI crash when trying to
+  // access the binding. The UIManager will clean up hooks when it's destroyed
+  // In case the lifecycle of the commit hook should be shorter than
+  // that of the UIManager consider unregistering the hook manually.
 }
 
 RootShadowNode::Unshared RNSScreenShadowNodeCommitHook::shadowTreeWillCommit(
@@ -30,8 +32,8 @@ RootShadowNode::Unshared RNSScreenShadowNodeCommitHook::shadowTreeWillCommit(
   auto newRootProps =
       std::static_pointer_cast<const RootProps>(newRootShadowNode->getProps());
 
-  const bool wasHorizontal = isHorizontal_(*oldRootProps.get());
-  const bool willBeHorizontal = isHorizontal_(*newRootProps.get());
+  const bool wasHorizontal = isHorizontal_(*oldRootProps);
+  const bool willBeHorizontal = isHorizontal_(*newRootProps);
 
   if (wasHorizontal != willBeHorizontal) {
     return newRootShadowNodeWithScreenFrameSizesReset(newRootShadowNode);
@@ -87,14 +89,37 @@ void RNSScreenShadowNodeCommitHook::findScreenNodes(
   }
 }
 
+/**
+ * This method might return nullptr. See its implementation for details.
+ */
 std::shared_ptr<UIManager>
 RNSScreenShadowNodeCommitHook::getUIManagerFromSharedContext(
-    std::shared_ptr<const ContextContainer> sharedContext) {
+    const std::shared_ptr<const ContextContainer> &sharedContext) {
+  if (sharedContext == nullptr) {
+    return nullptr;
+  }
+
   auto fabricUIManager =
       sharedContext
           ->at<jni::alias_ref<facebook::react::JFabricUIManager::javaobject>>(
               "FabricUIManager");
-  return fabricUIManager->getBinding()->getScheduler()->getUIManager();
+  if (fabricUIManager == nullptr) {
+    return nullptr;
+  }
+
+  // This line might still crash in case the FabricUIManager.mBinding (Java
+  // class) is at this moment `null`.
+  auto *fabricUiManagerBinding = fabricUIManager->getBinding();
+  if (fabricUiManagerBinding == nullptr) {
+    return nullptr;
+  }
+
+  auto scheduler = fabricUiManagerBinding->getScheduler();
+  if (scheduler == nullptr) {
+    return nullptr;
+  }
+
+  return scheduler->getUIManager();
 }
 
 } // namespace react

package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNodeCommitHook.h

@@ -13,7 +13,8 @@ class RNSScreenComponentDescriptor;
 
 class RNSScreenShadowNodeCommitHook : public UIManagerCommitHook {
  public:
-  RNSScreenShadowNodeCommitHook(std::shared_ptr<const ContextContainer>);
+  RNSScreenShadowNodeCommitHook(
+      const std::shared_ptr<const ContextContainer> &);
 
   virtual ~RNSScreenShadowNodeCommitHook() noexcept override;
 
@@ -28,8 +29,6 @@ class RNSScreenShadowNodeCommitHook : public UIManagerCommitHook {
       const ShadowTreeCommitOptions & /*commitOptions*/) noexcept override;
 
  private:
-  std::weak_ptr<const ContextContainer> contextContainer_;
-
   static inline bool isHorizontal_(const RootProps &props) {
     const auto &layoutConstraints = props.layoutConstraints;
     const float width = layoutConstraints.maximumSize.width;
@@ -46,7 +45,7 @@ class RNSScreenShadowNodeCommitHook : public UIManagerCommitHook {
       std::vector<const RNSScreenShadowNode *> &screenNodes);
 
   static std::shared_ptr<UIManager> getUIManagerFromSharedContext(
-      std::shared_ptr<const ContextContainer> sharedContext);
+      const std::shared_ptr<const ContextContainer> &sharedContext);
 };
 
 } // namespace react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.19.0-nightly-20251211-12e4eacaa",
+  "version": "4.19.0-nightly-20251212-c9b84ff7a",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",