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

package/ios/gamma/{split-view/RNSSplitViewScreenComponentView.mm → split/RNSSplitScreenComponentView.mm}

@@ -1,7 +1,7 @@
-#import "RNSSplitViewScreenComponentView.h"
+#import "RNSSplitScreenComponentView.h"
 #import <React/RCTAssert.h>
 #import <React/RCTSurfaceTouchHandler.h>
-#import <rnscreens/RNSSplitViewScreenComponentDescriptor.h>
+#import <rnscreens/RNSSplitScreenComponentDescriptor.h>
 #import "RNSConversions.h"
 #import "RNSSafeAreaViewNotifications.h"
 
@@ -9,19 +9,19 @@
 
 namespace react = facebook::react;
 
-@implementation RNSSplitViewScreenComponentView {
-  RNSSplitViewScreenComponentEventEmitter *_Nonnull _reactEventEmitter;
-  RNSSplitViewScreenController *_Nullable _controller;
-  RNSSplitViewScreenShadowStateProxy *_Nonnull _shadowStateProxy;
+@implementation RNSSplitScreenComponentView {
+  RNSSplitScreenComponentEventEmitter *_Nonnull _reactEventEmitter;
+  RNSSplitScreenController *_Nullable _controller;
+  RNSSplitScreenShadowStateProxy *_Nonnull _shadowStateProxy;
   RCTSurfaceTouchHandler *_Nullable _touchHandler;
   NSMutableSet<UIView *> *_viewsForFrameCorrection;
 }
 
-- (RNSSplitViewScreenController *)controller
+- (RNSSplitScreenController *)controller
 {
   RCTAssert(
       _controller != nil,
-      @"[RNScreens] Attempt to access RNSSplitViewScreenController before RNSSplitViewScreenComponentView was initialized. (for: %@)",
+      @"[RNScreens] Attempt to access RNSSplitScreenController before RNSSplitScreenComponentView was initialized. (for: %@)",
       self);
   return _controller;
 }
@@ -40,15 +40,15 @@ namespace react = facebook::react;
   [self resetProps];
   [self setupController];
 
-  _reactEventEmitter = [RNSSplitViewScreenComponentEventEmitter new];
-  _shadowStateProxy = [RNSSplitViewScreenShadowStateProxy new];
+  _reactEventEmitter = [RNSSplitScreenComponentEventEmitter new];
+  _shadowStateProxy = [RNSSplitScreenShadowStateProxy new];
 
   _viewsForFrameCorrection = [NSMutableSet set];
 }
 
 - (void)setupController
 {
-  _controller = [[RNSSplitViewScreenController alloc] initWithSplitViewScreenComponentView:self];
+  _controller = [[RNSSplitScreenController alloc] initWithSplitScreenComponentView:self];
   _controller.view = self;
 }
 
@@ -59,10 +59,10 @@ namespace react = facebook::react;
   // In contrast, prior to iOS 26, all SplitView columns were placed under RCTSurface,
   // meaning that touches were handler by RN handlers.
   if (@available(iOS 26.0, *)) {
-    // If the current controller’s splitViewController is of type RNSSplitViewHostController,
+    // If the current controller’s splitViewController is of type RNSSplitHostController,
     // we know that we're still inside the RN hierarchy,
     // so there's no need to enforce additional touch event support.
-    if ([_controller isInSplitViewHostSubtree]) {
+    if ([_controller isInSplitHostSubtree]) {
       return;
     }
 
@@ -79,10 +79,10 @@ namespace react = facebook::react;
 
 - (void)resetProps
 {
-  static const auto defaultProps = std::make_shared<const react::RNSSplitViewScreenProps>();
+  static const auto defaultProps = std::make_shared<const react::RNSSplitScreenProps>();
   _props = defaultProps;
 
-  _columnType = RNSSplitViewScreenColumnTypeColumn;
+  _columnType = RNSSplitScreenColumnTypeColumn;
 }
 
 - (void)registerForFrameCorrection:(UIView *)view
@@ -111,7 +111,7 @@ namespace react = facebook::react;
 
 #pragma mark - ShadowTreeState
 
-- (nonnull RNSSplitViewScreenShadowStateProxy *)shadowStateProxy
+- (nonnull RNSSplitScreenShadowStateProxy *)shadowStateProxy
 {
   RCTAssert(_shadowStateProxy != nil, @"[RNScreens] Attempt to access uninitialized _shadowStateProxy");
   return _shadowStateProxy;
@@ -119,7 +119,7 @@ namespace react = facebook::react;
 
 #pragma mark - Events
 
-- (nonnull RNSSplitViewScreenComponentEventEmitter *)reactEventEmitter
+- (nonnull RNSSplitScreenComponentEventEmitter *)reactEventEmitter
 {
   RCTAssert(_reactEventEmitter != nil, @"[RNScreens] Attempt to access uninitialized _reactEventEmitter");
   return _reactEventEmitter;
@@ -151,7 +151,7 @@ namespace react = facebook::react;
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return react::concreteComponentDescriptorProvider<react::RNSSplitViewScreenComponentDescriptor>();
+  return react::concreteComponentDescriptorProvider<react::RNSSplitScreenComponentDescriptor>();
 }
 
 + (BOOL)shouldBeRecycled
@@ -171,11 +171,11 @@ namespace react = facebook::react;
 - (void)updateProps:(const facebook::react::Props::Shared &)props
            oldProps:(const facebook::react::Props::Shared &)oldProps
 {
-  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSSplitViewScreenProps>(_props);
-  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSSplitViewScreenProps>(props);
+  const auto &oldComponentProps = *std::static_pointer_cast<const react::RNSSplitScreenProps>(_props);
+  const auto &newComponentProps = *std::static_pointer_cast<const react::RNSSplitScreenProps>(props);
 
   if (oldComponentProps.columnType != newComponentProps.columnType) {
-    _columnType = rnscreens::conversion::RNSSplitViewScreenColumnTypeFromScreenProp(newComponentProps.columnType);
+    _columnType = rnscreens::conversion::RNSSplitScreenColumnTypeFromScreenProp(newComponentProps.columnType);
   }
 
   [super updateProps:props oldProps:oldProps];
@@ -185,7 +185,7 @@ namespace react = facebook::react;
 {
   [super updateEventEmitter:eventEmitter];
   [_reactEventEmitter
-      updateEventEmitter:std::static_pointer_cast<const react::RNSSplitViewScreenEventEmitter>(eventEmitter)];
+      updateEventEmitter:std::static_pointer_cast<const react::RNSSplitScreenEventEmitter>(eventEmitter)];
 }
 
 - (void)invalidate
@@ -196,9 +196,19 @@ namespace react = facebook::react;
   _controller = nil;
 }
 
+#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
 
-Class<RCTComponentViewProtocol> RNSSplitViewScreenCls(void)
+Class<RCTComponentViewProtocol> RNSSplitScreenCls(void)
 {
-  return RNSSplitViewScreenComponentView.class;
+  return RNSSplitScreenComponentView.class;
 }

package/ios/gamma/{split-view/RNSSplitViewScreenComponentViewManager.h → split/RNSSplitScreenComponentViewManager.h}

@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNSSplitViewScreenComponentViewManager : RCTViewManager
+@interface RNSSplitScreenComponentViewManager : RCTViewManager
 
 @end
 

package/ios/gamma/split/RNSSplitScreenComponentViewManager.mm

@@ -0,0 +1,7 @@
+#import "RNSSplitScreenComponentViewManager.h"
+
+@implementation RNSSplitScreenComponentViewManager
+
+RCT_EXPORT_MODULE(RNSSplitScreenComponentViewManager)
+
+@end

package/ios/gamma/split/RNSSplitScreenController.swift

@@ -0,0 +1,133 @@
+import Foundation
+import UIKit
+
+/// @class RNSSplitScreenController
+/// @brief A UIViewController subclass that manages a Split column in a UISplitViewController.
+///
+/// Associated with a RNSSplitScreenComponentView, it handles layout synchronization with the
+/// Shadow Tree, emits React lifecycle events, and interacts with the SplitHost hierarchy.
+@objc
+public class RNSSplitScreenController: UIViewController {
+  let splitScreenComponentView: RNSSplitScreenComponentView
+
+  private var shadowStateProxy: RNSSplitScreenShadowStateProxy {
+    return splitScreenComponentView.shadowStateProxy()
+  }
+
+  private var reactEventEmitter: RNSSplitScreenComponentEventEmitter {
+    return splitScreenComponentView.reactEventEmitter()
+  }
+
+  @objc public required init(splitScreenComponentView: RNSSplitScreenComponentView) {
+    self.splitScreenComponentView = splitScreenComponentView
+    super.init(nibName: nil, bundle: nil)
+  }
+
+  required init?(coder aDecoder: NSCoder) {
+    return nil
+  }
+
+  ///
+  /// @brief Searching for the SplitHost controller
+  ///
+  /// It checks whether the parent controller is our host controller.
+  /// If we're outside the structure, e. g. for inspector represented as a modal,
+  /// we're searching for that controller using a reference that Screen keeps for Host component view.
+  ///
+  /// @return If found - a RNSSplitHostController instance, otherwise nil.
+  ///
+  func findSplitHostController() -> RNSSplitHostController? {
+    if let splitHostController = self.splitViewController as? RNSSplitHostController {
+      return splitHostController
+    }
+
+    if let splitHost = self.splitScreenComponentView.splitHost {
+      return splitHost.splitHostController
+    }
+
+    return nil
+  }
+
+  ///
+  /// @brief Determines if this controller is nested inside a SplitHost hierarchy.
+  ///
+  /// Used to differentiate between screens embedded in the native host and modal presentations.
+  ///
+  /// @return true if inside RNSSplitHostController, false otherwise.
+  ///
+  @objc
+  public func isInSplitHostSubtree() -> Bool {
+    return self.splitViewController is RNSSplitHostController
+  }
+
+  // MARK: Signals
+
+  @objc
+  public func setNeedsLifecycleStateUpdate() {
+    findSplitHostController()?.setNeedsUpdateOfChildViewControllers()
+  }
+
+  // MARK: Layout
+
+  @objc
+  public override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+
+    updateShadowTreeState()
+  }
+
+  ///
+  /// @brief Handles frame layout changes and updates Shadow Tree accordingly.
+  ///
+  /// Requests for the ShadowNode updates through the shadow state proxy.
+  /// Differentiates cases when we're in the Host hierarchy to calculate frame relatively
+  /// to the Host view from the modal case where we're passing absolute layout metrics to the ShadowNode.
+  ///
+  private func updateShadowTreeState() {
+    // For modals, which are presented outside the SplitHost subtree (and RN hierarchy),
+    // we're attaching our touch handler and we don't need to apply any offset corrections,
+    // because it's positioned relatively to our RNSSplitScreenComponentView
+    if !isInSplitHostSubtree() {
+      shadowStateProxy.updateShadowState(ofComponent: splitScreenComponentView)
+      return
+    }
+
+    let ancestorView = findSplitHostController()?.view
+    assert(
+      ancestorView != nil,
+      "[RNScreens] Expected to find RNSSplitHost component for RNSSplitScreen component"
+    )
+
+    shadowStateProxy.updateShadowState(
+      ofComponent: splitScreenComponentView, inContextOfAncestorView: ancestorView)
+  }
+
+  ///
+  /// @brief Request ShadowNode state update when the Split screen frame origin has changed.
+  ///
+  /// @param splitViewController The UISplitViewController whose layout positioning changed, represented by RNSSplitHostController.
+  ///
+  func columnPositioningDidChangeIn(splitViewController: UISplitViewController) {
+    shadowStateProxy.updateShadowState(
+      ofComponent: splitScreenComponentView, inContextOfAncestorView: splitViewController.view
+    )
+  }
+
+  // MARK: Events
+
+  public override func viewWillAppear(_ animated: Bool) {
+    reactEventEmitter.emitOnWillAppear()
+  }
+
+  public override func viewDidAppear(_ animated: Bool) {
+    reactEventEmitter.emitOnDidAppear()
+  }
+
+  public override func viewWillDisappear(_ animated: Bool) {
+    reactEventEmitter.emitOnWillDisappear()
+  }
+
+  public override func viewDidDisappear(_ animated: Bool) {
+    reactEventEmitter.emitOnDidDisappear()
+  }
+}

package/ios/gamma/{split-view/RNSSplitViewScreenShadowStateProxy.h → split/RNSSplitScreenShadowStateProxy.h}

@@ -10,38 +10,38 @@ namespace react = facebook::react;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class RNSSplitViewScreenComponentView;
+@class RNSSplitScreenComponentView;
 
 /**
- * @class RNSSplitViewScreenShadowStateProxy
+ * @class RNSSplitScreenShadowStateProxy
  * @brief Manages communication between native UIView layout and associated React Native ShadowNode state.
  *
- * This proxy enables RNSSplitViewScreenComponentView to propagate visual and layout-level state
- * back to the Shadow Tree via RNSSplitViewScreenShadowNode.
+ * This proxy enables RNSSplitScreenComponentView to propagate visual and layout-level state
+ * back to the Shadow Tree via RNSSplitScreenShadowNode.
  */
-@interface RNSSplitViewScreenShadowStateProxy : NSObject
+@interface RNSSplitScreenShadowStateProxy : NSObject
 
 /**
- * @brief Triggers a shadow state update for the given SplitViewScreen component.
+ * @brief Triggers a shadow state update for the given SplitScreen component.
  *
  * Internally uses the component’s frame in UIWindow coordinates to update the Shadow Tree state.
  *
- * @param screenComponentView An instance of RNSSplitViewScreenComponentView whose state should be updated.
+ * @param screenComponentView An instance of RNSSplitScreenComponentView whose state should be updated.
  */
-- (void)updateShadowStateOfComponent:(RNSSplitViewScreenComponentView *)screenComponentView;
+- (void)updateShadowStateOfComponent:(RNSSplitScreenComponentView *)screenComponentView;
 
 /**
- * @brief Triggers a shadow state update for the given SplitViewScreen component in the context of a given ancestor
+ * @brief Triggers a shadow state update for the given SplitScreen component in the context of a given ancestor
  * view.
  *
  * Converts the split view screen's local frame to coordinates of the specified ancestor view
  * before applying the update to the Shadow Tree. If the ancestor haven't been defined frame is calculated relatively to
  * the UIWindow.
  *
- * @param screenComponentView An instance of RNSSplitViewScreenComponentView whose state should be updated.
+ * @param screenComponentView An instance of RNSSplitScreenComponentView whose state should be updated.
  * @param ancestorView An optional UIView in whose coordinate space the frame should be computed.
  */
-- (void)updateShadowStateOfComponent:(RNSSplitViewScreenComponentView *)screenComponentView
+- (void)updateShadowStateOfComponent:(RNSSplitScreenComponentView *)screenComponentView
              inContextOfAncestorView:(UIView *_Nullable)ancestorView;
 
 /**
@@ -50,12 +50,12 @@ NS_ASSUME_NONNULL_BEGIN
  * Converts the frame to coordinates of the specified ancestor view,
  * before applying the update to the Shadow Tree.
  *
- * @param screenComponentView an instance of RNSSplitViewScreenComponentView whose state should be updated,
+ * @param screenComponentView an instance of RNSSplitScreenComponentView whose state should be updated,
  * @param frame frame to update the shadow state with; it must be in coordinate system of `screenComponentView`,
  * @param ancestorView coordinate-system provider view, relative to which the frame should be converted before sending
  * the update.
  */
-- (void)updateShadowStateOfComponent:(RNSSplitViewScreenComponentView *)screenComponentView
+- (void)updateShadowStateOfComponent:(RNSSplitScreenComponentView *)screenComponentView
                            withFrame:(CGRect)frame
              inContextOfAncestorView:(nonnull UIView *)ancestorView;
 
@@ -74,7 +74,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #if defined(__cplusplus)
 
-@interface RNSSplitViewScreenShadowStateProxy ()
+@interface RNSSplitScreenShadowStateProxy ()
 
 - (void)updateState:(react::State::Shared const &)state oldState:(react::State::Shared const &)oldState;
 

package/ios/gamma/{split-view/RNSSplitViewScreenShadowStateProxy.mm → split/RNSSplitScreenShadowStateProxy.mm}

@@ -1,15 +1,15 @@
-#import "RNSSplitViewScreenShadowStateProxy.h"
-#import "RNSSplitViewScreenComponentView.h"
+#import "RNSSplitScreenShadowStateProxy.h"
+#import "RNSSplitScreenComponentView.h"
 
 #import <React/RCTAssert.h>
 #import <React/RCTConversions.h>
 #import <cxxreact/ReactNativeVersion.h>
-#import <rnscreens/RNSSplitViewScreenShadowNode.h>
+#import <rnscreens/RNSSplitScreenShadowNode.h>
 
 namespace react = facebook::react;
 
-@implementation RNSSplitViewScreenShadowStateProxy {
-  react::RNSSplitViewScreenShadowNode::ConcreteState::Shared _state;
+@implementation RNSSplitScreenShadowStateProxy {
+  react::RNSSplitScreenShadowNode::ConcreteState::Shared _state;
   CGRect _lastScheduledFrame;
 }
 
@@ -22,12 +22,12 @@ namespace react = facebook::react;
   return self;
 }
 
-- (void)updateShadowStateOfComponent:(RNSSplitViewScreenComponentView *)screenComponentView
+- (void)updateShadowStateOfComponent:(RNSSplitScreenComponentView *)screenComponentView
 {
   [self updateShadowStateOfComponent:screenComponentView inContextOfAncestorView:nil];
 }
 
-- (void)updateShadowStateOfComponent:(RNSSplitViewScreenComponentView *)screenComponentView
+- (void)updateShadowStateOfComponent:(RNSSplitScreenComponentView *)screenComponentView
              inContextOfAncestorView:(UIView *_Nullable)ancestorView
 {
   CGRect frame = screenComponentView.frame;
@@ -44,7 +44,7 @@ namespace react = facebook::react;
   }
 
   if (!CGRectEqualToRect(frame, _lastScheduledFrame)) {
-    auto newState = react::RNSSplitViewScreenState{RCTSizeFromCGSize(frame.size), RCTPointFromCGPoint(frame.origin)};
+    auto newState = react::RNSSplitScreenState{RCTSizeFromCGSize(frame.size), RCTPointFromCGPoint(frame.origin)};
     _state->updateState(
         std::move(newState)
     // TODO: @t0maboro - remove this compilation check once TVOSExample is upgraded to RN 82+
@@ -58,7 +58,7 @@ namespace react = facebook::react;
   }
 }
 
-- (void)updateShadowStateOfComponent:(RNSSplitViewScreenComponentView *)screenComponentView
+- (void)updateShadowStateOfComponent:(RNSSplitScreenComponentView *)screenComponentView
                            withFrame:(CGRect)frame
              inContextOfAncestorView:(nonnull UIView *)ancestorView
 {
@@ -69,7 +69,7 @@ namespace react = facebook::react;
 
 - (void)updateState:(react::State::Shared const &)state oldState:(react::State::Shared const &)oldState
 {
-  _state = std::static_pointer_cast<const react::RNSSplitViewScreenShadowNode::ConcreteState>(state);
+  _state = std::static_pointer_cast<const react::RNSSplitScreenShadowNode::ConcreteState>(state);
 }
 
 @end

package/ios/gamma/stack/host/RNSStackHostComponentView.h

@@ -1,18 +1,12 @@
 #pragma once
 
 #import "RNSReactBaseView.h"
-
-@class RNSStackController;
-@class RNSStackScreenComponentView;
+#import "RNSStackScreenComponentView.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RNSStackHostComponentView : RNSReactBaseView
 
-@property (nonatomic, nonnull, strong, readonly) RNSStackController *stackController;
-
-- (nonnull NSMutableArray<RNSStackScreenComponentView *> *)reactSubviews;
-
 @end
 
 #pragma mark - Communication with StackScreen