react-native-screens 3.22.1 → 3.24.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

@@ -2,34 +2,34 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import "RNSEnums.h"
 
+namespace react = facebook::react;
+
 @interface RNSConvert : NSObject
 
 + (RNSScreenStackPresentation)RNSScreenStackPresentationFromCppEquivalent:
-    (facebook::react::RNSScreenStackPresentation)stackPresentation;
+    (react::RNSScreenStackPresentation)stackPresentation;
 
-+ (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:
-    (facebook::react::RNSScreenStackAnimation)stackAnimation;
++ (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:(react::RNSScreenStackAnimation)stackAnimation;
 
 + (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
-    (facebook::react::RNSScreenStackHeaderSubviewType)subviewType;
+    (react::RNSScreenStackHeaderSubviewType)subviewType;
 
 + (RNSScreenReplaceAnimation)RNSScreenReplaceAnimationFromCppEquivalent:
-    (facebook::react::RNSScreenReplaceAnimation)replaceAnimation;
+    (react::RNSScreenReplaceAnimation)replaceAnimation;
 
-+ (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:
-    (facebook::react::RNSScreenSwipeDirection)swipeDirection;
++ (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:(react::RNSScreenSwipeDirection)swipeDirection;
 
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:
-    (facebook::react::RNSScreenSheetAllowedDetents)allowedDetents;
++ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:(react::RNSScreenSheetAllowedDetents)allowedDetents;
 
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:
-    (facebook::react::RNSScreenSheetLargestUndimmedDetent)detent;
++ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:(react::RNSScreenSheetLargestUndimmedDetent)detent;
 
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
-    (const facebook::react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance;
+    (const react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance;
 
 + (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
-    (facebook::react::RNSSearchBarAutoCapitalize)autoCapitalize;
+    (react::RNSSearchBarAutoCapitalize)autoCapitalize;
+
++ (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement;
 
 @end
 

package/ios/RNSConvert.mm

@@ -4,119 +4,115 @@
 @implementation RNSConvert
 
 + (RNSScreenStackPresentation)RNSScreenStackPresentationFromCppEquivalent:
-    (facebook::react::RNSScreenStackPresentation)stackPresentation
+    (react::RNSScreenStackPresentation)stackPresentation
 {
   switch (stackPresentation) {
-    case facebook::react::RNSScreenStackPresentation::Push:
+    case react::RNSScreenStackPresentation::Push:
       return RNSScreenStackPresentationPush;
-    case facebook::react::RNSScreenStackPresentation::Modal:
+    case react::RNSScreenStackPresentation::Modal:
       return RNSScreenStackPresentationModal;
-    case facebook::react::RNSScreenStackPresentation::FullScreenModal:
+    case react::RNSScreenStackPresentation::FullScreenModal:
       return RNSScreenStackPresentationFullScreenModal;
-    case facebook::react::RNSScreenStackPresentation::FormSheet:
+    case react::RNSScreenStackPresentation::FormSheet:
       return RNSScreenStackPresentationFormSheet;
-    case facebook::react::RNSScreenStackPresentation::ContainedModal:
+    case react::RNSScreenStackPresentation::ContainedModal:
       return RNSScreenStackPresentationContainedModal;
-    case facebook::react::RNSScreenStackPresentation::TransparentModal:
+    case react::RNSScreenStackPresentation::TransparentModal:
       return RNSScreenStackPresentationTransparentModal;
-    case facebook::react::RNSScreenStackPresentation::ContainedTransparentModal:
+    case react::RNSScreenStackPresentation::ContainedTransparentModal:
       return RNSScreenStackPresentationContainedTransparentModal;
   }
 }
 
-+ (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:
-    (facebook::react::RNSScreenStackAnimation)stackAnimation
++ (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:(react::RNSScreenStackAnimation)stackAnimation
 {
   switch (stackAnimation) {
     // these three are intentionally grouped
-    case facebook::react::RNSScreenStackAnimation::Slide_from_right:
-    case facebook::react::RNSScreenStackAnimation::Slide_from_left:
-    case facebook::react::RNSScreenStackAnimation::Default:
+    case react::RNSScreenStackAnimation::Slide_from_right:
+    case react::RNSScreenStackAnimation::Slide_from_left:
+    case react::RNSScreenStackAnimation::Default:
       return RNSScreenStackAnimationDefault;
-    case facebook::react::RNSScreenStackAnimation::Flip:
+    case react::RNSScreenStackAnimation::Flip:
       return RNSScreenStackAnimationFlip;
-    case facebook::react::RNSScreenStackAnimation::Simple_push:
+    case react::RNSScreenStackAnimation::Simple_push:
       return RNSScreenStackAnimationSimplePush;
-    case facebook::react::RNSScreenStackAnimation::None:
+    case react::RNSScreenStackAnimation::None:
       return RNSScreenStackAnimationNone;
-    case facebook::react::RNSScreenStackAnimation::Fade:
+    case react::RNSScreenStackAnimation::Fade:
       return RNSScreenStackAnimationFade;
-    case facebook::react::RNSScreenStackAnimation::Slide_from_bottom:
+    case react::RNSScreenStackAnimation::Slide_from_bottom:
       return RNSScreenStackAnimationSlideFromBottom;
-    case facebook::react::RNSScreenStackAnimation::Fade_from_bottom:
+    case react::RNSScreenStackAnimation::Fade_from_bottom:
       return RNSScreenStackAnimationFadeFromBottom;
   }
 }
 
 + (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
-    (facebook::react::RNSScreenStackHeaderSubviewType)subviewType
+    (react::RNSScreenStackHeaderSubviewType)subviewType
 {
   switch (subviewType) {
-    case facebook::react::RNSScreenStackHeaderSubviewType::Left:
+    case react::RNSScreenStackHeaderSubviewType::Left:
       return RNSScreenStackHeaderSubviewTypeLeft;
-    case facebook::react::RNSScreenStackHeaderSubviewType::Right:
+    case react::RNSScreenStackHeaderSubviewType::Right:
       return RNSScreenStackHeaderSubviewTypeRight;
-    case facebook::react::RNSScreenStackHeaderSubviewType::Title:
+    case react::RNSScreenStackHeaderSubviewType::Title:
       return RNSScreenStackHeaderSubviewTypeTitle;
-    case facebook::react::RNSScreenStackHeaderSubviewType::Center:
+    case react::RNSScreenStackHeaderSubviewType::Center:
       return RNSScreenStackHeaderSubviewTypeCenter;
-    case facebook::react::RNSScreenStackHeaderSubviewType::SearchBar:
+    case react::RNSScreenStackHeaderSubviewType::SearchBar:
       return RNSScreenStackHeaderSubviewTypeSearchBar;
-    case facebook::react::RNSScreenStackHeaderSubviewType::Back:
+    case react::RNSScreenStackHeaderSubviewType::Back:
       return RNSScreenStackHeaderSubviewTypeBackButton;
   }
 }
 
 + (RNSScreenReplaceAnimation)RNSScreenReplaceAnimationFromCppEquivalent:
-    (facebook::react::RNSScreenReplaceAnimation)replaceAnimation
+    (react::RNSScreenReplaceAnimation)replaceAnimation
 {
   switch (replaceAnimation) {
-    case facebook::react::RNSScreenReplaceAnimation::Pop:
+    case react::RNSScreenReplaceAnimation::Pop:
       return RNSScreenReplaceAnimationPop;
-    case facebook::react::RNSScreenReplaceAnimation::Push:
+    case react::RNSScreenReplaceAnimation::Push:
       return RNSScreenReplaceAnimationPush;
   }
 }
 
-+ (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:
-    (facebook::react::RNSScreenSwipeDirection)swipeDirection
++ (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:(react::RNSScreenSwipeDirection)swipeDirection
 {
   switch (swipeDirection) {
-    case facebook::react::RNSScreenSwipeDirection::Horizontal:
+    case react::RNSScreenSwipeDirection::Horizontal:
       return RNSScreenSwipeDirectionHorizontal;
-    case facebook::react::RNSScreenSwipeDirection::Vertical:
+    case react::RNSScreenSwipeDirection::Vertical:
       return RNSScreenSwipeDirectionVertical;
   }
 }
 
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:
-    (facebook::react::RNSScreenSheetAllowedDetents)allowedDetents
++ (RNSScreenDetentType)RNSScreenDetentTypeFromAllowedDetents:(react::RNSScreenSheetAllowedDetents)allowedDetents
 {
   switch (allowedDetents) {
-    case facebook::react::RNSScreenSheetAllowedDetents::All:
+    case react::RNSScreenSheetAllowedDetents::All:
       return RNSScreenDetentTypeAll;
-    case facebook::react::RNSScreenSheetAllowedDetents::Large:
+    case react::RNSScreenSheetAllowedDetents::Large:
       return RNSScreenDetentTypeLarge;
-    case facebook::react::RNSScreenSheetAllowedDetents::Medium:
+    case react::RNSScreenSheetAllowedDetents::Medium:
       return RNSScreenDetentTypeMedium;
   }
 }
 
-+ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:
-    (facebook::react::RNSScreenSheetLargestUndimmedDetent)detent
++ (RNSScreenDetentType)RNSScreenDetentTypeFromLargestUndimmedDetent:(react::RNSScreenSheetLargestUndimmedDetent)detent
 {
   switch (detent) {
-    case facebook::react::RNSScreenSheetLargestUndimmedDetent::All:
+    case react::RNSScreenSheetLargestUndimmedDetent::All:
       return RNSScreenDetentTypeAll;
-    case facebook::react::RNSScreenSheetLargestUndimmedDetent::Large:
+    case react::RNSScreenSheetLargestUndimmedDetent::Large:
       return RNSScreenDetentTypeLarge;
-    case facebook::react::RNSScreenSheetLargestUndimmedDetent::Medium:
+    case react::RNSScreenSheetLargestUndimmedDetent::Medium:
       return RNSScreenDetentTypeMedium;
   }
 }
 
 + (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
-    (const facebook::react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance
+    (const react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance
 {
   return @{
     @"start" : @(gestureResponseDistance.start),
@@ -127,20 +123,32 @@
 }
 
 + (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
-    (facebook::react::RNSSearchBarAutoCapitalize)autoCapitalize
+    (react::RNSSearchBarAutoCapitalize)autoCapitalize
 {
   switch (autoCapitalize) {
-    case facebook::react::RNSSearchBarAutoCapitalize::Words:
+    case react::RNSSearchBarAutoCapitalize::Words:
       return UITextAutocapitalizationTypeWords;
-    case facebook::react::RNSSearchBarAutoCapitalize::Sentences:
+    case react::RNSSearchBarAutoCapitalize::Sentences:
       return UITextAutocapitalizationTypeSentences;
-    case facebook::react::RNSSearchBarAutoCapitalize::Characters:
+    case react::RNSSearchBarAutoCapitalize::Characters:
       return UITextAutocapitalizationTypeAllCharacters;
-    case facebook::react::RNSSearchBarAutoCapitalize::None:
+    case react::RNSSearchBarAutoCapitalize::None:
       return UITextAutocapitalizationTypeNone;
   }
 }
 
++ (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement
+{
+  switch (placement) {
+    case react::RNSSearchBarPlacement::Stacked:
+      return RNSSearchBarPlacementStacked;
+    case react::RNSSearchBarPlacement::Automatic:
+      return RNSSearchBarPlacementAutomatic;
+    case 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.h

@@ -7,6 +7,10 @@
 #import <React/RCTView.h>
 #endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
+namespace react = facebook::react;
+#endif // RCT_NEW_ARCH_ENABLED
+
 @interface RNSFullWindowOverlayManager : RCTViewManager
 
 @end
@@ -23,8 +27,8 @@
 #endif // RCT_NEW_ARCH_ENABLED
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@property (nonatomic) facebook::react::LayoutMetrics oldLayoutMetrics;
-@property (nonatomic) facebook::react::LayoutMetrics newLayoutMetrics;
+@property (nonatomic) react::LayoutMetrics oldLayoutMetrics;
+@property (nonatomic) react::LayoutMetrics newLayoutMetrics;
 #endif // RCT_NEW_ARCH_ENABLED
 
 @end

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]) {
@@ -74,7 +82,7 @@
 - (instancetype)init
 {
   if (self = [super init]) {
-    static const auto defaultProps = std::make_shared<const facebook::react::RNSFullWindowOverlayProps>();
+    static const auto defaultProps = std::make_shared<const react::RNSFullWindowOverlayProps>();
     _props = defaultProps;
     [self _initCommon];
   }
@@ -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];
@@ -151,10 +162,9 @@
   }
 }
 
-+ (facebook::react::ComponentDescriptorProvider)componentDescriptorProvider
++ (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return facebook::react::concreteComponentDescriptorProvider<
-      facebook::react::RNSFullWindowOverlayComponentDescriptor>();
+  return react::concreteComponentDescriptorProvider<react::RNSFullWindowOverlayComponentDescriptor>();
 }
 
 - (void)prepareForRecycle
@@ -182,8 +192,8 @@
   [childComponentView removeFromSuperview];
 }
 
-- (void)updateLayoutMetrics:(facebook::react::LayoutMetrics const &)layoutMetrics
-           oldLayoutMetrics:(facebook::react::LayoutMetrics const &)oldLayoutMetrics
+- (void)updateLayoutMetrics:(react::LayoutMetrics const &)layoutMetrics
+           oldLayoutMetrics:(react::LayoutMetrics const &)oldLayoutMetrics
 {
   CGRect frame = RCTCGRectFromRect(layoutMetrics.frame);
   _reactFrame = frame;

package/ios/RNSScreen.h

@@ -8,10 +8,14 @@
 #import <React/RCTViewComponentView.h>
 #else
 #import <React/RCTView.h>
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef RCT_NEW_ARCH_ENABLED
+namespace react = facebook::react;
+#endif // RCT_NEW_ARCH_ENABLED
+
 @interface RCTConvert (RNSScreen)
 
 + (RNSScreenStackPresentation)RNSScreenStackPresentation:(id)json;
@@ -27,7 +31,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 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@class RNSScreenStackHeaderConfig;
+
 @interface RNSScreenView :
 #ifdef RCT_NEW_ARCH_ENABLED
     RCTViewComponentView
@@ -86,9 +92,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 #ifdef RCT_NEW_ARCH_ENABLED
 // 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 (nonatomic) react::LayoutMetrics oldLayoutMetrics;
+@property (nonatomic) react::LayoutMetrics newLayoutMetrics;
+@property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
+@property (nonatomic, readonly) BOOL hasHeaderConfig;
 #else
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
@@ -97,6 +104,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 +116,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)