react-native-screens 4.24.0 → 4.25.0-beta.1

package/ios/tabs/host/RNSTabsNavigationState.mm

@@ -0,0 +1,45 @@
+#import "RNSTabsNavigationState.h"
+
+@implementation RNSTabsNavigationState
+
+- (instancetype)initWithSelectedScreenKey:(nonnull NSString *)selectedScreenKey provenance:(int)provenance
+{
+  if (self = [super init]) {
+    _selectedScreenKey = selectedScreenKey;
+    _provenance = provenance;
+  }
+  return self;
+}
+
+- (instancetype)cloneState
+{
+  auto *clonedValue =
+      [[RNSTabsNavigationState alloc] initWithSelectedScreenKey:[NSString stringWithString:self.selectedScreenKey]
+                                                     provenance:self.provenance];
+  return clonedValue;
+}
+
++ (instancetype)stateWithSelectedScreenKey:(nonnull NSString *)selectedScreenKey provenance:(int)provenance
+{
+  return [[RNSTabsNavigationState alloc] initWithSelectedScreenKey:selectedScreenKey provenance:provenance];
+}
+
+@end
+
+@implementation RNSTabsNavigationStateUpdateContext
+
+- (instancetype)initWithNavState:(nonnull RNSTabsNavigationState *)navState
+                      isRepeated:(BOOL)isRepeated
+       hasTriggeredSpecialEffect:(BOOL)hasTriggeredSpecialEffect
+                  isNativeAction:(BOOL)isNativeAction
+{
+  if (self = [super init]) {
+    _navState = navState;
+    _isRepeated = isRepeated;
+    _hasTriggeredSpecialEffect = hasTriggeredSpecialEffect;
+    _isNativeAction = isNativeAction;
+  }
+  return self;
+}
+
+@end

package/ios/tabs/screen/RNSTabsScreenComponentView.h

@@ -4,13 +4,10 @@
 #import "RNSEnums.h"
 #import "RNSReactBaseView.h"
 #import "RNSSafeAreaProviding.h"
-#import "RNSScrollEdgeEffectApplicator.h"
 #import "RNSScrollViewBehaviorOverriding.h"
 #import "RNSTabsScreenEventEmitter.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "RNSViewControllerInvalidating.h"
-#else
+#if !RCT_NEW_ARCH_ENABLED
 #import <React/RCTInvalidating.h>
 #endif
 
@@ -24,10 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
  * of a particular tab.
  */
 @interface RNSTabsScreenComponentView : RNSReactBaseView <
-                                            RNSSafeAreaProviding,
-#ifdef RCT_NEW_ARCH_ENABLED
-                                            RNSViewControllerInvalidating
-#else
+                                            RNSSafeAreaProviding
+#if !RCT_NEW_ARCH_ENABLED
+                                            ,
                                             RCTInvalidating
 #endif
                                             >
@@ -42,12 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, weak, nullable) RNSTabsHostComponentView *reactSuperview;
 
-/**
- * Updates [scroll edge effects](https://developer.apple.com/documentation/uikit/uiscrolledgeeffect)
- * on a content ScrollView inside the tab screen, if one exists. It uses ScrollViewFinder to find the ScrollView.
- */
-- (void)updateContentScrollViewEdgeEffectsIfExists;
-
 @end
 
 #pragma mark - Props
@@ -55,13 +45,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Properties set on component in JavaScript.
  */
-@interface RNSTabsScreenComponentView () <RNSScrollViewBehaviorOverriding, RNSScrollEdgeEffectProviding>
+@interface RNSTabsScreenComponentView () <RNSScrollViewBehaviorOverriding>
 
 // TODO: All of these properties should be `readonly`. Do this when support for legacy
 // architecture is dropped.
 
-@property (nonatomic) BOOL isSelectedScreen;
-@property (nonatomic, nullable) NSString *tabKey;
+@property (nonatomic, nullable) NSString *screenKey;
 @property (nonatomic, nullable) NSString *badgeValue;
 
 @property (nonatomic, nullable) NSString *tabBarItemTestID;
@@ -85,17 +74,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) BOOL shouldUseRepeatedTabSelectionPopToRootSpecialEffect;
 @property (nonatomic) BOOL shouldUseRepeatedTabSelectionScrollToTopSpecialEffect;
 
+@property (nonatomic) BOOL preventNativeSelection;
+
 @property (nonatomic, readonly) BOOL overrideScrollViewContentInsetAdjustmentBehavior;
 
 @property (nonatomic, nullable) NSString *tabItemTestID;
 @property (nonatomic, nullable) NSString *tabItemAccessibilityLabel;
 @property (nonatomic) BOOL tabBarItemNeedsA11yUpdate;
 
-@property (nonatomic) RNSScrollEdgeEffect bottomScrollEdgeEffect;
-@property (nonatomic) RNSScrollEdgeEffect leftScrollEdgeEffect;
-@property (nonatomic) RNSScrollEdgeEffect rightScrollEdgeEffect;
-@property (nonatomic) RNSScrollEdgeEffect topScrollEdgeEffect;
-
 @property (nonatomic) RNSTabsScreenSystemItem systemItem;
 
 @end

package/ios/tabs/screen/RNSTabsScreenComponentView.mm

@@ -40,7 +40,6 @@ namespace react = facebook::react;
   BOOL _tabScreenOrientationNeedsUpdate;
   BOOL _tabBarItemNeedsRecreation;
   BOOL _tabBarItemNeedsUpdate;
-  BOOL _scrollEdgeEffectsNeedUpdate;
 #endif // !RCT_NEW_ARCH_ENABLED
 }
 
@@ -55,7 +54,7 @@ namespace react = facebook::react;
 - (void)initState
 {
 #if RCT_NEW_ARCH_ENABLED
-  static const auto defaultProps = std::make_shared<const react::RNSTabsScreenProps>();
+  static const auto defaultProps = std::make_shared<const react::RNSTabsScreenIOSProps>();
   _props = defaultProps;
 #endif // RCT_NEW_ARCH_ENABLED
 
@@ -70,7 +69,6 @@ namespace react = facebook::react;
   _tabScreenOrientationNeedsUpdate = NO;
   _tabBarItemNeedsRecreation = NO;
   _tabBarItemNeedsUpdate = NO;
-  _scrollEdgeEffectsNeedUpdate = NO;
 #endif
 
   [self resetProps];
@@ -78,7 +76,6 @@ namespace react = facebook::react;
 
 - (void)resetProps
 {
-  _isSelectedScreen = NO;
   _badgeValue = nil;
   _title = nil;
   _isTitleUndefined = YES;
@@ -113,28 +110,26 @@ RNS_IGNORE_SUPER_CALL_BEGIN
 }
 RNS_IGNORE_SUPER_CALL_END
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#pragma mark - RNSViewControllerInvalidating
-
-- (void)invalidateController
+- (void)invalidateImpl
 {
-  _controller = nil;
-}
+  // We want to run after container updates are performed (transitions etc.)
+  __weak auto weakSelf = self;
 
-- (BOOL)shouldInvalidateOnMutation:(const facebook::react::ShadowViewMutation &)mutation
-{
-  // For tabs, Host is responsible for invalidating children.
-  return NO;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    auto strongSelf = weakSelf;
+    if (strongSelf) {
+      strongSelf->_controller = nil;
+    }
+  });
 }
 
-#else
+#if !RCT_NEW_ARCH_ENABLED
 
 #pragma mark - RCTInvalidating
 
 - (void)invalidate
 {
-  _controller = nil;
+  [self invalidateImpl];
 }
 
 #endif
@@ -166,12 +161,6 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
-- (void)updateContentScrollViewEdgeEffectsIfExists
-{
-  [RNSScrollEdgeEffectApplicator applyToScrollView:[RNSScrollViewFinder findScrollViewInFirstDescendantChainFrom:self]
-                                      withProvider:self];
-}
-
 #pragma mark - Prop update utils
 
 - (void)createTabBarItem
@@ -245,14 +234,13 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)updateProps:(const facebook::react::Props::Shared &)props
            oldProps:(const facebook::react::Props::Shared &)oldProps
 {
-  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSTabsScreenProps>(_props);
-  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSTabsScreenProps>(props);
+  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSTabsScreenIOSProps>(_props);
+  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSTabsScreenIOSProps>(props);
 
   bool tabItemNeedsAppearanceUpdate{false};
   bool tabScreenOrientationNeedsUpdate{false};
   bool tabBarItemNeedsRecreation{false};
   bool tabBarItemNeedsUpdate{false};
-  bool scrollEdgeEffectsNeedUpdate{false};
 
   if (newComponentProps.title != oldComponentProps.title ||
       newComponentProps.isTitleUndefined != oldComponentProps.isTitleUndefined) {
@@ -272,14 +260,9 @@ RNS_IGNORE_SUPER_CALL_END
     tabScreenOrientationNeedsUpdate = YES;
   }
 
-  if (newComponentProps.tabKey != oldComponentProps.tabKey) {
-    RCTAssert(!newComponentProps.tabKey.empty(), @"[RNScreens] tabKey must not be empty!");
-    _tabKey = RCTNSStringFromString(newComponentProps.tabKey);
-  }
-
-  if (newComponentProps.isFocused != oldComponentProps.isFocused) {
-    _isSelectedScreen = newComponentProps.isFocused;
-    [_controller tabScreenFocusHasChanged];
+  if (newComponentProps.screenKey != oldComponentProps.screenKey) {
+    RCTAssert(!newComponentProps.screenKey.empty(), @"[RNScreens] screenKey must not be empty!");
+    _screenKey = RCTNSStringFromString(newComponentProps.screenKey);
   }
 
   if (newComponentProps.badgeValue != oldComponentProps.badgeValue) {
@@ -356,6 +339,10 @@ RNS_IGNORE_SUPER_CALL_END
         newComponentProps.specialEffects.repeatedTabSelection.scrollToTop;
   }
 
+  if (newComponentProps.preventNativeSelection != oldComponentProps.preventNativeSelection) {
+    _preventNativeSelection = newComponentProps.preventNativeSelection;
+  }
+
   if (newComponentProps.overrideScrollViewContentInsetAdjustmentBehavior !=
       oldComponentProps.overrideScrollViewContentInsetAdjustmentBehavior) {
     _overrideScrollViewContentInsetAdjustmentBehavior =
@@ -384,34 +371,6 @@ RNS_IGNORE_SUPER_CALL_END
     tabBarItemNeedsRecreation = YES;
   }
 
-  if (newComponentProps.bottomScrollEdgeEffect != oldComponentProps.bottomScrollEdgeEffect) {
-    [self setBottomScrollEdgeEffect:rnscreens::conversion::
-                                        RNSTabsScrollEdgeEffectFromTabsScreenBottomScrollEdgeEffectCppEquivalent(
-                                            newComponentProps.bottomScrollEdgeEffect)];
-    scrollEdgeEffectsNeedUpdate = YES;
-  }
-
-  if (newComponentProps.leftScrollEdgeEffect != oldComponentProps.leftScrollEdgeEffect) {
-    [self setLeftScrollEdgeEffect:rnscreens::conversion::
-                                      RNSTabsScrollEdgeEffectFromTabsScreenLeftScrollEdgeEffectCppEquivalent(
-                                          newComponentProps.leftScrollEdgeEffect)];
-    scrollEdgeEffectsNeedUpdate = YES;
-  }
-
-  if (newComponentProps.rightScrollEdgeEffect != oldComponentProps.rightScrollEdgeEffect) {
-    [self setRightScrollEdgeEffect:rnscreens::conversion::
-                                       RNSTabsScrollEdgeEffectFromTabsScreenRightScrollEdgeEffectCppEquivalent(
-                                           newComponentProps.rightScrollEdgeEffect)];
-    scrollEdgeEffectsNeedUpdate = YES;
-  }
-
-  if (newComponentProps.topScrollEdgeEffect != oldComponentProps.topScrollEdgeEffect) {
-    [self setTopScrollEdgeEffect:rnscreens::conversion::
-                                     RNSTabsScrollEdgeEffectFromTabsScreenTopScrollEdgeEffectCppEquivalent(
-                                         newComponentProps.topScrollEdgeEffect)];
-    scrollEdgeEffectsNeedUpdate = YES;
-  }
-
   if (newComponentProps.userInterfaceStyle != oldComponentProps.userInterfaceStyle) {
     _userInterfaceStyle =
         rnscreens::conversion::UIUserInterfaceStyleFromTabsScreenCppEquivalent(newComponentProps.userInterfaceStyle);
@@ -438,11 +397,6 @@ RNS_IGNORE_SUPER_CALL_END
     [_controller tabScreenOrientationHasChanged];
   }
 
-  if (scrollEdgeEffectsNeedUpdate) {
-    [self updateContentScrollViewEdgeEffectsIfExists];
-    scrollEdgeEffectsNeedUpdate = NO;
-  }
-
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -458,7 +412,7 @@ RNS_IGNORE_SUPER_CALL_END
 {
   [super updateEventEmitter:eventEmitter];
   [_reactEventEmitter
-      updateEventEmitter:std::static_pointer_cast<const react::RNSTabsScreenEventEmitter>(eventEmitter)];
+      updateEventEmitter:std::static_pointer_cast<const react::RNSTabsScreenIOSEventEmitter>(eventEmitter)];
 }
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
@@ -466,8 +420,8 @@ RNS_IGNORE_SUPER_CALL_END
   RNSLog(@"TabScreen [%ld] mount [%ld] at %ld", self.tag, childComponentView.tag, index);
   [super mountChildComponentView:childComponentView index:index];
 
-  // overrideScrollViewBehavior and updateContentScrollViewEdgeEffects use first descendant chain
-  // from screen to find ScrollView, that's why we're only interested in child mounted at index 0.
+  // overrideScrollViewBehavior uses first descendant chain from screen to find ScrollView,
+  // that's why we're only interested in child mounted at index 0.
   if (index == 0) {
     // Before the props are set (first render) defer acting to after
     // we receive props, as user might have decided to disable this feature.
@@ -476,7 +430,6 @@ RNS_IGNORE_SUPER_CALL_END
     } else {
       _needsScrollViewBehaviorOverride = YES;
     }
-    [self updateContentScrollViewEdgeEffectsIfExists];
   }
 }
 
@@ -488,7 +441,7 @@ RNS_IGNORE_SUPER_CALL_END
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return react::concreteComponentDescriptorProvider<react::RNSTabsScreenComponentDescriptor>();
+  return react::concreteComponentDescriptorProvider<react::RNSTabsScreenIOSComponentDescriptor>();
 }
 
 + (BOOL)shouldBeRecycled
@@ -498,6 +451,11 @@ RNS_IGNORE_SUPER_CALL_END
   return NO;
 }
 
+- (void)invalidate
+{
+  [self invalidateImpl];
+}
+
 #else
 
 #pragma mark - LEGACY RCTComponent protocol
@@ -511,7 +469,7 @@ RNS_IGNORE_SUPER_CALL_END
   // enabling us to warn users that dynamic changes are not supported.
   // On Paper, setter for the prop may not be called (when it is undefined in JS).
   // Therefore we set the flag in didSetProps to make sure to handle this case as well.
-  // didSetProps will always be called because tabKey prop is required.
+  // didSetProps will always be called because screenKey prop is required.
   _isOverrideScrollViewContentInsetAdjustmentBehaviorSet = YES;
 
   if (_tabBarItemNeedsRecreation) {
@@ -539,11 +497,6 @@ RNS_IGNORE_SUPER_CALL_END
     [_controller tabScreenOrientationHasChanged];
     _tabScreenOrientationNeedsUpdate = NO;
   }
-
-  if (_scrollEdgeEffectsNeedUpdate) {
-    [self updateContentScrollViewEdgeEffectsIfExists];
-    _scrollEdgeEffectsNeedUpdate = NO;
-  }
 }
 
 #pragma mark - LEGACY prop setters
@@ -556,10 +509,10 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
-- (void)setTabKey:(NSString *)tabKey
+- (void)setScreenKey:(NSString *)screenKey
 {
-  RCTAssert([NSString rnscreens_isBlankOrNull:tabKey] == NO, @"[RNScreens] tabKey must not be empty");
-  _tabKey = tabKey;
+  RCTAssert([NSString rnscreens_isBlankOrNull:screenKey] == NO, @"[RNScreens] screenKey must not be empty");
+  _screenKey = screenKey;
 }
 
 - (void)setTitle:(NSString *)title
@@ -617,30 +570,6 @@ RNS_IGNORE_SUPER_CALL_END
   _tabItemNeedsAppearanceUpdate = YES;
 }
 
-- (void)setBottomScrollEdgeEffect:(RNSScrollEdgeEffect)bottomScrollEdgeEffect
-{
-  _bottomScrollEdgeEffect = bottomScrollEdgeEffect;
-  _scrollEdgeEffectsNeedUpdate = YES;
-}
-
-- (void)setLeftScrollEdgeEffect:(RNSScrollEdgeEffect)leftScrollEdgeEffect
-{
-  _leftScrollEdgeEffect = leftScrollEdgeEffect;
-  _scrollEdgeEffectsNeedUpdate = YES;
-}
-
-- (void)setRightScrollEdgeEffect:(RNSScrollEdgeEffect)rightScrollEdgeEffect
-{
-  _rightScrollEdgeEffect = rightScrollEdgeEffect;
-  _scrollEdgeEffectsNeedUpdate = YES;
-}
-
-- (void)setTopScrollEdgeEffect:(RNSScrollEdgeEffect)topScrollEdgeEffect
-{
-  _topScrollEdgeEffect = topScrollEdgeEffect;
-  _scrollEdgeEffectsNeedUpdate = YES;
-}
-
 - (void)setOverrideScrollViewContentInsetAdjustmentBehavior:(BOOL)overrideScrollViewContentInsetAdjustmentBehavior
 {
   _overrideScrollViewContentInsetAdjustmentBehavior = overrideScrollViewContentInsetAdjustmentBehavior;
@@ -750,6 +679,16 @@ RNS_FAILING_EVENT_GETTER(onDidDisappear);
 
 #endif // RCT_NEW_ARCH_ENABLED
 
+#pragma mark - Dynamic frameworks support
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 @end
 
 #if RCT_NEW_ARCH_ENABLED

package/ios/tabs/screen/RNSTabsScreenComponentViewManager.mm

@@ -17,7 +17,7 @@ RCT_EXPORT_MODULE(RNSTabsScreenManager)
   return [[RNSTabsScreenComponentView alloc] initWithFrame:CGRectZero];
 }
 
-RCT_EXPORT_VIEW_PROPERTY(tabKey, NSString);
+RCT_EXPORT_VIEW_PROPERTY(screenKey, NSString);
 
 RCT_REMAP_VIEW_PROPERTY(isFocused, isSelectedScreen, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(title, NSString);

package/ios/tabs/screen/RNSTabsScreenEventEmitter.h

@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #if RCT_NEW_ARCH_ENABLED
 
-- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSTabsScreenEventEmitter> &)emitter;
+- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSTabsScreenIOSEventEmitter> &)emitter;
 
 #else
 #pragma mark - LEGACY Event emitting blocks

package/ios/tabs/screen/RNSTabsScreenEventEmitter.mm

@@ -8,7 +8,7 @@
 
 @implementation RNSTabsScreenEventEmitter {
 #if RCT_NEW_ARCH_ENABLED
-  std::shared_ptr<const react::RNSTabsScreenEventEmitter> _reactEventEmitter;
+  std::shared_ptr<const react::RNSTabsScreenIOSEventEmitter> _reactEventEmitter;
 #endif // RCT_NEW_ARCH_ENABLED
 }
 
@@ -97,7 +97,7 @@
 }
 
 #if RCT_NEW_ARCH_ENABLED
-- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSTabsScreenEventEmitter> &)emitter
+- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSTabsScreenIOSEventEmitter> &)emitter
 {
   _reactEventEmitter = emitter;
 }

package/ios/tabs/screen/RNSTabsScreenViewController.h

@@ -18,11 +18,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly, nullable) RNSTabsScreenComponentView *tabScreenComponentView;
 @property (nonatomic, weak, readonly, nullable) id<RNSTabsSpecialEffectsSupporting> tabsSpecialEffectsDelegate;
 
-/**
- * Tell the controller that the tab screen it owns has got its react-props-focus changed.
- */
-- (void)tabScreenFocusHasChanged;
-
 /**
  * Tell the controller that the tab screen it owns has got its react-props related to appearance changed.
  */
@@ -53,4 +48,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface RNSTabsScreenViewController (TabsScreenPropsForwarding)
+
+- (nullable NSString *)getScreenKeyOrNull;
+
+- (BOOL)isPreventNativeSelectionEnabled;
+
+@end
+
 NS_ASSUME_NONNULL_END

package/ios/tabs/screen/RNSTabsScreenViewController.mm

@@ -16,18 +16,6 @@
   return static_cast<RNSTabsScreenComponentView *>(self.view);
 }
 
-- (void)tabScreenFocusHasChanged
-{
-  RNSLog(
-      @"TabScreen [%ld] changed focus: %d",
-      self.tabScreenComponentView.tag,
-      self.tabScreenComponentView.isSelectedScreen);
-
-  // The focus of owned tab has been updated from react. We tell the parent controller that it should update the
-  // container.
-  [[self findTabBarController] setNeedsUpdateOfSelectedTab:true];
-}
-
 - (void)tabItemAppearanceHasChanged
 {
   [[self findTabBarController] setNeedsUpdateOfTabBarAppearance:true];
@@ -40,21 +28,25 @@
 
 - (void)viewWillAppear:(BOOL)animated
 {
+  [super viewWillAppear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnWillAppear];
 }
 
 - (void)viewDidAppear:(BOOL)animated
 {
+  [super viewDidAppear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnDidAppear];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
 {
+  [super viewWillDisappear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnWillDisappear];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
+  [super viewDidDisappear:animated];
   [self.tabScreenComponentView.reactEventEmitter emitOnDidDisappear];
 }
 
@@ -133,3 +125,17 @@
 #endif // !TARGET_OS_TV
 
 @end
+
+@implementation RNSTabsScreenViewController (TabsScreenPropsForwarding)
+
+- (nullable NSString *)getScreenKeyOrNull
+{
+  return self.tabScreenComponentView.screenKey;
+}
+
+- (BOOL)isPreventNativeSelectionEnabled
+{
+  return self.tabScreenComponentView.preventNativeSelection;
+}
+
+@end

package/ios/utils/RNSLog.swift

@@ -0,0 +1,6 @@
+public func rnsLog(_ items: Any..., separator: String = " ", terminator: String = "\n") {
+  #if RNS_DEBUG_LOGGING
+    let output = items.map { "\($0)" }.joined(separator: separator)
+    Swift.print(output, terminator: terminator)
+  #endif
+}

package/ios/utils/UIView+RNSUtility.h

@@ -1,24 +1,13 @@
 #pragma once
 
 #import <Foundation/Foundation.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceTouchHandler.h>
-#else
-#import <React/RCTTouchHandler.h>
-#endif // RCT_NEW_ARCH_ENABLED
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#define RNS_TOUCH_HANDLER_ARCH_TYPE RCTSurfaceTouchHandler
-#else
-#define RNS_TOUCH_HANDLER_ARCH_TYPE RCTTouchHandler
-#endif // RCT_NEW_ARCH_ENABLED
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface UIView (RNSUtility)
 
-- (nullable RNS_TOUCH_HANDLER_ARCH_TYPE *)rnscreens_findTouchHandlerInAncestorChain;
+- (nullable RCTSurfaceTouchHandler *)rnscreens_findTouchHandlerInAncestorChain;
 
 @end
 

package/ios/utils/UIView+RNSUtility.mm

@@ -1,17 +1,14 @@
 #import "UIView+RNSUtility.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceView.h>
 #import "RNSModalScreen.h"
-#endif
 
 @implementation UIView (RNSUtility)
 
-- (nullable RNS_TOUCH_HANDLER_ARCH_TYPE *)rnscreens_findTouchHandlerInAncestorChain
+- (nullable RCTSurfaceTouchHandler *)rnscreens_findTouchHandlerInAncestorChain
 {
   UIView *parent = self.superview;
 
-#ifdef RCT_NEW_ARCH_ENABLED
   // On Fabric there is no view that exposes touchHandler above us in the view hierarchy, however it is still
   // utilised. `RCTSurfaceView` should be present above us, which hosts `RCTFabricSurface` instance, which in turn
   // hosts `RCTSurfaceTouchHandler` as a private field. When initialised, `RCTSurfaceTouchHandler` is attached to the
@@ -33,24 +30,10 @@
   // so we should not be afraid of any performance hit here.
   for (UIGestureRecognizer *recognizer in parent.gestureRecognizers) {
     if ([recognizer isKindOfClass:RCTSurfaceTouchHandler.class]) {
-      return static_cast<RNS_TOUCH_HANDLER_ARCH_TYPE *>(recognizer);
+      return static_cast<RCTSurfaceTouchHandler *>(recognizer);
     }
   }
 
-#else
-  // On Paper we can access touchHandler hosted by `RCTRootContentView` which should be above ScreenStack
-  // in view hierarchy.
-  while (parent != nil && ![parent respondsToSelector:@selector(touchHandler)]) {
-    parent = parent.superview;
-  }
-
-  if (parent != nil) {
-    RCTTouchHandler *touchHandler = [parent performSelector:@selector(touchHandler)];
-    return static_cast<RNS_TOUCH_HANDLER_ARCH_TYPE *>(touchHandler);
-  }
-
-#endif // RCT_NEW_ARCH_ENABLED
-
   return nil;
 }
 

package/lib/commonjs/components/ScreenStack.js

@@ -28,6 +28,7 @@ function ScreenStack(props) {
     currentScreenId,
     transitionAnimation,
     screenEdgeGesture,
+    nativeContainerStyle,
     onFinishTransitioning,
     children,
     ...rest
@@ -60,7 +61,9 @@ function ScreenStack(props) {
      * before Expo SDK release, we may consider removing it after releasing
      * react-native-screens@4.21.
      */
-    iosPreventReattachmentOfDismissedScreens: _flags.default.experiment.iosPreventReattachmentOfDismissedScreens
+    iosPreventReattachmentOfDismissedScreens: _flags.default.experiment.iosPreventReattachmentOfDismissedScreens,
+    iosPreventReattachmentOfDismissedModals: _flags.default.experiment.iosPreventReattachmentOfDismissedModals,
+    nativeContainerBackgroundColor: nativeContainerStyle?.backgroundColor
     /**
      * This messy override is to conform NativeProps used by codegen and
      * our Public API. To see reasoning go to this PR:

package/lib/commonjs/components/ScreenStack.js.map

@@ -1 +1 @@
-{"version":3,"names":["Object","defineProperty","exports","value","default","_react","_interopRequireDefault","require","_contexts","_warnOnce","_ScreenStackNativeComponent","_flags","e","__esModule","_extends","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","assertGHProvider","ScreenGestureDetector","goBackGesture","isGestureDetectorProviderNotDetected","name","undefined","warnOnce","assertCustomScreenTransitionsProps","screensRefs","currentScreenId","isGestureDetectorNotConfiguredProperly","ScreenStack","props","passedScreenRefs","transitionAnimation","screenEdgeGesture","onFinishTransitioning","children","rest","React","useRef","current","ref","useContext","GHContext","gestureDetectorBridge","stackUseEffectCallback","_stackRef","useEffect","createElement","RNSScreensRefContext","Provider","iosPreventReattachmentOfDismissedScreens","featureFlags","experiment","_default"],"sourceRoot":"../../../src","sources":["components/ScreenStack.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Object","defineProperty","exports","value","default","_react","_interopRequireDefault","require","_contexts","_warnOnce","_ScreenStackNativeComponent","_flags","e","__esModule","_extends","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","assertGHProvider","ScreenGestureDetector","goBackGesture","isGestureDetectorProviderNotDetected","name","undefined","warnOnce","assertCustomScreenTransitionsProps","screensRefs","currentScreenId","isGestureDetectorNotConfiguredProperly","ScreenStack","props","passedScreenRefs","transitionAnimation","screenEdgeGesture","nativeContainerStyle","onFinishTransitioning","children","rest","React","useRef","current","ref","useContext","GHContext","gestureDetectorBridge","stackUseEffectCallback","_stackRef","useEffect","createElement","RNSScreensRefContext","Provider","iosPreventReattachmentOfDismissedScreens","featureFlags","experiment","iosPreventReattachmentOfDismissedModals","nativeContainerBackgroundColor","backgroundColor","_default"],"sourceRoot":"../../../src","sources":["components/ScreenStack.tsx"],"mappings":"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","ignoreList":[]}