react-native-screens 4.24.0 → 4.25.0-beta.2

package/ios/RNSFullWindowOverlay.h

@@ -1,17 +1,11 @@
 #pragma once
 
 #import <React/RCTViewManager.h>
+#import "RNSReactBaseView.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTInvalidating.h>
-#import <React/RCTView.h>
-#endif
-
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 @interface RNSFullWindowOverlayManager : RCTViewManager
 
@@ -21,18 +15,13 @@ namespace react = facebook::react;
 
 @end
 
-@interface RNSFullWindowOverlay :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-    RCTView <RCTInvalidating>
-#endif // RCT_NEW_ARCH_ENABLED
+@interface RNSFullWindowOverlay : RNSReactBaseView
 
 @property (nonatomic) BOOL accessibilityContainerViewIsModal;
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 @property (nonatomic) react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 @end

package/ios/RNSFullWindowOverlay.mm

@@ -3,7 +3,6 @@
 #import "RNSDefines.h"
 #import "RNSFullWindowOverlay.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTSurfaceTouchHandler.h>
@@ -11,9 +10,6 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import <rnscreens/RNSFullWindowOverlayComponentDescriptor.h>
-#else
-#import <React/RCTTouchHandler.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSFullWindowOverlayContainer
 
@@ -70,23 +66,11 @@
 @end
 
 @implementation RNSFullWindowOverlay {
-  __weak RCTBridge *_bridge;
   RNSFullWindowOverlayContainer *_container;
   CGRect _reactFrame;
-#ifdef RCT_NEW_ARCH_ENABLED
   RCTSurfaceTouchHandler *_touchHandler;
-#else
-  RCTTouchHandler *_touchHandler;
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
-// Needed because of this: https://github.com/facebook/react-native/pull/37274
-+ (void)load
-{
-  [super load];
-}
-
-#ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)init
 {
   if (self = [super init]) {
@@ -96,17 +80,6 @@
   }
   return self;
 }
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-{
-  if (self = [super init]) {
-    _bridge = bridge;
-    [self initCommonProps];
-  }
-
-  return self;
-}
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)initCommonProps
 {
@@ -154,11 +127,7 @@
       UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, _container);
     }
     if (_touchHandler == nil) {
-#ifdef RCT_NEW_ARCH_ENABLED
       _touchHandler = [RCTSurfaceTouchHandler new];
-#else
-      _touchHandler = [[RCTTouchHandler alloc] initWithBridge:_bridge];
-#endif
     }
     [_touchHandler attachToView:_container];
 
@@ -193,7 +162,6 @@
   }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #pragma mark - Fabric Specific
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
@@ -228,7 +196,7 @@ RNS_IGNORE_SUPER_CALL_BEGIN
 {
   CGRect frame = RCTCGRectFromRect(layoutMetrics.frame);
 
-  // Due to view flattening on new architecture there are situations
+  // Due to view flattening there are situations
   // when we receive frames with origin different from (0, 0).
   // We account for this frame manipulation in shadow node by setting
   // RootNodeKind trait for the shadow node making state consistent
@@ -253,44 +221,23 @@ RNS_IGNORE_SUPER_CALL_END
   [super updateProps:props oldProps:oldProps];
 }
 
-#else
-#pragma mark - Paper specific
-
-- (void)reactSetFrame:(CGRect)frame
-{
-  _reactFrame = frame;
-  [_container setFrame:frame];
-}
+#pragma mark - Dynamic frameworks support
 
-- (void)invalidate
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
 {
-  [_container removeFromSuperview];
-  _container = nil;
+  [super load];
 }
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSFullWindowOverlayCls(void)
 {
   return RNSFullWindowOverlay.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSFullWindowOverlayManager
 
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_VIEW_PROPERTY(accessibilityContainerViewIsModal, BOOL)
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-- (UIView *)view
-{
-  return [[RNSFullWindowOverlay alloc] initWithBridge:self.bridge];
-}
-#endif // RCT_NEW_ARCH_ENABLED
-
 @end

package/ios/RNSModalScreen.mm

@@ -1,9 +1,7 @@
 #import "RNSModalScreen.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTFabricComponentsPlugins.h>
 #import <rnscreens/RNSModalScreenComponentDescriptor.h>
-#endif
 
 @implementation RNSModalScreen
 
@@ -29,37 +27,30 @@
                   }];
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
++ (react::ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return react::concreteComponentDescriptorProvider<react::RNSModalScreenComponentDescriptor>();
+}
+
+#pragma mark - Dynamic frameworks support
 
 // Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
 + (void)load
 {
   [super load];
 }
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
-+ (react::ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return react::concreteComponentDescriptorProvider<react::RNSModalScreenComponentDescriptor>();
-}
-#endif
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSModalScreenCls(void)
 {
   return RNSModalScreen.class;
 }
-#endif
 
 @implementation RNSModalScreenManager
 
 RCT_EXPORT_MODULE()
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-- (UIView *)view
-{
-  return [[RNSModalScreen alloc] initWithBridge:self.bridge];
-}
-#endif // RCT_NEW_ARCH_ENABLED
 @end

package/ios/RNSModule.h

@@ -1,18 +1,14 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 #import <rnscreens/rnscreens.h>
-#else
-#import <React/RCTBridge.h>
 #endif
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RNSModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
                        <NativeScreensModuleSpec>
-#else
-                       <RCTBridgeModule>
 #endif
 
 @end

package/ios/RNSModule.mm

@@ -1,8 +1,6 @@
 #import "RNSModule.h"
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUtils.h>
 #include <jsi/jsi.h>
 #import "RNSScreenStack.h"
@@ -16,9 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 RCT_EXPORT_MODULE()
 
-#ifdef RCT_NEW_ARCH_ENABLED
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-#endif // RCT_NEW_ARCH_ENABLED
 @synthesize bridge = _bridge;
 
 - (dispatch_queue_t)methodQueue
@@ -42,12 +38,7 @@ RCT_EXPORT_MODULE()
 - (RNSScreenStackView *)getScreenStackView:(NSNumber *)reactTag
 {
   RCTAssertMainQueue();
-  RNSScreenStackView *view;
-#ifdef RCT_NEW_ARCH_ENABLED
-  view = (RNSScreenStackView *)[self.viewRegistry_DEPRECATED viewForReactTag:reactTag];
-#else
-  view = (RNSScreenStackView *)[self.bridge.uiManager viewForReactTag:reactTag];
-#endif // RCT_NEW_ARCH_ENABLED
+  RNSScreenStackView *view = (RNSScreenStackView *)[self.viewRegistry_DEPRECATED viewForReactTag:reactTag];
   return view;
 }
 
@@ -66,11 +57,7 @@ RCT_EXPORT_MODULE()
     UIView *belowTopScreen = screens[screenCount - 2].view;
     belowTopScreen.transform = CGAffineTransformMake(1, 0, 0, 1, 0, 0);
     isActiveTransition = true;
-#ifdef RCT_NEW_ARCH_ENABLED
     screenTags = @[ @(topScreen.tag), @(belowTopScreen.tag) ];
-#else
-    screenTags = @[ topScreen.reactTag, belowTopScreen.reactTag ];
-#endif // RCT_NEW_ARCH_ENABLED
     [stackView startScreenTransition];
   }
   return screenTags;
@@ -122,21 +109,17 @@ RCT_EXPORT_MODULE()
   return view;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   [self installHostObject];
   return std::make_shared<facebook::react::NativeScreensModuleSpecJSI>(params);
 }
-#endif
 
 - (void)installHostObject
 {
   /*
-   installHostObject method is called from constantsToExport and getTurboModule,
-   because depending on the selected architecture, only one method will be called.
-   For `Paper`, it will be constantsToExport, and for `Fabric`, it will be getTurboModule.
+   installHostObject method is called from constantsToExport and getTurboModule.
 */
   RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
   if (cxxBridge != nil) {

package/ios/RNSScreen.h

@@ -15,17 +15,13 @@
 #import "RNSOrientationProviding.h"
 #endif // !TARGET_OS_TV
 
-#if RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTView.h>
-#endif // RCT_NEW_ARCH_ENABLED
+#import "RNSReactBaseView.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
-#ifdef RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
+
+NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTConvert (RNSScreen)
 
@@ -55,26 +51,20 @@ namespace react = facebook::react;
 - (void)calculateAndNotifyHeaderHeightChangeIsModal:(BOOL)isModal;
 - (void)notifyFinishTransitioning;
 - (RNSScreenView *)screenView;
-#ifdef RCT_NEW_ARCH_ENABLED
 - (void)setViewToSnapshot;
 - (CGFloat)calculateHeaderHeightIsModal:(BOOL)isModal;
-#endif
 - (BOOL)isRemovedFromParent;
+- (void)notifyPresentedControllerDismissed;
 
 @end
 
 @class RNSScreenStackHeaderConfig;
 
-@interface RNSScreenView :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-    RCTView
-#endif
-    <RNSScreenContentWrapperDelegate,
-     RNSScrollViewBehaviorOverriding,
-     RNSSafeAreaProviding,
-     RNSScrollEdgeEffectProviding>
+@interface RNSScreenView : RNSReactBaseView <
+                               RNSScreenContentWrapperDelegate,
+                               RNSScrollViewBehaviorOverriding,
+                               RNSSafeAreaProviding,
+                               RNSScrollEdgeEffectProviding>
 
 /**
  * This is value of the prop as passed by the user. To get effective value see derived property
@@ -127,10 +117,10 @@ namespace react = facebook::react;
 @property (nonatomic) BOOL sheetExpandsWhenScrolledToEdge;
 #endif // !TARGET_OS_TV
 
-#ifdef RCT_NEW_ARCH_ENABLED
-// we recreate the behavior of `reactSetFrame` on new architecture
+#if defined(__cplusplus)
 @property (nonatomic) react::LayoutMetrics oldLayoutMetrics;
 @property (nonatomic) react::LayoutMetrics newLayoutMetrics;
+#endif // __cplusplus
 @property (weak, nonatomic) RNSScreenStackHeaderConfig *config;
 @property (nonatomic, readonly) BOOL hasHeaderConfig;
 @property (nonatomic, readonly, getter=isMarkedForUnmountInCurrentTransaction)
@@ -141,23 +131,10 @@ namespace react = facebook::react;
  * *This property was introduced for the sake of integration with reanimated.*
  */
 @property (nonatomic) BOOL snapshotAfterUpdates;
-#else
-@property (nonatomic, copy) RCTDirectEventBlock onAppear;
-@property (nonatomic, copy) RCTDirectEventBlock onDisappear;
-@property (nonatomic, copy) RCTDirectEventBlock onDismissed;
-@property (nonatomic, copy) RCTDirectEventBlock onHeaderHeightChange;
-@property (nonatomic, copy) RCTDirectEventBlock onWillAppear;
-@property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
-@property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
-@property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
-@property (nonatomic, copy) RCTDirectEventBlock onGestureCancel;
-@property (nonatomic, copy) RCTDirectEventBlock onSheetDetentChanged;
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)notifyFinishTransitioning;
 - (void)notifyHeaderHeightChange:(double)height;
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (void)notifyWillAppear;
 - (void)notifyWillDisappear;
 - (void)notifyAppear;
@@ -172,9 +149,6 @@ namespace react = facebook::react;
  * replace it with snapshot or not.
  */
 - (void)willBeUnmountedInUpcomingTransaction;
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge;
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward;
 - (void)notifyDismissCancelledWithDismissCount:(int)dismissCount;
@@ -193,16 +167,6 @@ namespace react = facebook::react;
  */
 - (void)invalidateImpl;
 
-#ifndef RCT_NEW_ARCH_ENABLED
-/**
- * Tell `Screen` component that it has been removed from react state and can safely cleanup
- * any retained resources.
- *
- * On old architecture this method might be called by RN via `RCTInvalidating` protocol.
- */
-- (void)invalidate;
-#endif // !RCT_NEW_ARCH_ENABLED
-
 /**
  * Looks for header configuration in instance's `reactSubviews` and returns it. If not present returns `nil`.
  */