react-native-screens 3.22.0 → 3.23.0

package/android/src/main/java/com/swmansion/rnscreens/SearchBarManager.kt

@@ -97,6 +97,8 @@ class SearchBarManager : ViewGroupManager<SearchBarView>() {
         view.shouldShowHintSearchIcon = shouldShowHintSearchIcon ?: true
     }
 
+    fun setPlacement(view: SearchBarView, placeholder: String?) = Unit
+
     override fun receiveCommand(root: SearchBarView, commandId: String?, args: ReadableArray?) {
         when (commandId) {
             "focus" -> root.handleFocusJsRequest()

package/ios/RNSConvert.h

@@ -31,6 +31,8 @@
 + (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
     (facebook::react::RNSSearchBarAutoCapitalize)autoCapitalize;
 
++ (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(facebook::react::RNSSearchBarPlacement)placement;
+
 @end
 
 #endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSConvert.mm

@@ -141,6 +141,18 @@
   }
 }
 
++ (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(facebook::react::RNSSearchBarPlacement)placement
+{
+  switch (placement) {
+    case facebook::react::RNSSearchBarPlacement::Stacked:
+      return RNSSearchBarPlacementStacked;
+    case facebook::react::RNSSearchBarPlacement::Automatic:
+      return RNSSearchBarPlacementAutomatic;
+    case facebook::react::RNSSearchBarPlacement::Inline:
+      return RNSSearchBarPlacementInline;
+  }
+}
+
 @end
 
 #endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSEnums.h

@@ -63,3 +63,9 @@ typedef NS_ENUM(NSInteger, RNSScreenDetentType) {
   RNSScreenDetentTypeLarge,
   RNSScreenDetentTypeAll,
 };
+
+typedef NS_ENUM(NSInteger, RNSSearchBarPlacement) {
+  RNSSearchBarPlacementAutomatic,
+  RNSSearchBarPlacementInline,
+  RNSSearchBarPlacementStacked,
+};

package/ios/RNSFullWindowOverlay.mm

@@ -15,6 +15,14 @@
 
 @implementation RNSFullWindowOverlayContainer
 
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    self.accessibilityViewIsModal = YES;
+  }
+  return self;
+}
+
 - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
 {
   for (UIView *view in [self subviews]) {
@@ -127,6 +135,9 @@
       [_touchHandler detachFromView:_container];
     }
   } else {
+    if (_container != nil) {
+      UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, _container);
+    }
     if (_touchHandler == nil) {
 #ifdef RCT_NEW_ARCH_ENABLED
       _touchHandler = [RCTSurfaceTouchHandler new];

package/ios/RNSScreen.h

@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RNSScreenView;
 
-@interface RNSScreen : UIViewController <RNScreensViewControllerDelegate>
+@interface RNSScreen : UIViewController <RNSViewControllerDelegate>
 
 - (instancetype)initWithView:(UIView *)view;
 - (UIViewController *)findChildVCForConfigAndTrait:(RNSWindowTrait)trait includingModals:(BOOL)includingModals;
@@ -40,6 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@class RNSScreenStackHeaderConfig;
+
 @interface RNSScreenView :
 #ifdef RCT_NEW_ARCH_ENABLED
     RCTViewComponentView
@@ -88,7 +90,8 @@ NS_ASSUME_NONNULL_BEGIN
 // we recreate the behavior of `reactSetFrame` on new architecture
 @property (nonatomic) facebook::react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) facebook::react::LayoutMetrics newLayoutMetrics;
-@property (weak, nonatomic) UIView *config;
+@property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
+@property (nonatomic, readonly) BOOL hasHeaderConfig;
 #else
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
@@ -97,6 +100,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
 @property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
 @property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
+@property (nonatomic, copy) RCTDirectEventBlock onGestureCancel;
 #endif // RCT_NEW_ARCH_ENABLED
 
 - (void)notifyFinishTransitioning;
@@ -108,12 +112,16 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)notifyDisappear;
 - (void)updateBounds;
 - (void)notifyDismissedWithCount:(int)dismissCount;
+- (instancetype)initWithFrame:(CGRect)frame;
 #endif
 
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward;
 - (void)notifyDismissCancelledWithDismissCount:(int)dismissCount;
 - (BOOL)isModal;
 
+/// Looks for header configuration in instance's `reactSubviews` and returns it. If not present returns `nil`.
+- (RNSScreenStackHeaderConfig *_Nullable)findHeaderConfig;
+
 @end
 
 @interface UIView (RNSScreen)

package/ios/RNSScreen.mm

@@ -54,7 +54,6 @@
     _reactSubviews = [NSMutableArray new];
     [self initCommonProps];
   }
-
   return self;
 }
 #endif // RCT_NEW_ARCH_ENABLED
@@ -392,6 +391,20 @@
 #endif
 }
 
+- (void)notifyGestureCancel
+{
+#ifdef RCT_NEW_ARCH_ENABLED
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const facebook::react::RNSScreenEventEmitter>(_eventEmitter)
+        ->onGestureCancel(facebook::react::RNSScreenEventEmitter::OnGestureCancel{});
+  }
+#else
+  if (self.onGestureCancel) {
+    self.onGestureCancel(nil);
+  }
+#endif
+}
+
 - (BOOL)isMountedUnderScreenOrReactRoot
 {
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -517,6 +530,16 @@
   return self.stackPresentation != RNSScreenStackPresentationPush;
 }
 
+- (RNSScreenStackHeaderConfig *_Nullable)findHeaderConfig
+{
+  for (UIView *view in self.reactSubviews) {
+    if ([view isKindOfClass:RNSScreenStackHeaderConfig.class]) {
+      return (RNSScreenStackHeaderConfig *)view;
+    }
+  }
+  return nil;
+}
+
 #if !TARGET_OS_TV
 /**
  * Updates settings for sheet presentation controller.
@@ -574,6 +597,11 @@
 #pragma mark - Fabric specific
 #ifdef RCT_NEW_ARCH_ENABLED
 
+- (BOOL)hasHeaderConfig
+{
+  return _config != nil;
+}
+
 + (facebook::react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return facebook::react::concreteComponentDescriptorProvider<facebook::react::RNSScreenComponentDescriptor>();
@@ -581,12 +609,12 @@
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  [super mountChildComponentView:childComponentView index:index];
   if ([childComponentView isKindOfClass:[RNSScreenStackHeaderConfig class]]) {
-    _config = childComponentView;
-    ((RNSScreenStackHeaderConfig *)childComponentView).screenView = self;
+    _config = (RNSScreenStackHeaderConfig *)childComponentView;
+    _config.screenView = self;
   }
   [_reactSubviews insertObject:childComponentView atIndex:index];
+  [super mountChildComponentView:childComponentView index:index];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
@@ -716,10 +744,10 @@
   _newLayoutMetrics = layoutMetrics;
   _oldLayoutMetrics = oldLayoutMetrics;
   UIViewController *parentVC = self.reactViewController.parentViewController;
-  if (parentVC != nil && ![parentVC isKindOfClass:[RNScreensNavigationController class]]) {
+  if (parentVC != nil && ![parentVC isKindOfClass:[RNSNavigationController class]]) {
     [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
   }
-  // when screen is mounted under RNScreensNavigationController it's size is controller
+  // when screen is mounted under RNSNavigationController it's size is controller
   // by the navigation controller itself. That is, it is set to fill space of
   // the controller. In that case we ignore react layout system from managing
   // the screen dimensions and we wait for the screen VC to update and then we
@@ -756,10 +784,10 @@
 {
   _reactFrame = frame;
   UIViewController *parentVC = self.reactViewController.parentViewController;
-  if (parentVC != nil && ![parentVC isKindOfClass:[RNScreensNavigationController class]]) {
+  if (parentVC != nil && ![parentVC isKindOfClass:[RNSNavigationController class]]) {
     [super reactSetFrame:frame];
   }
-  // when screen is mounted under RNScreensNavigationController it's size is controller
+  // when screen is mounted under RNSNavigationController it's size is controller
   // by the navigation controller itself. That is, it is set to fill space of
   // the controller. In that case we ignore react layout system from managing
   // the screen dimensions and we wait for the screen VC to update and then we
@@ -886,6 +914,8 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
     // or successfully swiped back
     [self.screenView notifyAppear];
     [self notifyTransitionProgress:1.0 closing:NO goingForward:_goingForward];
+  } else {
+    [self.screenView notifyGestureCancel];
   }
 
   _isSwiping = NO;
@@ -928,12 +958,11 @@ 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 RNScreensNavigationController in which case system
+  // 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
-  BOOL isDisplayedWithinUINavController =
-      [self.parentViewController isKindOfClass:[RNScreensNavigationController class]];
+  BOOL isDisplayedWithinUINavController = [self.parentViewController isKindOfClass:[RNSNavigationController class]];
   BOOL isPresentedAsNativeModal = self.parentViewController == nil && self.presentingViewController != nil;
 
   if (isDisplayedWithinUINavController || isPresentedAsNativeModal) {
@@ -1048,7 +1077,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   if (lastViewController == nil) {
     return selfOrNil;
   } else {
-    if ([lastViewController conformsToProtocol:@protocol(RNScreensViewControllerDelegate)]) {
+    if ([lastViewController conformsToProtocol:@protocol(RNSViewControllerDelegate)]) {
       // If there is a child (should be VC of ScreenContainer or ScreenStack), that has a child that could provide the
       // trait, we recursively go into its findChildVCForConfig, and if one of the children has the trait set, we return
       // it, otherwise we return self if this VC has config, and nil if it doesn't we use
@@ -1178,12 +1207,10 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 
     // we need to check whether reactSubviews array is empty, because on Fabric child nodes are unmounted first ->
     // reactSubviews array may be empty
-    if (currentIndex > 0 && [self.screenView.reactSubviews count] > 0 &&
-        [self.screenView.reactSubviews[0] isKindOfClass:[RNSScreenStackHeaderConfig class]]) {
+    RNSScreenStackHeaderConfig *config = [self.screenView findHeaderConfig];
+    if (currentIndex > 0 && config != nil) {
       UINavigationItem *prevNavigationItem =
           [self.navigationController.viewControllers objectAtIndex:currentIndex - 1].navigationItem;
-      RNSScreenStackHeaderConfig *config = ((RNSScreenStackHeaderConfig *)self.screenView.reactSubviews[0]);
-
       BOOL wasSearchBarActive = prevNavigationItem.searchController.active;
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -1275,6 +1302,7 @@ RCT_EXPORT_VIEW_PROPERTY(onNativeDismissCancelled, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onTransitionProgress, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onWillAppear, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onWillDisappear, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onGestureCancel, RCTDirectEventBlock);
 
 #if !TARGET_OS_TV
 RCT_EXPORT_VIEW_PROPERTY(screenOrientation, UIInterfaceOrientationMask)

package/ios/RNSScreenContainer.h

@@ -14,11 +14,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@protocol RNScreensViewControllerDelegate
+@protocol RNSViewControllerDelegate
 
 @end
 
-@interface RNScreensViewController : UIViewController <RNScreensViewControllerDelegate>
+@interface RNSViewController : UIViewController <RNSViewControllerDelegate>
 
 - (UIViewController *)findActiveChildVC;
 

package/ios/RNSScreenContainer.mm

@@ -8,7 +8,7 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #endif
 
-@implementation RNScreensViewController
+@implementation RNSViewController
 
 #if !TARGET_OS_TV
 - (UIViewController *)childViewControllerForStatusBarStyle
@@ -72,7 +72,7 @@
 
 - (void)setupController
 {
-  _controller = [[RNScreensViewController alloc] init];
+  _controller = [[RNSViewController alloc] init];
   [self addSubview:_controller.view];
 }
 

package/ios/RNSScreenNavigationContainer.h

@@ -3,7 +3,7 @@
 #import "RNSScreenContainer.h"
 #import "RNSScreenStack.h"
 
-@interface RNScreensContainerNavigationController : RNScreensNavigationController
+@interface RNSContainerNavigationController : RNSNavigationController
 
 @end
 

package/ios/RNSScreenNavigationContainer.mm

@@ -8,7 +8,7 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #endif
 
-@implementation RNScreensContainerNavigationController
+@implementation RNSContainerNavigationController
 
 @end
 
@@ -16,8 +16,8 @@
 
 - (void)setupController
 {
-  self.controller = [[RNScreensContainerNavigationController alloc] init];
-  [(RNScreensContainerNavigationController *)self.controller setNavigationBarHidden:YES animated:NO];
+  self.controller = [[RNSContainerNavigationController alloc] init];
+  [(RNSContainerNavigationController *)self.controller setNavigationBarHidden:YES animated:NO];
   [self addSubview:self.controller.view];
 }
 
@@ -27,7 +27,7 @@
     if (screen.activityState == RNSActivityStateOnTop) {
       // there should never be more than one screen with `RNSActivityStateOnTop`
       // since this component should be used for `tabs` and `drawer` navigators
-      [(RNScreensContainerNavigationController *)self.controller setViewControllers:@[ screen.controller ] animated:NO];
+      [(RNSContainerNavigationController *)self.controller setViewControllers:@[ screen.controller ] animated:NO];
       [screen notifyFinishTransitioning];
     }
   }

package/ios/RNSScreenStack.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNScreensNavigationController : UINavigationController <RNScreensViewControllerDelegate>
+@interface RNSNavigationController : UINavigationController <RNSViewControllerDelegate>
 
 @end
 

package/ios/RNSScreenStack.mm

@@ -1,4 +1,5 @@
 #ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTMountingTransactionObserving.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/UIView+React.h>
@@ -6,9 +7,6 @@
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-
-#import <React/RCTFabricComponentsPlugins.h>
-
 #else
 #import <React/RCTBridge.h>
 #import <React/RCTRootContentView.h>
@@ -41,7 +39,7 @@
 
 @end
 
-@implementation RNScreensNavigationController
+@implementation RNSNavigationController
 
 #if !TARGET_OS_TV
 - (UIViewController *)childViewControllerForStatusBarStyle
@@ -128,7 +126,7 @@
 {
   _reactSubviews = [NSMutableArray new];
   _presentedModals = [NSMutableArray new];
-  _controller = [RNScreensNavigationController new];
+  _controller = [RNSNavigationController new];
   _controller.delegate = self;
 #if !TARGET_OS_TV
   [self setupGestureHandlers];

package/ios/RNSScreenStackHeaderConfig.mm

@@ -606,8 +606,14 @@ namespace rct = facebook::react;
             RNSSearchBar *searchBar = subview.subviews[0];
             navitem.searchController = searchBar.controller;
             navitem.hidesSearchBarWhenScrolling = searchBar.hideWhenScrolling;
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_16_0) && \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_16_0
+            if (@available(iOS 16.0, *)) {
+              navitem.preferredSearchBarPlacement = [searchBar placementAsUINavigationItemSearchBarPlacement];
+            }
+#endif /* Check for iOS 16.0 */
           }
-#endif
+#endif /* !TARGET_OS_TV */
         }
         break;
       }

package/ios/RNSScreenWindowTraits.mm

@@ -242,12 +242,12 @@
                 inViewController:(UIViewController *)vc
 {
   UIViewController *lastViewController = [[vc childViewControllers] lastObject];
-  if ([lastViewController conformsToProtocol:@protocol(RNScreensViewControllerDelegate)]) {
+  if ([lastViewController conformsToProtocol:@protocol(RNSViewControllerDelegate)]) {
     UIViewController *vc = nil;
-    if ([lastViewController isKindOfClass:[RNScreensViewController class]]) {
-      vc = [(RNScreensViewController *)lastViewController findActiveChildVC];
-    } else if ([lastViewController isKindOfClass:[RNScreensNavigationController class]]) {
-      vc = [(RNScreensNavigationController *)lastViewController topViewController];
+    if ([lastViewController isKindOfClass:[RNSViewController class]]) {
+      vc = [(RNSViewController *)lastViewController findActiveChildVC];
+    } else if ([lastViewController isKindOfClass:[RNSNavigationController class]]) {
+      vc = [(RNSNavigationController *)lastViewController topViewController];
     }
     return [vc isKindOfClass:[RNSScreen class]] &&
         [(RNSScreen *)vc findChildVCForConfigAndTrait:trait includingModals:includingModals] != nil;

package/ios/RNSSearchBar.h

@@ -8,6 +8,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTComponent.h>
 #import <React/RCTViewManager.h>
+#import "RNSEnums.h"
 
 @interface RNSSearchBar :
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -17,9 +18,12 @@
 #endif
 
 @property (nonatomic) BOOL hideWhenScrolling;
-
+@property (nonatomic) RNSSearchBarPlacement placement;
 @property (nonatomic, retain) UISearchController *controller;
 
+- (UINavigationItemSearchBarPlacement)placementAsUINavigationItemSearchBarPlacement API_AVAILABLE(ios(16.0))
+    API_UNAVAILABLE(tvos, watchos);
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #else
 @property (nonatomic, copy) RCTBubblingEventBlock onChangeText;

package/ios/RNSSearchBar.mm

@@ -49,6 +49,7 @@
   _controller = [[UISearchController alloc] initWithSearchResultsController:nil];
   _controller.searchBar.delegate = self;
   _hideWhenScrolling = YES;
+  _placement = RNSSearchBarPlacementStacked;
 }
 
 - (void)emitOnFocusEvent
@@ -208,6 +209,18 @@
 #endif
 }
 
+- (UINavigationItemSearchBarPlacement)placementAsUINavigationItemSearchBarPlacement
+{
+  switch (_placement) {
+    case RNSSearchBarPlacementStacked:
+      return UINavigationItemSearchBarPlacementStacked;
+    case RNSSearchBarPlacementAutomatic:
+      return UINavigationItemSearchBarPlacementAutomatic;
+    case RNSSearchBarPlacementInline:
+      return UINavigationItemSearchBarPlacementInline;
+  }
+}
+
 #pragma mark delegate methods
 
 - (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar
@@ -326,6 +339,10 @@
     [self setTextColor:RCTUIColorFromSharedColor(newScreenProps.textColor)];
   }
 
+  if (oldScreenProps.placement != newScreenProps.placement) {
+    self.placement = [RNSConvert RNSScreenSearchBarPlacementFromCppEquivalent:newScreenProps.placement];
+  }
+
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -372,6 +389,7 @@ RCT_EXPORT_VIEW_PROPERTY(barTintColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(tintColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(textColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(cancelButtonText, NSString)
+RCT_EXPORT_VIEW_PROPERTY(placement, RNSSearchBarPlacement)
 
 RCT_EXPORT_VIEW_PROPERTY(onChangeText, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onCancelButtonPress, RCTBubblingEventBlock)
@@ -424,3 +442,17 @@ RCT_EXPORT_METHOD(setText : (NSNumber *_Nonnull)reactTag text : (NSString *)text
 #endif /* !RCT_NEW_ARCH_ENABLED */
 
 @end
+
+@implementation RCTConvert (RNSScreen)
+
+RCT_ENUM_CONVERTER(
+    RNSSearchBarPlacement,
+    (@{
+      @"automatic" : @(RNSSearchBarPlacementAutomatic),
+      @"inline" : @(RNSSearchBarPlacementInline),
+      @"stacked" : @(RNSSearchBarPlacementStacked),
+    }),
+    RNSSearchBarPlacementStacked,
+    integerValue)
+
+@end

package/ios/UIViewController+RNScreens.mm

@@ -8,39 +8,39 @@
 #if !TARGET_OS_TV
 - (UIViewController *)reactNativeScreensChildViewControllerForStatusBarStyle
 {
-  UIViewController *childVC = [self findChildRNScreensViewController];
+  UIViewController *childVC = [self findChildRNSScreensViewController];
   return childVC ?: [self reactNativeScreensChildViewControllerForStatusBarStyle];
 }
 
 - (UIViewController *)reactNativeScreensChildViewControllerForStatusBarHidden
 {
-  UIViewController *childVC = [self findChildRNScreensViewController];
+  UIViewController *childVC = [self findChildRNSScreensViewController];
   return childVC ?: [self reactNativeScreensChildViewControllerForStatusBarHidden];
 }
 
 - (UIStatusBarAnimation)reactNativeScreensPreferredStatusBarUpdateAnimation
 {
-  UIViewController *childVC = [self findChildRNScreensViewController];
+  UIViewController *childVC = [self findChildRNSScreensViewController];
   return childVC ? childVC.preferredStatusBarUpdateAnimation
                  : [self reactNativeScreensPreferredStatusBarUpdateAnimation];
 }
 
 - (UIInterfaceOrientationMask)reactNativeScreensSupportedInterfaceOrientations
 {
-  UIViewController *childVC = [self findChildRNScreensViewController];
+  UIViewController *childVC = [self findChildRNSScreensViewController];
   return childVC ? childVC.supportedInterfaceOrientations : [self reactNativeScreensSupportedInterfaceOrientations];
 }
 
 - (UIViewController *)reactNativeScreensChildViewControllerForHomeIndicatorAutoHidden
 {
-  UIViewController *childVC = [self findChildRNScreensViewController];
+  UIViewController *childVC = [self findChildRNSScreensViewController];
   return childVC ?: [self reactNativeScreensChildViewControllerForHomeIndicatorAutoHidden];
 }
 
-- (UIViewController *)findChildRNScreensViewController
+- (UIViewController *)findChildRNSScreensViewController
 {
   UIViewController *lastViewController = [[self childViewControllers] lastObject];
-  if ([lastViewController conformsToProtocol:@protocol(RNScreensViewControllerDelegate)]) {
+  if ([lastViewController conformsToProtocol:@protocol(RNSViewControllerDelegate)]) {
     return lastViewController;
   }
   return nil;

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

@@ -1 +1 @@
-{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","codegenNativeComponent","interfaceOnly","exports"],"sources":["ScreenNativeComponent.ts"],"sourcesContent":["import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\nimport type { ViewProps, ColorValue } from 'react-native';\nimport type {\n  BubblingEventHandler,\n  WithDefault,\n  Int32,\n  Float,\n  Double,\n} from 'react-native/Libraries/Types/CodegenTypes';\n\n// eslint-disable-next-line @typescript-eslint/ban-types\ntype ScreenEvent = Readonly<{}>;\n\ntype ScreenDismissedEvent = Readonly<{\n  dismissCount: Int32;\n}>;\n\ntype TransitionProgressEvent = Readonly<{\n  progress: Double;\n  closing: Int32;\n  goingForward: Int32;\n}>;\n\ntype GestureResponseDistanceType = Readonly<{\n  start: Float;\n  end: Float;\n  top: Float;\n  bottom: Float;\n}>;\n\ntype StackPresentation =\n  | 'push'\n  | 'modal'\n  | 'transparentModal'\n  | 'fullScreenModal'\n  | 'formSheet'\n  | 'containedModal'\n  | 'containedTransparentModal';\n\ntype StackAnimation =\n  | 'default'\n  | 'flip'\n  | 'simple_push'\n  | 'none'\n  | 'fade'\n  | 'slide_from_right'\n  | 'slide_from_left'\n  | 'slide_from_bottom'\n  | 'fade_from_bottom';\n\ntype SwipeDirection = 'vertical' | 'horizontal';\n\ntype ReplaceAnimation = 'pop' | 'push';\n\ntype SheetDetentTypes = 'large' | 'medium' | 'all';\n\nexport interface NativeProps extends ViewProps {\n  onAppear?: BubblingEventHandler<ScreenEvent>;\n  onDisappear?: BubblingEventHandler<ScreenEvent>;\n  onDismissed?: BubblingEventHandler<ScreenDismissedEvent>;\n  onNativeDismissCancelled?: BubblingEventHandler<ScreenDismissedEvent>;\n  onWillAppear?: BubblingEventHandler<ScreenEvent>;\n  onWillDisappear?: BubblingEventHandler<ScreenEvent>;\n  onTransitionProgress?: BubblingEventHandler<TransitionProgressEvent>;\n  sheetAllowedDetents?: WithDefault<SheetDetentTypes, 'large'>;\n  sheetLargestUndimmedDetent?: WithDefault<SheetDetentTypes, 'all'>;\n  sheetGrabberVisible?: WithDefault<boolean, false>;\n  sheetCornerRadius?: WithDefault<Float, -1.0>;\n  sheetExpandsWhenScrolledToEdge?: WithDefault<boolean, false>;\n  customAnimationOnSwipe?: boolean;\n  fullScreenSwipeEnabled?: boolean;\n  homeIndicatorHidden?: boolean;\n  preventNativeDismiss?: boolean;\n  gestureEnabled?: WithDefault<boolean, true>;\n  statusBarColor?: ColorValue;\n  statusBarHidden?: boolean;\n  screenOrientation?: string;\n  statusBarAnimation?: string;\n  statusBarStyle?: string;\n  statusBarTranslucent?: boolean;\n  gestureResponseDistance?: GestureResponseDistanceType;\n  stackPresentation?: WithDefault<StackPresentation, 'push'>;\n  stackAnimation?: WithDefault<StackAnimation, 'default'>;\n  transitionDuration?: WithDefault<Int32, 350>;\n  replaceAnimation?: WithDefault<ReplaceAnimation, 'pop'>;\n  swipeDirection?: WithDefault<SwipeDirection, 'horizontal'>;\n  hideKeyboardOnSwipe?: boolean;\n  activityState?: WithDefault<Float, -1.0>;\n  navigationBarColor?: ColorValue;\n  navigationBarHidden?: boolean;\n  nativeBackButtonDismissalEnabled?: boolean;\n  onHeaderBackButtonClicked?: BubblingEventHandler<ScreenEvent>;\n}\n\nexport default codegenNativeComponent<NativeProps>('RNSScreen', {\n  interfaceOnly: true,\n});\n"],"mappings":";;;;;;AAAA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAU7F;AAAA,IAAAG,QAAA,GAoFe,IAAAC,+BAAsB,EAAc,WAAW,EAAE;EAC9DC,aAAa,EAAE;AACjB,CAAC,CAAC;AAAAC,OAAA,CAAAJ,OAAA,GAAAC,QAAA"}
+{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","codegenNativeComponent","interfaceOnly","exports"],"sources":["ScreenNativeComponent.ts"],"sourcesContent":["import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\nimport type { ViewProps, ColorValue } from 'react-native';\nimport type {\n  BubblingEventHandler,\n  WithDefault,\n  Int32,\n  Float,\n  Double,\n} from 'react-native/Libraries/Types/CodegenTypes';\n\n// eslint-disable-next-line @typescript-eslint/ban-types\ntype ScreenEvent = Readonly<{}>;\n\ntype ScreenDismissedEvent = Readonly<{\n  dismissCount: Int32;\n}>;\n\ntype TransitionProgressEvent = Readonly<{\n  progress: Double;\n  closing: Int32;\n  goingForward: Int32;\n}>;\n\ntype GestureResponseDistanceType = Readonly<{\n  start: Float;\n  end: Float;\n  top: Float;\n  bottom: Float;\n}>;\n\ntype StackPresentation =\n  | 'push'\n  | 'modal'\n  | 'transparentModal'\n  | 'fullScreenModal'\n  | 'formSheet'\n  | 'containedModal'\n  | 'containedTransparentModal';\n\ntype StackAnimation =\n  | 'default'\n  | 'flip'\n  | 'simple_push'\n  | 'none'\n  | 'fade'\n  | 'slide_from_right'\n  | 'slide_from_left'\n  | 'slide_from_bottom'\n  | 'fade_from_bottom';\n\ntype SwipeDirection = 'vertical' | 'horizontal';\n\ntype ReplaceAnimation = 'pop' | 'push';\n\ntype SheetDetentTypes = 'large' | 'medium' | 'all';\n\nexport interface NativeProps extends ViewProps {\n  onAppear?: BubblingEventHandler<ScreenEvent>;\n  onDisappear?: BubblingEventHandler<ScreenEvent>;\n  onDismissed?: BubblingEventHandler<ScreenDismissedEvent>;\n  onNativeDismissCancelled?: BubblingEventHandler<ScreenDismissedEvent>;\n  onWillAppear?: BubblingEventHandler<ScreenEvent>;\n  onWillDisappear?: BubblingEventHandler<ScreenEvent>;\n  onTransitionProgress?: BubblingEventHandler<TransitionProgressEvent>;\n  onGestureCancel?: BubblingEventHandler<ScreenEvent>;\n  sheetAllowedDetents?: WithDefault<SheetDetentTypes, 'large'>;\n  sheetLargestUndimmedDetent?: WithDefault<SheetDetentTypes, 'all'>;\n  sheetGrabberVisible?: WithDefault<boolean, false>;\n  sheetCornerRadius?: WithDefault<Float, -1.0>;\n  sheetExpandsWhenScrolledToEdge?: WithDefault<boolean, false>;\n  customAnimationOnSwipe?: boolean;\n  fullScreenSwipeEnabled?: boolean;\n  homeIndicatorHidden?: boolean;\n  preventNativeDismiss?: boolean;\n  gestureEnabled?: WithDefault<boolean, true>;\n  statusBarColor?: ColorValue;\n  statusBarHidden?: boolean;\n  screenOrientation?: string;\n  statusBarAnimation?: string;\n  statusBarStyle?: string;\n  statusBarTranslucent?: boolean;\n  gestureResponseDistance?: GestureResponseDistanceType;\n  stackPresentation?: WithDefault<StackPresentation, 'push'>;\n  stackAnimation?: WithDefault<StackAnimation, 'default'>;\n  transitionDuration?: WithDefault<Int32, 350>;\n  replaceAnimation?: WithDefault<ReplaceAnimation, 'pop'>;\n  swipeDirection?: WithDefault<SwipeDirection, 'horizontal'>;\n  hideKeyboardOnSwipe?: boolean;\n  activityState?: WithDefault<Float, -1.0>;\n  navigationBarColor?: ColorValue;\n  navigationBarHidden?: boolean;\n  nativeBackButtonDismissalEnabled?: boolean;\n  onHeaderBackButtonClicked?: BubblingEventHandler<ScreenEvent>;\n}\n\nexport default codegenNativeComponent<NativeProps>('RNSScreen', {\n  interfaceOnly: true,\n});\n"],"mappings":";;;;;;AAAA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAU7F;AAAA,IAAAG,QAAA,GAqFe,IAAAC,+BAAsB,EAAc,WAAW,EAAE;EAC9DC,aAAa,EAAE;AACjB,CAAC,CAAC;AAAAC,OAAA,CAAAJ,OAAA,GAAAC,QAAA"}

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

@@ -1 +1 @@
-{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","_codegenNativeCommands","obj","__esModule","default","Commands","codegenNativeCommands","supportedCommands","exports","_default","codegenNativeComponent"],"sources":["SearchBarNativeComponent.ts"],"sourcesContent":["/* eslint-disable */\nimport codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\nimport type { ViewProps, ColorValue, HostComponent } from 'react-native';\nimport type {\n  WithDefault,\n  BubblingEventHandler,\n} from 'react-native/Libraries/Types/CodegenTypes';\nimport codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';\n\ntype SearchBarEvent = Readonly<{}>;\n\ntype SearchButtonPressedEvent = Readonly<{\n  text?: string;\n}>;\n\ntype ChangeTextEvent = Readonly<{\n  text?: string;\n}>;\n\ntype AutoCapitalizeType = 'none' | 'words' | 'sentences' | 'characters';\n\ninterface NativeProps extends ViewProps {\n  onFocus?: BubblingEventHandler<SearchBarEvent> | null;\n  onBlur?: BubblingEventHandler<SearchBarEvent> | null;\n  onSearchButtonPress?: BubblingEventHandler<SearchButtonPressedEvent> | null;\n  onCancelButtonPress?: BubblingEventHandler<SearchBarEvent> | null;\n  onChangeText?: BubblingEventHandler<ChangeTextEvent> | null;\n  hideWhenScrolling?: boolean;\n  autoCapitalize?: WithDefault<AutoCapitalizeType, 'none'>;\n  placeholder?: string;\n  obscureBackground?: boolean;\n  hideNavigationBar?: boolean;\n  cancelButtonText?: string;\n  // TODO: implement these on iOS\n  barTintColor?: ColorValue;\n  tintColor?: ColorValue;\n  textColor?: ColorValue;\n\n  // Android only\n  disableBackButtonOverride?: boolean;\n  // TODO: consider creating enum here\n  inputType?: string;\n  onClose?: BubblingEventHandler<SearchBarEvent> | null;\n  onOpen?: BubblingEventHandler<SearchBarEvent> | null;\n  hintTextColor?: ColorValue;\n  headerIconColor?: ColorValue;\n  shouldShowHintSearchIcon?: WithDefault<boolean, true>;\n}\n\ntype ComponentType = HostComponent<NativeProps>;\n\ninterface NativeCommands {\n  blur: (viewRef: React.ElementRef<ComponentType>) => void;\n  focus: (viewRef: React.ElementRef<ComponentType>) => void;\n  clearText: (viewRef: React.ElementRef<ComponentType>) => void;\n  toggleCancelButton: (\n    viewRef: React.ElementRef<ComponentType>,\n    flag: boolean\n  ) => void;\n  setText: (viewRef: React.ElementRef<ComponentType>, text: string) => void;\n}\n\nexport const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({\n  supportedCommands: [\n    'blur',\n    'focus',\n    'clearText',\n    'toggleCancelButton',\n    'setText',\n  ],\n});\n\nexport default codegenNativeComponent<NativeProps>('RNSSearchBar', {});\n"],"mappings":";;;;;;AACA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAMA,IAAAC,sBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAA2F,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAP3F;;AA8DO,MAAMG,QAAwB,GAAG,IAAAC,8BAAqB,EAAiB;EAC5EC,iBAAiB,EAAE,CACjB,MAAM,EACN,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,SAAS;AAEb,CAAC,CAAC;AAACC,OAAA,CAAAH,QAAA,GAAAA,QAAA;AAAA,IAAAI,QAAA,GAEY,IAAAC,+BAAsB,EAAc,cAAc,EAAE,CAAC,CAAC,CAAC;AAAAF,OAAA,CAAAJ,OAAA,GAAAK,QAAA"}
+{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","_codegenNativeCommands","obj","__esModule","default","Commands","codegenNativeCommands","supportedCommands","exports","_default","codegenNativeComponent"],"sources":["SearchBarNativeComponent.ts"],"sourcesContent":["/* eslint-disable */\nimport codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\nimport type { ViewProps, ColorValue, HostComponent } from 'react-native';\nimport type {\n  WithDefault,\n  BubblingEventHandler,\n} from 'react-native/Libraries/Types/CodegenTypes';\nimport codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';\n\ntype SearchBarEvent = Readonly<{}>;\n\ntype SearchButtonPressedEvent = Readonly<{\n  text?: string;\n}>;\n\ntype ChangeTextEvent = Readonly<{\n  text?: string;\n}>;\n\ntype SearchBarPlacement = 'automatic' | 'inline' | 'stacked';\n\ntype AutoCapitalizeType = 'none' | 'words' | 'sentences' | 'characters';\n\ninterface NativeProps extends ViewProps {\n  onFocus?: BubblingEventHandler<SearchBarEvent> | null;\n  onBlur?: BubblingEventHandler<SearchBarEvent> | null;\n  onSearchButtonPress?: BubblingEventHandler<SearchButtonPressedEvent> | null;\n  onCancelButtonPress?: BubblingEventHandler<SearchBarEvent> | null;\n  onChangeText?: BubblingEventHandler<ChangeTextEvent> | null;\n  hideWhenScrolling?: boolean;\n  autoCapitalize?: WithDefault<AutoCapitalizeType, 'none'>;\n  placeholder?: string;\n  placement?: WithDefault<SearchBarPlacement, 'stacked'>;\n  obscureBackground?: boolean;\n  hideNavigationBar?: boolean;\n  cancelButtonText?: string;\n  // TODO: implement these on iOS\n  barTintColor?: ColorValue;\n  tintColor?: ColorValue;\n  textColor?: ColorValue;\n\n  // Android only\n  disableBackButtonOverride?: boolean;\n  // TODO: consider creating enum here\n  inputType?: string;\n  onClose?: BubblingEventHandler<SearchBarEvent> | null;\n  onOpen?: BubblingEventHandler<SearchBarEvent> | null;\n  hintTextColor?: ColorValue;\n  headerIconColor?: ColorValue;\n  shouldShowHintSearchIcon?: WithDefault<boolean, true>;\n}\n\ntype ComponentType = HostComponent<NativeProps>;\n\ninterface NativeCommands {\n  blur: (viewRef: React.ElementRef<ComponentType>) => void;\n  focus: (viewRef: React.ElementRef<ComponentType>) => void;\n  clearText: (viewRef: React.ElementRef<ComponentType>) => void;\n  toggleCancelButton: (\n    viewRef: React.ElementRef<ComponentType>,\n    flag: boolean\n  ) => void;\n  setText: (viewRef: React.ElementRef<ComponentType>, text: string) => void;\n}\n\nexport const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({\n  supportedCommands: [\n    'blur',\n    'focus',\n    'clearText',\n    'toggleCancelButton',\n    'setText',\n  ],\n});\n\nexport default codegenNativeComponent<NativeProps>('RNSSearchBar', {});\n"],"mappings":";;;;;;AACA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAMA,IAAAC,sBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAA2F,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAP3F;;AAiEO,MAAMG,QAAwB,GAAG,IAAAC,8BAAqB,EAAiB;EAC5EC,iBAAiB,EAAE,CACjB,MAAM,EACN,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,SAAS;AAEb,CAAC,CAAC;AAACC,OAAA,CAAAH,QAAA,GAAAA,QAAA;AAAA,IAAAI,QAAA,GAEY,IAAAC,+BAAsB,EAAc,cAAc,EAAE,CAAC,CAAC,CAAC;AAAAF,OAAA,CAAAJ,OAAA,GAAAK,QAAA"}

package/lib/commonjs/index.native.js

@@ -157,6 +157,16 @@ class InnerScreen extends _react.default.Component {
       freezeOnBlur = ENABLE_FREEZE,
       ...rest
     } = this.props;
+
+    // To maintain default behaviour of formSheet stack presentation style & and to have resonable
+    // defaults for new medium-detent iOS API we need to set defaults here
+    const {
+      sheetAllowedDetents = 'large',
+      sheetLargestUndimmedDetent = 'all',
+      sheetGrabberVisible = false,
+      sheetCornerRadius = -1.0,
+      sheetExpandsWhenScrolledToEdge = true
+    } = rest;
     if (enabled && isPlatformSupported) {
       var _gestureResponseDista, _gestureResponseDista2, _gestureResponseDista3, _gestureResponseDista4;
       AnimatedNativeScreen = AnimatedNativeScreen || _reactNative.Animated.createAnimatedComponent(ScreensNativeModules.NativeScreen);
@@ -169,6 +179,7 @@ class InnerScreen extends _react.default.Component {
         children,
         isNativeStack,
         gestureResponseDistance,
+        onGestureCancel,
         ...props
       } = rest;
       if (active !== undefined && activityState === undefined) {
@@ -190,6 +201,11 @@ class InnerScreen extends _react.default.Component {
         freeze: freezeOnBlur && activityState === 0
       }, /*#__PURE__*/_react.default.createElement(AnimatedNativeScreen, _extends({}, props, {
         activityState: activityState,
+        sheetAllowedDetents: sheetAllowedDetents,
+        sheetLargestUndimmedDetent: sheetLargestUndimmedDetent,
+        sheetGrabberVisible: sheetGrabberVisible,
+        sheetCornerRadius: sheetCornerRadius,
+        sheetExpandsWhenScrolledToEdge: sheetExpandsWhenScrolledToEdge,
         gestureResponseDistance: {
           start: (_gestureResponseDista = gestureResponseDistance === null || gestureResponseDistance === void 0 ? void 0 : gestureResponseDistance.start) !== null && _gestureResponseDista !== void 0 ? _gestureResponseDista : -1,
           end: (_gestureResponseDista2 = gestureResponseDistance === null || gestureResponseDistance === void 0 ? void 0 : gestureResponseDistance.end) !== null && _gestureResponseDista2 !== void 0 ? _gestureResponseDista2 : -1,
@@ -208,7 +224,10 @@ class InnerScreen extends _react.default.Component {
           }
         }], {
           useNativeDriver: true
-        })
+        }),
+        onGestureCancel: onGestureCancel !== null && onGestureCancel !== void 0 ? onGestureCancel : () => {
+          // for internal use
+        }
       }), !isNativeStack ?
       // see comment of this prop in types.tsx for information why it is needed
       children : /*#__PURE__*/_react.default.createElement(_TransitionProgressContext.default.Provider, {