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

package/cpp/legacy/RNSScreenRemovalListener.h

@@ -4,12 +4,22 @@
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/ShadowView.h>
 
+#include <cstdint>
+#include <functional>
+#include <mutex>
+
 using namespace facebook::react;
 
 struct RNSScreenRemovalListener : public MountingOverrideDelegate {
-  std::function<void(int)> listenerFunction_;
-  RNSScreenRemovalListener(std::function<void(int)> &&listenerFunction_)
-      : listenerFunction_(std::move(listenerFunction_)) {}
+  RNSScreenRemovalListener() = default;
+
+  // RN core lacks a `removeMountingOverrideDelegate` API, so this instance is
+  // process-immortal and swaps its callback instead of being replaced. The
+  // ownership token keeps a stale proxy's teardown from clearing a newer
+  // proxy's listener.
+  // See https://github.com/software-mansion/react-native-screens/pull/4413
+  uint64_t setListener(std::function<void(int)> &&listenerFunction);
+  void clearListener(uint64_t token);
 
   bool shouldOverridePullTransaction() const override;
   std::optional<MountingTransaction> pullTransaction(
@@ -17,4 +27,9 @@ struct RNSScreenRemovalListener : public MountingOverrideDelegate {
       MountingTransaction::Number number,
       const TransactionTelemetry &telemetry,
       ShadowViewMutationList mutations) const override;
+
+ private:
+  mutable std::mutex listenerMutex_;
+  std::function<void(int)> listenerFunction_;
+  uint64_t currentToken_{0};
 };

package/ios/RNSEnums.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#import <UIKit/UIKit.h>
+
 typedef NS_ENUM(NSInteger, RNSScrollEdgeEffect) {
   RNSScrollEdgeEffectAutomatic,
   RNSScrollEdgeEffectHard,
@@ -49,11 +51,22 @@ typedef NS_ENUM(NSInteger, RNSBlurEffectStyle) {
 
 typedef NS_ENUM(NSInteger, RNSTabsIconType) {
   RNSTabsIconTypeImage,
-  RNSTabsIconTypeTemplate,
   RNSTabsIconTypeSfSymbol,
   RNSTabsIconTypeXcasset,
 };
 
+typedef NS_ENUM(NSInteger, RNSTabsIconImageRenderingMode) {
+  RNSTabsIconImageRenderingModeDefault,
+  RNSTabsIconImageRenderingModeTemplate,
+  RNSTabsIconImageRenderingModeOriginal,
+};
+
+typedef NS_ENUM(NSInteger, RNSTabsIconSymbolRenderingMode) {
+  RNSTabsIconSymbolRenderingModeDefault,
+  RNSTabsIconSymbolRenderingModeMonochrome,
+  RNSTabsIconSymbolRenderingModeOriginal,
+};
+
 typedef NS_ENUM(NSInteger, RNSOrientation) {
   RNSOrientationInherit,
   RNSOrientationAll,
@@ -82,6 +95,8 @@ typedef NS_ENUM(NSInteger, RNSTabsScreenSystemItem) {
   RNSTabsScreenSystemItemTopRated
 };
 
+typedef NS_ENUM(NSInteger, RNSTabsScreenTabRole) { RNSTabsScreenTabRoleNone, RNSTabsScreenTabRoleSearch };
+
 typedef NS_ENUM(NSInteger, RNSTabsBottomAccessoryEnvironment) {
   RNSTabsBottomAccessoryEnvironmentRegular,
   RNSTabsBottomAccessoryEnvironmentInline

package/ios/conversion/RNSConversions.h

@@ -1,125 +1,24 @@
 #pragma once
 
 #if defined(__cplusplus)
-#import <React/RCTImageSource.h>
-#import <react/renderer/components/rnscreens/EventEmitters.h>
-#import <react/renderer/components/rnscreens/Props.h>
-#import <optional>
-#import "RNSDefines.h"
-#import "RNSEnums.h"
-#import "RNSTabsNavigationState.h"
-
+#import <UIKit/UIKit.h>
 #import <folly/dynamic.h>
+#import "RNSEnums.h"
 
 namespace rnscreens::conversion {
 
-namespace react = facebook::react;
-
 // copied from FollyConvert.mm
 id RNSConvertFollyDynamicToId(const folly::dynamic &dyn);
 
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromString(NSString *blurEffectString);
-
-UIBlurEffect *RNSUIBlurEffectFromString(NSString *blurEffectString);
-
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect);
-
-UIBlurEffect *RNSUIBlurEffectFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect);
-
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-
-API_AVAILABLE(ios(26.0))
-UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabsHostTabBarMinimizeBehavior(
-    react::RNSTabsHostIOSTabBarMinimizeBehavior tabBarMinimizeBehavior);
-
-#endif // Check for iOS >= 26
-
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
-
-API_AVAILABLE(ios(18.0))
-UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode(
-    react::RNSTabsHostIOSTabBarControllerMode tabBarControllerMode);
-
-#endif // Check for iOS >= 18
-
-react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
-RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
-    RNSTabsNavigationStateRejectionReason reason);
-
-react::RNSTabsHostIOSEventEmitter::OnTabSelectedActionOrigin RNSOnTabSelectedActionOriginFromRNSTabsActionOrigin(
-    RNSTabsActionOrigin actionOrigin);
-
-RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType);
-
-RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
-    react::RNSTabsScreenIOSSystemItem systemItem);
-
-UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem);
-
-#if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
-
-API_AVAILABLE(ios(26.0))
-std::optional<react::RNSTabsBottomAccessoryEventEmitter::OnEnvironmentChangeEnvironment>
-RNSTabsBottomAccessoryOnEnvironmentChangePayloadFromUITabAccessoryEnvironment(UITabAccessoryEnvironment environment);
-
-RNSTabsBottomAccessoryEnvironment RNSTabsBottomAccessoryEnvironmentFromCppEquivalent(
-    react::RNSTabsBottomAccessoryContentEnvironment environment);
-
-#endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
-    react::RNSTabsScreenIOSUserInterfaceStyle userInterfaceStyle);
-
-RCTImageSource *RCTImageSourceFromImageSourceAndIconType(const facebook::react::ImageSource *imageSource,
-                                                         RNSTabsIconType iconType);
-
-RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenIOSOrientation orientation);
-
 #if !TARGET_OS_TV
-UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(RNSOrientation orientation);
+UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(
+    RNSOrientation orientation);
 
-RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(UIInterfaceOrientationMask orientationMask);
+// Currently unused in stack v5. Maybe remove after stopping support for v4.
+RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(
+    UIInterfaceOrientationMask orientationMask);
 #endif // !TARGET_OS_TV
 
-UITraitEnvironmentLayoutDirection UITraitEnvironmentLayoutDirectionFromTabsHostCppEquivalent(
-    react::RNSTabsHostIOSLayoutDirection layoutDirection);
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSTabsHostIOSColorScheme colorScheme);
-
-#pragma mark SplitHost props
-
-UISplitViewControllerSplitBehavior SplitViewPreferredSplitBehaviorFromHostProp(
-    react::RNSSplitHostPreferredSplitBehavior behavior);
-
-UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(react::RNSSplitHostPrimaryEdge primaryEdge);
-
-UISplitViewControllerDisplayMode SplitViewPreferredDisplayModeFromHostProp(
-    react::RNSSplitHostPreferredDisplayMode displayMode);
-
-#if !TARGET_OS_TV
-UISplitViewControllerBackgroundStyle SplitViewPrimaryBackgroundStyleFromHostProp(
-    react::RNSSplitHostPrimaryBackgroundStyle primaryBackgroundStyle);
-#endif // !TARGET_OS_TV
-
-UISplitViewControllerDisplayModeButtonVisibility SplitViewDisplayModeButtonVisibilityFromHostProp(
-    react::RNSSplitHostDisplayModeButtonVisibility displayModeButtonVisibility);
-
-std::string UISplitViewControllerDisplayModeToString(UISplitViewControllerDisplayMode displayMode);
-
-std::optional<UISplitViewControllerColumn> SplitViewTopColumnForCollapsingFromHostProp(
-    react::RNSSplitHostTopColumnForCollapsing topColumnForCollapsing);
-
-RNSOrientation RNSOrientationFromRNSSplitHostOrientation(react::RNSSplitHostOrientation orientation);
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSSplitHostColorScheme colorScheme);
-
-#pragma mark SplitScreen props
-
-RNSSplitScreenColumnType RNSSplitScreenColumnTypeFromScreenProp(react::RNSSplitScreenColumnType columnType);
-
 }; // namespace rnscreens::conversion
 
-#import "RNSConversions-ScrollViewMarker.h"
-#import "RNSConversions-Stack.h"
-
 #endif // defined(__cplusplus)

package/ios/helpers/image/RNSImageLoadingHelper.h

@@ -27,6 +27,13 @@
                  asTemplate:(BOOL)isTemplate
             completionBlock:(void (^_Nonnull)(UIImage *_Nullable image))imageLoadingCompletionBlock;
 
+/**
+ * Loads a symbol image by name: a built-in SF Symbol if one matches, otherwise a custom
+ * symbol from the app's asset catalog (custom symbols are semantically SF Symbols, but
+ * UIKit only resolves them via `imageNamed:`).
+ */
++ (nullable UIImage *)symbolImageNamed:(nonnull NSString *)name;
+
 @end
 
 #endif // defined(__cplusplus)

package/ios/helpers/image/RNSImageLoadingHelper.mm

@@ -59,6 +59,15 @@
       }];
 }
 
++ (nullable UIImage *)symbolImageNamed:(nonnull NSString *)name
+{
+  UIImage *image = [UIImage systemImageNamed:name];
+  if (image == nil) {
+    image = [UIImage imageNamed:name];
+  }
+  return image;
+}
+
 + (nullable UIImage *)handleRenderingModeForImage:(nullable UIImage *)image isTemplate:(BOOL)isTemplate
 {
   if (isTemplate) {

package/ios/legacy/RNSBarButtonItem.mm

@@ -89,6 +89,21 @@ static UIMenuOptions RNSMakeUIMenuOptionsFromConfig(NSDictionary *config);
   }
 #endif
 
+// 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, *)) {
+    NSString *visibilityPriority = dict[@"visibilityPriority"];
+    if ([visibilityPriority isEqualToString:@"low"]) {
+      self.visibilityPriority = UIBarButtonItemVisibilityPriorityLow;
+    } else if ([visibilityPriority isEqualToString:@"high"]) {
+      self.visibilityPriority = UIBarButtonItemVisibilityPriorityHigh;
+    } else if ([visibilityPriority isEqualToString:@"standard"]) {
+      self.visibilityPriority = UIBarButtonItemVisibilityPriorityStandard;
+    }
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV && !TARGET_OS_VISION
+
   NSString *variant = dict[@"variant"];
   if (variant) {
     if ([variant isEqualToString:@"done"]) {

package/ios/legacy/RNSConvert.h

@@ -4,6 +4,7 @@
 #if defined(__cplusplus)
 #import <react/renderer/components/rnscreens/Props.h>
 #endif // __cplusplus
+#import "RNSDefines.h"
 #import "RNSLegacyEnums.h"
 
 #if defined(__cplusplus)
@@ -31,6 +32,11 @@ namespace react = facebook::react;
 + (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
     (react::RNSScreenStackHeaderSubviewType)subviewType;
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
++ (UIBarButtonItemVisibilityPriority)UIBarButtonItemVisibilityPriorityFromCppEquivalent:
+    (react::RNSScreenStackHeaderSubviewVisibilityPriority)visibilityPriority API_AVAILABLE(ios(27.0));
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+
 + (RNSScreenReplaceAnimation)RNSScreenReplaceAnimationFromCppEquivalent:
     (react::RNSScreenReplaceAnimation)replaceAnimation;
 

package/ios/legacy/RNSConvert.mm

@@ -118,6 +118,23 @@
   }
 }
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
++ (UIBarButtonItemVisibilityPriority)UIBarButtonItemVisibilityPriorityFromCppEquivalent:
+    (react::RNSScreenStackHeaderSubviewVisibilityPriority)visibilityPriority
+{
+  switch (visibilityPriority) {
+    using enum react::RNSScreenStackHeaderSubviewVisibilityPriority;
+
+    case Low:
+      return UIBarButtonItemVisibilityPriorityLow;
+    case High:
+      return UIBarButtonItemVisibilityPriorityHigh;
+    case Standard:
+      return UIBarButtonItemVisibilityPriorityStandard;
+  }
+}
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0)
+
 + (RNSScreenReplaceAnimation)RNSScreenReplaceAnimationFromCppEquivalent:
     (react::RNSScreenReplaceAnimation)replaceAnimation
 {

package/ios/legacy/RNSFullWindowOverlay.mm

@@ -9,7 +9,7 @@
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSFullWindowOverlayComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSFullWindowOverlayComponentDescriptor.h>
 
 @implementation RNSFullWindowOverlayContainer
 

package/ios/legacy/RNSModalScreen.mm

@@ -1,7 +1,7 @@
 #import "RNSModalScreen.h"
 
 #import <React/RCTFabricComponentsPlugins.h>
-#import <rnscreens/RNSModalScreenComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSModalScreenComponentDescriptor.h>
 
 @implementation RNSModalScreen
 

package/ios/legacy/RNSNavigationBar.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#import <UIKit/UIKit.h>
+#import "RNSDefines.h"
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RNSNavigationBarLayoutDelegate <NSObject>
+
+- (void)navigationBarDidLayoutSubviews:(UINavigationBar *)navigationBar;
+
+@end
+
+/**
+ * Navigation bar used by the legacy stack (`RNSNavigationController`).
+ *
+ * It reports its layout passes to the `layoutDelegate`. On iOS 26+ UIKit can move the content of the navigation bar
+ * (e.g. on rotation or fold of iPhone Duo, or during the bar minimization on iOS 27) without any layout pass of the
+ * navigation controller's view, and layout of the bar is the only callback we receive in such a case.
+ */
+@interface RNSNavigationBar : UINavigationBar
+
+@property (nonatomic, weak, nullable) id<RNSNavigationBarLayoutDelegate> layoutDelegate;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV

package/ios/legacy/RNSNavigationBar.mm

@@ -0,0 +1,15 @@
+#import "RNSNavigationBar.h"
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
+
+@implementation RNSNavigationBar
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+  [_layoutDelegate navigationBarDidLayoutSubviews:self];
+}
+
+@end
+
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV

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"
@@ -53,6 +53,9 @@ struct ContentWrapperBox {
 
 @implementation RNSScreenView {
   __weak RCTScrollViewComponentView *_sheetsScrollView;
+  /// Tag of `_sheetsScrollView` at the time we started observing it. Fabric changes the tag when it recycles
+  /// the view, so a mismatch means the instance now belongs to some other component.
+  NSInteger _sheetsScrollViewTag;
 
   /// Up-to-date only when sheet is in `fitToContents` mode.
   CGFloat _sheetContentHeight;
@@ -99,6 +102,7 @@ struct ContentWrapperBox {
   _sheetExpandsWhenScrolledToEdge = YES;
 #endif // !TARGET_OS_TV
   _sheetsScrollView = nil;
+  _sheetsScrollViewTag = 0;
   _sheetContentHeight = 0.0;
   _markedForUnmountInCurrentTransaction = NO;
   _synchronousShadowStateUpdatesEnabled = YES;
@@ -134,16 +138,24 @@ RNS_IGNORE_SUPER_CALL_END
   if (_state != nullptr) {
     RNSScreenStackHeaderConfig *config = [self findHeaderConfig];
 
-    // * in large title, ScrollView handles the offset of content so we cannot set it here also
-    // * TODO: Why is it assumed in comment above, that large title uses scrollview here? What if only SafeAreaView is
+    // The content offset sent to the shadow tree must match the screen's native origin in the navigation controller's
+    // view. It is used by measurements & hit testing only, the size is delivered separately (`frameSize`).
+    // * On iOS 26+ (see `+[RNSScreenStackHeaderConfig screensExtendUnderOpaqueNavigationBar]`) the screen is always
+    // laid out under the navigation bar, so the origin is 0 and the `SafeAreaView` rendered by `ScreenStackItem`
+    // insets the content below an opaque bar. All branches below evaluate to 0 in that case.
+    // * Below iOS 26, when config.translucent == true, we use `edgesForExtendedLayout` and the screen is laid out
+    // under the navigation bar, therefore there is no need to set content offset in shadow tree.
+    // * Below iOS 26, in large title, ScrollView handles the offset of content so we cannot set it here also.
+    // TODO: Why is it assumed in comment above, that large title uses scrollview here? What if only SafeAreaView is
     // used?
-    // * When config.translucent == true, we currently use `edgesForExtendedLayout` and the screen is laid out under the
-    // navigation bar, therefore there is no need to set content offset in shadow tree.
     // * When this view is the modal root controller (presented in separate view hierarchy) it does not have navigation
     // bar! We send non-zero size to JS, for some reason. TODO: this needs to be investigated.
-    const CGFloat effectiveContentOffsetY = config.largeTitle || config.translucent || self.isPresentedAsNativeModal
-        ? 0
-        : [_controller calculateHeaderHeightIsModal:self.isPresentedAsNativeModal];
+    // * Otherwise the offset must match the actual native origin of the screen. We can not derive it from the
+    // navigation bar geometry, because UIKit does not always lay out the screen right below the navigation bar
+    // (e.g. on iOS 26 `edgesForExtendedLayout` ignores the navigation bar's origin offset).
+    // See https://github.com/software-mansion/react-native-screens-labs/issues/1841
+    const CGFloat effectiveContentOffsetY =
+        config.largeTitle || config.translucent || self.isPresentedAsNativeModal ? 0 : [self originInNavigationView].y;
 
     auto newState = react::RNSScreenState{RCTSizeFromCGSize(self.bounds.size), {0, effectiveContentOffsetY}};
 
@@ -176,8 +188,26 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+// Returns origin of the screen in the coordinate space of its navigation controller's view, which matches
+// the coordinate space of the screen stack in the shadow tree.
+- (CGPoint)originInNavigationView
+{
+  UIView *navigationView = _controller.navigationController.view;
+  if (navigationView == nil || ![self isDescendantOfView:navigationView]) {
+    return CGPointZero;
+  }
+  return [self convertPoint:CGPointZero toView:navigationView];
+}
+
 - (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];
@@ -187,6 +217,8 @@ RNS_IGNORE_SUPER_CALL_END
     // we are going to overwrite it anyway.
     [scrollView addObserver:self forKeyPath:@"bounds" options:0 context:nil];
   }
+  // Refreshed even for the same instance: Fabric might have recycled it back into this sheet.
+  _sheetsScrollViewTag = scrollView != nil ? scrollView.tag : 0;
   if (scrollView != nil) {
     [self correctScrollViewFrame:scrollView withHeader:nil];
   }
@@ -215,6 +247,16 @@ RNS_IGNORE_SUPER_CALL_END
     return;
   }
 
+  // The sheet's content can remove its scroll view while the sheet stays presented. Fabric then recycles
+  // the instance (possibly into another screen), which changes its tag. Stop observing it instead of
+  // forcing it to this screen's frame. See #4785.
+  if (scrollView.tag != _sheetsScrollViewTag) {
+    [scrollView removeObserver:self forKeyPath:@"bounds" context:nil];
+    _sheetsScrollView = nil;
+    _sheetsScrollViewTag = 0;
+    return;
+  }
+
   RNSScreenContentWrapper *_Nullable contentWrapper = _contentWrapperBox.contentWrapper;
   if (contentWrapper != nil && [contentWrapper coerceChildScrollViewComponentSizeToSize:self.frame.size]) {
     return;
@@ -777,6 +819,7 @@ RNS_IGNORE_SUPER_CALL_END
   if (_sheetsScrollView != nil) {
     [_sheetsScrollView removeObserver:self forKeyPath:@"bounds" context:nil];
     _sheetsScrollView = nil;
+    _sheetsScrollViewTag = 0;
   }
 
   // We want to run after container updates are performed (transitions etc.)
@@ -1421,6 +1464,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   BOOL _isSwiping;
   BOOL _shouldNotify;
   BOOL _isRemovedFromParent;
+  BOOL _hasNotifiedDismissed;
 }
 
 #pragma mark - Common
@@ -1432,6 +1476,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
     _fakeView = [UIView new];
     _shouldNotify = YES;
     _isRemovedFromParent = NO;
+    _hasNotifiedDismissed = NO;
   }
   return self;
 }
@@ -1528,7 +1573,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
       [self.screenView notifyDismissCancelledWithDismissCount:_dismissCount];
     } else {
       // screen dismissed, send event
-      [self.screenView notifyDismissedWithCount:_dismissCount];
+      [self notifyDismissedIfNeeded];
     }
   }
   // same flow as in viewDidAppear
@@ -1546,10 +1591,12 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   [super viewDidLayoutSubviews];
 
   // The below code makes the screen view adapt dimensions provided by the system. We take these
-  // into account only when the view is mounted under RNSNavigationController in which case system
-  // provides additional padding to account for possible header, and in the case when screen is
-  // shown as a native modal, as the final dimensions of the modal on iOS 12+ are shorter than the
-  // screen size
+  // into account only when the view is mounted under RNSNavigationController, in which case the
+  // navigation controller sizes the screen (below iOS 26 an opaque navigation bar is excluded from
+  // the screen's frame, on iOS 26+ the screen always spans under the bar, see
+  // `+[RNSScreenStackHeaderConfig screensExtendUnderOpaqueNavigationBar]`), and in the case when
+  // screen is shown as a native modal, as the final dimensions of the modal on iOS 12+ are shorter
+  // than the screen size.
   BOOL isDisplayedWithinUINavController = [self.parentViewController isKindOfClass:[RNSNavigationController class]];
   BOOL isTabScreen = [self.parentViewController isKindOfClass:RNSTabBarController.class];
 
@@ -1582,24 +1629,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;
@@ -1631,6 +1660,12 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
     return 0;
   }
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV
+  if (@available(iOS 27.0, *)) {
+    return [self calculateMinimizationAwareHeaderHeightInNavigationController:navctr];
+  }
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV
+
   CGFloat navbarHeight = navctr.navigationBar.frame.size.height;
 #if !TARGET_OS_TV
   CGFloat navbarInset = navctr.navigationBar.frame.origin.y;
@@ -1642,6 +1677,35 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   return navbarHeight + navbarInset;
 }
 
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV
+// On iOS 27 the navigation bar can minimize in response to scrolling (`UIBarMinimization`). The frame of
+// `UINavigationBar` does not follow the minimization, only its subviews (background, content view, large title,
+// search bar) do - they are shifted up within the bar. Therefore we measure the bottom edge of the subviews
+// instead, in the coordinate space of the navigation controller's view. The value is clamped to the bar's frame,
+// which is the maximum extent of the bar in the expanded state.
+- (CGFloat)calculateMinimizationAwareHeaderHeightInNavigationController:(UINavigationController *)navctr
+    API_AVAILABLE(ios(27.0))
+{
+  UINavigationBar *navbar = navctr.navigationBar;
+  CGFloat navbarMaxY = CGRectGetMaxY([navbar convertRect:navbar.bounds toView:navctr.view]);
+  CGFloat maxY = -CGFLOAT_MAX;
+
+  for (UIView *subview in navbar.subviews) {
+    if (subview.isHidden || CGRectIsEmpty(subview.frame)) {
+      continue;
+    }
+    maxY = MAX(maxY, CGRectGetMaxY([navbar convertRect:subview.frame toView:navctr.view]));
+  }
+
+  if (maxY == -CGFLOAT_MAX) {
+    // No measurable subviews, same as the pre-iOS 27 formula.
+    return navbarMaxY;
+  }
+
+  return MIN(maxY, navbarMaxY);
+}
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(27_0) && !TARGET_OS_TV
+
 - (void)calculateAndNotifyHeaderHeightChangeIsModal:(BOOL)isModal
 {
   CGFloat totalHeight = [self calculateHeaderHeightIsModal:isModal];
@@ -1709,6 +1773,34 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   _isRemovedFromParent = YES;
 }
 
+- (BOOL)isNativelyDismissedFromContainer
+{
+  if (self.presentingViewController != nil) {
+    return NO;
+  }
+  if (self.parentViewController == nil) {
+    return YES;
+  }
+  if ([self.parentViewController isKindOfClass:UINavigationController.class]) {
+    UINavigationController *navigationController = (UINavigationController *)self.parentViewController;
+    return ![navigationController.viewControllers containsObject:self];
+  }
+  return NO;
+}
+
+- (void)notifyDismissedIfNeeded
+{
+  if (_hasNotifiedDismissed || self.screenView.preventNativeDismiss) {
+    return;
+  }
+  if (![self isNativelyDismissedFromContainer]) {
+    return;
+  }
+  _hasNotifiedDismissed = YES;
+  _isRemovedFromParent = YES;
+  [self.screenView notifyDismissedWithCount:_dismissCount];
+}
+
 #pragma mark - transition progress related methods
 
 - (void)setupProgressNotification
@@ -1731,12 +1823,19 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
       [self->_animationTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
     };
 
+    BOOL notifyDismissWhenTransitionEnds = _closing;
     [self.transitionCoordinator
         animateAlongsideTransition:animation
                         completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
                           [self->_animationTimer setPaused:YES];
                           [self->_animationTimer invalidate];
                           [self->_fakeView removeFromSuperview];
+                          // iOS 27 can skip viewDidDisappear when a tab switch
+                          // interrupts popToRoot. If this screen was popped,
+                          // notify JS when the transition ends.
+                          if (notifyDismissWhenTransitionEnds) {
+                            [self notifyDismissedIfNeeded];
+                          }
                         }];
   }
 }