react-native-screens 5.0.0-alpha.2 → 5.0.0-alpha.4

package/ios/legacy/RNSScreenContentWrapper.mm

@@ -53,6 +53,9 @@ namespace react = facebook::react;
 {
   UIViewController *controller = screenCtrl;
   float headerHeightErrata = 0.f;
+  // When screens extend under opaque navigation bars (iOS 26+), the `SafeAreaView` rendered inside this wrapper insets
+  // the content below the bar, so the bar height is already part of the wrapper's frame and must not be added again.
+  const BOOL wrapperFrameIncludesNavigationBar = [RNSScreenStackHeaderConfig screensExtendUnderOpaqueNavigationBar];
 
   do {
     if ([controller isKindOfClass:RNSScreen.class]) {
@@ -60,7 +63,7 @@ namespace react = facebook::react;
       if ([currentScreen.screenView registerContentWrapper:self contentHeightErrata:headerHeightErrata]) {
         break;
       }
-    } else if ([controller isKindOfClass:RNSNavigationController.class]) {
+    } else if (!wrapperFrameIncludesNavigationBar && [controller isKindOfClass:RNSNavigationController.class]) {
       RNSNavigationController *navigationController = static_cast<RNSNavigationController *>(controller);
       UINavigationBar *navigationBar = navigationController.navigationBar;
 

package/ios/legacy/RNSScreenStack.mm

@@ -12,6 +12,7 @@
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import "RCTSurfaceTouchHandler+RNSUtility.h"
 #import "RNSDefines.h"
+#import "RNSNavigationBar.h"
 #import "RNSPercentDrivenInteractiveTransition.h"
 #import "RNSScreen.h"
 #import "RNSScreenStackAnimator.h"
@@ -24,6 +25,10 @@
 #import "UIView+RNSUtility.h"
 #import "integrations/RNSDismissibleModalProtocol.h"
 
+#if TARGET_OS_TV
+#import <React/RCTTVRemoteHandler.h>
+#endif // TARGET_OS_TV
+
 namespace react = facebook::react;
 
 @interface RNSScreenStackView () <UINavigationControllerDelegate,
@@ -36,9 +41,36 @@ namespace react = facebook::react;
 @property (nonatomic) BOOL updatingModals;
 @property (nonatomic) BOOL scheduleModalsUpdate;
 
+#if TARGET_OS_TV
+@property (nonatomic, assign) BOOL disableDefaultMenuAction;
+@property (nonatomic, assign) BOOL observingTVMenuKeyNotifications;
+#endif // TARGET_OS_TV
+
+@end
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+@interface RNSNavigationController () <RNSNavigationBarLayoutDelegate>
 @end
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
 
-@implementation RNSNavigationController
+@implementation RNSNavigationController {
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+  CGRect _lastNavigationBarFrame;
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+}
+
+- (instancetype)init
+{
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+  self = [super initWithNavigationBarClass:RNSNavigationBar.class toolbarClass:nil];
+  if (self != nil && [self.navigationBar isKindOfClass:RNSNavigationBar.class]) {
+    static_cast<RNSNavigationBar *>(self.navigationBar).layoutDelegate = self;
+  }
+#else // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+  self = [super init];
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+  return self;
+}
 
 #if !TARGET_OS_TV
 - (UIViewController *)childViewControllerForStatusBarStyle
@@ -59,25 +91,34 @@ namespace react = facebook::react;
 - (void)viewDidLayoutSubviews
 {
   [super viewDidLayoutSubviews];
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+  if (@available(iOS 26.0, *)) {
+    [self requestLayoutIfNavigationBarFrameChanged];
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
   if ([self.topViewController isKindOfClass:[RNSScreen class]]) {
     RNSScreen *screenController = (RNSScreen *)self.topViewController;
-    BOOL isNotDismissingModal = screenController.presentedViewController == nil ||
-        (screenController.presentedViewController != nil &&
-         ![screenController.presentedViewController isBeingDismissed]);
-    BOOL isPresentingSearchController =
-        [screenController.presentedViewController isKindOfClass:UISearchController.class];
-
-    // Calculate header height during simple transition from one screen to another.
-    // If RNSScreen includes a navigation controller of type RNSNavigationController, it should not calculate
-    // header height, as it could have nested stack.
-    if (![screenController hasNestedStack] && (isPresentingSearchController || isNotDismissingModal)) {
-      [screenController calculateAndNotifyHeaderHeightChangeIsModal:NO];
-    }
-
+    [self notifyHeaderHeightChangeToScreen:screenController];
     [self maybeUpdateHeaderLayoutInfoInShadowTree:screenController];
   }
 }
 
+- (void)notifyHeaderHeightChangeToScreen:(RNSScreen *)screenController
+{
+  BOOL isNotDismissingModal = screenController.presentedViewController == nil ||
+      (screenController.presentedViewController != nil && ![screenController.presentedViewController isBeingDismissed]);
+  BOOL isPresentingSearchController = [screenController.presentedViewController isKindOfClass:UISearchController.class];
+
+  // Calculate header height during simple transition from one screen to another.
+  // If RNSScreen includes a navigation controller of type RNSNavigationController, it should not calculate
+  // header height, as it could have nested stack.
+  if (![screenController hasNestedStack] && (isPresentingSearchController || isNotDismissingModal)) {
+    [screenController calculateAndNotifyHeaderHeightChangeIsModal:NO];
+  }
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
   return [self topViewController].supportedInterfaceOrientations;
@@ -116,7 +157,61 @@ namespace react = facebook::react;
 
   [headerConfig updateHeaderStateInShadowTreeInContextOfNavigationBar:self.navigationBar];
 }
-#endif
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+- (void)requestLayoutIfNavigationBarFrameChanged API_AVAILABLE(ios(26.0))
+{
+  // UIKit positions the navigation bar during layout of our view, but on iOS 26+ it does so after it has computed
+  // the safe area insets of the top view controller. The insets are therefore derived from the previous frame of
+  // the bar and they are not corrected until the next layout pass, which nobody requests.
+  // Since on iOS 26+ the screen is always laid out under the navigation bar, anything that relies on the insets
+  // (`SafeAreaView` rendered by `ScreenStackItem`, content inset adjustment of a scroll view) is misplaced by
+  // the distance the bar has travelled.
+  //
+  // When the frame of the bar has changed, we request another layout pass, in which UIKit computes the insets with
+  // the bar already in place. It runs in the same frame. The frame of the bar does not depend on the insets of
+  // the top view controller, so the bar is not moved in the additional pass and we do not request yet another one.
+  const CGRect navigationBarFrame = self.navigationBar.frame;
+  if (!CGRectEqualToRect(navigationBarFrame, _lastNavigationBarFrame)) {
+    _lastNavigationBarFrame = navigationBarFrame;
+    [self.view setNeedsLayout];
+  }
+}
+
+#pragma mark - RNSNavigationBarLayoutDelegate
+
+- (void)navigationBarDidLayoutSubviews:(UINavigationBar *)navigationBar
+{
+  // On iOS 26+ UIKit can position the content of the navigation bar after `viewDidLayoutSubviews`, in a layout pass
+  // that follows layout of the bar itself (e.g. title view on rotation of iPhone Duo), or without any layout pass of
+  // our view at all (bar minimization on iOS 27). None of our views receives a callback when it is moved this way,
+  // therefore we request layout of the header subviews. They are laid out later in the same layout pass, after their
+  // ancestors, and update their position in the shadow tree then.
+  // See https://github.com/software-mansion/react-native-screens-labs/issues/1841
+  if (@available(iOS 26.0, *)) {
+    if (![self.topViewController isKindOfClass:[RNSScreen class]]) {
+      return;
+    }
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+    // The bar minimization (iOS 27+) changes the visible height of the bar without changing its frame and without
+    // layout of our view, so this is the only place where we can follow it.
+    if (@available(iOS 27.0, *)) {
+      [self notifyHeaderHeightChangeToScreen:static_cast<RNSScreen *>(self.topViewController)];
+    }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+
+    auto headerConfig = static_cast<RNSScreen *>(self.topViewController).screenView.findHeaderConfig;
+    if (headerConfig == nil || !headerConfig.shouldHeaderBeVisible) {
+      return;
+    }
+
+    [headerConfig setNeedsLayoutForHeaderSubviewsInNavigationBar:navigationBar];
+  }
+}
+
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+#endif // !TARGET_OS_TV
 
 - (void)willMoveToParentViewController:(UIViewController *)parent
 {
@@ -283,8 +378,81 @@ RNS_IGNORE_SUPER_CALL_END
   [super didMoveToWindow];
   // for handling nested stacks
   [self maybeAddToParentAndUpdateContainer];
+#if TARGET_OS_TV
+  if (self.window != nil) {
+    [self registerForTVMenuKeyNotificationsIfNeeded];
+    [self syncTVMenuKeyHandling];
+  } else {
+    [self unregisterForTVMenuKeyNotificationsIfNeeded];
+  }
+#endif // TARGET_OS_TV
+}
+
+#if TARGET_OS_TV
+
+- (void)registerForTVMenuKeyNotificationsIfNeeded
+{
+  if (_observingTVMenuKeyNotifications) {
+    return;
+  }
+  _observingTVMenuKeyNotifications = YES;
+  NSNotificationCenter *center = NSNotificationCenter.defaultCenter;
+  [center addObserver:self
+             selector:@selector(handleTVMenuKeyNotification:)
+                 name:RCTTVEnableMenuKeyNotification
+               object:nil];
+  [center addObserver:self
+             selector:@selector(handleTVMenuKeyNotification:)
+                 name:RCTTVDisableMenuKeyNotification
+               object:nil];
+}
+
+- (void)unregisterForTVMenuKeyNotificationsIfNeeded
+{
+  if (!_observingTVMenuKeyNotifications) {
+    return;
+  }
+  _observingTVMenuKeyNotifications = NO;
+  NSNotificationCenter *center = NSNotificationCenter.defaultCenter;
+  [center removeObserver:self name:RCTTVEnableMenuKeyNotification object:nil];
+  [center removeObserver:self name:RCTTVDisableMenuKeyNotification object:nil];
+}
+
+- (void)handleTVMenuKeyNotification:(NSNotification *)notification
+{
+  [self syncTVMenuKeyHandling];
+}
+
+- (BOOL)shouldDisableUIKitMenuBackGesture
+{
+  return _disableDefaultMenuAction && [RCTTVRemoteHandler useMenuKey];
+}
+
+- (nullable UITapGestureRecognizer *)uiKitMenuBackGestureRecognizer
+{
+  for (UIGestureRecognizer *recognizer in _controller.view.gestureRecognizers) {
+    if (![recognizer isKindOfClass:UITapGestureRecognizer.class]) {
+      continue;
+    }
+    UITapGestureRecognizer *tapRecognizer = (UITapGestureRecognizer *)recognizer;
+    if ([tapRecognizer.allowedPressTypes containsObject:@(UIPressTypeMenu)]) {
+      return tapRecognizer;
+    }
+  }
+  return nil;
 }
 
+- (void)syncTVMenuKeyHandling
+{
+  UITapGestureRecognizer *menuBackGesture = [self uiKitMenuBackGestureRecognizer];
+  if (menuBackGesture == nil) {
+    return;
+  }
+  menuBackGesture.enabled = ![self shouldDisableUIKitMenuBackGesture];
+}
+
+#endif // TARGET_OS_TV
+
 - (void)maybeAddToParentAndUpdateContainer
 {
   BOOL wasScreenMounted = _controller.parentViewController != nil;
@@ -997,6 +1165,15 @@ RNS_IGNORE_SUPER_CALL_END
 }
 #endif
 
+#if TARGET_OS_TV
+- (void)navigationController:(UINavigationController *)navigationController
+       didShowViewController:(UIViewController *)viewController
+                    animated:(BOOL)animated
+{
+  [self syncTVMenuKeyHandling];
+}
+#endif // TARGET_OS_TV
+
 - (void)markChildUpdated
 {
   // In native stack this should be called only for `preload` purposes.
@@ -1279,6 +1456,13 @@ RNS_IGNORE_SUPER_CALL_END
     _controller.view.backgroundColor = _nativeContainerBackgroundColor;
   }
 
+#if TARGET_OS_TV
+  if (newScreenProps.disableDefaultMenuAction != oldScreenProps.disableDefaultMenuAction) {
+    _disableDefaultMenuAction = newScreenProps.disableDefaultMenuAction;
+    [self syncTVMenuKeyHandling];
+  }
+#endif // TARGET_OS_TV
+
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -1375,6 +1559,9 @@ RNS_IGNORE_SUPER_CALL_END
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
+#if TARGET_OS_TV
+  [self unregisterForTVMenuKeyNotificationsIfNeeded];
+#endif // TARGET_OS_TV
   _reactSubviews = [NSMutableArray new];
 
   for (UIViewController *controller in _presentedModals) {

package/ios/legacy/RNSScreenStackHeaderConfig.h

@@ -3,6 +3,7 @@
 #if defined(__cplusplus)
 #import <React/RCTConvert.h>
 #endif // __cplusplus
+#import "RNSDefines.h"
 #import "RNSReactBaseView.h"
 #import "RNSScreen.h"
 #import "RNSScreenStackHeaderSubview.h"
@@ -58,6 +59,17 @@ NS_ASSUME_NONNULL_END
                       animated:(BOOL)animated
                     withConfig:(nonnull RNSScreenStackHeaderConfig *)config;
 
+/**
+ * Returns `YES` when screens in the legacy stack are always laid out under the navigation bar
+ * (`edgesForExtendedLayout = UIRectEdgeAll`), also when the header is opaque. In that case the content is inset below
+ * an opaque bar by the `SafeAreaView` rendered by `ScreenStackItem` (JS) and the screen's origin in the navigation
+ * controller's view is always 0. Otherwise (iOS < 26, tvOS, visionOS) a screen with a visible, opaque header is laid
+ * out below the bar (`UIRectEdgeAll - UIRectEdgeTop`).
+ *
+ * Keep in sync with `getSafeAreaEdges` in `src/legacy/components/ScreenStackItem.tsx`.
+ */
++ (BOOL)screensExtendUnderOpaqueNavigationBar;
+
 /**
  * Returns true iff subview of given `type` is present.
  *
@@ -99,6 +111,24 @@ NS_ASSUME_NONNULL_END
  */
 - (void)updateHeaderStateInShadowTreeInContextOfNavigationBar:(nullable UINavigationBar *)navBar;
 
+/**
+ * Requests `updateViewControllerIfNeeded` to be called once, after the current
+ * mounting transaction finishes. Use this instead of calling `updateViewControllerIfNeeded`
+ * directly from subviews, so that a single transaction updating several subviews
+ * re-applies the config only once, with all subviews already updated.
+ */
+- (void)setNeedsViewControllerUpdate;
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+/**
+ * Requests layout of all header subviews attached to the view hierarchy. Header subview updates its state in shadow
+ * tree when it is laid out, therefore this method should be called when `navBar` lays out its subviews - the header
+ * subviews are laid out later in the same layout pass, after UIKit has positioned the content of the navigation bar.
+ * When the content of `navBar` is moved out of the bar (bar minimization on iOS 27+) this method does nothing.
+ */
+- (void)setNeedsLayoutForHeaderSubviewsInNavigationBar:(nonnull UINavigationBar *)navBar;
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
 @end
 
 #pragma mark - Experimental

package/ios/legacy/RNSScreenStackHeaderConfig.mm

@@ -13,8 +13,8 @@
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenStackHeaderConfigComponentDescriptor.h>
 #import <react/utils/ManagedObjectWrapper.h>
-#import <rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h>
 #import "RCTImageComponentView+RNSScreenStackHeaderConfig.h"
 #import "RNSBackBarButtonItem.h"
 #import "RNSBarButtonItem.h"
@@ -58,6 +58,9 @@ static const NSNumber *const DEFAULT_TITLE_LARGE_FONT_SIZE = @34;
   /// Whether a react subview has been added / removed in current transaction. This flag is reset after each react
   /// transaction via RCTMountingTransactionObserving protocol.
   bool _addedReactSubviewsInCurrentTransaction;
+  /// Whether a react subview requested the config to be re-applied in current transaction.
+  /// Consumed & reset in `mountingTransactionDidMount:withSurfaceTelemetry:`.
+  bool _needsViewControllerUpdateInCurrentTransaction;
   RCTImageLoader *_imageLoader;
 }
 
@@ -69,6 +72,7 @@ static const NSNumber *const DEFAULT_TITLE_LARGE_FONT_SIZE = @34;
     _show = YES;
     _translucent = NO;
     _addedReactSubviewsInCurrentTransaction = false;
+    _needsViewControllerUpdateInCurrentTransaction = false;
     _lastSendState = react::RNSScreenStackHeaderConfigState(react::Size{}, react::EdgeInsets{}, react::Point{});
     [self initProps];
   }
@@ -157,11 +161,18 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+- (void)setNeedsViewControllerUpdate
+{
+  _needsViewControllerUpdateInCurrentTransaction = true;
+}
+
 - (void)layoutNavigationControllerView
 {
-  // We need to layout navigation controller view after translucent prop changes, because otherwise
-  // frame of RNSScreen will not be changed and screen content will remain the same size.
-  // For more details look at https://github.com/software-mansion/react-native-screens/issues/1158
+  // We need to layout navigation controller view after `translucent` / `hidden` prop changes. Below iOS 26 the frame
+  // of RNSScreen depends on them (`edgesForExtendedLayout`), so without the layout pass the screen content would
+  // remain the same size (https://github.com/software-mansion/react-native-screens/issues/1158). On iOS 26+ the frame
+  // does not change, but the layout pass still refreshes the header layout info in the shadow tree and the safe area
+  // insets consumed by the `SafeAreaView` rendered by `ScreenStackItem`.
   UIViewController *vc = _screenView.controller;
   UINavigationController *navctr = vc.navigationController;
   [navctr.view setNeedsLayout];
@@ -194,17 +205,10 @@ RNS_IGNORE_SUPER_CALL_END
     return;
   }
 
+  // Screen's content offset in shadow tree matches its actual native origin (see `-[RNSScreenView updateBounds]`),
+  // therefore navigation bar's frame in screen's coordinate space can be used directly.
   CGRect navBarFrameInScreenView = [navigationBar convertRect:navigationBar.bounds toView:_screenView];
 
-  // On iOS 26+ in landscape mode there is a bug with `edgesForExtendedLayout` for non-transparent
-  // header. We're applying SAV to fix it but we need to take it into account for HeaderConfig's
-  // origin as well.
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-  if (!_translucent && self.shouldHeaderBeVisible) {
-    navBarFrameInScreenView.origin.y -= _screenView.safeAreaInsets.top;
-  }
-#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-
   [self updateShadowStateWithSize:navigationBar.frame.size
                        edgeInsets:[self computeEdgeInsetsOfNavigationBar:navigationBar]
                       frameOrigin:navBarFrameInScreenView.origin];
@@ -213,6 +217,24 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+- (void)setNeedsLayoutForHeaderSubviewsInNavigationBar:(nonnull UINavigationBar *)navigationBar
+{
+  // During the bar minimization (iOS 27+) UIKit moves the content view of the navigation bar above the bar, on each
+  // frame of the scroll. The header subviews are not visible then, therefore we do not follow their position, to
+  // avoid state update on each frame. When the bar is restored, its content view is back at the origin of the bar.
+  if (CGRectGetMinY(navigationBar.rnscreens_findContentView.frame) < 0) {
+    return;
+  }
+
+  for (RNSScreenStackHeaderSubview *subview in self.reactSubviews) {
+    if (subview.window != nil) {
+      [subview setNeedsLayout];
+    }
+  }
+}
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
 - (NSDirectionalEdgeInsets)computeEdgeInsetsOfNavigationBar:(nonnull UINavigationBar *)navigationBar
 {
   NSDirectionalEdgeInsets navBarMargins = [navigationBar directionalLayoutMargins];
@@ -353,6 +375,18 @@ RNS_IGNORE_SUPER_CALL_END
   return nil;
 }
 
++ (BOOL)screensExtendUnderOpaqueNavigationBar
+{
+#if TARGET_OS_TV || TARGET_OS_VISION
+  return NO;
+#else // TARGET_OS_TV || TARGET_OS_VISION
+  if (@available(iOS 26.0, *)) {
+    return YES;
+  }
+  return NO;
+#endif // TARGET_OS_TV || TARGET_OS_VISION
+}
+
 + (void)willShowViewController:(UIViewController *)vc
                       animated:(BOOL)animated
                     withConfig:(RNSScreenStackHeaderConfig *)config
@@ -494,12 +528,16 @@ RNS_IGNORE_SUPER_CALL_END
   BOOL wasHidden = navctr.navigationBarHidden;
   BOOL shouldHide = config == nil || !config.shouldHeaderBeVisible;
 
-  if (!shouldHide && !config.translucent) {
-    // when nav bar is not translucent we change edgesForExtendedLayout to avoid system laying out
-    // the screen underneath navigation controllers
+  if (!shouldHide && !config.translucent && ![self screensExtendUnderOpaqueNavigationBar]) {
+    // When nav bar is not translucent we change edgesForExtendedLayout to avoid system laying out
+    // the screen underneath navigation controllers.
     vc.edgesForExtendedLayout = UIRectEdgeAll - UIRectEdgeTop;
   } else {
-    // system default is UIRectEdgeAll
+    // System default is UIRectEdgeAll - the screen is laid out under the navigation bar.
+    // On iOS 26+ this is also the case for an opaque header: UIKit does not reliably lay out the screen right below
+    // the bar when the top edge is excluded (it ignores the bar's origin offset, e.g. in landscape or on iPhone Duo),
+    // so we let the screen extend under the bar and inset the content with the `SafeAreaView` rendered by
+    // `ScreenStackItem`. See https://github.com/software-mansion/react-native-screens-labs/issues/1841
     vc.edgesForExtendedLayout = UIRectEdgeAll;
   }
 
@@ -523,6 +561,16 @@ RNS_IGNORE_SUPER_CALL_END
   }
   navitem.largeTitleDisplayMode =
       config.largeTitle ? UINavigationItemLargeTitleDisplayModeAlways : UINavigationItemLargeTitleDisplayModeNever;
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+  if (@available(iOS 27.0, *)) {
+    // Due to native limitations related to opaque header and minimization behavior, we disable it for opaque headers.
+    UIBarMinimization *minimization = [UIBarMinimization new];
+    minimization.minimizationBehavior =
+        config.translucent ? UIBarMinimizationBehaviorAutomatic : UIBarMinimizationBehaviorNever;
+    navitem.navigationBarMinimization = minimization;
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
 #endif
 
   UINavigationBarAppearance *appearance = [self buildAppearance:vc withConfig:config];
@@ -905,8 +953,13 @@ RNS_IGNORE_SUPER_CALL_END
     if (self.shouldHeaderBeVisible) {
       [self layoutNavigationControllerView];
     }
+  } else if (_needsViewControllerUpdateInCurrentTransaction) {
+    // Subviews (e.g. their `visibilityPriority`) changed in this transaction. Re-apply the config once,
+    // now that all of them have already received their new props.
+    [self updateViewControllerIfNeeded];
   }
   _addedReactSubviewsInCurrentTransaction = false;
+  _needsViewControllerUpdateInCurrentTransaction = false;
 }
 
 - (void)replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView
@@ -947,6 +1000,7 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+#ifndef NDEBUG
 static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
 {
   switch (resizeMode) {
@@ -965,6 +1019,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;
 
@@ -21,6 +21,7 @@ namespace react = facebook::react;
   // The cycle is cleared via `invalidateUIBarButtonItem` method, called by `invalidate` callback.
   UIBarButtonItem *_barButtonItem;
   BOOL _hidesSharedBackground;
+  react::RNSScreenStackHeaderSubviewVisibilityPriority _visibilityPriority;
 }
 
 #pragma mark - Common
@@ -112,6 +113,7 @@ namespace react = facebook::react;
     _props = defaultProps;
     _lastScheduledFrame = CGRectZero;
     _synchronousShadowStateUpdatesEnabled = YES;
+    _visibilityPriority = react::RNSScreenStackHeaderSubviewVisibilityPriority::Standard;
   }
 
   return self;
@@ -125,6 +127,7 @@ namespace react = facebook::react;
 
   [self setType:[RNSConvert RNSScreenStackHeaderSubviewTypeFromCppEquivalent:newHeaderSubviewProps.type]];
   [self setHidesSharedBackground:newHeaderSubviewProps.hidesSharedBackground];
+  [self setVisibilityPriority:newHeaderSubviewProps.visibilityPriority];
   [self setSynchronousShadowStateUpdatesEnabled:newHeaderSubviewProps.synchronousShadowStateUpdatesEnabled];
   [super updateProps:props oldProps:oldProps];
 }
@@ -280,6 +283,17 @@ RNS_IGNORE_SUPER_CALL_END
     }
   }
 #endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
+// tvOS and visionOS are excluded on purpose: `visibilityPriority` exists there, but the only
+// supported value is `standard`, which is already the default.
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
+  if (@available(iOS 27.0, *)) {
+    if (_barButtonItem != nil) {
+      _barButtonItem.visibilityPriority =
+          [RNSConvert UIBarButtonItemVisibilityPriorityFromCppEquivalent:_visibilityPriority];
+    }
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
 }
 
 - (void)setHidesSharedBackground:(BOOL)hidesSharedBackground
@@ -288,6 +302,25 @@ RNS_IGNORE_SUPER_CALL_END
   [self configureBarButtonItem];
 }
 
+- (void)setVisibilityPriority:(react::RNSScreenStackHeaderSubviewVisibilityPriority)visibilityPriority
+{
+  if (visibilityPriority == _visibilityPriority) {
+    return;
+  }
+
+  _visibilityPriority = visibilityPriority;
+  [self configureBarButtonItem];
+
+  // Changing the priority of an item that is already in the bar is not enough:
+  // the bar only re-evaluates which items fit when it is handed its items again,
+  // which the header does whenever it re-applies its config. We defer that until
+  // the end of the mounting transaction, so that sibling subviews updated in the
+  // same transaction are taken into account & the config is re-applied only once.
+  if (_barButtonItem != nil) {
+    [[self getHeaderConfig] setNeedsViewControllerUpdate];
+  }
+}
+
 #pragma mark - Dynamic frameworks support
 
 // Needed because of this: https://github.com/facebook/react-native/pull/37274

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