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

package/ios/RNSScreenStack.mm

@@ -1,4 +1,5 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNSScreenStack.h"
+#import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTFabricSurface.h>
 #import <React/RCTMountingTransactionObserving.h>
@@ -10,20 +11,9 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import "RCTSurfaceTouchHandler+RNSUtility.h"
-#else
-#import <React/RCTBridge.h>
-#import <React/RCTRootContentView.h>
-#import <React/RCTShadowView.h>
-#import <React/RCTTouchHandler.h>
-#import <React/RCTUIManager.h>
-#import <React/RCTUIManagerUtils.h>
-#import "RCTTouchHandler+RNSUtility.h"
-#endif // RCT_NEW_ARCH_ENABLED
-
 #import "RNSDefines.h"
 #import "RNSPercentDrivenInteractiveTransition.h"
 #import "RNSScreen.h"
-#import "RNSScreenStack.h"
 #import "RNSScreenStackAnimator.h"
 #import "RNSScreenStackHeaderConfig.h"
 #import "RNSScreenWindowTraits.h"
@@ -35,21 +25,15 @@
 #import "integrations/RNSDismissibleModalProtocol.h"
 #import "utils/UINavigationBar+RNSUtility.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
 
 @interface RNSScreenStackView () <
     UINavigationControllerDelegate,
     UIAdaptivePresentationControllerDelegate,
     UIGestureRecognizerDelegate,
     UIViewControllerTransitioningDelegate,
-    RNSViewInteractionAware
-#ifdef RCT_NEW_ARCH_ENABLED
-    ,
-    RCTMountingTransactionObserving
-#endif
-    >
+    RNSViewInteractionAware,
+    RCTMountingTransactionObserving>
 
 @property (nonatomic) NSMutableArray<UIViewController *> *presentedModals;
 @property (nonatomic) BOOL updatingModals;
@@ -133,25 +117,7 @@ namespace react = facebook::react;
     return;
   }
 
-#ifdef RCT_NEW_ARCH_ENABLED
   [headerConfig updateHeaderStateInShadowTreeInContextOfNavigationBar:self.navigationBar];
-#else
-  NSDirectionalEdgeInsets navBarMargins = [self.navigationBar directionalLayoutMargins];
-  NSDirectionalEdgeInsets navBarContentMargins =
-      [self.navigationBar.rnscreens_findContentView directionalLayoutMargins];
-
-  BOOL isDisplayingBackButton = [headerConfig shouldBackButtonBeVisibleInNavigationBar:self.navigationBar];
-
-  // 44.0 is just "closed eyes default". It is so on device I've tested with, nothing more.
-  UIView *barButtonView = isDisplayingBackButton ? self.navigationBar.rnscreens_findBackButtonWrapperView : nil;
-  CGFloat platformBackButtonWidth = barButtonView != nil ? barButtonView.frame.size.width : 44.0f;
-
-  [headerConfig updateHeaderConfigState:NSDirectionalEdgeInsets{
-                                            .leading = navBarMargins.leading + navBarContentMargins.leading +
-                                                (isDisplayingBackButton ? platformBackButtonWidth : 0),
-                                            .trailing = navBarMargins.trailing + navBarContentMargins.trailing,
-                                        }];
-#endif // RCT_NEW_ARCH_ENABLED
 }
 #endif
 
@@ -213,21 +179,6 @@ namespace react = facebook::react;
   __weak RNSScreenStackManager *_manager;
   BOOL _updateScheduled;
   UIPanGestureRecognizer *_sinkEventsPanGestureRecognizer;
-#ifdef RCT_NEW_ARCH_ENABLED
-  /// Screens that are subject of `ShadowViewMutation::Type::Delete` mutation
-  /// in current transaction. This vector should be populated when we receive notification via
-  /// `RCTMountingObserving` protocol, that a transaction will be performed, and should
-  /// be cleaned up when we're notified that the transaction has been completed.
-  std::vector<__strong RNSScreenView *> _toBeDeletedScreens;
-#endif // RCT_NEW_ARCH_ENABLED
-}
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
-// Needed because of this: https://github.com/facebook/react-native/pull/37274
-+ (void)load
-{
-  [super load];
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -240,7 +191,6 @@ namespace react = facebook::react;
 
   return self;
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (instancetype)initWithManager:(RNSScreenStackManager *)manager
 {
@@ -259,7 +209,9 @@ namespace react = facebook::react;
   _controller = [RNSNavigationController new];
   _controller.delegate = self;
   _sinkEventsPanGestureRecognizer = [[UIPanGestureRecognizer alloc] init];
+  _nativeContainerBackgroundColor = nil;
   _iosPreventReattachmentOfDismissedScreens = YES;
+  _iosPreventReattachmentOfDismissedModals = YES;
 #if !TARGET_OS_TV && !TARGET_OS_VISION
   [self setupGestureHandlers];
 #endif
@@ -289,28 +241,20 @@ namespace react = facebook::react;
 
 - (void)emitOnFinishTransitioningEvent
 {
-#ifdef RCT_NEW_ARCH_ENABLED
   if (_eventEmitter != nullptr) {
     std::dynamic_pointer_cast<const react::RNSScreenStackEventEmitter>(_eventEmitter)
         ->onFinishTransitioning(react::RNSScreenStackEventEmitter::OnFinishTransitioning{});
   }
-#else
-  if (self.onFinishTransitioning) {
-    self.onFinishTransitioning(nil);
-  }
-#endif
 }
 
 - (void)navigationController:(UINavigationController *)navigationController
       willShowViewController:(UIViewController *)viewController
                     animated:(BOOL)animated
 {
-#ifdef RCT_NEW_ARCH_ENABLED
   if (![viewController.view isKindOfClass:[RNSScreenView class]]) {
     // if the current view is a snapshot, config was already removed so we don't trigger the method
     return;
   }
-#endif
   auto *screenView = static_cast<RNSScreenView *>(viewController.view);
   [RNSScreenStackHeaderConfig willShowViewController:viewController
                                             animated:animated
@@ -328,22 +272,7 @@ namespace react = facebook::react;
     [_presentedModals removeObject:presentationController.presentedViewController];
 
     _updatingModals = NO;
-#ifdef RCT_NEW_ARCH_ENABLED
     [self emitOnFinishTransitioningEvent];
-#else
-    // we double check if there are no new controllers pending to be presented since someone could
-    // have tried to push another one during the transition.
-    // We don't do it on Fabric since update of container will be triggered from "unmount" method afterwards
-    [self updateContainer];
-    if (self.onFinishTransitioning) {
-      // instead of directly triggering onFinishTransitioning this time we enqueue the event on the
-      // main queue. We do that because onDismiss event is also enqueued and we want for the transition
-      // finish event to arrive later than onDismiss (see RNSScreen#notifyDismiss)
-      dispatch_async(dispatch_get_main_queue(), ^{
-        [self emitOnFinishTransitioningEvent];
-      });
-    }
-#endif
   }
 }
 
@@ -357,17 +286,8 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)didMoveToWindow
 {
   [super didMoveToWindow];
-#ifdef RCT_NEW_ARCH_ENABLED
   // for handling nested stacks
   [self maybeAddToParentAndUpdateContainer];
-#else
-  if (!_invalidated) {
-    // We check whether the view has been invalidated before running side-effects in didMoveToWindow
-    // This is needed because when LayoutAnimations are used it is possible for view to be re-attached
-    // to a window despite the fact it has been removed from the React Native view hierarchy.
-    [self maybeAddToParentAndUpdateContainer];
-  }
-#endif
   if (self.window == nil) {
     // When hot reload happens that would remove the whole stack, disabling the interaction on a screen out transition
     // will not be matched with enabling the interactions on another screen's in transition. We need to make sure
@@ -702,11 +622,7 @@ RNS_IGNORE_SUPER_CALL_END
   }
 
   UIViewController *top = controllers.lastObject;
-#ifdef RCT_NEW_ARCH_ENABLED
   UIViewController *previousTop = _controller.topViewController;
-#else
-  UIViewController *previousTop = _controller.viewControllers.lastObject;
-#endif
 
   // At the start we set viewControllers to contain a single UIViewController
   // instance. This is a workaround for header height adjustment bug (see comment
@@ -724,7 +640,6 @@ RNS_IGNORE_SUPER_CALL_END
       if (![_controller.viewControllers containsObject:top] &&
           ((RNSScreenView *)top.view).replaceAnimation == RNSScreenReplaceAnimationPush) {
         // setting new controllers with animation does `push` animation by default
-#ifdef RCT_NEW_ARCH_ENABLED
         // This is a workaround for the case, when in the app we're trying to do `replace` action on screens, when
         // there's already ongoing transition to some screen. In such case, we're making the snapshot, but we're trying
         // to add it to the wrong superview (where it should be UIViewControllerWrapperView, but it's
@@ -732,15 +647,21 @@ RNS_IGNORE_SUPER_CALL_END
         // either, so we need to turn off animations, when the view is not yet mounted, but it will appear after the
         // transition of previous replacement.
         [_controller setViewControllers:controllers animated:previousTop.view.window != nil];
-#else
-        [_controller setViewControllers:controllers animated:YES];
-#endif // RCT_NEW_ARCH_ENABLED
       } else {
         // last top controller is no longer on stack
         // in this case we set the controllers stack to the new list with
         // added the last top element to it and perform (animated) pop
         NSMutableArray *newControllers = [NSMutableArray arrayWithArray:controllers];
         [newControllers addObject:previousTop];
+
+#if !TARGET_OS_TV
+        // If we're replacing root screen, there should be no back button.
+        BOOL isRootReplace = _controller.viewControllers.count == 1 && controllers.count == 1;
+        if (isRootReplace) {
+          previousTop.navigationItem.hidesBackButton = YES;
+        }
+#endif // !TARGET_OS_TV
+
         [_controller setViewControllers:newControllers animated:NO];
         [_controller popViewControllerAnimated:YES];
       }
@@ -782,11 +703,30 @@ RNS_IGNORE_SUPER_CALL_END
           /// quickly. Since view recycling is disabled, once we detect that a screen has been removed from the view
           /// hierarchy, it won't be reused. This allows us to safely filter out dismissed screens from screens coming
           /// from JS state via `controllers`.
-          if (_iosPreventReattachmentOfDismissedScreens && screen.controller.isRemovedFromParent) {
+          ///
+          /// Note: screens with `preventNativeDismiss` are intentionally excluded from this guard.
+          /// When `preventNativeDismiss` is set and the user triggers a native back gesture, UIKit removes
+          /// the screen from its parent. We then need to reattach it so that the `preventNativeDismiss`
+          /// callback fires correctly on the JS side. This breaks the general assumption that a screen
+          /// removed from the hierarchy will never be reattached.
+          /// See: https://github.com/software-mansion/react-native-screens/issues/3885
+          if (_iosPreventReattachmentOfDismissedScreens && screen.controller.isRemovedFromParent &&
+              !screen.preventNativeDismiss) {
             continue;
           }
           [pushControllers addObject:screen.controller];
         } else {
+          /// When a Modal is dismissed natively the event is sent to JS **asynchronously**.
+          /// If multiple modals are pushed/dismissed quickly, JS might send back
+          /// a delayed update containing modals that were already dismissed. Attempting to render this
+          /// stale state could force UIKit to illegally reshuffle presented controllers.
+          /// We're preventing this, identifying reshuffling as an invalid state.
+          /// Since view recycling is disabled, once we detect that a modal has been removed from the view
+          /// hierarchy, it won't be reused. This allows us to safely filter out dismissed modal from modals coming
+          /// from JS state via `controllers`.
+          if (_iosPreventReattachmentOfDismissedModals && screen.controller.isRemovedFromParent) {
+            continue;
+          }
           [modalControllers addObject:screen.controller];
         }
       }
@@ -819,16 +759,6 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
-- (void)dismissOnReload
-{
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self invalidate];
-  });
-#endif // RCT_NEW_ARCH_ENABLED
-}
-
 #pragma mark methods connected to transitioning
 
 - (id<UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController
@@ -1371,7 +1301,6 @@ RNS_IGNORE_SUPER_CALL_END
   return ids;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric specific
 
 - (void)updateProps:(const facebook::react::Props::Shared &)props
@@ -1385,6 +1314,16 @@ RNS_IGNORE_SUPER_CALL_END
     [self setIosPreventReattachmentOfDismissedScreens:newScreenProps.iosPreventReattachmentOfDismissedScreens];
   }
 
+  if (newScreenProps.iosPreventReattachmentOfDismissedModals !=
+      oldScreenProps.iosPreventReattachmentOfDismissedModals) {
+    [self setIosPreventReattachmentOfDismissedModals:newScreenProps.iosPreventReattachmentOfDismissedModals];
+  }
+
+  if (newScreenProps.nativeContainerBackgroundColor != oldScreenProps.nativeContainerBackgroundColor) {
+    _nativeContainerBackgroundColor = RCTUIColorFromSharedColor(newScreenProps.nativeContainerBackgroundColor);
+    _controller.view.backgroundColor = _nativeContainerBackgroundColor;
+  }
+
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -1451,7 +1390,6 @@ RNS_IGNORE_SUPER_CALL_END
       RNSScreenView *_Nullable toBeRemovedChild = [self childScreenForTag:mutation.oldChildShadowView.tag];
       if (toBeRemovedChild != nil) {
         [toBeRemovedChild willBeUnmountedInUpcomingTransaction];
-        _toBeDeletedScreens.push_back(toBeRemovedChild);
       }
     }
   }
@@ -1476,25 +1414,6 @@ RNS_IGNORE_SUPER_CALL_END
       break;
     }
   }
-
-  if (!self->_toBeDeletedScreens.empty()) {
-    __weak RNSScreenStackView *weakSelf = self;
-    // We want to run after container updates are performed (transitions etc.)
-    dispatch_async(dispatch_get_main_queue(), ^{
-      RNSScreenStackView *_Nullable strongSelf = weakSelf;
-      if (strongSelf == nil) {
-        return;
-      }
-      for (RNSScreenView *screenRef : strongSelf->_toBeDeletedScreens) {
-#ifdef RCT_NEW_ARCH_ENABLED
-        [screenRef invalidateImpl];
-#else
-        [screenRef invalidate];
-#endif
-      }
-      strongSelf->_toBeDeletedScreens.clear();
-    });
-  }
 }
 
 - (void)prepareForRecycle
@@ -1516,72 +1435,24 @@ RNS_IGNORE_SUPER_CALL_END
 {
   return react::concreteComponentDescriptorProvider<react::RNSScreenStackComponentDescriptor>();
 }
-#else
-#pragma mark - Paper specific
 
-- (void)invalidate
-{
-  _invalidated = YES;
-  [self dismissAllRelatedModals];
-  [_controller willMoveToParentViewController:nil];
-  [_controller removeFromParentViewController];
-}
+#pragma mark - Dynamic frameworks support
 
-// This method aims to dismiss all modals for which presentation process
-// has been initiated in this navigation controller, i. e. either a Screen
-// with modal presentation or foreign modal presented from inside a Screen.
-- (void)dismissAllRelatedModals
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
 {
-  [_controller.presentedViewController dismissViewControllerAnimated:YES completion:nil];
-
-  // This loop seems to be excessive. Above message send to `_controller` should
-  // be enough, because system dismisses the controllers recursively,
-  // however better safe than sorry & introduce a regression, thus it is left here.
-  for (UIViewController *controller in [_presentedModals reverseObjectEnumerator]) {
-    [controller dismissViewControllerAnimated:NO completion:nil];
-  }
-  [_presentedModals removeAllObjects];
+  [super load];
 }
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSScreenStackCls(void)
 {
   return RNSScreenStackView.class;
 }
-#endif
-
-@implementation RNSScreenStackManager {
-  NSPointerArray *_stacks;
-}
 
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_VIEW_PROPERTY(onFinishTransitioning, RCTDirectEventBlock);
-RCT_EXPORT_VIEW_PROPERTY(iosPreventReattachmentOfDismissedScreens, BOOL);
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-- (UIView *)view
-{
-  RNSScreenStackView *view = [[RNSScreenStackView alloc] initWithManager:self];
-  if (!_stacks) {
-    _stacks = [NSPointerArray weakObjectsPointerArray];
-  }
-  [_stacks addPointer:(__bridge void *)view];
-  return view;
-}
-#endif // RCT_NEW_ARCH_ENABLED
-
-- (void)invalidate
-{
-  for (RNSScreenStackView *stack in _stacks) {
-    [stack dismissOnReload];
-  }
-  _stacks = nil;
-}
+@implementation RNSScreenStackManager
 
 @end

package/ios/RNSScreenStackAnimator.mm

@@ -5,8 +5,7 @@
 
 #pragma mark - Constants
 
-// Default duration for transitions in seconds. Note, that this enforces the default
-// only on Paper. On Fabric the transition duration coming from JS layer
+// Default duration for transitions in seconds. Note, that the transition duration coming from JS layer
 // is never null, thus it defaults to the value set in component codegen spec.
 static constexpr NSTimeInterval RNSDefaultTransitionDuration = 0.5;
 

package/ios/RNSScreenStackHeaderConfig.h

@@ -1,13 +1,7 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTShadowView.h>
-#import <React/RCTViewManager.h>
-#endif
-
 #import <React/RCTConvert.h>
+#import "RNSReactBaseView.h"
 #import "RNSScreen.h"
 #import "RNSScreenStackHeaderSubview.h"
 #import "RNSSearchBar.h"
@@ -18,20 +12,11 @@
 
 @end
 
-@interface RNSScreenStackHeaderConfig :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-    UIView
-#endif
+@interface RNSScreenStackHeaderConfig : RNSReactBaseView
 
 @property (nonatomic, weak) RNSScreenView *screenView;
 
-#ifdef RCT_NEW_ARCH_ENABLED
 @property (nonatomic) BOOL show;
-#else
-@property (nonatomic) BOOL hide;
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -63,10 +48,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) RNSBlurEffectStyle blurEffect;
 @property (nonatomic, copy, nullable) NSArray<NSDictionary<NSString *, id> *> *headerRightBarButtonItems;
 @property (nonatomic, copy, nullable) NSArray<NSDictionary<NSString *, id> *> *headerLeftBarButtonItems;
-#if !RCT_NEW_ARCH_ENABLED
-@property (nonatomic) RCTDirectEventBlock onPressHeaderBarButtonItem;
-@property (nonatomic) RCTDirectEventBlock onPressHeaderBarButtonMenuItem;
-#endif
 @property (nonatomic, readwrite) BOOL synchronousShadowStateUpdatesEnabled;
 
 NS_ASSUME_NONNULL_END
@@ -92,12 +73,7 @@ NS_ASSUME_NONNULL_END
 - (BOOL)hasSubviewLeft;
 
 /**
- * Returns
- * - `YES` on Paper, when `self.hide == NO`
- * - `YES` on Fabric, when `self.show == YES`
- * - `NO` otherwise.
- *
- * Convenience method, so that we do not need ifdefs in every callsite.
+ * Returns `YES` when `self.show == YES`, `NO` otherwise.
  */
 - (BOOL)shouldHeaderBeVisible;
 
@@ -107,7 +83,6 @@ NS_ASSUME_NONNULL_END
  */
 - (BOOL)shouldBackButtonBeVisibleInNavigationBar:(nullable UINavigationBar *)navBar;
 
-#ifdef RCT_NEW_ARCH_ENABLED
 /**
  * Allows to send information with size to the corresponding node in shadow tree.
  * This method updates state of header config shadow node only.
@@ -119,13 +94,6 @@ NS_ASSUME_NONNULL_END
  * When `navBar == nil` this method does nothing.
  */
 - (void)updateHeaderStateInShadowTreeInContextOfNavigationBar:(nullable UINavigationBar *)navBar;
-#else
-/**
- * Allows to send information with insets to the corresponding node in shadow tree.
- * Currently only horizontal insets are send through. Vertical ones are filtered out.
- */
-- (void)updateHeaderConfigState:(NSDirectionalEdgeInsets)insets;
-#endif
 
 @end
 
@@ -143,31 +111,6 @@ NS_ASSUME_NONNULL_END
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-
-#pragma mark - Legacy Shadow View
-/**
- * Used as local data send to shadow view on Paper. This helps us to provide Yoga
- * with knowledge of native insets in the navigation bar.
- */
-@interface RNSHeaderConfigInsetsPayload : NSObject
-
-@property (nonatomic) NSDirectionalEdgeInsets insets;
-
-- (instancetype)initWithInsets:(NSDirectionalEdgeInsets)insets NS_DESIGNATED_INITIALIZER;
-
-@end
-
-/**
- * Custom shadow view for header config. This is used on Paper to provide Yoga
- * with knowledge of native header insets (horizontal padding).
- */
-@interface RNSScreenStackHeaderConfigShadowView : RCTShadowView
-
-@end
-#endif
-
 #pragma mark - RCTConvert
 
 @interface RCTConvert (RNSScreenStackHeader)