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

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/host/RNSTabBarController.h

@@ -2,6 +2,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RNSTabBarAppearanceCoordinator.h"
+#import "RNSTabsNavigationState.h"
 #import "RNSTabsScreenViewController.h"
 
 #if !TARGET_OS_TV
@@ -10,6 +11,29 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class RNSTabsHostComponentView;
+@class RNSTabBarController;
+
+@protocol RNSTabBarControllerDelegate <NSObject>
+
+- (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
+        didUpdateStateTo:(nonnull RNSTabsNavigationState *)navState
+             withContext:(nonnull RNSTabsNavigationStateUpdateContext *)context;
+
+- (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
+    rejectedStateUpdateTo:(nonnull RNSTabsNavigationState *)rejectedNavState
+             currentState:(nonnull RNSTabsNavigationState *)currentNavState
+               withReason:(RNSTabsNavigationStateRejectionReason)reasonCode;
+
+- (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
+    preventedSelectionOf:(nonnull NSString *)screenKey
+            currentState:(nonnull RNSTabsNavigationState *)currentNavState;
+
+- (void)tabBarController:(nonnull RNSTabBarController *)tabBarController
+    didSelectMoreTabWithCurrentState:(nonnull RNSTabsNavigationState *)currentNavState;
+
+@end
+
 @protocol RNSReactTransactionObserving
 
 - (void)reactMountingTransactionWillMount;
@@ -41,6 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Get reference to the host component view that owns this tab bar controller.
  *
  * Might return null in cases where the controller view hierararchy is not attached to parent.
+ * The reference is retained strongly and it is expected to be managed by `TabsHost`.
  */
 @property (nonatomic, readonly, nullable) RNSTabsHostComponentView *tabsHostComponentView;
 
@@ -50,6 +75,33 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readonly, strong, nonnull) RNSTabBarAppearanceCoordinator *tabBarAppearanceCoordinator;
 
+/**
+ * Represents current navigation state.
+ *
+ * After each model update, the container (controller) updates the navigation state. The `provenance` part is
+ * incremented monotonically with each state update.
+ *
+ * The controller manages this state. It MUST NOT be overwritten by any external actor.
+ */
+@property (nonatomic, readonly, strong, nullable) RNSTabsNavigationState *navigationState;
+
+/**
+ *
+ * If true, the controller will reject any navigation state updates
+ * if the provenance of the update is stale.
+ *
+ * A navigation state update is considered stale if its provenance is older
+ * than the provenance of the currently active navigation state.
+ *
+ * This can happen, e.g. when an update from JS is dispatched, but before it reaches the native
+ * side, another update happens on UI thread, e.g. user selects another tab. For such
+ * situations, where to-be-applied navigation state update had been dispatched w/o
+ * full context of actual navigation state you can toggle this prop.
+ *
+ * If an update is rejected due to being stale, the controller will notify its delegate.
+ */
+@property (nonatomic, readwrite) BOOL rejectStaleNavigationStateUpdates;
+
 /**
  * Update tab controller state with previously provided children.
  *
@@ -57,7 +109,7 @@ NS_ASSUME_NONNULL_BEGIN
  * The requested update is performed immediately. If you do not need this, consider just raising an appropriate
  * invalidation signal & let the controller decide when to flush the updates.
  */
-- (void)updateReactChildrenControllersIfNeeded;
+- (void)updateChildViewControllersIfNeeded;
 
 /**
  * Force update of the tab controller state with previously provided children.
@@ -68,7 +120,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)updateReactChildrenControllers;
 
 /**
- * Find out which tab bar controller is currently focused & select it.
+ * If any state update operation is pending - perform it.
  *
  * This method does nothing if the update has not been previously requested.
  * If needed, the requested update is performed immediately. If you do not need this, consider just raising an
@@ -77,7 +129,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)updateSelectedViewControllerIfNeeded;
 
 /**
- * Find out which tab bar controller is currently focused & select it.
+ * Update the selected view controller to what's currently requested.
+ *
+ * To request update use `setPendingNavigationStateUpdate`.
  *
  * The requested update is performed immediately. If you do not need this, consider just raising an appropriate
  * invalidation signal & let the controller decide when to flush the updates.
@@ -118,6 +172,30 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)updateOrientation;
 
+/**
+ * Updates the layout direction based on property on host view.
+ *
+ * This method does nothing if the update has not been previously requested.
+ * If needed, the requested update is performed immediately. If you do not need this, consider just raising an
+ * appropriate invalidation signal & let the controller decide when to flush the updates.
+ *
+ * This method is necessary only on iOS versions prior to 17.
+ * On iOS 17+, use `traitOverrides.layoutDirection` on the controller directly.
+ */
+- (void)updateLayoutDirectionBelowIOS17IfNeeded;
+
+/**
+ * Updates the layout direction based on property on host view.
+ *
+ * The requested update is performed immediately. If you do not need this, consider just raising an appropriate
+ * invalidation signal & let the controller decide when to flush the updates.
+ *
+ * This method is necessary only on iOS versions prior to 17.
+ * On iOS 17+, use `traitOverrides.layoutDirection` on the controller directly.
+ *
+ * This method can only be called when `parentViewController` is not nil.
+ */
+- (void)updateLayoutDirectionBelowIOS17;
 @end
 
 #pragma mark - Signals
@@ -137,18 +215,20 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)childViewControllersHaveChangedTo:(nonnull NSArray<RNSTabsScreenViewController *> *)childViewControllers;
 
 /**
- * Tell the controller that react provided tabs have changed (count / instances) & the child view controllers need to be
- * updated.
+ * Request navigation state update from the controller to the given one.
  *
- * Do not raise this signal only when focused state of the tab has changed - use `needsSelectedTabUpdate` instead.
+ * If you want to execute multiple updates in sequence you must flush the container after each one separately.
  */
-@property (nonatomic, readwrite) bool needsUpdateOfReactChildrenControllers;
+- (void)setPendingNavigationStateUpdate:(nullable RNSTabsNavigationState *)navState;
 
 /**
  * Tell the controller that react provided tabs have changed (count / instances) & the child view controllers need to be
  * updated.
+ *
+ * Do not raise this signal only when you want to modify selected view controller. Use `setPendingNavigationStateUpdate`
+ * instead.
  */
-@property (nonatomic, readwrite) bool needsUpdateOfSelectedTab;
+@property (nonatomic, readwrite) bool needsUpdateOfChildViewControllers;
 
 /**
  * Tell the controller that some configuration regarding the tab bar apperance has changed & the appearance requires
@@ -161,6 +241,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readwrite) bool needsOrientationUpdate;
 
+/**
+ * Tell the controller that some configuration regarding layout direction has changed & it requires update.
+ *
+ * This flag is necessary only on iOS versions prior to 17.
+ * On iOS 17+, use `traitOverrides.layoutDirection` on the controller directly.
+ */
+@property (nonatomic, readwrite) bool needsLayoutDirectionUpdateBelowIOS17;
+
 @end
 
 NS_ASSUME_NONNULL_END