react-native-screens 4.11.0-beta.1 → 4.11.0-beta.2

package/RNScreens.podspec

@@ -4,6 +4,8 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 min_supported_ios_version = new_arch_enabled ? "15.1" : "15.1"
+min_supported_tvos_version = "15.1"
+min_supported_visionos_version = "1.0"
 source_files = new_arch_enabled ? 'ios/**/*.{h,m,mm,cpp}' : ["ios/**/*.{h,m,mm}", "cpp/RNScreensTurboModule.cpp", "cpp/RNScreensTurboModule.h"]
 
 Pod::Spec.new do |s|
@@ -16,7 +18,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/software-mansion/react-native-screens"
   s.license      = "MIT"
   s.author       = { "author" => "author@domain.cn" }
-  s.platforms    = { :ios => min_supported_ios_version, :tvos => "11.0", :visionos => "1.0" }
+  s.platforms    = { :ios => min_supported_ios_version, :tvos => min_supported_tvos_version, :visionos => min_supported_visionos_version }
   s.source       = { :git => "https://github.com/software-mansion/react-native-screens.git", :tag => "#{s.version}" }
   s.source_files = source_files
   s.project_header_files = "cpp/**/*.h" # Don't expose C++ headers publicly to allow importing framework into Swift files

package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp

@@ -11,8 +11,7 @@ extern const char RNSScreenComponentName[] = "RNSScreen";
 Point RNSScreenShadowNode::getContentOriginOffset(
     bool /*includeTransform*/) const {
   auto stateData = getStateData();
-  auto contentOffset = stateData.contentOffset;
-  return {contentOffset.x, contentOffset.y};
+  return stateData.contentOffset;
 }
 
 std::optional<std::reference_wrapper<const ShadowNode::Shared>>

package/ios/RNSConvert.mm

@@ -195,53 +195,50 @@
 + (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect
 {
   using enum react::RNSScreenStackHeaderConfigBlurEffect;
-#if !TARGET_OS_TV && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    switch (blurEffect) {
-      case None:
-        return RNSBlurEffectStyleNone;
-      case ExtraLight:
-        return RNSBlurEffectStyleExtraLight;
-      case Light:
-        return RNSBlurEffectStyleLight;
-      case Dark:
-        return RNSBlurEffectStyleDark;
-      case Regular:
-        return RNSBlurEffectStyleRegular;
-      case Prominent:
-        return RNSBlurEffectStyleProminent;
-      case SystemUltraThinMaterial:
-        return RNSBlurEffectStyleSystemUltraThinMaterial;
-      case SystemThinMaterial:
-        return RNSBlurEffectStyleSystemThinMaterial;
-      case SystemMaterial:
-        return RNSBlurEffectStyleSystemMaterial;
-      case SystemThickMaterial:
-        return RNSBlurEffectStyleSystemThickMaterial;
-      case SystemChromeMaterial:
-        return RNSBlurEffectStyleSystemChromeMaterial;
-      case SystemUltraThinMaterialLight:
-        return RNSBlurEffectStyleSystemUltraThinMaterialLight;
-      case SystemThinMaterialLight:
-        return RNSBlurEffectStyleSystemThinMaterialLight;
-      case SystemMaterialLight:
-        return RNSBlurEffectStyleSystemMaterialLight;
-      case SystemThickMaterialLight:
-        return RNSBlurEffectStyleSystemThickMaterialLight;
-      case SystemChromeMaterialLight:
-        return RNSBlurEffectStyleSystemChromeMaterialLight;
-      case SystemUltraThinMaterialDark:
-        return RNSBlurEffectStyleSystemUltraThinMaterialDark;
-      case SystemThinMaterialDark:
-        return RNSBlurEffectStyleSystemThinMaterialDark;
-      case SystemMaterialDark:
-        return RNSBlurEffectStyleSystemMaterialDark;
-      case SystemThickMaterialDark:
-        return RNSBlurEffectStyleSystemThickMaterialDark;
-      case SystemChromeMaterialDark:
-        return RNSBlurEffectStyleSystemChromeMaterialDark;
-    }
+#if !TARGET_OS_TV
+  switch (blurEffect) {
+    case None:
+      return RNSBlurEffectStyleNone;
+    case ExtraLight:
+      return RNSBlurEffectStyleExtraLight;
+    case Light:
+      return RNSBlurEffectStyleLight;
+    case Dark:
+      return RNSBlurEffectStyleDark;
+    case Regular:
+      return RNSBlurEffectStyleRegular;
+    case Prominent:
+      return RNSBlurEffectStyleProminent;
+    case SystemUltraThinMaterial:
+      return RNSBlurEffectStyleSystemUltraThinMaterial;
+    case SystemThinMaterial:
+      return RNSBlurEffectStyleSystemThinMaterial;
+    case SystemMaterial:
+      return RNSBlurEffectStyleSystemMaterial;
+    case SystemThickMaterial:
+      return RNSBlurEffectStyleSystemThickMaterial;
+    case SystemChromeMaterial:
+      return RNSBlurEffectStyleSystemChromeMaterial;
+    case SystemUltraThinMaterialLight:
+      return RNSBlurEffectStyleSystemUltraThinMaterialLight;
+    case SystemThinMaterialLight:
+      return RNSBlurEffectStyleSystemThinMaterialLight;
+    case SystemMaterialLight:
+      return RNSBlurEffectStyleSystemMaterialLight;
+    case SystemThickMaterialLight:
+      return RNSBlurEffectStyleSystemThickMaterialLight;
+    case SystemChromeMaterialLight:
+      return RNSBlurEffectStyleSystemChromeMaterialLight;
+    case SystemUltraThinMaterialDark:
+      return RNSBlurEffectStyleSystemUltraThinMaterialDark;
+    case SystemThinMaterialDark:
+      return RNSBlurEffectStyleSystemThinMaterialDark;
+    case SystemMaterialDark:
+      return RNSBlurEffectStyleSystemMaterialDark;
+    case SystemThickMaterialDark:
+      return RNSBlurEffectStyleSystemThickMaterialDark;
+    case SystemChromeMaterialDark:
+      return RNSBlurEffectStyleSystemChromeMaterialDark;
   }
 #endif
 

package/ios/RNSFullWindowOverlay.h

@@ -26,6 +26,8 @@ namespace react = facebook::react;
     RCTView <RCTInvalidating>
 #endif // RCT_NEW_ARCH_ENABLED
 
+@property (nonatomic) BOOL accessibilityContainerViewIsModal;
+
 #ifdef RCT_NEW_ARCH_ENABLED
 @property (nonatomic) react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;

package/ios/RNSFullWindowOverlay.mm

@@ -17,10 +17,10 @@
 
 @implementation RNSFullWindowOverlayContainer
 
-- (instancetype)initWithFrame:(CGRect)frame
+- (instancetype)initWithFrame:(CGRect)frame accessibilityViewIsModal:(BOOL)accessibilityViewIsModal
 {
   if (self = [super initWithFrame:frame]) {
-    self.accessibilityViewIsModal = YES;
+    self.accessibilityViewIsModal = accessibilityViewIsModal;
   }
   return self;
 }
@@ -92,29 +92,37 @@
   if (self = [super init]) {
     static const auto defaultProps = std::make_shared<const react::RNSFullWindowOverlayProps>();
     _props = defaultProps;
-    [self _initCommon];
+    [self initCommonProps];
   }
   return self;
 }
-#endif // RCT_NEW_ARCH_ENABLED
-
+#else
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   if (self = [super init]) {
     _bridge = bridge;
-    [self _initCommon];
+    [self initCommonProps];
   }
 
   return self;
 }
+#endif // RCT_NEW_ARCH_ENABLED
 
-- (void)_initCommon
+- (void)initCommonProps
 {
+  // Default value used by container.
+  _accessibilityContainerViewIsModal = YES;
   _reactFrame = CGRectNull;
   _container = self.container;
   [self show];
 }
 
+- (void)setAccessibilityContainerViewIsModal:(BOOL)accessibilityContainerViewIsModal
+{
+  _accessibilityContainerViewIsModal = accessibilityContainerViewIsModal;
+  self.container.accessibilityViewIsModal = accessibilityContainerViewIsModal;
+}
+
 - (void)addSubview:(UIView *)view
 {
   [_container addSubview:view];
@@ -123,7 +131,8 @@
 - (RNSFullWindowOverlayContainer *)container
 {
   if (_container == nil) {
-    _container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame];
+    _container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame
+                                             accessibilityViewIsModal:_accessibilityContainerViewIsModal];
   }
 
   return _container;
@@ -220,6 +229,19 @@ RNS_IGNORE_SUPER_CALL_BEGIN
 
 RNS_IGNORE_SUPER_CALL_END
 
+- (void)updateProps:(const facebook::react::Props::Shared &)props
+           oldProps:(const facebook::react::Props::Shared &)oldProps
+{
+  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSFullWindowOverlayProps>(_props);
+  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSFullWindowOverlayProps>(props);
+
+  if (newComponentProps.accessibilityContainerViewIsModal != oldComponentProps.accessibilityContainerViewIsModal) {
+    [self setAccessibilityContainerViewIsModal:newComponentProps.accessibilityContainerViewIsModal];
+  }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
 #else
 #pragma mark - Paper specific
 
@@ -250,6 +272,8 @@ Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void)
 
 RCT_EXPORT_MODULE()
 
+RCT_EXPORT_VIEW_PROPERTY(accessibilityContainerViewIsModal, BOOL)
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #else
 - (UIView *)view

package/ios/RNSScreen.mm

@@ -151,12 +151,20 @@ RNS_IGNORE_SUPER_CALL_END
 #ifdef RCT_NEW_ARCH_ENABLED
   if (_state != nullptr) {
     RNSScreenStackHeaderConfig *config = [self findHeaderConfig];
-    // in large title, ScrollView handles the offset of content so we cannot set it here also.
-    CGFloat headerHeight =
-        config.largeTitle ? 0 : [_controller calculateHeaderHeightIsModal:self.isPresentedAsNativeModal];
-    auto newState =
-        react::RNSScreenState{RCTSizeFromCGSize(self.bounds.size), RCTPointFromCGPoint(CGPointMake(0, headerHeight))};
+
+    // 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.
+    const CGFloat effectiveContentOffsetY = config.largeTitle || config.translucent
+        ? 0
+        : [_controller calculateHeaderHeightIsModal:self.isPresentedAsNativeModal];
+
+    auto newState = react::RNSScreenState{RCTSizeFromCGSize(self.bounds.size), {0, effectiveContentOffsetY}};
     _state->updateState(std::move(newState));
+
+    // TODO: Requesting layout on every layout is wrong. We should look for a way to get rid of this.
     UINavigationController *navctr = _controller.navigationController;
     [navctr.view setNeedsLayout];
   }
@@ -237,16 +245,7 @@ RNS_IGNORE_SUPER_CALL_END
 {
   switch (stackPresentation) {
     case RNSScreenStackPresentationModal:
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-      if (@available(iOS 13.0, tvOS 13.0, *)) {
-        _controller.modalPresentationStyle = UIModalPresentationAutomatic;
-      } else {
-        _controller.modalPresentationStyle = UIModalPresentationFullScreen;
-      }
-#else
-      _controller.modalPresentationStyle = UIModalPresentationFullScreen;
-#endif
+      _controller.modalPresentationStyle = UIModalPresentationAutomatic;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_17_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_17_0 && !TARGET_OS_TV
       if (@available(iOS 18.0, *)) {
@@ -337,12 +336,7 @@ RNS_IGNORE_SUPER_CALL_END
 
 - (void)setGestureEnabled:(BOOL)gestureEnabled
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, tvOS 13.0, *)) {
-    _controller.modalInPresentation = !gestureEnabled;
-  }
-#endif
+  _controller.modalInPresentation = !gestureEnabled;
 
   _gestureEnabled = gestureEnabled;
 }
@@ -753,8 +747,6 @@ RNS_IGNORE_SUPER_CALL_END
   return _gestureEnabled;
 }
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
 - (void)presentationControllerDidAttemptToDismiss:(UIPresentationController *)presentationController
 {
   // NOTE(kkafar): We should consider depracating the use of gesture cancel here & align
@@ -764,7 +756,6 @@ RNS_IGNORE_SUPER_CALL_END
     [self notifyDismissCancelledWithDismissCount:1];
   }
 }
-#endif
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
 {
@@ -1572,18 +1563,12 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 #if !TARGET_OS_TV && !TARGET_OS_VISION
   CGSize fallbackStatusBarSize = [[UIApplication sharedApplication] statusBarFrame].size;
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    CGSize primaryStatusBarSize = self.view.window.windowScene.statusBarManager.statusBarFrame.size;
-    if (primaryStatusBarSize.height == 0 || primaryStatusBarSize.width == 0)
-      return fallbackStatusBarSize;
-
-    return primaryStatusBarSize;
-  } else {
+  CGSize primaryStatusBarSize = self.view.window.windowScene.statusBarManager.statusBarFrame.size;
+  if (primaryStatusBarSize.height == 0 || primaryStatusBarSize.width == 0) {
     return fallbackStatusBarSize;
   }
-#endif /* Check for iOS 13.0 */
+
+  return primaryStatusBarSize;
 
 #else
   // TVOS does not have status bar.
@@ -1914,6 +1899,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   // if we dismissed the view natively, it will already be detached from view hierarchy
   if (self.view.window != nil) {
     UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:NO];
+    snapshot.frame = self.view.frame;
     [self.view removeFromSuperview];
     self.view = snapshot;
     [superView addSubview:snapshot];

package/ios/RNSScreenStack.mm

@@ -492,14 +492,9 @@ RNS_IGNORE_SUPER_CALL_END
         UIViewController *next = controllers[i];
         BOOL lastModal = (i == controllers.count - 1);
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-        if (@available(iOS 13.0, tvOS 13.0, *)) {
-          // Inherit UI style from its parent - solves an issue with incorrect style being applied to some UIKit views
-          // like date picker or segmented control.
-          next.overrideUserInterfaceStyle = self->_controller.overrideUserInterfaceStyle;
-        }
-#endif
+        // Inherit UI style from its parent - solves an issue with incorrect style being applied to some UIKit views
+        // like date picker or segmented control.
+        next.overrideUserInterfaceStyle = self->_controller.overrideUserInterfaceStyle;
 
         BOOL shouldAnimate = lastModal && [next isKindOfClass:[RNSScreen class]] &&
             ((RNSScreen *)next).screenView.stackAnimation != RNSScreenStackAnimationNone;
@@ -1234,6 +1229,9 @@ RNS_IGNORE_SUPER_CALL_END
                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
 {
   for (const auto &mutation : transaction.getMutations()) {
+    // Note that self.tag might be invalid in cases this stack is removed.
+    // This mostlikely does not cause any problems now, but it is something
+    // worth to be aware of.
     if (MUTATION_PARENT_TAG(mutation) == self.tag &&
         (mutation.type == react::ShadowViewMutation::Type::Insert ||
          mutation.type == react::ShadowViewMutation::Type::Remove)) {

package/ios/RNSScreenStackHeaderConfig.mm

@@ -35,7 +35,10 @@
 namespace react = facebook::react;
 #endif // RCT_NEW_ARCH_ENABLED
 
-#ifndef RCT_NEW_ARCH_ENABLED
+static constexpr auto DEFAULT_TITLE_FONT_SIZE = @17;
+static constexpr auto DEFAULT_TITLE_LARGE_FONT_SIZE = @34;
+
+#if !defined(RCT_NEW_ARCH_ENABLED)
 // Some RN private method hacking below. Couldn't figure out better way to access image data
 // of a given RCTImageView. See more comments in the code section processing SubviewTypeBackButton
 @interface RCTImageView (Private)
@@ -276,96 +279,9 @@ RNS_IGNORE_SUPER_CALL_END
 + (void)setAnimatedConfig:(UIViewController *)vc withConfig:(RNSScreenStackHeaderConfig *)config
 {
   UINavigationBar *navbar = ((UINavigationController *)vc.parentViewController).navigationBar;
-  // It is workaround for loading custom back icon when transitioning from a screen without header to the screen which
-  // has one. This action fails when navigating to the screen with header for the second time and loads default back
-  // button. It looks like changing the tint color of navbar triggers an update of the items belonging to it and it
-  // seems to load the custom back image so we change the tint color's alpha by a very small amount and then set it to
-  // the one it should have.
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_14_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
-  // it brakes the behavior of `headerRight` in iOS 14, where the bug desribed above seems to be fixed, so we do nothing
-  // in iOS 14
-  if (@available(iOS 14.0, *)) {
-  } else
-#endif
-  {
-    [navbar setTintColor:[config.color colorWithAlphaComponent:CGColorGetAlpha(config.color.CGColor) - 0.01]];
-  }
   [navbar setTintColor:config.color];
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    // font customized on the navigation item level, so nothing to do here
-  } else
-#endif
-  {
-    BOOL hideShadow = config.hideShadow;
-
-    if (config.backgroundColor && CGColorGetAlpha(config.backgroundColor.CGColor) == 0.) {
-      [navbar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-      [navbar setBarTintColor:[UIColor clearColor]];
-      hideShadow = YES;
-    } else {
-      [navbar setBackgroundImage:nil forBarMetrics:UIBarMetricsDefault];
-      [navbar setBarTintColor:config.backgroundColor];
-    }
-    [navbar setTranslucent:config.translucent];
-    [navbar setValue:@(hideShadow ? YES : NO) forKey:@"hidesShadow"];
-
-    if (config.titleFontFamily || config.titleFontSize || config.titleFontWeight || config.titleColor) {
-      NSMutableDictionary *attrs = [NSMutableDictionary new];
-
-      if (config.titleColor) {
-        attrs[NSForegroundColorAttributeName] = config.titleColor;
-      }
-
-      NSString *family = config.titleFontFamily ?: nil;
-      NSNumber *size = config.titleFontSize ?: @17;
-      NSString *weight = config.titleFontWeight ?: nil;
-      if (family || weight) {
-        attrs[NSFontAttributeName] = [RCTFont updateFont:nil
-                                              withFamily:family
-                                                    size:size
-                                                  weight:weight
-                                                   style:nil
-                                                 variant:nil
-                                         scaleMultiplier:1.0];
-      } else {
-        attrs[NSFontAttributeName] = [UIFont boldSystemFontOfSize:[size floatValue]];
-      }
-      [navbar setTitleTextAttributes:attrs];
-    }
-
-#if !TARGET_OS_TV && !TARGET_OS_VISION
-    if (@available(iOS 11.0, *)) {
-      if (config.largeTitle &&
-          (config.largeTitleFontFamily || config.largeTitleFontSize || config.largeTitleFontWeight ||
-           config.largeTitleColor || config.titleColor)) {
-        NSMutableDictionary *largeAttrs = [NSMutableDictionary new];
-        if (config.largeTitleColor || config.titleColor) {
-          largeAttrs[NSForegroundColorAttributeName] =
-              config.largeTitleColor ? config.largeTitleColor : config.titleColor;
-        }
-        NSString *largeFamily = config.largeTitleFontFamily ?: nil;
-        NSNumber *largeSize = config.largeTitleFontSize ?: @34;
-        NSString *largeWeight = config.largeTitleFontWeight ?: nil;
-        if (largeFamily || largeWeight) {
-          largeAttrs[NSFontAttributeName] = [RCTFont updateFont:nil
-                                                     withFamily:largeFamily
-                                                           size:largeSize
-                                                         weight:largeWeight
-                                                          style:nil
-                                                        variant:nil
-                                                scaleMultiplier:1.0];
-        } else {
-          largeAttrs[NSFontAttributeName] = [UIFont systemFontOfSize:[largeSize floatValue] weight:UIFontWeightBold];
-        }
-        [navbar setLargeTitleTextAttributes:largeAttrs];
-      }
-    }
-#endif
-  }
+  // font customized on the navigation item level, so nothing to do here
 }
 
 + (void)setTitleAttibutes:(NSDictionary *)attrs forButton:(UIBarButtonItem *)button
@@ -476,8 +392,6 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
 + (UINavigationBarAppearance *)buildAppearance:(UIViewController *)vc
                                     withConfig:(RNSScreenStackHeaderConfig *)config API_AVAILABLE(ios(13.0))
 {
@@ -525,7 +439,7 @@ RNS_IGNORE_SUPER_CALL_END
 #endif
 
     NSString *family = config.titleFontFamily ?: nil;
-    NSNumber *size = config.titleFontSize ?: @17;
+    NSNumber *size = config.titleFontSize ?: DEFAULT_TITLE_FONT_SIZE;
     NSString *weight = config.titleFontWeight ?: nil;
     if (family || weight) {
       attrs[NSFontAttributeName] = [RCTFont updateFont:nil
@@ -553,7 +467,7 @@ RNS_IGNORE_SUPER_CALL_END
 #endif
 
     NSString *largeFamily = config.largeTitleFontFamily ?: nil;
-    NSNumber *largeSize = config.largeTitleFontSize ?: @34;
+    NSNumber *largeSize = config.largeTitleFontSize ?: DEFAULT_TITLE_LARGE_FONT_SIZE;
     NSString *largeWeight = config.largeTitleFontWeight ?: nil;
     if (largeFamily || largeWeight) {
       largeAttrs[NSFontAttributeName] = [RCTFont updateFont:nil
@@ -578,7 +492,6 @@ RNS_IGNORE_SUPER_CALL_END
   }
   return appearance;
 }
-#endif // Check for >= iOS 13.0
 
 + (void)updateViewController:(UIViewController *)vc
                   withConfig:(RNSScreenStackHeaderConfig *)config
@@ -603,7 +516,7 @@ RNS_IGNORE_SUPER_CALL_END
   BOOL shouldHide = config == nil || !config.shouldHeaderBeVisible;
 
   if (!shouldHide && !config.translucent) {
-    // when nav bar is not translucent we chage edgesForExtendedLayout to avoid system laying out
+    // when nav bar is not translucent we change edgesForExtendedLayout to avoid system laying out
     // the screen underneath navigation controllers
     vc.edgesForExtendedLayout = UIRectEdgeNone;
   } else {
@@ -621,118 +534,44 @@ RNS_IGNORE_SUPER_CALL_END
   }
 
 #if !TARGET_OS_TV
-  const auto isBackTitleBlank = [NSString rnscreens_isBlankOrNull:config.backTitle] == YES;
-  NSString *resolvedBackTitle = isBackTitleBlank ? prevItem.title : config.backTitle;
-  RNSUIBarButtonItem *backBarButtonItem = [[RNSUIBarButtonItem alloc] initWithTitle:resolvedBackTitle
-                                                                              style:UIBarButtonItemStylePlain
-                                                                             target:nil
-                                                                             action:nil];
-  [backBarButtonItem setMenuHidden:config.disableBackButtonMenu];
-
-  auto shouldUseCustomBackBarButtonItem = !isBackTitleBlank || config.disableBackButtonMenu;
-
-  // This has any effect only in case the `backBarButtonItem` is not set.
-  // We apply it before we configure the back item, because it might get overriden.
-  prevItem.backButtonDisplayMode = config.backButtonDisplayMode;
-
-  if (config.isBackTitleVisible) {
-    if ((config.backTitleFontFamily &&
-         // While being used by react-navigation, the `backTitleFontFamily` will
-         // be set to "System" by default - which is the system default font.
-         // To avoid always considering the font as customized, we need to have an additional check.
-         // See: https://github.com/software-mansion/react-native-screens/pull/2105#discussion_r1565222738
-         ![config.backTitleFontFamily isEqual:@"System"]) ||
-        config.backTitleFontSize) {
-      shouldUseCustomBackBarButtonItem = YES;
-      NSMutableDictionary *attrs = [NSMutableDictionary new];
-      NSNumber *size = config.backTitleFontSize ?: @17;
-      if (config.backTitleFontFamily) {
-        attrs[NSFontAttributeName] = [RCTFont updateFont:nil
-                                              withFamily:config.backTitleFontFamily
-                                                    size:size
-                                                  weight:nil
-                                                   style:nil
-                                                 variant:nil
-                                         scaleMultiplier:1.0];
-      } else {
-        attrs[NSFontAttributeName] = [UIFont boldSystemFontOfSize:[size floatValue]];
-      }
-      [self setTitleAttibutes:attrs forButton:backBarButtonItem];
-    }
-  } else {
-    // back button title should be not visible next to back button,
-    // but it should still appear in back menu (if one is enabled)
-
-    prevItem.backButtonTitle = resolvedBackTitle;
-    prevItem.backButtonDisplayMode = UINavigationItemBackButtonDisplayModeMinimal;
-    shouldUseCustomBackBarButtonItem = NO;
-  }
-
-  // Prevent unnecessary assignment of backBarButtonItem if it is not customized,
-  // as assigning one will override the native behavior of automatically shortening
-  // the title to "Back" or hide the back title if there's not enough space.
-  // See: https://github.com/software-mansion/react-native-screens/issues/1589
-  if (shouldUseCustomBackBarButtonItem) {
-    prevItem.backBarButtonItem = backBarButtonItem;
-  }
+  [config configureBackItem:prevItem];
 
-  if (@available(iOS 11.0, *)) {
-    if (config.largeTitle) {
-      navctr.navigationBar.prefersLargeTitles = YES;
-    }
-    navitem.largeTitleDisplayMode =
-        config.largeTitle ? UINavigationItemLargeTitleDisplayModeAlways : UINavigationItemLargeTitleDisplayModeNever;
+  if (config.largeTitle) {
+    navctr.navigationBar.prefersLargeTitles = YES;
   }
+  navitem.largeTitleDisplayMode =
+      config.largeTitle ? UINavigationItemLargeTitleDisplayModeAlways : UINavigationItemLargeTitleDisplayModeNever;
 #endif
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, tvOS 13.0, *)) {
-    UINavigationBarAppearance *appearance = [self buildAppearance:vc withConfig:config];
-    navitem.standardAppearance = appearance;
-    navitem.compactAppearance = appearance;
+  UINavigationBarAppearance *appearance = [self buildAppearance:vc withConfig:config];
+  navitem.standardAppearance = appearance;
+  navitem.compactAppearance = appearance;
 
 // appearance does not apply to the tvOS so we need to use lagacy customization
 #if TARGET_OS_TV
-    navctr.navigationBar.titleTextAttributes = appearance.titleTextAttributes;
-    navctr.navigationBar.backgroundColor = appearance.backgroundColor;
+  navctr.navigationBar.titleTextAttributes = appearance.titleTextAttributes;
+  navctr.navigationBar.backgroundColor = appearance.backgroundColor;
 #endif
 
-    UINavigationBarAppearance *scrollEdgeAppearance =
-        [[UINavigationBarAppearance alloc] initWithBarAppearance:appearance];
-    if (config.largeTitleBackgroundColor != nil) {
-      // Add support for using a fully transparent bar when the backgroundColor is set to transparent.
-      if (CGColorGetAlpha(config.largeTitleBackgroundColor.CGColor) == 0.) {
-        // This will also remove the background blur effect in the large title which is otherwise inherited from the
-        // standard appearance.
-        [scrollEdgeAppearance configureWithTransparentBackground];
-        // This must be set to nil otherwise a default view will be added to the navigation bar background with an
-        // opaque background.
-        scrollEdgeAppearance.backgroundColor = nil;
-      } else {
-        scrollEdgeAppearance.backgroundColor = config.largeTitleBackgroundColor;
-      }
-    }
-    if (config.largeTitleHideShadow) {
-      scrollEdgeAppearance.shadowColor = nil;
-    }
-    navitem.scrollEdgeAppearance = scrollEdgeAppearance;
-  } else
-#endif
-  {
-#if !TARGET_OS_TV
-    // updating backIndicatotImage does not work when called during transition. On iOS pre 13 we need
-    // to update it before the navigation starts.
-    UIImage *backButtonImage = [config loadBackButtonImageInViewController:vc];
-    if (backButtonImage) {
-      navctr.navigationBar.backIndicatorImage = backButtonImage;
-      navctr.navigationBar.backIndicatorTransitionMaskImage = backButtonImage;
-    } else if (navctr.navigationBar.backIndicatorImage) {
-      navctr.navigationBar.backIndicatorImage = nil;
-      navctr.navigationBar.backIndicatorTransitionMaskImage = nil;
+  UINavigationBarAppearance *scrollEdgeAppearance =
+      [[UINavigationBarAppearance alloc] initWithBarAppearance:appearance];
+  if (config.largeTitleBackgroundColor != nil) {
+    // Add support for using a fully transparent bar when the backgroundColor is set to transparent.
+    if (CGColorGetAlpha(config.largeTitleBackgroundColor.CGColor) == 0.) {
+      // This will also remove the background blur effect in the large title which is otherwise inherited from the
+      // standard appearance.
+      [scrollEdgeAppearance configureWithTransparentBackground];
+      // This must be set to nil otherwise a default view will be added to the navigation bar background with an
+      // opaque background.
+      scrollEdgeAppearance.backgroundColor = nil;
+    } else {
+      scrollEdgeAppearance.backgroundColor = config.largeTitleBackgroundColor;
     }
-#endif
   }
+  if (config.largeTitleHideShadow) {
+    scrollEdgeAppearance.shadowColor = nil;
+  }
+  navitem.scrollEdgeAppearance = scrollEdgeAppearance;
 #if !TARGET_OS_TV
   navitem.hidesBackButton = config.hideBackButton;
 #endif
@@ -828,6 +667,71 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+- (void)configureBackItem:(nullable UINavigationItem *)prevItem API_UNAVAILABLE(tvos)
+{
+#if !TARGET_OS_TV
+  if (prevItem == nil) {
+    return;
+  }
+
+  const auto *config = self;
+
+  const auto isBackTitleBlank = [NSString rnscreens_isBlankOrNull:config.backTitle] == YES;
+  NSString *resolvedBackTitle = isBackTitleBlank ? prevItem.title : config.backTitle;
+  RNSUIBarButtonItem *backBarButtonItem = [[RNSUIBarButtonItem alloc] initWithTitle:resolvedBackTitle
+                                                                              style:UIBarButtonItemStylePlain
+                                                                             target:nil
+                                                                             action:nil];
+  [backBarButtonItem setMenuHidden:config.disableBackButtonMenu];
+
+  auto shouldUseCustomBackBarButtonItem = config.disableBackButtonMenu;
+
+  // This has any effect only in case the `backBarButtonItem` is not set.
+  // We apply it before we configure the back item, because it might get overriden.
+  prevItem.backButtonDisplayMode = config.backButtonDisplayMode;
+  prevItem.backButtonTitle = resolvedBackTitle;
+
+  if (config.isBackTitleVisible) {
+    if ((config.backTitleFontFamily &&
+         // While being used by react-navigation, the `backTitleFontFamily` will
+         // be set to "System" by default - which is the system default font.
+         // To avoid always considering the font as customized, we need to have an additional check.
+         // See: https://github.com/software-mansion/react-native-screens/pull/2105#discussion_r1565222738
+         ![config.backTitleFontFamily isEqual:@"System"]) ||
+        config.backTitleFontSize) {
+      shouldUseCustomBackBarButtonItem = YES;
+      NSMutableDictionary *attrs = [NSMutableDictionary new];
+      NSNumber *size = config.backTitleFontSize ?: @17;
+      if (config.backTitleFontFamily) {
+        attrs[NSFontAttributeName] = [RCTFont updateFont:nil
+                                              withFamily:config.backTitleFontFamily
+                                                    size:size
+                                                  weight:nil
+                                                   style:nil
+                                                 variant:nil
+                                         scaleMultiplier:1.0];
+      } else {
+        attrs[NSFontAttributeName] = [UIFont boldSystemFontOfSize:[size floatValue]];
+      }
+      [RNSScreenStackHeaderConfig setTitleAttibutes:attrs forButton:backBarButtonItem];
+    }
+  } else {
+    // back button title should be not visible next to back button,
+    // but it should still appear in back menu
+    prevItem.backButtonDisplayMode = UINavigationItemBackButtonDisplayModeMinimal;
+    shouldUseCustomBackBarButtonItem = NO;
+  }
+
+  // Prevent unnecessary assignment of backBarButtonItem if it is not customized,
+  // as assigning one will override the native behavior of automatically shortening
+  // the title to "Back" or hide the back title if there's not enough space.
+  // See: https://github.com/software-mansion/react-native-screens/issues/1589
+  if (shouldUseCustomBackBarButtonItem) {
+    prevItem.backBarButtonItem = backBarButtonItem;
+  }
+#endif
+}
+
 - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *)navCtrl
 {
   if ((self.direction == UISemanticContentAttributeForceLeftToRight ||
@@ -1239,35 +1143,28 @@ RCT_EXPORT_VIEW_PROPERTY(translucent, BOOL)
     @"extraLight" : @(RNSBlurEffectStyleExtraLight),
     @"light" : @(RNSBlurEffectStyleLight),
     @"dark" : @(RNSBlurEffectStyleDark),
+    @"regular" : @(RNSBlurEffectStyleRegular),
+    @"prominent" : @(RNSBlurEffectStyleProminent),
   }];
 
-  if (@available(iOS 10.0, *)) {
-    [blurEffects addEntriesFromDictionary:@{
-      @"regular" : @(RNSBlurEffectStyleRegular),
-      @"prominent" : @(RNSBlurEffectStyleProminent),
-    }];
-  }
-#if !TARGET_OS_TV && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    [blurEffects addEntriesFromDictionary:@{
-      @"systemUltraThinMaterial" : @(RNSBlurEffectStyleSystemUltraThinMaterial),
-      @"systemThinMaterial" : @(RNSBlurEffectStyleSystemThinMaterial),
-      @"systemMaterial" : @(RNSBlurEffectStyleSystemMaterial),
-      @"systemThickMaterial" : @(RNSBlurEffectStyleSystemThickMaterial),
-      @"systemChromeMaterial" : @(RNSBlurEffectStyleSystemChromeMaterial),
-      @"systemUltraThinMaterialLight" : @(RNSBlurEffectStyleSystemUltraThinMaterialLight),
-      @"systemThinMaterialLight" : @(RNSBlurEffectStyleSystemThinMaterialLight),
-      @"systemMaterialLight" : @(RNSBlurEffectStyleSystemMaterialLight),
-      @"systemThickMaterialLight" : @(RNSBlurEffectStyleSystemThickMaterialLight),
-      @"systemChromeMaterialLight" : @(RNSBlurEffectStyleSystemChromeMaterialLight),
-      @"systemUltraThinMaterialDark" : @(RNSBlurEffectStyleSystemUltraThinMaterialDark),
-      @"systemThinMaterialDark" : @(RNSBlurEffectStyleSystemThinMaterialDark),
-      @"systemMaterialDark" : @(RNSBlurEffectStyleSystemMaterialDark),
-      @"systemThickMaterialDark" : @(RNSBlurEffectStyleSystemThickMaterialDark),
-      @"systemChromeMaterialDark" : @(RNSBlurEffectStyleSystemChromeMaterialDark),
-    }];
-  }
+#if !TARGET_OS_TV
+  [blurEffects addEntriesFromDictionary:@{
+    @"systemUltraThinMaterial" : @(RNSBlurEffectStyleSystemUltraThinMaterial),
+    @"systemThinMaterial" : @(RNSBlurEffectStyleSystemThinMaterial),
+    @"systemMaterial" : @(RNSBlurEffectStyleSystemMaterial),
+    @"systemThickMaterial" : @(RNSBlurEffectStyleSystemThickMaterial),
+    @"systemChromeMaterial" : @(RNSBlurEffectStyleSystemChromeMaterial),
+    @"systemUltraThinMaterialLight" : @(RNSBlurEffectStyleSystemUltraThinMaterialLight),
+    @"systemThinMaterialLight" : @(RNSBlurEffectStyleSystemThinMaterialLight),
+    @"systemMaterialLight" : @(RNSBlurEffectStyleSystemMaterialLight),
+    @"systemThickMaterialLight" : @(RNSBlurEffectStyleSystemThickMaterialLight),
+    @"systemChromeMaterialLight" : @(RNSBlurEffectStyleSystemChromeMaterialLight),
+    @"systemUltraThinMaterialDark" : @(RNSBlurEffectStyleSystemUltraThinMaterialDark),
+    @"systemThinMaterialDark" : @(RNSBlurEffectStyleSystemThinMaterialDark),
+    @"systemMaterialDark" : @(RNSBlurEffectStyleSystemMaterialDark),
+    @"systemThickMaterialDark" : @(RNSBlurEffectStyleSystemThickMaterialDark),
+    @"systemChromeMaterialDark" : @(RNSBlurEffectStyleSystemChromeMaterialDark),
+  }];
 #endif
   return blurEffects;
 }

package/ios/RNSScreenWindowTraits.mm

@@ -40,32 +40,22 @@
 #if !TARGET_OS_TV
 + (UIStatusBarStyle)statusBarStyleForRNSStatusBarStyle:(RNSStatusBarStyle)statusBarStyle
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    switch (statusBarStyle) {
-      case RNSStatusBarStyleAuto:
-        return [UITraitCollection.currentTraitCollection userInterfaceStyle] == UIUserInterfaceStyleDark
-            ? UIStatusBarStyleLightContent
-            : UIStatusBarStyleDarkContent;
-      case RNSStatusBarStyleInverted:
-        return [UITraitCollection.currentTraitCollection userInterfaceStyle] == UIUserInterfaceStyleDark
-            ? UIStatusBarStyleDarkContent
-            : UIStatusBarStyleLightContent;
-      case RNSStatusBarStyleLight:
-        return UIStatusBarStyleLightContent;
-      case RNSStatusBarStyleDark:
-        return UIStatusBarStyleDarkContent;
-      default:
-        return UIStatusBarStyleLightContent;
-    }
-  }
-#endif
-  // it is the only non-default style available for iOS < 13
-  if (statusBarStyle == RNSStatusBarStyleLight) {
-    return UIStatusBarStyleLightContent;
+  switch (statusBarStyle) {
+    case RNSStatusBarStyleAuto:
+      return [UITraitCollection.currentTraitCollection userInterfaceStyle] == UIUserInterfaceStyleDark
+          ? UIStatusBarStyleLightContent
+          : UIStatusBarStyleDarkContent;
+    case RNSStatusBarStyleInverted:
+      return [UITraitCollection.currentTraitCollection userInterfaceStyle] == UIUserInterfaceStyleDark
+          ? UIStatusBarStyleDarkContent
+          : UIStatusBarStyleLightContent;
+    case RNSStatusBarStyleLight:
+      return UIStatusBarStyleLightContent;
+    case RNSStatusBarStyleDark:
+      return UIStatusBarStyleDarkContent;
+    default:
+      return UIStatusBarStyleLightContent;
   }
-  return UIStatusBarStyleDefault;
 }
 #endif
 
@@ -194,19 +184,11 @@
 // https://stackoverflow.com/questions/57965701/statusbarorientation-was-deprecated-in-ios-13-0-when-attempting-to-get-app-ori/61249908#61249908
 + (UIInterfaceOrientation)interfaceOrientation
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-  if (@available(iOS 13.0, *)) {
-    UIWindowScene *windowScene = RCTKeyWindow().windowScene;
-    if (windowScene == nil) {
-      return UIInterfaceOrientationUnknown;
-    }
-    return windowScene.interfaceOrientation;
-  } else
-#endif
-  {
-    return UIApplication.sharedApplication.statusBarOrientation;
+  UIWindowScene *windowScene = RCTKeyWindow().windowScene;
+  if (windowScene == nil) {
+    return UIInterfaceOrientationUnknown;
   }
+  return windowScene.interfaceOrientation;
 }
 #endif
 

package/ios/RNSSearchBar.mm

@@ -173,11 +173,8 @@ namespace react = facebook::react;
 
 - (void)setBarTintColor:(UIColor *)barTintColor
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 && !TARGET_OS_TV
-  if (@available(iOS 13.0, *)) {
-    [_controller.searchBar.searchTextField setBackgroundColor:barTintColor];
-  }
+#if !TARGET_OS_TV
+  [_controller.searchBar.searchTextField setBackgroundColor:barTintColor];
 #endif
 }
 
@@ -188,12 +185,9 @@ namespace react = facebook::react;
 
 - (void)setTextColor:(UIColor *)textColor
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 && !TARGET_OS_TV
+#if !TARGET_OS_TV
   _textColor = textColor;
-  if (@available(iOS 13.0, *)) {
-    [_controller.searchBar.searchTextField setTextColor:_textColor];
-  }
+  [_controller.searchBar.searchTextField setTextColor:_textColor];
 #endif
 }
 
@@ -205,11 +199,11 @@ namespace react = facebook::react;
 - (void)hideCancelButton
 {
 #if !TARGET_OS_TV
-  if (@available(iOS 13, *)) {
+  if (!_controller.automaticallyShowsCancelButton) {
+    [_controller.searchBar setShowsCancelButton:NO animated:YES];
+  } else {
     // On iOS 13+ UISearchController automatically shows/hides cancel button
     // https://developer.apple.com/documentation/uikit/uisearchcontroller/3152926-automaticallyshowscancelbutton?language=objc
-  } else {
-    [_controller.searchBar setShowsCancelButton:NO animated:YES];
   }
 #endif
 }
@@ -217,11 +211,11 @@ namespace react = facebook::react;
 - (void)showCancelButton
 {
 #if !TARGET_OS_TV
-  if (@available(iOS 13, *)) {
+  if (!_controller.automaticallyShowsCancelButton) {
+    [_controller.searchBar setShowsCancelButton:YES animated:YES];
+  } else {
     // On iOS 13+ UISearchController automatically shows/hides cancel button
     // https://developer.apple.com/documentation/uikit/uisearchcontroller/3152926-automaticallyshowscancelbutton?language=objc
-  } else {
-    [_controller.searchBar setShowsCancelButton:YES animated:YES];
   }
 #endif
 }
@@ -246,14 +240,11 @@ namespace react = facebook::react;
 
 - (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar
 {
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 && !TARGET_OS_TV
-  if (@available(iOS 13.0, *)) {
-    // for some reason, the color does not change when set at the beginning,
-    // so we apply it again here
-    if (_textColor != nil) {
-      [_controller.searchBar.searchTextField setTextColor:_textColor];
-    }
+#if !TARGET_OS_TV
+  // for some reason, the color does not change when set at the beginning,
+  // so we apply it again here
+  if (_textColor != nil) {
+    [_controller.searchBar.searchTextField setTextColor:_textColor];
   }
 #endif
 

package/lib/commonjs/components/FullWindowOverlay.js

@@ -24,7 +24,8 @@ function FullWindowOverlay(props) {
     style: [_reactNative.StyleSheet.absoluteFill, {
       width,
       height
-    }]
+    }],
+    accessibilityContainerViewIsModal: props.unstable_accessibilityContainerViewIsModal
   }, props.children);
 }
 var _default = exports.default = FullWindowOverlay;

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_FullWindowOverlayNativeComponent","e","__esModule","default","NativeFullWindowOverlay","FullWindowOverlayNativeComponent","FullWindowOverlay","props","width","height","useWindowDimensions","Platform","OS","console","warn","createElement","View","style","StyleSheet","absoluteFill","children","_default","exports"],"sourceRoot":"../../../src","sources":["components/FullWindowOverlay.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAUA,IAAAE,iCAAA,GAAAH,sBAAA,CAAAC,OAAA;AAA0F,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAD1F;;AAEA,MAAMG,uBAIL,GAAGC,yCAAuC;AAE3C,SAASC,iBAAiBA,CAACC,KAA8B,EAAE;EACzD,MAAM;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EAC/C,IAAIC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;IACzBC,OAAO,CAACC,IAAI,CAAC,uDAAuD,CAAC;IACrE,oBAAOlB,MAAA,CAAAO,OAAA,CAAAY,aAAA,CAAChB,YAAA,CAAAiB,IAAI,EAAKT,KAAQ,CAAC;EAC5B;EACA,oBACEX,MAAA,CAAAO,OAAA,CAAAY,aAAA,CAACX,uBAAuB;IACtBa,KAAK,EAAE,CAACC,uBAAU,CAACC,YAAY,EAAE;MAAEX,KAAK;MAAEC;IAAO,CAAC;EAAE,GACnDF,KAAK,CAACa,QACgB,CAAC;AAE9B;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAnB,OAAA,GAEcG,iBAAiB","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_FullWindowOverlayNativeComponent","e","__esModule","default","NativeFullWindowOverlay","FullWindowOverlayNativeComponent","FullWindowOverlay","props","width","height","useWindowDimensions","Platform","OS","console","warn","createElement","View","style","StyleSheet","absoluteFill","accessibilityContainerViewIsModal","unstable_accessibilityContainerViewIsModal","children","_default","exports"],"sourceRoot":"../../../src","sources":["components/FullWindowOverlay.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAUA,IAAAE,iCAAA,GAAAH,sBAAA,CAAAC,OAAA;AAA0F,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAD1F;;AAIA,MAAMG,uBAKL,GAAGC,yCAAuC;AAO3C,SAASC,iBAAiBA,CAACC,KAA6B,EAAE;EACxD,MAAM;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EAC/C,IAAIC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;IACzBC,OAAO,CAACC,IAAI,CAAC,uDAAuD,CAAC;IACrE,oBAAOlB,MAAA,CAAAO,OAAA,CAAAY,aAAA,CAAChB,YAAA,CAAAiB,IAAI,EAAKT,KAAQ,CAAC;EAC5B;EACA,oBACEX,MAAA,CAAAO,OAAA,CAAAY,aAAA,CAACX,uBAAuB;IACtBa,KAAK,EAAE,CAACC,uBAAU,CAACC,YAAY,EAAE;MAAEX,KAAK;MAAEC;IAAO,CAAC,CAAE;IACpDW,iCAAiC,EAC/Bb,KAAK,CAACc;EACP,GACAd,KAAK,CAACe,QACgB,CAAC;AAE9B;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAArB,OAAA,GAEcG,iBAAiB","ignoreList":[]}

package/lib/commonjs/fabric/FullWindowOverlayNativeComponent.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _codegenNativeComponent = _interopRequireDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Internal export, not part of stable library API.
 var _default = exports.default = (0, _codegenNativeComponent.default)('RNSFullWindowOverlay', {
   interfaceOnly: true
 });

package/lib/commonjs/fabric/FullWindowOverlayNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["Object","defineProperty","exports","value","default","_codegenNativeComponent","_interopRequireDefault","require","e","__esModule","_default","codegenNativeComponent","interfaceOnly"],"sourceRoot":"../../../src","sources":["fabric/FullWindowOverlayNativeComponent.ts"],"mappings":";AAAA,YAAY;;AAACA,MAAA,CAAAC,cAAA,CAAAC,OAAA;EAAAC,KAAA;AAAA;AAAAD,OAAA,CAAAE,OAAA;AAEb,IAAAC,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAJ,OAAA,EAAAI,CAAA;AAAA,IAAAE,QAAA,GAAAR,OAAA,CAAAE,OAAA,GAK9E,IAAAO,+BAAsB,EAAc,sBAAsB,EAAE;EACzEC,aAAa,EAAE;AACjB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["Object","defineProperty","exports","value","default","_codegenNativeComponent","_interopRequireDefault","require","e","__esModule","_default","codegenNativeComponent","interfaceOnly"],"sourceRoot":"../../../src","sources":["fabric/FullWindowOverlayNativeComponent.ts"],"mappings":";AAAA,YAAY;;AAACA,MAAA,CAAAC,cAAA,CAAAC,OAAA;EAAAC,KAAA;AAAA;AAAAD,OAAA,CAAAE,OAAA;AAEb,IAAAC,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAJ,OAAA,EAAAI,CAAA;AAI7F;AAAA,IAAAE,QAAA,GAAAR,OAAA,CAAAE,OAAA,GAKe,IAAAO,+BAAsB,EAAc,sBAAsB,EAAE;EACzEC,aAAa,EAAE;AACjB,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/FullWindowOverlay.js

@@ -17,7 +17,8 @@ function FullWindowOverlay(props) {
     style: [StyleSheet.absoluteFill, {
       width,
       height
-    }]
+    }],
+    accessibilityContainerViewIsModal: props.unstable_accessibilityContainerViewIsModal
   }, props.children);
 }
 export default FullWindowOverlay;

package/lib/module/components/FullWindowOverlay.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Platform","StyleSheet","View","useWindowDimensions","FullWindowOverlayNativeComponent","NativeFullWindowOverlay","FullWindowOverlay","props","width","height","OS","console","warn","createElement","style","absoluteFill","children"],"sourceRoot":"../../../src","sources":["components/FullWindowOverlay.tsx"],"mappings":"AAAA,OAAOA,KAAK,MAAwC,OAAO;AAC3D,SACEC,QAAQ,EAERC,UAAU,EACVC,IAAI,EAEJC,mBAAmB,QACd,cAAc;;AAErB;AACA,OAAOC,gCAAgC,MAAM,4CAA4C;AACzF,MAAMC,uBAIL,GAAGD,gCAAuC;AAE3C,SAASE,iBAAiBA,CAACC,KAA8B,EAAE;EACzD,MAAM;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGN,mBAAmB,CAAC,CAAC;EAC/C,IAAIH,QAAQ,CAACU,EAAE,KAAK,KAAK,EAAE;IACzBC,OAAO,CAACC,IAAI,CAAC,uDAAuD,CAAC;IACrE,oBAAOb,KAAA,CAAAc,aAAA,CAACX,IAAI,EAAKK,KAAQ,CAAC;EAC5B;EACA,oBACER,KAAA,CAAAc,aAAA,CAACR,uBAAuB;IACtBS,KAAK,EAAE,CAACb,UAAU,CAACc,YAAY,EAAE;MAAEP,KAAK;MAAEC;IAAO,CAAC;EAAE,GACnDF,KAAK,CAACS,QACgB,CAAC;AAE9B;AAEA,eAAeV,iBAAiB","ignoreList":[]}
+{"version":3,"names":["React","Platform","StyleSheet","View","useWindowDimensions","FullWindowOverlayNativeComponent","NativeFullWindowOverlay","FullWindowOverlay","props","width","height","OS","console","warn","createElement","style","absoluteFill","accessibilityContainerViewIsModal","unstable_accessibilityContainerViewIsModal","children"],"sourceRoot":"../../../src","sources":["components/FullWindowOverlay.tsx"],"mappings":"AAAA,OAAOA,KAAK,MAAwC,OAAO;AAC3D,SACEC,QAAQ,EAERC,UAAU,EACVC,IAAI,EAEJC,mBAAmB,QACd,cAAc;;AAErB;AACA,OAAOC,gCAAgC,MAAM,4CAA4C;AAGzF,MAAMC,uBAKL,GAAGD,gCAAuC;AAO3C,SAASE,iBAAiBA,CAACC,KAA6B,EAAE;EACxD,MAAM;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGN,mBAAmB,CAAC,CAAC;EAC/C,IAAIH,QAAQ,CAACU,EAAE,KAAK,KAAK,EAAE;IACzBC,OAAO,CAACC,IAAI,CAAC,uDAAuD,CAAC;IACrE,oBAAOb,KAAA,CAAAc,aAAA,CAACX,IAAI,EAAKK,KAAQ,CAAC;EAC5B;EACA,oBACER,KAAA,CAAAc,aAAA,CAACR,uBAAuB;IACtBS,KAAK,EAAE,CAACb,UAAU,CAACc,YAAY,EAAE;MAAEP,KAAK;MAAEC;IAAO,CAAC,CAAE;IACpDO,iCAAiC,EAC/BT,KAAK,CAACU;EACP,GACAV,KAAK,CAACW,QACgB,CAAC;AAE9B;AAEA,eAAeZ,iBAAiB","ignoreList":[]}

package/lib/module/fabric/FullWindowOverlayNativeComponent.js

@@ -1,6 +1,9 @@
 'use client';
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+
+// Internal export, not part of stable library API.
+
 export default codegenNativeComponent('RNSFullWindowOverlay', {
   interfaceOnly: true
 });

package/lib/module/fabric/FullWindowOverlayNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["codegenNativeComponent","interfaceOnly"],"sourceRoot":"../../../src","sources":["fabric/FullWindowOverlayNativeComponent.ts"],"mappings":"AAAA,YAAY;;AAEZ,OAAOA,sBAAsB,MAAM,yDAAyD;AAK5F,eAAeA,sBAAsB,CAAc,sBAAsB,EAAE;EACzEC,aAAa,EAAE;AACjB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["codegenNativeComponent","interfaceOnly"],"sourceRoot":"../../../src","sources":["fabric/FullWindowOverlayNativeComponent.ts"],"mappings":"AAAA,YAAY;;AAEZ,OAAOA,sBAAsB,MAAM,yDAAyD;;AAI5F;;AAKA,eAAeA,sBAAsB,CAAc,sBAAsB,EAAE;EACzEC,aAAa,EAAE;AACjB,CAAC,CAAC","ignoreList":[]}

package/lib/typescript/components/FullWindowOverlay.d.ts

@@ -1,6 +1,8 @@
 import React, { ReactNode } from 'react';
-declare function FullWindowOverlay(props: {
+type FullWindowOverlayProps = {
     children: ReactNode;
-}): React.JSX.Element;
+    unstable_accessibilityContainerViewIsModal?: boolean;
+};
+declare function FullWindowOverlay(props: FullWindowOverlayProps): React.JSX.Element;
 export default FullWindowOverlay;
 //# sourceMappingURL=FullWindowOverlay.d.ts.map

package/lib/typescript/components/FullWindowOverlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FullWindowOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/FullWindowOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAqB,SAAS,EAAE,MAAM,OAAO,CAAC;AAkB5D,iBAAS,iBAAiB,CAAC,KAAK,EAAE;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,qBAYxD;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"FullWindowOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/FullWindowOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAqB,SAAS,EAAE,MAAM,OAAO,CAAC;AAqB5D,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,SAAS,CAAC;IACpB,0CAA0C,CAAC,EAAE,OAAO,CAAC;CACtD,CAAC;AAEF,iBAAS,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,qBAevD;AAED,eAAe,iBAAiB,CAAC"}

package/lib/typescript/fabric/FullWindowOverlayNativeComponent.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="react-native/types/modules/Codegen" />
 import type { ViewProps } from 'react-native';
-interface NativeProps extends ViewProps {
+import { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
+export interface NativeProps extends ViewProps {
+    accessibilityContainerViewIsModal?: WithDefault<boolean, true>;
 }
 declare const _default: import("react-native/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
 export default _default;

package/lib/typescript/fabric/FullWindowOverlayNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FullWindowOverlayNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/fabric/FullWindowOverlayNativeComponent.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,UAAU,WAAY,SAAQ,SAAS;CAAG;;AAE1C,wBAEG"}
+{"version":3,"file":"FullWindowOverlayNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/fabric/FullWindowOverlayNativeComponent.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAGxE,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,iCAAiC,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;CAChE;;AAED,wBAEG"}

package/lib/typescript/native-stack/types.d.ts

@@ -121,7 +121,7 @@ export type NativeStackNavigationOptions = {
      */
     disableBackButtonMenu?: boolean;
     /**
-     * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu`, `backTitle` and `backTitleVisible=false` is set.
+     * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu` and `backTitleVisible=false` is set.
      * The following values are currently supported (they correspond to [UINavigationItemBackButtonDisplayMode](https://developer.apple.com/documentation/uikit/uinavigationitembackbuttondisplaymode?language=objc)):
      *
      * - `default` – show given back button previous controller title, system generic or just icon based on available space

package/lib/typescript/types.d.ts

@@ -120,7 +120,7 @@ export interface ScreenProps extends ViewProps {
      *
      * @deprecated For all apps targeting Android SDK 35 or above this prop has no effect and is subject to removal in the future.
      *  For SDK below 35 this works only with specific app setup.
-     *  This props is subject to removal in the future.
+     *  This prop is subject to removal in the future.
      *  See: https://developer.android.com/reference/android/view/Window#setNavigationBarColor(int)
      */
     navigationBarColor?: ColorValue;
@@ -495,7 +495,7 @@ export interface ScreenStackHeaderConfigProps extends ViewProps {
      */
     disableBackButtonMenu?: boolean;
     /**
-     * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu`, `backTitle` and `backTitleVisible=false` is set.
+     * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu` and `backTitleVisible=false` is set.
      * The following values are currently supported (they correspond to [UINavigationItemBackButtonDisplayMode](https://developer.apple.com/documentation/uikit/uinavigationitembackbuttondisplaymode?language=objc)):
      *
      * - `default` – show given back button previous controller title, system generic or just icon based on available space

package/native-stack/README.md

@@ -82,7 +82,7 @@ Boolean indicating whether to show the menu on longPress of iOS >= 14 back butto
 
 #### `backButtonDisplayMode` (iOS only)
 
-Enum value indicating display mode of back button. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu`, `backTitle` and `backTitleVisible=false` is set. The `backTitleVisible` forces `backButtonDisplayMode: minimal` and omits other values. Read more [#2800](https://github.com/software-mansion/react-native-screens/pull/2800). The other props, under the hood, customize `backButtonItem` which overrides `backButtonDisplayMode`. Read more [#2123](https://github.com/software-mansion/react-native-screens/pull/2123).
+Enum value indicating display mode of back button. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu` and `backTitleVisible=false` is set. The `backTitleVisible` forces `backButtonDisplayMode: minimal` and omits other values. Read more [#2800](https://github.com/software-mansion/react-native-screens/pull/2800). The other props, under the hood, customize `backButtonItem` which overrides `backButtonDisplayMode`. Read more [#2123](https://github.com/software-mansion/react-native-screens/pull/2123).
 
 Possible options:
 
@@ -349,7 +349,7 @@ How the screen should be presented. Possible values:
 - `containedModal` – will use "UIModalPresentationCurrentContext" modal style on iOS and will fallback to `"modal"` on Android.
 - `containedTransparentModal` – will use "UIModalPresentationOverCurrentContext" modal style on iOS and will fallback to `"transparentModal"` on Android.
 - `fullScreenModal` – will use "UIModalPresentationFullScreen" modal style on iOS and will fallback to `"modal"` on Android.
-- `formSheet` – will use "UIModalPresentationFormSheet" modal style on iOS and will fallback to `"modal"` on Android.
+- `formSheet` – will use "UIModalPresentationFormSheet" modal style on iOS and "BottomSheetBehavior" on Android.
 - `pageSheet` – will use "UIModalPresentationPageSheet" modal style on iOS and will fallback to `"modal"` on Android.
 
 Defaults to `push`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.11.0-beta.1",
+  "version": "4.11.0-beta.2",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",

package/src/components/FullWindowOverlay.tsx

@@ -10,13 +10,21 @@ import {
 
 // Native components
 import FullWindowOverlayNativeComponent from '../fabric/FullWindowOverlayNativeComponent';
+import type { NativeProps } from '../fabric/FullWindowOverlayNativeComponent';
+
 const NativeFullWindowOverlay: React.ComponentType<
   PropsWithChildren<{
     style: StyleProp<ViewStyle>;
-  }>
+  }> &
+    NativeProps
 > = FullWindowOverlayNativeComponent as any;
 
-function FullWindowOverlay(props: { children: ReactNode }) {
+type FullWindowOverlayProps = {
+  children: ReactNode;
+  unstable_accessibilityContainerViewIsModal?: boolean;
+};
+
+function FullWindowOverlay(props: FullWindowOverlayProps) {
   const { width, height } = useWindowDimensions();
   if (Platform.OS !== 'ios') {
     console.warn('Using FullWindowOverlay is only valid on iOS devices.');
@@ -24,7 +32,10 @@ function FullWindowOverlay(props: { children: ReactNode }) {
   }
   return (
     <NativeFullWindowOverlay
-      style={[StyleSheet.absoluteFill, { width, height }]}>
+      style={[StyleSheet.absoluteFill, { width, height }]}
+      accessibilityContainerViewIsModal={
+        props.unstable_accessibilityContainerViewIsModal
+      }>
       {props.children}
     </NativeFullWindowOverlay>
   );

package/src/fabric/FullWindowOverlayNativeComponent.ts

@@ -2,8 +2,12 @@
 
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import type { ViewProps } from 'react-native';
+import { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
 
-interface NativeProps extends ViewProps {}
+// Internal export, not part of stable library API.
+export interface NativeProps extends ViewProps {
+  accessibilityContainerViewIsModal?: WithDefault<boolean, true>;
+}
 
 export default codegenNativeComponent<NativeProps>('RNSFullWindowOverlay', {
   interfaceOnly: true,

package/src/native-stack/types.tsx

@@ -140,7 +140,7 @@ export type NativeStackNavigationOptions = {
    */
   disableBackButtonMenu?: boolean;
   /**
-   * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu`, `backTitle` and `backTitleVisible=false` is set.
+   * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu` and `backTitleVisible=false` is set.
    * The following values are currently supported (they correspond to [UINavigationItemBackButtonDisplayMode](https://developer.apple.com/documentation/uikit/uinavigationitembackbuttondisplaymode?language=objc)):
    *
    * - `default` – show given back button previous controller title, system generic or just icon based on available space

package/src/types.tsx

@@ -188,7 +188,7 @@ export interface ScreenProps extends ViewProps {
    *
    * @deprecated For all apps targeting Android SDK 35 or above this prop has no effect and is subject to removal in the future.
    *  For SDK below 35 this works only with specific app setup.
-   *  This props is subject to removal in the future.
+   *  This prop is subject to removal in the future.
    *  See: https://developer.android.com/reference/android/view/Window#setNavigationBarColor(int)
    */
   navigationBarColor?: ColorValue;
@@ -576,7 +576,7 @@ export interface ScreenStackHeaderConfigProps extends ViewProps {
    */
   disableBackButtonMenu?: boolean;
   /**
-   * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu`, `backTitle` and `backTitleVisible=false` is set.
+   * How the back button behaves. It is used only when none of: `backTitleFontFamily`, `backTitleFontSize`, `disableBackButtonMenu` and `backTitleVisible=false` is set.
    * The following values are currently supported (they correspond to [UINavigationItemBackButtonDisplayMode](https://developer.apple.com/documentation/uikit/uinavigationitembackbuttondisplaymode?language=objc)):
    *
    * - `default` – show given back button previous controller title, system generic or just icon based on available space