react-native-screens 3.13.0 → 3.14.1

package/ios/RNSFullWindowOverlay.h

@@ -1,6 +1,11 @@
+#import <React/RCTViewManager.h>
+
+#ifdef RN_FABRIC_ENABLED
+#import <React/RCTViewComponentView.h>
+#else
 #import <React/RCTInvalidating.h>
 #import <React/RCTView.h>
-#import <React/RCTViewManager.h>
+#endif
 
 @interface RNSFullWindowOverlayManager : RCTViewManager
 
@@ -10,6 +15,16 @@
 
 @end
 
-@interface RNSFullWindowOverlay : RCTView <RCTInvalidating>
+@interface RNSFullWindowOverlay :
+#ifdef RN_FABRIC_ENABLED
+    RCTViewComponentView
+#else
+    RCTView <RCTInvalidating>
+#endif // RN_FABRIC_ENABLED
+
+#ifdef RN_FABRIC_ENABLED
+@property (nonatomic) facebook::react::LayoutMetrics oldLayoutMetrics;
+@property (nonatomic) facebook::react::LayoutMetrics newLayoutMetrics;
+#endif // RN_FABRIC_ENABLED
 
 @end

package/ios/RNSFullWindowOverlay.mm

@@ -0,0 +1,199 @@
+#import <UIKit/UIKit.h>
+
+#import "RNSFullWindowOverlay.h"
+
+#ifdef RN_FABRIC_ENABLED
+#import <React/RCTConversions.h>
+#import <React/RCTSurfaceTouchHandler.h>
+#import <react/renderer/components/rnscreens/ComponentDescriptors.h>
+#import <react/renderer/components/rnscreens/Props.h>
+#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+#import "RCTFabricComponentsPlugins.h"
+#else
+#import <React/RCTTouchHandler.h>
+#endif // RN_FABRIC_ENABLED
+
+@implementation RNSFullWindowOverlayContainer
+
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
+{
+  for (UIView *view in [self subviews]) {
+    if (view.userInteractionEnabled && [view pointInside:[self convertPoint:point toView:view] withEvent:event]) {
+      return YES;
+    }
+  }
+  return NO;
+}
+
+@end
+
+@implementation RNSFullWindowOverlay {
+  __weak RCTBridge *_bridge;
+  RNSFullWindowOverlayContainer *_container;
+  CGRect _reactFrame;
+#ifdef RN_FABRIC_ENABLED
+  RCTSurfaceTouchHandler *_touchHandler;
+#else
+  RCTTouchHandler *_touchHandler;
+#endif // RN_FABRIC_ENABLED
+}
+
+#ifdef RN_FABRIC_ENABLED
+- (instancetype)init
+{
+  if (self = [super init]) {
+    static const auto defaultProps = std::make_shared<const facebook::react::RNSFullWindowOverlayProps>();
+    _props = defaultProps;
+    [self _initCommon];
+  }
+  return self;
+}
+#endif // RN_FABRIC_ENABLED
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+{
+  if (self = [super init]) {
+    _bridge = bridge;
+    [self _initCommon];
+  }
+
+  return self;
+}
+
+- (void)_initCommon
+{
+  _reactFrame = CGRectNull;
+  _container = self.container;
+  [self show];
+}
+
+- (void)addSubview:(UIView *)view
+{
+  [_container addSubview:view];
+}
+
+- (RNSFullWindowOverlayContainer *)container
+{
+  if (_container == nil) {
+    _container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame];
+  }
+
+  return _container;
+}
+
+- (void)show
+{
+  UIWindow *window = RCTSharedApplication().delegate.window;
+  [window addSubview:_container];
+}
+
+- (void)didMoveToWindow
+{
+  if (self.window == nil) {
+    if (_container != nil) {
+      [_container removeFromSuperview];
+      [_touchHandler detachFromView:_container];
+    }
+  } else {
+    if (_touchHandler == nil) {
+#ifdef RN_FABRIC_ENABLED
+      _touchHandler = [RCTSurfaceTouchHandler new];
+#else
+      _touchHandler = [[RCTTouchHandler alloc] initWithBridge:_bridge];
+#endif
+    }
+    [_touchHandler attachToView:_container];
+  }
+}
+
+#ifdef RN_FABRIC_ENABLED
+#pragma mark - Fabric Specific
+
+// When the component unmounts we remove it from window's children,
+// so when the component gets recycled we need to add it back.
+- (void)maybeShow
+{
+  UIWindow *window = RCTSharedApplication().delegate.window;
+  if (![[window subviews] containsObject:self]) {
+    [window addSubview:_container];
+  }
+}
+
++ (facebook::react::ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return facebook::react::concreteComponentDescriptorProvider<
+      facebook::react::RNSFullWindowOverlayComponentDescriptor>();
+}
+
+- (void)prepareForRecycle
+{
+  [_container removeFromSuperview];
+  // Due to view recycling we don't really want to set _container = nil
+  // as it won't be instantiated when the component appears for the second time.
+  // We could consider nulling in here & using container (lazy getter) everywhere else.
+  // _container = nil;
+  [super prepareForRecycle];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  // When the component unmounts we remove it from window's children,
+  // so when the component gets recycled we need to add it back.
+  // As for now it is called here as we lack of method that is called
+  // just before component gets restored (from recycle pool).
+  [self maybeShow];
+  [self addSubview:childComponentView];
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+  [childComponentView removeFromSuperview];
+}
+
+- (void)updateLayoutMetrics:(facebook::react::LayoutMetrics const &)layoutMetrics
+           oldLayoutMetrics:(facebook::react::LayoutMetrics const &)oldLayoutMetrics
+{
+  CGRect frame = RCTCGRectFromRect(layoutMetrics.frame);
+  _reactFrame = frame;
+  [_container setFrame:frame];
+}
+
+#else
+#pragma mark - Paper specific
+
+- (void)reactSetFrame:(CGRect)frame
+{
+  _reactFrame = frame;
+  [_container setFrame:frame];
+}
+
+- (void)invalidate
+{
+  [_container removeFromSuperview];
+  _container = nil;
+}
+
+#endif // RN_FABRIC_ENABLED
+
+@end
+
+#ifdef RN_FABRIC_ENABLED
+Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void)
+{
+  return RNSFullWindowOverlay.class;
+}
+#endif // RN_FABRIC_ENABLED
+
+@implementation RNSFullWindowOverlayManager
+
+RCT_EXPORT_MODULE()
+
+#ifdef RN_FABRIC_ENABLED
+#else
+- (UIView *)view
+{
+  return [[RNSFullWindowOverlay alloc] initWithBridge:self.bridge];
+}
+#endif // RN_FABRIC_ENABLED
+
+@end

package/ios/RNSScreen.h

@@ -1,59 +1,16 @@
 #import <React/RCTComponent.h>
-#import <React/RCTView.h>
 #import <React/RCTViewManager.h>
 
+#import "RNSEnums.h"
 #import "RNSScreenContainer.h"
 
-typedef NS_ENUM(NSInteger, RNSScreenStackPresentation) {
-  RNSScreenStackPresentationPush,
-  RNSScreenStackPresentationModal,
-  RNSScreenStackPresentationTransparentModal,
-  RNSScreenStackPresentationContainedModal,
-  RNSScreenStackPresentationContainedTransparentModal,
-  RNSScreenStackPresentationFullScreenModal,
-  RNSScreenStackPresentationFormSheet
-};
-
-typedef NS_ENUM(NSInteger, RNSScreenStackAnimation) {
-  RNSScreenStackAnimationDefault,
-  RNSScreenStackAnimationNone,
-  RNSScreenStackAnimationFade,
-  RNSScreenStackAnimationFadeFromBottom,
-  RNSScreenStackAnimationFlip,
-  RNSScreenStackAnimationSlideFromBottom,
-  RNSScreenStackAnimationSimplePush,
-};
-
-typedef NS_ENUM(NSInteger, RNSScreenReplaceAnimation) {
-  RNSScreenReplaceAnimationPop,
-  RNSScreenReplaceAnimationPush,
-};
-
-typedef NS_ENUM(NSInteger, RNSScreenSwipeDirection) {
-  RNSScreenSwipeDirectionHorizontal,
-  RNSScreenSwipeDirectionVertical,
-};
-
-typedef NS_ENUM(NSInteger, RNSActivityState) {
-  RNSActivityStateInactive = 0,
-  RNSActivityStateTransitioningOrBelowTop = 1,
-  RNSActivityStateOnTop = 2
-};
-
-typedef NS_ENUM(NSInteger, RNSStatusBarStyle) {
-  RNSStatusBarStyleAuto,
-  RNSStatusBarStyleInverted,
-  RNSStatusBarStyleLight,
-  RNSStatusBarStyleDark,
-};
-
-typedef NS_ENUM(NSInteger, RNSWindowTrait) {
-  RNSWindowTraitStyle,
-  RNSWindowTraitAnimation,
-  RNSWindowTraitHidden,
-  RNSWindowTraitOrientation,
-  RNSWindowTraitHomeIndicatorHidden,
-};
+#if RN_FABRIC_ENABLED
+#import <React/RCTViewComponentView.h>
+#else
+#import <React/RCTView.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTConvert (RNSScreen)
 
@@ -62,61 +19,89 @@ typedef NS_ENUM(NSInteger, RNSWindowTrait) {
 
 #if !TARGET_OS_TV
 + (RNSStatusBarStyle)RNSStatusBarStyle:(id)json;
++ (UIStatusBarAnimation)UIStatusBarAnimation:(id)json;
 + (UIInterfaceOrientationMask)UIInterfaceOrientationMask:(id)json;
 #endif
 
 @end
 
+@class RNSScreenView;
+
 @interface RNSScreen : UIViewController <RNScreensViewControllerDelegate>
 
 - (instancetype)initWithView:(UIView *)view;
-- (void)notifyFinishTransitioning;
 - (UIViewController *)findChildVCForConfigAndTrait:(RNSWindowTrait)trait includingModals:(BOOL)includingModals;
+- (void)notifyFinishTransitioning;
+- (RNSScreenView *)screenView;
+#ifdef RN_FABRIC_ENABLED
+- (void)setViewToSnapshot:(UIView *)snapshot;
+- (void)resetViewToScreen;
+#endif
 
 @end
 
-@interface RNSScreenManager : RCTViewManager
-
-@end
-
-@interface RNSScreenView : RCTView
-
-@property (nonatomic, copy) RCTDirectEventBlock onAppear;
-@property (nonatomic, copy) RCTDirectEventBlock onDisappear;
-@property (nonatomic, copy) RCTDirectEventBlock onDismissed;
-@property (nonatomic, copy) RCTDirectEventBlock onWillAppear;
-@property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
-@property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
-@property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
+@interface RNSScreenView :
+#ifdef RN_FABRIC_ENABLED
+    RCTViewComponentView
+#else
+    RCTView
+#endif
 
-@property (weak, nonatomic) UIView<RNSScreenContainerDelegate> *reactSuperview;
-@property (nonatomic, retain) UIViewController *controller;
-@property (nonatomic, readonly) BOOL dismissed;
-@property (nonatomic) int activityState;
+@property (nonatomic) BOOL fullScreenSwipeEnabled;
 @property (nonatomic) BOOL gestureEnabled;
-@property (nonatomic) RNSScreenStackAnimation stackAnimation;
-@property (nonatomic) RNSScreenStackPresentation stackPresentation;
-@property (nonatomic) RNSScreenReplaceAnimation replaceAnimation;
-@property (nonatomic) RNSScreenSwipeDirection swipeDirection;
-@property (nonatomic) BOOL preventNativeDismiss;
-@property (nonatomic) BOOL hasOrientationSet;
+@property (nonatomic) BOOL hasStatusBarHiddenSet;
 @property (nonatomic) BOOL hasStatusBarStyleSet;
 @property (nonatomic) BOOL hasStatusBarAnimationSet;
-@property (nonatomic) BOOL hasStatusBarHiddenSet;
 @property (nonatomic) BOOL hasHomeIndicatorHiddenSet;
-@property (nonatomic) BOOL customAnimationOnSwipe;
-@property (nonatomic) BOOL fullScreenSwipeEnabled;
+@property (nonatomic) BOOL hasOrientationSet;
+@property (nonatomic) RNSScreenStackAnimation stackAnimation;
+@property (nonatomic) RNSScreenStackPresentation stackPresentation;
+@property (nonatomic) RNSScreenSwipeDirection swipeDirection;
+@property (nonatomic) RNSScreenReplaceAnimation replaceAnimation;
 @property (nonatomic, retain) NSNumber *transitionDuration;
+@property (nonatomic, readonly) BOOL dismissed;
+@property (nonatomic) BOOL hideKeyboardOnSwipe;
+@property (nonatomic) BOOL customAnimationOnSwipe;
+@property (nonatomic) BOOL preventNativeDismiss;
+@property (nonatomic, retain) RNSScreen *controller;
+@property (nonatomic, copy) NSDictionary *gestureResponseDistance;
+@property (nonatomic) int activityState;
+@property (weak, nonatomic) UIView<RNSScreenContainerDelegate> *reactSuperview;
 
 #if !TARGET_OS_TV
 @property (nonatomic) RNSStatusBarStyle statusBarStyle;
 @property (nonatomic) UIStatusBarAnimation statusBarAnimation;
-@property (nonatomic) BOOL statusBarHidden;
 @property (nonatomic) UIInterfaceOrientationMask screenOrientation;
+@property (nonatomic) BOOL statusBarHidden;
 @property (nonatomic) BOOL homeIndicatorHidden;
 #endif
 
+#ifdef RN_FABRIC_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;
+#else
+@property (nonatomic, copy) RCTDirectEventBlock onAppear;
+@property (nonatomic, copy) RCTDirectEventBlock onDisappear;
+@property (nonatomic, copy) RCTDirectEventBlock onDismissed;
+@property (nonatomic, copy) RCTDirectEventBlock onWillAppear;
+@property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
+@property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
+@property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
+#endif
+
 - (void)notifyFinishTransitioning;
+
+#ifdef RN_FABRIC_ENABLED
+- (void)notifyWillAppear;
+- (void)notifyWillDisappear;
+- (void)notifyAppear;
+- (void)notifyDisappear;
+- (void)updateBounds;
+- (void)notifyDismissedWithCount:(int)dismissCount;
+#endif
+
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward;
 
 @end
@@ -124,3 +109,9 @@ typedef NS_ENUM(NSInteger, RNSWindowTrait) {
 @interface UIView (RNSScreen)
 - (UIViewController *)parentViewController;
 @end
+
+@interface RNSScreenManager : RCTViewManager
+
+@end
+
+NS_ASSUME_NONNULL_END