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

package/ios/safe-area/RNSSafeAreaViewComponentView.mm

@@ -7,44 +7,24 @@
 #import "RNSSafeAreaProviding.h"
 #import "RNSSafeAreaViewNotifications.h"
 
-#if RCT_NEW_ARCH_ENABLED
 #import <cxxreact/ReactNativeVersion.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <rnscreens/RNSSafeAreaViewComponentDescriptor.h>
 #import <rnscreens/RNSSafeAreaViewState.h>
-#else
-#import <React/RCTUIManager.h>
-#import "RNSSafeAreaViewEdges.h"
-#import "RNSSafeAreaViewLocalData.h"
-#endif // RCT_NEW_ARCH_ENABLED
 
-#if RCT_NEW_ARCH_ENABLED
 namespace react = facebook::react;
-#endif // RCT_NEW_ARCH_ENABLED
 
 static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold);
 
 #pragma mark - View implementation
 
 @implementation RNSSafeAreaViewComponentView {
-#if RCT_NEW_ARCH_ENABLED
   facebook::react::RNSSafeAreaViewShadowNode::ConcreteState::Shared _state;
-#else
-  __weak RCTBridge *_bridge;
-  RNSSafeAreaViewEdges _edges;
-#endif // RCT_NEW_ARCH_ENABLED
   UIEdgeInsets _currentSafeAreaInsets;
   __weak UIView<RNSSafeAreaProviding> *_Nullable _providerView;
 }
 
-#if RCT_NEW_ARCH_ENABLED
-// Needed because of this: https://github.com/facebook/react-native/pull/37274
-+ (void)load
-{
-  [super load];
-}
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
@@ -52,29 +32,11 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
   }
   return self;
 }
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-{
-  if (self = [super initWithFrame:CGRectZero]) {
-    _bridge = bridge;
-    [self initState];
-  }
-
-  return self;
-}
-
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)decoder)
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)initState
 {
-#if RCT_NEW_ARCH_ENABLED
   static const auto defaultProps = std::make_shared<const react::RNSSafeAreaViewProps>();
   _props = defaultProps;
-#else
-  _edges = RNSSafeAreaViewEdgesMake(false, false, false, false);
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (void)didMoveToWindow
@@ -131,14 +93,9 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
   }
 
   _currentSafeAreaInsets = safeAreaInsets;
-#if RCT_NEW_ARCH_ENABLED
   [self updateState];
-#else
-  [self updateLocalData];
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
-#if RCT_NEW_ARCH_ENABLED
 - (void)updateState
 {
   using facebook::react::RNSSafeAreaViewShadowNode;
@@ -156,16 +113,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 #endif // REACT_NATIVE_VERSION_MINOR >= 82
   );
 }
-#else
-- (void)updateLocalData
-{
-  RNSSafeAreaViewLocalData *localData = [[RNSSafeAreaViewLocalData alloc] initWithInsets:_currentSafeAreaInsets
-                                                                                   edges:_edges];
-  [_bridge.uiManager setLocalData:localData forView:self];
-}
-#endif // RCT_NEW_ARCH_ENABLED
 
-#if RCT_NEW_ARCH_ENABLED
 #pragma mark - RCTComponentViewProtocol
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
@@ -199,15 +147,16 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
   _currentSafeAreaInsets = UIEdgeInsetsZero;
 }
 
-#else
-#pragma mark - Paper props / LEGACY RCTComponent protocol
+#pragma mark - Dynamic frameworks support
 
-- (void)setEdges:(RNSSafeAreaViewEdges)edges
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
 {
-  _edges = edges;
-  [self updateLocalData];
+  [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 @end
 
 #pragma mark - Utility functions
@@ -218,11 +167,9 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
       ABS(insets1.top - insets2.top) <= threshold && ABS(insets1.bottom - insets2.bottom) <= threshold;
 }
 
-#if RCT_NEW_ARCH_ENABLED
 #pragma mark - View class exposure
 
 Class<RCTComponentViewProtocol> RNSSafeAreaView(void)
 {
   return RNSSafeAreaViewComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/stubs/RNSGammaStubs.h

@@ -15,10 +15,13 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RNSStackScreenComponentView : NSObject
 @end
 
-@interface RNSSplitViewHostComponentView : NSObject
+@interface RNSSplitHostComponentView : NSObject
 @end
 
-@interface RNSSplitViewScreenComponentView : NSObject
+@interface RNSSplitScreenComponentView : NSObject
+@end
+
+@interface RNSScrollViewMarkerComponentView : NSObject
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/stubs/RNSGammaStubs.mm

@@ -6,8 +6,11 @@
 @implementation RNSStackScreenComponentView
 @end
 
-@implementation RNSSplitViewHostComponentView
+@implementation RNSSplitHostComponentView
 @end
 
-@implementation RNSSplitViewScreenComponentView
+@implementation RNSSplitScreenComponentView
+@end
+
+@implementation RNSScrollViewMarkerComponentView
 @end

package/ios/tabs/RNSTabBarAppearanceCoordinator.h

@@ -1,9 +1,10 @@
 #pragma once
 
 #import <Foundation/Foundation.h>
-#import "RNSTabsHostComponentView.h"
 #import "RNSTabsScreenViewController.h"
 
+@class RNSTabsHostComponentView;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class RCTImageLoader;

package/ios/tabs/RNSTabBarAppearanceCoordinator.mm

@@ -5,6 +5,7 @@
 #import "RNSConversions.h"
 #import "RNSImageLoadingHelper.h"
 #import "RNSTabBarController.h"
+#import "RNSTabsHostComponentView.h"
 #import "RNSTabsScreenViewController.h"
 
 @implementation RNSTabBarAppearanceCoordinator

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.h

@@ -4,9 +4,7 @@
 #import "RNSTabsBottomAccessoryEventEmitter.h"
 #import "RNSTabsHostComponentView.h"
 
-#if RCT_NEW_ARCH_ENABLED
-#import "RNSViewControllerInvalidating.h"
-#else
+#if !RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridge.h>
 #import <React/RCTInvalidating.h>
 #endif
@@ -24,13 +22,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 #endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
-@interface RNSTabsBottomAccessoryComponentView : RNSReactBaseView <
-#if RCT_NEW_ARCH_ENABLED
-                                                     RNSViewControllerInvalidating
-#else // RCT_NEW_ARCH_ENABLED
-                                                     RCTInvalidating
+@interface RNSTabsBottomAccessoryComponentView : RNSReactBaseView
+#if !RCT_NEW_ARCH_ENABLED
+                                                 <RCTInvalidating>
 #endif // RCT_NEW_ARCH_ENABLED
-                                                     >
 
 #if !RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithFrame:(CGRect)frame bridge:(RCTBridge *)bridge;

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.mm

@@ -74,11 +74,7 @@ namespace react = facebook::react;
   if (self.window != nil) {
     [_helper registerForAccessoryFrameChanges];
   } else {
-#if RCT_NEW_ARCH_ENABLED
-    [self invalidateController];
-#else // RCT_NEW_ARCH_ENABLED
     [self invalidate];
-#endif // RCT_NEW_ARCH_ENABLED
   }
 }
 
@@ -119,22 +115,14 @@ namespace react = facebook::react;
   return NO;
 }
 
-- (facebook::react::RNSTabsBottomAccessoryShadowNode::ConcreteState::Shared)state
-{
-  return _state;
-}
-
-#pragma mark - RNSViewControllerInvalidating
-
-- (void)invalidateController
+- (void)invalidate
 {
   [self invalidateImpl];
 }
 
-- (BOOL)shouldInvalidateOnMutation:(const facebook::react::ShadowViewMutation &)mutation
+- (facebook::react::RNSTabsBottomAccessoryShadowNode::ConcreteState::Shared)state
 {
-  // For tabs, Host is responsible for invalidating children.
-  return NO;
+  return _state;
 }
 
 #else // RCT_NEW_ARCH_ENABLED
@@ -186,6 +174,16 @@ namespace react = facebook::react;
 
 #endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
+#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
+
 @end
 
 #if RCT_NEW_ARCH_ENABLED

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentViewManager.mm

@@ -12,7 +12,7 @@ RCT_EXPORT_MODULE(RNSTabsBottomAccessoryManager)
 
 - (UIView *)view
 {
-  // For Paper, we need to initialize TabsAccessory with bridge
+  // For Paper, we need to initialize TabsBottomAccessory with bridge
   return [[RNSTabsBottomAccessoryComponentView alloc] initWithFrame:CGRectZero bridge:self.bridge];
 }
 

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryContentComponentView.mm

@@ -109,6 +109,16 @@ namespace react = facebook::react;
 
 #endif // RCT_NEW_ARCH_ENABLED
 
+#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
+
 @end
 
 #if RCT_NEW_ARCH_ENABLED

package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryHelper.mm

@@ -8,8 +8,11 @@
 
 namespace react = facebook::react;
 
+static void *RNSTabsBottomAccessoryNativeWrapperViewContext = &RNSTabsBottomAccessoryNativeWrapperViewContext;
+
 @implementation RNSTabsBottomAccessoryHelper {
   RNSTabsBottomAccessoryComponentView *__weak _bottomAccessoryView;
+  UIView *__weak _observedNativeWrapperView;
 
 #if REACT_NATIVE_VERSION_MINOR < 82
   BOOL _initialStateUpdateSent;
@@ -35,6 +38,7 @@ namespace react = facebook::react;
 
 - (void)initState
 {
+  _observedNativeWrapperView = nil;
 #if REACT_NATIVE_VERSION_MINOR < 82
   _initialStateUpdateSent = NO;
   _displayLink = nil;
@@ -110,9 +114,32 @@ namespace react = facebook::react;
 
 #pragma mark - Observing frame changes
 
+- (void)unregisterForAccessoryFrameChanges
+{
+  UIView *observedNativeWrapperView = _observedNativeWrapperView;
+  if (observedNativeWrapperView == nil) {
+    return;
+  }
+
+  [observedNativeWrapperView removeObserver:self
+                                 forKeyPath:@"center"
+                                    context:RNSTabsBottomAccessoryNativeWrapperViewContext];
+  _observedNativeWrapperView = nil;
+}
+
 - (void)registerForAccessoryFrameChanges
 {
-  [self.nativeWrapperView addObserver:self forKeyPath:@"center" options:NSKeyValueObservingOptionInitial context:nil];
+  UIView *nativeWrapperView = self.nativeWrapperView;
+  if (_observedNativeWrapperView == nativeWrapperView) {
+    return;
+  }
+
+  [self unregisterForAccessoryFrameChanges];
+  [nativeWrapperView addObserver:self
+                      forKeyPath:@"center"
+                         options:NSKeyValueObservingOptionInitial
+                         context:RNSTabsBottomAccessoryNativeWrapperViewContext];
+  _observedNativeWrapperView = nativeWrapperView;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
@@ -120,7 +147,11 @@ namespace react = facebook::react;
                         change:(NSDictionary *)change
                        context:(void *)context
 {
-  [self notifyWrapperViewFrameHasChanged];
+  if (context == RNSTabsBottomAccessoryNativeWrapperViewContext) {
+    [self notifyWrapperViewFrameHasChanged];
+  } else {
+    [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+  }
 }
 
 - (UIView *)nativeWrapperView
@@ -192,9 +223,7 @@ namespace react = facebook::react;
 {
   [_bottomAccessoryView unregisterForTraitChanges:_traitChangeRegistration];
   _traitChangeRegistration = nil;
-  // Using nativeWrapperView directly here to avoid failing RCTAssert in self.nativeWrapperView.
-  // If we're called from didMoveToWindow, it's not a problem, but I'm not sure if this will always be the case.
-  [_bottomAccessoryView.superview.superview removeObserver:self forKeyPath:@"center"];
+  [self unregisterForAccessoryFrameChanges];
   _bottomAccessoryView = nil;
 #if REACT_NATIVE_VERSION_MINOR < 82
   [self invalidateDisplayLink];