react-native-screens 5.0.0-alpha.1 → 5.0.0-alpha.3

package/ios/legacy/RNSScreen.mm

@@ -14,7 +14,7 @@
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSScreenComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenComponentDescriptor.h>
 #import "RNSConvert.h"
 #import "RNSHeaderHeightChangeEvent.h"
 #import "RNSScreenViewEvent.h"
@@ -102,6 +102,7 @@ struct ContentWrapperBox {
   _sheetContentHeight = 0.0;
   _markedForUnmountInCurrentTransaction = NO;
   _synchronousShadowStateUpdatesEnabled = YES;
+  _iosOrientationInheritanceFixEnabled = YES;
 }
 
 - (BOOL)getFullScreenSwipeShadowEnabled
@@ -177,6 +178,13 @@ RNS_IGNORE_SUPER_CALL_END
 
 - (void)applyFrameCorrectionForDescendantScrollView
 {
+  // A dismissed sheet can still receive a layout pass after React has deleted it. By then Fabric
+  // may have recycled its scroll view into the screen that replaced the sheet, and sizing that
+  // scroll view to the sheet would clip the new screen. See #4651.
+  if (_invalidated) {
+    return;
+  }
+
   RCTScrollViewComponentView *scrollView = [self tryFindDescendantScrollView];
   if (_sheetsScrollView != scrollView) {
     [_sheetsScrollView removeObserver:self forKeyPath:@"bounds" context:nil];
@@ -769,6 +777,8 @@ RNS_IGNORE_SUPER_CALL_END
 
 - (void)invalidateImpl
 {
+  _invalidated = YES;
+
   // Since the scroll view might get immediately recycled we remove ourselves
   // immediately.
   if (_sheetsScrollView != nil) {
@@ -1259,6 +1269,8 @@ RNS_IGNORE_SUPER_CALL_END
 
   [self setSynchronousShadowStateUpdatesEnabled:newScreenProps.synchronousShadowStateUpdatesEnabled];
 
+  [self setIosOrientationInheritanceFixEnabled:newScreenProps.iosOrientationInheritanceFixEnabled];
+
 #if !TARGET_OS_TV
   if (newScreenProps.statusBarHidden != oldScreenProps.statusBarHidden) {
     [self setStatusBarHidden:newScreenProps.statusBarHidden];
@@ -1407,7 +1419,6 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 @implementation RNSScreen {
   __weak id _previousFirstResponder;
   CGRect _lastViewFrame;
-  RNSScreenView *_initialView;
   UIView *_fakeView;
   CADisplayLink *_animationTimer;
   CGFloat _currentAlpha;
@@ -1428,7 +1439,6 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
     _fakeView = [UIView new];
     _shouldNotify = YES;
     _isRemovedFromParent = NO;
-    _initialView = (RNSScreenView *)view;
   }
   return self;
 }
@@ -1579,24 +1589,6 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   return NO;
 }
 
-- (CGSize)getStatusBarHeightIsModal:(BOOL)isModal
-{
-#if !TARGET_OS_TV && !TARGET_OS_VISION
-  CGSize fallbackStatusBarSize = [[UIApplication sharedApplication] statusBarFrame].size;
-
-  CGSize primaryStatusBarSize = self.view.window.windowScene.statusBarManager.statusBarFrame.size;
-  if (primaryStatusBarSize.height == 0 || primaryStatusBarSize.width == 0) {
-    return fallbackStatusBarSize;
-  }
-
-  return primaryStatusBarSize;
-
-#else
-  // TVOS does not have status bar.
-  return CGSizeMake(0, 0);
-#endif // !TARGET_OS_TV
-}
-
 - (UINavigationController *)getVisibleNavigationControllerIsModal:(BOOL)isModal
 {
   UINavigationController *navctr = self.navigationController;
@@ -1751,9 +1743,13 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward
 {
-  if ([self.view isKindOfClass:[RNSScreenView class]]) {
-    // if the view is already snapshot, there is not sense in sending progress since on JS side
-    // the component is already not present
+  if (![self.view isKindOfClass:[RNSScreenView class]]) {
+    return;
+  }
+
+  // if the screen was already deleted by React, there is no sense in sending progress
+  // since on JS side the component is already not present
+  if (!static_cast<RNSScreenView *>(self.view).isInvalidated) {
     [(RNSScreenView *)self.view notifyTransitionProgress:progress closing:closing goingForward:goingForward];
   }
 }
@@ -1907,11 +1903,9 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   return (int)[[self.screenView.reactSuperview reactSubviews] indexOfObject:view];
 }
 
-// Since the view of the controller can be a snapshot of type `UIView`,
-// when we want to check props of ScreenView, we need to get them from _initialView
 - (RNSScreenView *)screenView
 {
-  return _initialView;
+  return static_cast<RNSScreenView *>(self.view);
 }
 
 - (void)hideHeaderIfNecessary
@@ -1984,6 +1978,19 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
     }
   }
 
+  // If flag is enabled, we're doing same evaluation as `[self supportedInterfaceOrientations]`
+  // but we fall back to `RNSOrientationInherit` if orientation is not set in order not to
+  // override parent's orientation. For more details see:
+  // https://github.com/software-mansion/react-native-screens/pull/4408
+  if (self.screenView.iosOrientationInheritanceFixEnabled) {
+    UIViewController *orientationVC = [self findChildVCForConfigAndTrait:RNSWindowTraitOrientation includingModals:YES];
+    if ([orientationVC isKindOfClass:[RNSScreen class]]) {
+      return rnscreens::conversion::RNSOrientationFromUIInterfaceOrientationMask(
+          ((RNSScreen *)orientationVC).screenView.screenOrientation);
+    }
+    return RNSOrientationInherit;
+  }
+
   return rnscreens::conversion::RNSOrientationFromUIInterfaceOrientationMask([self supportedInterfaceOrientations]);
 }
 
@@ -1991,18 +1998,22 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 
 #pragma mark - Fabric specific
 
-- (void)setViewToSnapshot
+- (void)addSnapshotToView
 {
-  UIView *superView = self.view.superview;
   // if we dismissed the view natively, it will already be detached from view hierarchy
-  if (self.view.window != nil) {
-    auto afterUpdates = self.screenView.snapshotAfterUpdates;
-    UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:afterUpdates];
-    snapshot.frame = self.view.frame;
-    [self.view removeFromSuperview];
-    self.view = snapshot;
-    [superView addSubview:snapshot];
+  if (self.view.window == nil) {
+    return;
   }
+
+  // The snapshot is added inside the screen view instead of replacing it, so `self.view` remains
+  // the view UIKit captured for the ongoing transition and is torn down (with the snapshot)
+  // consistently. Replacing the view mid-transition made iOS 26 teardown re-insert the original
+  // view into the hierarchy and remove only the snapshot, leaving a view that blocked all touches.
+  UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:self.screenView.snapshotAfterUpdates];
+  snapshot.frame = self.view.bounds;
+  // fill the whole screen view with the snapshot
+  snapshot.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+  [self.view addSubview:snapshot];
 }
 
 @end

package/ios/legacy/RNSScreenContentWrapper.mm

@@ -16,6 +16,15 @@ namespace react = facebook::react;
 
 @implementation RNSScreenContentWrapper
 
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const react::RNSScreenContentWrapperProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
 - (void)notifyDelegateWithFrame:(CGRect)frame
 {
   [self.delegate contentWrapper:self receivedReactFrame:frame];

package/ios/legacy/RNSScreenFooter.mm

@@ -12,6 +12,8 @@
 - (instancetype)init
 {
   if (self = [super init]) {
+    static const auto defaultProps = std::make_shared<const facebook::react::RNSScreenFooterProps>();
+    _props = defaultProps;
     self.translatesAutoresizingMaskIntoConstraints = false;
     _parent = nil;
   }

package/ios/legacy/RNSScreenStack.mm

@@ -244,8 +244,10 @@ namespace react = facebook::react;
       willShowViewController:(UIViewController *)viewController
                     animated:(BOOL)animated
 {
-  if (![viewController.view isKindOfClass:[RNSScreenView class]]) {
-    // if the current view is a snapshot, config was already removed so we don't trigger the method
+  if (![viewController.view isKindOfClass:[RNSScreenView class]] ||
+      static_cast<RNSScreenView *>(viewController.view).isInvalidated) {
+    // if the screen was already deleted by React, its config was already removed
+    // so we don't trigger the method
     return;
   }
   auto *screenView = static_cast<RNSScreenView *>(viewController.view);
@@ -1313,7 +1315,7 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   RNSScreenView *screenChildComponent = (RNSScreenView *)childComponentView;
-  [screenChildComponent.controller setViewToSnapshot];
+  [screenChildComponent.controller addSnapshotToView];
 
   RCTAssert(screenChildComponent.reactSuperview == self,
             @"Attempt to unmount a view which is mounted inside different view. (parent: %@, child: %@, index: %@)",
@@ -1330,7 +1332,10 @@ RNS_IGNORE_SUPER_CALL_END
       @([[_reactSubviews objectAtIndex:index] tag]));
   screenChildComponent.reactSuperview = nil;
   [_reactSubviews removeObject:screenChildComponent];
-  [screenChildComponent removeFromSuperview];
+
+  if (screenChildComponent.window == nil) {
+    [screenChildComponent removeFromSuperview];
+  }
 }
 
 - (void)mountingTransactionWillMount:(const facebook::react::MountingTransaction &)transaction

package/ios/legacy/RNSScreenStackHeaderConfig.mm

@@ -14,7 +14,7 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import <react/utils/ManagedObjectWrapper.h>
-#import <rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenStackHeaderConfigComponentDescriptor.h>
 #import "RCTImageComponentView+RNSScreenStackHeaderConfig.h"
 #import "RNSBackBarButtonItem.h"
 #import "RNSBarButtonItem.h"
@@ -947,6 +947,7 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+#ifndef NDEBUG
 static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
 {
   switch (resizeMode) {
@@ -965,6 +966,7 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
       return RCTResizeModeStretch;
   }
 }
+#endif // !NDEBUG
 
 + (RCTImageSource *)imageSourceFromImageView:(RCTImageComponentView *)view
 {

package/ios/legacy/RNSScreenStackHeaderSubview.mm

@@ -10,7 +10,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
-#import <rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenStackHeaderSubviewComponentDescriptor.h>
 
 namespace react = facebook::react;
 

package/ios/legacy/RNSScreenWindowTraits.mm

@@ -101,7 +101,8 @@
 {
 #if !TARGET_OS_TV && !TARGET_OS_VISION
   dispatch_async(dispatch_get_main_queue(), ^{
-    UIInterfaceOrientationMask orientationMask = [RCTKeyWindow().rootViewController supportedInterfaceOrientations];
+    UIWindow *window = RCTKeyWindow();
+    UIInterfaceOrientationMask orientationMask = [window.rootViewController supportedInterfaceOrientations];
 
     UIInterfaceOrientation currentDeviceOrientation =
         [RNSScreenWindowTraits interfaceOrientationFromDeviceOrientation:[[UIDevice currentDevice] orientation]];
@@ -130,17 +131,7 @@
     if (newOrientation != UIInterfaceOrientationUnknown) {
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
       if (@available(iOS 16.0, *)) {
-        NSArray *array = [[[UIApplication sharedApplication] connectedScenes] allObjects];
-
-        // when an app supports multiple scenes (e.g. CarPlay), it is possible that
-        // UIWindowScene is not the first scene, or it may not be present at all
-        UIWindowScene *scene = nil;
-        for (id connectedScene in array) {
-          if ([connectedScene isKindOfClass:[UIWindowScene class]]) {
-            scene = connectedScene;
-            break;
-          }
-        }
+        UIWindowScene *scene = window.windowScene;
 
         if (scene == nil) {
           return;
@@ -154,7 +145,8 @@
 
         // `attemptRotationToDeviceOrientation` is deprecated for modern OS versions
         // so we need to use `setNeedsUpdateOfSupportedInterfaceOrientations`
-        UIViewController *topController = [UIApplication sharedApplication].keyWindow.rootViewController;
+
+        UIViewController *topController = window.rootViewController;
         while (topController.presentedViewController) {
           topController = topController.presentedViewController;
         }

package/ios/modals/form-sheet/RNSFormSheetConfigurationApplicator.h

@@ -10,13 +10,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RNSFormSheetConfigurationApplicator : NSObject
 
-- (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
++ (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
                                         behaviorProvider:(id<RNSFormSheetBehaviorProvider>)behaviorProvider
                                               controller:(RNSFormSheetContentController *)controller
                                              coordinator:(RNSFormSheetUpdateCoordinator *)coordinator;
 
-- (void)resetInitialDetent;
-
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/modals/form-sheet/RNSFormSheetConfigurationApplicator.mm

@@ -7,43 +7,33 @@
 #import "RNSFormSheetUpdateCoordinator.h"
 #import "RNSFormSheetUpdateFlags.h"
 
-@implementation RNSFormSheetConfigurationApplicator {
-  BOOL _initialDetentApplied;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _initialDetentApplied = NO;
-  }
-  return self;
-}
+@implementation RNSFormSheetConfigurationApplicator
 
-- (void)resetInitialDetent
-{
-  _initialDetentApplied = NO;
-}
-
-- (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
++ (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
                                         behaviorProvider:(id<RNSFormSheetBehaviorProvider>)behaviorProvider
                                               controller:(RNSFormSheetContentController *)controller
                                              coordinator:(RNSFormSheetUpdateCoordinator *)coordinator
 {
-  RNSFormSheetUpdateFlags configFlags = RNSFormSheetUpdateFlagsAppearance | RNSFormSheetUpdateFlagsBehavior;
+  RNSFormSheetUpdateFlags configFlags =
+      RNSFormSheetUpdateFlagsAppearance | RNSFormSheetUpdateFlagsBehavior | RNSFormSheetUpdateFlagsInitialDetent;
+
+  BOOL shouldSelectInitialDetent = [coordinator needsAny:RNSFormSheetUpdateFlagsInitialDetent];
 
   [coordinator updateIfAnyNeeded:configFlags
                performOperations:^{
                  [self applyConfigurationWithAppearanceProvider:appearanceProvider
                                                behaviorProvider:behaviorProvider
-                                                     controller:controller];
+                                                     controller:controller
+                                            selectInitialDetent:shouldSelectInitialDetent];
                }];
 }
 
 #pragma mark - Updaters
 
-- (void)applyConfigurationWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
++ (void)applyConfigurationWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
                                 behaviorProvider:(id<RNSFormSheetBehaviorProvider>)behaviorProvider
                                       controller:(RNSFormSheetContentController *)controller
+                             selectInitialDetent:(BOOL)selectInitialDetent
 {
 #if !TARGET_OS_TV
   UISheetPresentationController *sheet = controller.sheetPresentationController;
@@ -57,11 +47,10 @@
       [RNSFormSheetDetentResolver buildSheetDetentsWithBehaviorProvider:behaviorProvider];
 
   UISheetPresentationControllerDetentIdentifier initialDetentIdentifier = nil;
-  if (!_initialDetentApplied) {
+  if (selectInitialDetent) {
     initialDetentIdentifier =
         [RNSFormSheetDetentResolver initialDetentIdentifierForDetents:nativeDetents
                                                      atRequestedIndex:behaviorProvider.initialDetentIndex];
-    _initialDetentApplied = YES;
   }
 
   BOOL prefersScrollingExpands = behaviorProvider.prefersScrollingExpandsWhenScrolledToEdge;

package/ios/modals/form-sheet/RNSFormSheetContentController.h

@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setNeedsPresentationUpdate;
 - (void)setNeedsBehaviorUpdate;
 - (void)setNeedsAppearanceUpdate;
-- (void)setNeedsInitialDetentReset;
+- (void)setNeedsInitialDetentUpdate;
 
 #pragma mark - Updates
 

package/ios/modals/form-sheet/RNSFormSheetContentController.mm

@@ -20,12 +20,9 @@
 
 @implementation RNSFormSheetContentController {
   RNSFormSheetUpdateCoordinator *_Nonnull _updateCoordinator;
-  RNSFormSheetConfigurationApplicator *_Nonnull _configurationApplicator;
   RNSFormSheetPresentationManager *_Nonnull _presentationManager;
 
   UITapGestureRecognizer *_Nullable _backdropTapGestureRecognizer;
-
-  BOOL _needsInitialDetentReset;
 }
 
 - (instancetype)init
@@ -34,10 +31,7 @@
     self.modalPresentationStyle = UIModalPresentationFormSheet;
 
     _updateCoordinator = [RNSFormSheetUpdateCoordinator new];
-    _configurationApplicator = [RNSFormSheetConfigurationApplicator new];
     _presentationManager = [RNSFormSheetPresentationManager new];
-
-    _needsInitialDetentReset = NO;
   }
   return self;
 }
@@ -142,7 +136,7 @@
   // We must force a full configuration update for this new instance.
   [self setNeedsAppearanceUpdate];
   [self setNeedsBehaviorUpdate];
-  [self setNeedsInitialDetentReset];
+  [self setNeedsInitialDetentUpdate];
   [self updateConfigurationIfNeeded];
 }
 
@@ -160,15 +154,10 @@
     return;
   }
 
-  if (_needsInitialDetentReset) {
-    _needsInitialDetentReset = NO;
-    [_configurationApplicator resetInitialDetent];
-  }
-
-  [_configurationApplicator applyConfigurationIfNeededWithAppearanceProvider:appearanceProvider
-                                                            behaviorProvider:behaviorProvider
-                                                                  controller:self
-                                                                 coordinator:_updateCoordinator];
+  [RNSFormSheetConfigurationApplicator applyConfigurationIfNeededWithAppearanceProvider:appearanceProvider
+                                                                       behaviorProvider:behaviorProvider
+                                                                             controller:self
+                                                                            coordinator:_updateCoordinator];
 }
 
 #pragma mark - Signals
@@ -188,9 +177,9 @@
   [_updateCoordinator setNeeds:RNSFormSheetUpdateFlagsBehavior];
 }
 
-- (void)setNeedsInitialDetentReset
+- (void)setNeedsInitialDetentUpdate
 {
-  _needsInitialDetentReset = YES;
+  [_updateCoordinator setNeeds:RNSFormSheetUpdateFlagsInitialDetent];
 }
 
 #pragma mark - Updates

package/ios/modals/form-sheet/RNSFormSheetContentWrapperComponentView.mm

@@ -7,6 +7,15 @@ namespace react = facebook::react;
 
 @implementation RNSFormSheetContentWrapperComponentView
 
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const react::RNSFormSheetContentWrapperProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider

package/ios/modals/form-sheet/RNSFormSheetHostComponentView.mm

@@ -13,7 +13,7 @@
 #import <React/RCTSurfaceTouchHandler.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
-#import <rnscreens/RNSFormSheetHostComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSFormSheetHostComponentDescriptor.h>
 
 namespace react = facebook::react;
 
@@ -246,9 +246,9 @@ namespace react = facebook::react;
       // because UIKit destroys the presentationController after the modal is dismissed.
       [_controller setNeedsAppearanceUpdate];
       [_controller setNeedsBehaviorUpdate];
-      // Reset the initial-detent applied flag when reopening so the
-      // configured initialDetentIndex can be applied again.
-      [_controller setNeedsInitialDetentReset];
+      // Request the configured initialDetentIndex to be selected
+      // again on the fresh presentation controller.
+      [_controller setNeedsInitialDetentUpdate];
     }
   }
 

package/ios/modals/form-sheet/RNSFormSheetHostShadowStateProxy.mm

@@ -1,8 +1,8 @@
 #import "RNSFormSheetHostShadowStateProxy.h"
 
 #import <React/RCTConversions.h>
-#import <rnscreens/RNSFormSheetHostShadowNode.h>
-#import <rnscreens/RNSFormSheetHostState.h>
+#import <react/renderer/components/rnscreens/RNSFormSheetHostShadowNode.h>
+#import <react/renderer/components/rnscreens/RNSFormSheetHostState.h>
 
 namespace react = facebook::react;
 

package/ios/modals/form-sheet/RNSFormSheetUpdateFlags.h

@@ -10,4 +10,7 @@ typedef NS_OPTIONS(NSUInteger, RNSFormSheetUpdateFlags) {
   RNSFormSheetUpdateFlagsAppearance = 1 << 1,
   // The sheet's behavioral layout (detents, scrolling config) needs to be re-applied.
   RNSFormSheetUpdateFlagsBehavior = 1 << 2,
+  // The sheet's selected detent needs to be (re)set to the configured `initialDetentIndex`.
+  // Requested once per presentation cycle, since UIKit recreates the presentation controller on every present.
+  RNSFormSheetUpdateFlagsInitialDetent = 1 << 3,
 };

package/ios/safe-area/RNSSafeAreaViewComponentView.mm

@@ -9,8 +9,8 @@
 
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
-#import <rnscreens/RNSSafeAreaViewComponentDescriptor.h>
-#import <rnscreens/RNSSafeAreaViewState.h>
+#import <react/renderer/components/rnscreens/RNSSafeAreaViewComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSSafeAreaViewState.h>
 
 namespace react = facebook::react;
 

package/ios/scroll-to-top-guard/RNSScrollToTopGuard.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#import "RNSReactBaseView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Backing native view for the experimental, iOS-only `ScrollToTopGuard` component. It wraps its
+ * children and attaches an `RNSScrollToTopGuardGestureRecognizer` to itself on OS versions where
+ * the system "scroll to top" navigation-bar interaction exists (iPadOS 26+, iPhone iOS 27+), so
+ * that tapping the wrapped content does not scroll the underlying scroll view to top.
+ */
+@interface RNSScrollToTopGuard : RNSReactBaseView
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/scroll-to-top-guard/RNSScrollToTopGuard.mm

@@ -0,0 +1,57 @@
+#import "RNSScrollToTopGuard.h"
+#import <react/renderer/components/rnscreens/ComponentDescriptors.h>
+#import <react/renderer/components/rnscreens/EventEmitters.h>
+#import <react/renderer/components/rnscreens/Props.h>
+#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+#import "RNSDefines.h"
+#import "RNSScrollToTopGuardGestureRecognizer.h"
+
+namespace react = facebook::react;
+
+@implementation RNSScrollToTopGuard
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    [self initState];
+  }
+  return self;
+}
+
+- (void)initState
+{
+  static const auto defaultProps = std::make_shared<const react::RNSScrollToTopGuardProps>();
+  _props = defaultProps;
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+  // Attach the guard once on mount, only on OS versions where the system scroll-to-top
+  // interaction exists. On other versions this view is a plain passthrough.
+  if ([RNSScrollToTopGuardGestureRecognizer shouldGuardScrollToTop]) {
+    [RNSScrollToTopGuardGestureRecognizer applyToView:self];
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+}
+
++ (react::ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return react::concreteComponentDescriptorProvider<react::RNSScrollToTopGuardComponentDescriptor>();
+}
+
+#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
+
+#pragma mark - View class exposure
+
+Class<RCTComponentViewProtocol> RNSScrollToTopGuardCls(void)
+{
+  return RNSScrollToTopGuard.class;
+}

package/ios/scroll-to-top-guard/RNSScrollToTopGuardGestureRecognizer.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * This gesture recognizer is necessary to handle views placed in the navigation bar area on OS
+ * versions where the system triggers "scroll to top" by tapping that area (iPadOS 26+ and iPhone
+ * iOS 27+). Otherwise, tapping such a view results in a scroll to top action even if there is a
+ * pressable inside it.
+ */
+@interface RNSScrollToTopGuardGestureRecognizer : UITapGestureRecognizer <UIGestureRecognizerDelegate>
+
+/**
+ * Returns YES on OS versions / device idioms where the system scroll-to-top-on-header interaction
+ * exists (iPad: iOS 26+, iPhone: iOS 27+); NO otherwise.
+ */
++ (BOOL)shouldGuardScrollToTop;
+
+/**
+ * Creates the scroll to top guard gesture recognizer and adds it to the given view.
+ */
++ (void)applyToView:(UIView *)view;
+
+@end
+
+NS_ASSUME_NONNULL_END