react-native-screens 4.19.0-nightly-20251030-193c63f33 → 4.19.0-nightly-20251101-690f01275

package/android/src/main/cpp/NativeProxy.cpp

@@ -53,6 +53,8 @@ void NativeProxy::nativeAddMutationsListener(
 }
 
 void NativeProxy::cleanupExpiredMountingCoordinators() {
+  std::lock_guard<std::mutex> lock(coordinatorsMutex_);
+
   coordinatorsWithMountingOverrides_.erase(
       std::remove_if(
           coordinatorsWithMountingOverrides_.begin(),
@@ -65,6 +67,8 @@ void NativeProxy::cleanupExpiredMountingCoordinators() {
 void NativeProxy::addMountingCoordinatorIfNeeded(
     const std::shared_ptr<const facebook::react::MountingCoordinator>
         &coordinator) {
+  std::lock_guard<std::mutex> lock(coordinatorsMutex_);
+
   bool wasRegistered = std::ranges::any_of(
       coordinatorsWithMountingOverrides_,
       [&coordinator](

package/android/src/main/cpp/NativeProxy.h

@@ -4,6 +4,7 @@
 #include <react/fabric/JFabricUIManager.h>
 #include "RNSScreenRemovalListener.h"
 
+#include <mutex>
 #include <string>
 
 namespace rnscreens {
@@ -25,6 +26,8 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
   friend HybridBase;
   jni::global_ref<NativeProxy::javaobject> javaPart_;
 
+  std::mutex coordinatorsMutex_;
+
   explicit NativeProxy(jni::alias_ref<NativeProxy::javaobject> jThis);
 
   void nativeAddMutationsListener(

package/ios/RNSScreen.h

@@ -171,13 +171,21 @@ namespace react = facebook::react;
 - (BOOL)isModal;
 - (BOOL)isPresentedAsNativeModal;
 
+/**
+ * Tell `Screen` component that it has been removed from react state and can safely cleanup
+ * any retained resources.
+ */
+- (void)invalidateImpl;
+
+#ifndef RCT_NEW_ARCH_ENABLED
 /**
  * Tell `Screen` component that it has been removed from react state and can safely cleanup
  * any retained resources.
  *
- * Note, that on old architecture this method might be called by RN via `RCTInvalidating` protocol.
+ * On old architecture this method might be called by RN via `RCTInvalidating` protocol.
  */
 - (void)invalidate;
+#endif // !RCT_NEW_ARCH_ENABLED
 
 /**
  * Looks for header configuration in instance's `reactSubviews` and returns it. If not present returns `nil`.

package/ios/RNSScreen.mm

@@ -934,12 +934,19 @@ RNS_IGNORE_SUPER_CALL_END
       self.controller.modalPresentationStyle == UIModalPresentationOverCurrentContext;
 }
 
-- (void)invalidate
+- (void)invalidateImpl
 {
   _controller = nil;
   [_sheetsScrollView removeObserver:self forKeyPath:@"bounds" context:nil];
 }
 
+#ifndef RCT_NEW_ARCH_ENABLED
+- (void)invalidate
+{
+  [self invalidateImpl];
+}
+#endif
+
 #if !TARGET_OS_TV && !TARGET_OS_VISION
 
 - (void)setPropertyForSheet:(UISheetPresentationController *)sheet withBlock:(void (^)(void))block animate:(BOOL)animate

package/ios/RNSScreenContainer.mm

@@ -266,7 +266,7 @@ RNS_IGNORE_SUPER_CALL_END
   [super load];
 }
 
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {

package/ios/RNSScreenStack.mm

@@ -1409,7 +1409,11 @@ RNS_IGNORE_SUPER_CALL_END
         return;
       }
       for (RNSScreenView *screenRef : strongSelf->_toBeDeletedScreens) {
+#ifdef RCT_NEW_ARCH_ENABLED
+        [screenRef invalidateImpl];
+#else
         [screenRef invalidate];
+#endif
       }
       strongSelf->_toBeDeletedScreens.clear();
     });

package/ios/bottom-tabs/RNSBottomTabsHostComponentView.mm

@@ -207,7 +207,7 @@ namespace react = facebook::react;
   return [_reactEventEmitter emitOnNativeFocusChange:OnNativeFocusChangePayload{.tabKey = tabScreen.tabKey}];
 }
 
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 #if RCT_NEW_ARCH_ENABLED
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index

package/ios/bottom-tabs/RNSBottomTabsScreenComponentView.mm

@@ -243,7 +243,7 @@ RNS_IGNORE_SUPER_CALL_END
 }
 
 #if RCT_NEW_ARCH_ENABLED
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 - (void)updateProps:(const facebook::react::Props::Shared &)props
            oldProps:(const facebook::react::Props::Shared &)oldProps

package/ios/gamma/split-view/RNSSplitViewHostComponentView.mm

@@ -116,13 +116,6 @@ static const CGFloat epsilon = 1e-6;
   }
 }
 
-- (void)willMoveToWindow:(UIWindow *)newWindow
-{
-  if (newWindow == nil) {
-    [self invalidate];
-  }
-}
-
 - (void)didMoveToWindow
 {
   [self setupController];
@@ -148,17 +141,6 @@ static const CGFloat epsilon = 1e-6;
   }
 }
 
-- (void)invalidate
-{
-  // We assume that split host is removed from view hierarchy **only** when
-  // whole component is destroyed & therefore we do the necessary cleanup here.
-  // If at some point that statement does not hold anymore, this cleanup
-  // should be moved to a different place.
-  for (RNSSplitViewScreenComponentView *subview in _reactSubviews) {
-    [subview invalidate];
-  }
-}
-
 RNS_IGNORE_SUPER_CALL_BEGIN
 - (nonnull NSMutableArray<RNSSplitViewScreenComponentView *> *)reactSubviews
 {
@@ -176,7 +158,7 @@ RNS_IGNORE_SUPER_CALL_END
   return _controller;
 }
 
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {

package/ios/gamma/split-view/RNSSplitViewScreenComponentView.h

@@ -21,13 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly, nonnull) RNSSplitViewScreenController *controller;
 @property (nonatomic, weak, readwrite, nullable) RNSSplitViewHostComponentView *splitViewHost;
 
-/**
- * @brief A function responsible for requesting a cleanup in the SplitViewScreen component.
- *
- * Should be called when the component is about to be deleted.
- */
-- (void)invalidate;
-
 @end
 
 #pragma mark - ShadowTreeState

package/ios/gamma/split-view/RNSSplitViewScreenComponentView.mm

@@ -85,14 +85,6 @@ namespace react = facebook::react;
   _columnType = RNSSplitViewScreenColumnTypeColumn;
 }
 
-- (void)invalidate
-{
-  // Controller keeps the strong reference to the component via the `.view` property.
-  // Therefore, we need to enforce a proper cleanup, breaking the retain cycle,
-  // when we want to destroy the component.
-  _controller = nil;
-}
-
 - (void)registerForFrameCorrection:(UIView *)view
 {
   [_viewsForFrameCorrection addObject:view];
@@ -155,7 +147,7 @@ namespace react = facebook::react;
   [self dispatchSafeAreaDidChangeNotification];
 }
 
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
@@ -196,6 +188,14 @@ namespace react = facebook::react;
       updateEventEmitter:std::static_pointer_cast<const react::RNSSplitViewScreenEventEmitter>(eventEmitter)];
 }
 
+- (void)invalidate
+{
+  // Controller keeps the strong reference to the component via the `.view` property.
+  // Therefore, we need to enforce a proper cleanup, breaking the retain cycle,
+  // when we want to destroy the component.
+  _controller = nil;
+}
+
 @end
 
 Class<RCTComponentViewProtocol> RNSSplitViewScreenCls(void)

package/ios/gamma/stack/RNSScreenStackHostComponentView.mm

@@ -75,7 +75,7 @@ RNS_IGNORE_SUPER_CALL_END
   return _controller;
 }
 
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {

package/ios/gamma/stack/RNSStackScreenComponentView.mm

@@ -66,7 +66,7 @@ namespace react = facebook::react;
   return _reactEventEmitter;
 }
 
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 - (void)updateProps:(const facebook::react::Props::Shared &)props
            oldProps:(const facebook::react::Props::Shared &)oldProps

package/ios/safe-area/RNSSafeAreaViewComponentView.mm

@@ -166,7 +166,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 #endif // RCT_NEW_ARCH_ENABLED
 
 #if RCT_NEW_ARCH_ENABLED
-#pragma mark - RCTViewComponentViewProtocol
+#pragma mark - RCTComponentViewProtocol
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.19.0-nightly-20251030-193c63f33",
+  "version": "4.19.0-nightly-20251101-690f01275",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",
@@ -86,10 +86,10 @@
     "@react-native-community/cli": "20.0.0-alpha.2",
     "@react-native-community/cli-platform-android": "20.0.0-alpha.2",
     "@react-native-community/cli-platform-ios": "20.0.0-alpha.2",
-    "@react-native/babel-preset": "0.82.0-rc.4",
-    "@react-native/eslint-config": "0.82.0-rc.4",
-    "@react-native/metro-config": "0.82.0-rc.4",
-    "@react-native/typescript-config": "0.82.0-rc.4",
+    "@react-native/babel-preset": "0.82.1",
+    "@react-native/eslint-config": "0.82.1",
+    "@react-native/metro-config": "0.82.1",
+    "@react-native/typescript-config": "0.82.1",
     "@react-navigation/native": "^5.8.0",
     "@react-navigation/stack": "^5.10.0",
     "@types/jest": "^29.5.13",
@@ -112,7 +112,7 @@
     "prettier": "^2.8.8",
     "react": "^19.1.1",
     "react-dom": "^19.1.0",
-    "react-native": "0.82.0-rc.4",
+    "react-native": "0.82.1",
     "react-native-builder-bob": "^0.23.2",
     "react-native-gesture-handler": "^2.28.0",
     "react-native-reanimated": "^3.19.0",