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

package/ios/RNSScreenContainer.h

@@ -1,11 +1,7 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#else
-#endif
-
 #import <React/RCTViewManager.h>
+#import "RNSReactBaseView.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -30,12 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface RNSScreenContainerView :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView <RNSScreenContainerDelegate>
-#else
-    UIView <RNSScreenContainerDelegate, RCTInvalidating>
-#endif
+@interface RNSScreenContainerView : RNSReactBaseView <RNSScreenContainerDelegate>
 
 @property (nonatomic, retain) UIViewController *controller;
 @property (nonatomic, retain) NSMutableArray *reactSubviews;

package/ios/RNSScreenContainer.mm

@@ -2,7 +2,6 @@
 #import "RNSDefines.h"
 #import "RNSScreen.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
@@ -10,8 +9,6 @@
 
 namespace react = facebook::react;
 
-#endif // RCT_NEW_ARCH_ENABLED
-
 #pragma mark - RNSViewController
 
 @implementation RNSViewController
@@ -66,10 +63,8 @@ namespace react = facebook::react;
 - (instancetype)init
 {
   if (self = [super initWithFrame:CGRectZero]) {
-#ifdef RCT_NEW_ARCH_ENABLED
     static const auto defaultProps = std::make_shared<const react::RNSScreenContainerProps>();
     _props = defaultProps;
-#endif
     _activeScreens = [NSMutableSet new];
     _reactSubviews = [NSMutableArray new];
     [self setupController];
@@ -246,25 +241,14 @@ RNS_IGNORE_SUPER_CALL_END
   [super layoutSubviews];
   _controller.view.frame = self.bounds;
   for (RNSScreenView *subview in _reactSubviews) {
-#ifdef RCT_NEW_ARCH_ENABLED
     react::LayoutMetrics screenLayoutMetrics = subview.newLayoutMetrics;
     screenLayoutMetrics.frame = RCTRectFromCGRect(CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height));
     [subview updateLayoutMetrics:screenLayoutMetrics oldLayoutMetrics:subview.oldLayoutMetrics];
-#else
-    [subview reactSetFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height)];
-#endif
     [subview setNeedsLayout];
   }
 }
 
 #pragma mark-- Fabric specific
-#ifdef RCT_NEW_ARCH_ENABLED
-
-// Needed because of this: https://github.com/facebook/react-native/pull/37274
-+ (void)load
-{
-  [super load];
-}
 
 #pragma mark - RCTComponentViewProtocol
 
@@ -327,34 +311,23 @@ RNS_IGNORE_SUPER_CALL_END
   [_controller removeFromParentViewController];
 }
 
-#pragma mark-- Paper specific
-#else
+#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
 {
-  _invalidated = YES;
-  [_controller willMoveToParentViewController:nil];
-  [_controller removeFromParentViewController];
+  [super load];
 }
-
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSScreenContainerCls(void)
 {
   return RNSScreenContainerView.class;
 }
-#endif
 
 @implementation RNSScreenContainerManager
 
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  return [[RNSScreenContainerView alloc] init];
-}
-
 @end

package/ios/RNSScreenContentWrapper.h

@@ -3,13 +3,11 @@
 #import <React/RCTViewManager.h>
 #import <UIKit/UIKit.h>
 #import "RNSDefines.h"
+#import "RNSReactBaseView.h"
 
-#if RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 #import <React/RCTFabricComponentsPlugins.h>
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTView.h>
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -30,12 +28,7 @@ typedef struct {
   UIView *contentContainerView;
 } RNSScrollViewSearchResult;
 
-@interface RNSScreenContentWrapper :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-    RCTView
-#endif
+@interface RNSScreenContentWrapper : RNSReactBaseView
 
 @property (nonatomic, nullable, weak) id<RNSScreenContentWrapperDelegate> delegate;
 

package/ios/RNSScreenContentWrapper.mm

@@ -1,10 +1,4 @@
 #import "RNSScreenContentWrapper.h"
-#import "RNSDefines.h"
-#import "RNSSafeAreaViewComponentView.h"
-#import "RNSScreen.h"
-#import "RNSScreenStack.h"
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTLog.h>
 #import <React/RCTScrollViewComponentView.h>
@@ -12,26 +6,15 @@
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+#import "RNSDefines.h"
+#import "RNSSafeAreaViewComponentView.h"
+#import "RNSScreen.h"
+#import "RNSScreenStack.h"
 
 namespace react = facebook::react;
-#else
-#import <React/RCTScrollView.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSScreenContentWrapper
 
-#ifndef RCT_NEW_ARCH_ENABLED
-
-- (void)reactSetFrame:(CGRect)frame
-{
-  [super reactSetFrame:frame];
-  if (self.delegate != nil) {
-    [self.delegate contentWrapper:self receivedReactFrame:frame];
-  }
-}
-
-#endif // !RCT_NEW_ARCH_ENABLED
-
 - (void)notifyDelegateWithFrame:(CGRect)frame
 {
   [self.delegate contentWrapper:self receivedReactFrame:frame];
@@ -82,11 +65,7 @@ namespace react = facebook::react;
       static_cast<RNSScreen *_Nullable>([[self findFirstScreenViewAncestor] reactViewController]);
 
   if (screen == nil) {
-    // On old architecture, especially when executing `replace` action it can happen that **replaced** (old one) screen
-    // receives willMoveToWindow: with not nil argument. On new architecture it seems to work as expected.
-#ifdef RCT_NEW_ARCH_ENABLED
     RCTLogWarn(@"Failed to find parent screen controller from %@.", self);
-#endif
     return;
   }
   [self attachToAncestorScreenViewStartingFrom:screen];
@@ -171,15 +150,13 @@ namespace react = facebook::react;
     CGRect newFrame = scrollViewComponent.frame;
     newFrame.size = size;
     newFrame.size.height -= headerView.frame.size.height;
-#ifdef RCT_NEW_ARCH_ENABLED
-    // For some unknown yet reason on new architecture the scroll view
+    // For some unknown yet reason on Fabric the scroll view
     // is placed at (0, 0), which makes no sense given there
     // is another child at lower index in flex layout.
     // TODO: Research why this happens and solve this properly.
     if (newFrame.origin.y == 0) {
       newFrame.origin.y = headerView.frame.size.height;
     }
-#endif // RCT_NEW_ARCH_ENABLED
     scrollViewComponent.frame = newFrame;
     return YES;
   }
@@ -187,8 +164,6 @@ namespace react = facebook::react;
   return NO;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #pragma mark - RCTComponentViewProtocol
 
 - (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
@@ -208,22 +183,18 @@ Class<RCTComponentViewProtocol> RNSScreenContentWrapperCls(void)
   return RNSScreenContentWrapper.class;
 }
 
+#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_NEW_ARCH_ENABLED
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
 @implementation RNSScreenContentWrapperManager
 
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  return [RNSScreenContentWrapper new];
-}
-
 @end

package/ios/RNSScreenFooter.h

@@ -2,24 +2,17 @@
 
 #import <React/RCTViewManager.h>
 #import <UIKit/UIKit.h>
+#import "RNSReactBaseView.h"
 
-#if RCT_NEW_ARCH_ENABLED
+#if defined(__cplusplus)
 #import <React/RCTFabricComponentsPlugins.h>
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTView.h>
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus
 
 NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^OnLayoutCallback)(CGRect frame);
 
-@interface RNSScreenFooter :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-    RCTView
-#endif
+@interface RNSScreenFooter : RNSReactBaseView
 
 @property (nonatomic, copy, nullable) OnLayoutCallback onLayout;
 

package/ios/RNSScreenFooter.mm

@@ -1,14 +1,9 @@
 #import "RNSScreenFooter.h"
-#import "RNSScreen.h"
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-
-#endif // RCT_NEW_ARCH_ENABLED
+#import "RNSScreen.h"
 
 @implementation RNSScreenFooter {
   RNSScreenView *_parent;
@@ -95,16 +90,6 @@
   //  }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#pragma Fabric specific
-
-// Needed because of this: https://github.com/facebook/react-native/pull/37274
-+ (void)load
-{
-  [super load];
-}
-
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSScreenFooterComponentDescriptor>();
@@ -115,28 +100,18 @@ Class<RCTComponentViewProtocol> RNSScreenFooterCls(void)
   return RNSScreenFooter.class;
 }
 
-#else
-
-#pragma Paper specific
+#pragma mark - Dynamic frameworks support
 
-- (void)reactSetFrame:(CGRect)frame
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
 {
-  // ignore frame from react
-  // this view should be layouted by it's parent screen
-  //  [super reactSetFrame:frame];
+  [super load];
 }
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
 @implementation RNSScreenFooterManager
 
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  return [RNSScreenFooter new];
-}
-
 @end

package/ios/RNSScreenNavigationContainer.mm

@@ -2,13 +2,11 @@
 #import "RNSScreen.h"
 #import "RNSScreenContainer.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTFabricComponentsPlugins.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
 
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNSContainerNavigationController
 
@@ -38,36 +36,29 @@ namespace react = facebook::react;
 }
 
 #pragma mark-- Fabric specific
-#ifdef RCT_NEW_ARCH_ENABLED
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSScreenNavigationContainerComponentDescriptor>();
 }
 
+#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
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 @end
 
-#ifdef RCT_NEW_ARCH_ENABLED
 Class<RCTComponentViewProtocol> RNSScreenNavigationContainerCls(void)
 {
   return RNSScreenNavigationContainerView.class;
 }
-#endif
 
 @implementation RNSScreenNavigationContainerManager
 
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  return [[RNSScreenNavigationContainerView alloc] init];
-}
-
 @end

package/ios/RNSScreenStack.h

@@ -1,12 +1,6 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTUIManagerObserverCoordinator.h>
-#import <React/RCTViewManager.h>
-#endif
-
+#import "RNSReactBaseView.h"
 #import "RNSScreenContainer.h"
 #import "RNSTabsSpecialEffectsSupporting.h"
 
@@ -27,12 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface RNSScreenStackView :
-#ifdef RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView <RNSScreenContainerDelegate>
-#else
-    UIView <RNSScreenContainerDelegate, RCTInvalidating>
-#endif
+@interface RNSScreenStackView : RNSReactBaseView <RNSScreenContainerDelegate>
 
 - (void)markChildUpdated;
 - (void)didUpdateChildren;
@@ -44,11 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) BOOL disableSwipeBack;
 
 @property (nonatomic, readwrite) BOOL iosPreventReattachmentOfDismissedScreens;
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-@property (nonatomic, copy) RCTDirectEventBlock onFinishTransitioning;
-#endif // RCT_NEW_ARCH_ENABLED
+@property (nonatomic, readwrite) BOOL iosPreventReattachmentOfDismissedModals;
 
 @end
 
@@ -62,9 +47,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readonly, nonnull) NSArray<NSString *> *screenIds;
 
+@property (nonatomic, strong, readonly, nullable) UIColor *nativeContainerBackgroundColor;
+
 @end
 
-@interface RNSScreenStackManager : RCTViewManager <RCTInvalidating>
+@interface RNSScreenStackManager : RCTViewManager
 
 @end