react-native-screens 5.0.0-alpha.2 → 5.0.0-alpha.4

package/ios/split/RNSSplitHostController.h

@@ -3,31 +3,50 @@
 #import <UIKit/UIKit.h>
 #import "RNSOrientationProviding.h"
 #import "RNSReactMountingTransactionObserving.h"
+#import "RNSSplitHostProviders.h"
 
-@class RNSSplitHostComponentView;
+@class RNSSplitHostController;
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ * @protocol RNSSplitHostControllerEventsDelegate
+ * @brief Receives UISplitViewController lifecycle notifications from the Split host controller.
+ */
+@protocol RNSSplitHostControllerEventsDelegate <NSObject>
+
+- (void)splitHostControllerDidCollapse:(RNSSplitHostController *)controller;
+- (void)splitHostControllerDidExpand:(RNSSplitHostController *)controller;
+- (void)splitHostController:(RNSSplitHostController *)controller
+    willChangeDisplayModeFrom:(UISplitViewControllerDisplayMode)fromDisplayMode
+                           to:(UISplitViewControllerDisplayMode)toDisplayMode;
+- (void)splitHostControllerDidHideInspector:(RNSSplitHostController *)controller;
+
+@end
+
 /**
  * @class RNSSplitHostController
  * @brief A controller associated with the RN native component representing Split host.
  *
- * Manages a collection of RNSSplitScreenComponentView instances,
- * synchronizes appearance settings with props, observes component lifecycle, and emits events.
+ * Installs the column controllers, synchronizes appearance settings with the configuration exposed by the providers,
+ * observes the UISplitViewController lifecycle and reports it to the delegate.
  */
 @interface RNSSplitHostController
     : UISplitViewController <RNSReactMountingTransactionObserving, RNSOrientationProviding>
 
+@property (nonatomic, weak, nullable) id<RNSSplitHostControllerEventsDelegate> eventsDelegate;
+@property (nonatomic, weak, nullable) id<RNSSplitHostAppearanceProvider> appearanceProvider;
+@property (nonatomic, weak, nullable) id<RNSSplitHostBehaviorProvider> behaviorProvider;
+@property (nonatomic, weak, nullable) id<RNSSplitHostColumnsProvider> columnsProvider;
+
 /**
  * @brief Initializes the Split host controller with provided style.
  *
  * The style for the Split component can be passed only in the initialization method and cannot be changed dynamically.
  *
- * @param splitHostComponentView The view managed by this controller.
  * @param numberOfColumns Expected number of visible columns.
  */
-- (instancetype)initWithSplitHostComponentView:(RNSSplitHostComponentView *)splitHostComponentView
-                               numberOfColumns:(NSInteger)numberOfColumns;
+- (instancetype)initWithNumberOfColumns:(NSInteger)numberOfColumns;
 
 #pragma mark - Signals
 

package/ios/split/RNSSplitHostController.mm

@@ -4,15 +4,13 @@
 #import "RNSDefines.h"
 #import "RNSSplitAppearanceApplicator.h"
 #import "RNSSplitAppearanceCoordinator.h"
-#import "RNSSplitHostComponentView.h"
 #import "RNSSplitNavigationController.h"
 #import "RNSSplitNavigationControllerFrameOriginChangeDelegate.h"
-#import "RNSSplitScreenComponentView.h"
 #import "RNSSplitScreenController.h"
 
-static const NSInteger minNumberOfColumns = 2;
-static const NSInteger maxNumberOfColumns = 3;
-static const NSInteger maxNumberOfInspectors = 1;
+[[maybe_unused]] static const NSInteger minNumberOfColumns = 2;
+[[maybe_unused]] static const NSInteger maxNumberOfColumns = 3;
+[[maybe_unused]] static const NSInteger maxNumberOfInspectors = 1;
 
 @interface RNSSplitHostController () <UISplitViewControllerDelegate,
                                       RNSSplitNavigationControllerFrameOriginChangeDelegate>
@@ -24,8 +22,6 @@ static const NSInteger maxNumberOfInspectors = 1;
   RNSSplitAppearanceCoordinator *_splitAppearanceCoordinator;
   RNSSplitAppearanceApplicator *_splitAppearanceApplicator;
 
-  RNSSplitHostComponentView *_splitHostComponentView;
-
   /**
    * This variable is keeping the value of how many columns were set in the initial render. It's used for validation,
    * because Split doesn't support changing number of columns dynamically.
@@ -43,11 +39,9 @@ static const NSInteger maxNumberOfInspectors = 1;
   NSMutableSet<NSNumber *> *_visibleColumns;
 }
 
-- (instancetype)initWithSplitHostComponentView:(RNSSplitHostComponentView *)splitHostComponentView
-                               numberOfColumns:(NSInteger)numberOfColumns
+- (instancetype)initWithNumberOfColumns:(NSInteger)numberOfColumns
 {
   if (self = [super initWithStyle:[RNSSplitHostController styleByNumberOfColumns:numberOfColumns]]) {
-    _splitHostComponentView = splitHostComponentView;
     _splitAppearanceCoordinator = [RNSSplitAppearanceCoordinator new];
     _splitAppearanceApplicator = [RNSSplitAppearanceApplicator new];
     _fixedColumnsCount = numberOfColumns;
@@ -60,11 +54,6 @@ static const NSInteger maxNumberOfInspectors = 1;
   return self;
 }
 
-- (RNSSplitHostComponentEventEmitter *)reactEventEmitter
-{
-  return [_splitHostComponentView reactEventEmitter];
-}
-
 #pragma mark - Signals
 
 - (void)setNeedsUpdateOfChildViewControllers
@@ -114,18 +103,16 @@ static const NSInteger maxNumberOfInspectors = 1;
   RCTAssert(_needsChildViewControllersUpdate,
             @"[RNScreens] Child view controller must be invalidated when update is forced!");
 
-  NSArray<RNSSplitScreenComponentView *> *currentColumns = [self filterSubviewsOfType:RNSSplitScreenColumnTypeColumn
-                                                                                   in:self.splitReactSubviews];
-  NSArray<RNSSplitScreenComponentView *> *currentInspectors =
-      [self filterSubviewsOfType:RNSSplitScreenColumnTypeInspector in:self.splitReactSubviews];
+  NSArray<RNSSplitScreenController *> *currentColumns = [self.columnsProvider columnControllers];
+  NSArray<RNSSplitScreenController *> *currentInspectors = [self.columnsProvider inspectorControllers];
 
   [self validateColumns:currentColumns];
   [self validateInspectors:currentInspectors];
 
   NSMutableArray<RNSSplitNavigationController *> *currentViewControllers =
       [NSMutableArray arrayWithCapacity:currentColumns.count];
-  for (RNSSplitScreenComponentView *column in currentColumns) {
-    [currentViewControllers addObject:[[RNSSplitNavigationController alloc] initWithRootViewController:column.controller
+  for (RNSSplitScreenController *columnController in currentColumns) {
+    [currentViewControllers addObject:[[RNSSplitNavigationController alloc] initWithRootViewController:columnController
                                                                              frameOriginChangeDelegate:self]];
   }
 
@@ -142,7 +129,7 @@ static const NSInteger maxNumberOfInspectors = 1;
 
 - (void)updateSplitAppearanceIfNeeded
 {
-  [_splitAppearanceApplicator updateAppearanceIfNeeded:_splitHostComponentView
+  [_splitAppearanceApplicator updateAppearanceIfNeeded:self.appearanceProvider
                                    splitHostController:self
                                  appearanceCoordinator:_splitAppearanceCoordinator];
 }
@@ -184,29 +171,6 @@ static const NSInteger maxNumberOfInspectors = 1;
   }
 }
 
-/**
- * @brief Filters the given subviews array by a specific column type.
- *
- * Iterates over the provided subviews array and returns only the elements that match
- * the specified RNSSplitScreenColumnType (e.g., .column, .inspector).
- *
- * @param type The target RNSSplitScreenColumnType to filter for.
- * @param subviews The array of RNSSplitScreenComponentView elements to filter.
- * @return A filtered array of RNSSplitScreenComponentView objects with the specified column type.
- */
-- (NSArray<RNSSplitScreenComponentView *> *)filterSubviewsOfType:(RNSSplitScreenColumnType)type
-                                                              in:(NSArray<RNSSplitScreenComponentView *> *)subviews
-{
-  NSMutableArray<RNSSplitScreenComponentView *> *filteredSubviews = [NSMutableArray array];
-  for (RNSSplitScreenComponentView *subview in subviews) {
-    if (subview.columnType == type) {
-      [filteredSubviews addObject:subview];
-    }
-  }
-
-  return filteredSubviews;
-}
-
 #pragma mark - Public setters
 
 - (void)toggleSplitViewInspector:(BOOL)showInspector
@@ -278,7 +242,7 @@ static const NSInteger maxNumberOfInspectors = 1;
 
 - (RNSOrientation)evaluateOrientation
 {
-  return _splitHostComponentView.orientation;
+  return self.appearanceProvider.orientation;
 }
 
 #pragma mark - Validators
@@ -286,17 +250,12 @@ static const NSInteger maxNumberOfInspectors = 1;
 /** @brief Validates that child structure meets required constraints defined for columns and the inspector. */
 - (void)validateSplitViewHierarchy
 {
-  NSArray<RNSSplitScreenComponentView *> *columns = [self filterSubviewsOfType:RNSSplitScreenColumnTypeColumn
-                                                                            in:self.splitReactSubviews];
-  NSArray<RNSSplitScreenComponentView *> *inspectors = [self filterSubviewsOfType:RNSSplitScreenColumnTypeInspector
-                                                                               in:self.splitReactSubviews];
-
-  [self validateColumns:columns];
-  [self validateInspectors:inspectors];
+  [self validateColumns:[self.columnsProvider columnControllers]];
+  [self validateInspectors:[self.columnsProvider inspectorControllers]];
 }
 
 /** @brief Ensures that number of columns is valid and hasn't changed dynamically. */
-- (void)validateColumns:(NSArray<RNSSplitScreenComponentView *> *)columns
+- (void)validateColumns:(NSArray<RNSSplitScreenController *> *)columns
 {
   RCTAssert((NSInteger)columns.count >= minNumberOfColumns && (NSInteger)columns.count <= maxNumberOfColumns,
             @"[RNScreens] Split can only have from %ld to %ld columns",
@@ -308,7 +267,7 @@ static const NSInteger maxNumberOfInspectors = 1;
 }
 
 /** @brief Ensures that at most one inspector is present. */
-- (void)validateInspectors:(NSArray<RNSSplitScreenComponentView *> *)inspectors
+- (void)validateInspectors:(NSArray<RNSSplitScreenController *> *)inspectors
 {
   RCTAssert((NSInteger)inspectors.count <= maxNumberOfInspectors,
             @"[RNScreens] Split can only have %ld inspector",
@@ -356,33 +315,6 @@ static const NSInteger maxNumberOfInspectors = 1;
   return splitScreenControllers;
 }
 
-/**
- * @brief Gets all React subviews of type RNSSplitScreenComponentView.
- *
- * Accesses all the subviews from the reactSubviews collection. It asserts that each one is a
- * RNSSplitScreenComponentView.
- *
- * @return An array of RNSSplitScreenComponentView subviews which are children of the host component view.
- */
-- (NSArray<RNSSplitScreenComponentView *> *)splitReactSubviews
-{
-  NSArray<RNSSplitScreenComponentView *> *reactSubviews = [_splitHostComponentView reactSubviews];
-  NSMutableArray<RNSSplitScreenComponentView *> *splitReactSubviews =
-      [NSMutableArray arrayWithCapacity:reactSubviews.count];
-
-  for (RNSSplitScreenComponentView *subview in reactSubviews) {
-    RCTAssert([subview isKindOfClass:RNSSplitScreenComponentView.class],
-              @"[RNScreens] Expected RNSSplitScreenComponentView but got %@",
-              NSStringFromClass(subview.class));
-
-    if ([subview isKindOfClass:RNSSplitScreenComponentView.class]) {
-      [splitReactSubviews addObject:subview];
-    }
-  }
-
-  return splitReactSubviews;
-}
-
 #pragma mark - RNSSplitNavigationControllerFrameOriginChangeDelegate
 
 /**
@@ -407,16 +339,16 @@ static const NSInteger maxNumberOfInspectors = 1;
  *
  * Attaches a view controller for the inspector column.
  *
- * @param inspectors An array of inspector-type RNSSplitScreenComponentView subviews.
+ * @param inspectors An array of controllers of the inspector-type columns.
  */
-- (void)maybeSetupInspector:(NSArray<RNSSplitScreenComponentView *> *)inspectors
+- (void)maybeSetupInspector:(NSArray<RNSSplitScreenController *> *)inspectors
 {
 #if !TARGET_OS_TV
   if (@available(iOS 26.0, *)) {
-    RNSSplitScreenComponentView *inspector = inspectors.firstObject;
+    RNSSplitScreenController *inspector = inspectors.firstObject;
     if (inspector != nil) {
       RNSSplitNavigationController *inspectorViewController =
-          [[RNSSplitNavigationController alloc] initWithRootViewController:inspector.controller];
+          [[RNSSplitNavigationController alloc] initWithRootViewController:inspector];
       [self setViewController:inspectorViewController forColumn:UISplitViewControllerColumnInspector];
     }
   }
@@ -469,12 +401,12 @@ static const NSInteger maxNumberOfInspectors = 1;
 
 - (void)splitViewControllerDidCollapse:(UISplitViewController *)svc
 {
-  [[self reactEventEmitter] emitOnCollapse];
+  [self.eventsDelegate splitHostControllerDidCollapse:self];
 }
 
 - (void)splitViewControllerDidExpand:(UISplitViewController *)svc
 {
-  [[self reactEventEmitter] emitOnExpand];
+  [self.eventsDelegate splitHostControllerDidExpand:self];
 }
 
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
@@ -508,7 +440,7 @@ static const NSInteger maxNumberOfInspectors = 1;
     UIViewController *inspectorViewController = [self viewControllerForColumn:UISplitViewControllerColumnInspector];
     if (inspectorViewController != nil) {
       if (inspectorViewController.view.window == nil) {
-        [[self reactEventEmitter] emitOnHideInspector];
+        [self.eventsDelegate splitHostControllerDidHideInspector:self];
       }
     }
   }
@@ -521,7 +453,7 @@ static const NSInteger maxNumberOfInspectors = 1;
     willChangeToDisplayMode:(UISplitViewControllerDisplayMode)displayMode
 {
   if (self.displayMode != displayMode) {
-    [[self reactEventEmitter] emitOnDisplayModeWillChangeFrom:self.displayMode to:displayMode];
+    [self.eventsDelegate splitHostController:self willChangeDisplayModeFrom:self.displayMode to:displayMode];
   }
 
   __weak auto weakSelf = self;
@@ -550,8 +482,8 @@ static const NSInteger maxNumberOfInspectors = 1;
 - (UISplitViewControllerColumn)splitViewController:(UISplitViewController *)svc
          topColumnForCollapsingToProposedTopColumn:(UISplitViewControllerColumn)proposedTopColumn
 {
-  if (_splitHostComponentView.hasCustomTopColumnForCollapsing) {
-    return _splitHostComponentView.topColumnForCollapsingColumn;
+  if (self.behaviorProvider.hasCustomTopColumnForCollapsing) {
+    return self.behaviorProvider.topColumnForCollapsingColumn;
   }
 
   return proposedTopColumn;

package/ios/split/RNSSplitHostProviders.h

@@ -0,0 +1,67 @@
+#pragma once
+
+#import <UIKit/UIKit.h>
+#import "RNSDefines.h"
+#import "RNSEnums.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RNSSplitScreenController;
+
+/**
+ * @brief Configuration of the UISplitViewController appearance.
+ */
+@protocol RNSSplitHostAppearanceProvider <NSObject>
+
+- (UISplitViewControllerSplitBehavior)preferredSplitBehavior;
+- (UISplitViewControllerPrimaryEdge)primaryEdge;
+- (UISplitViewControllerDisplayMode)preferredDisplayMode;
+- (UISplitViewControllerDisplayModeButtonVisibility)displayModeButtonVisibility;
+#if !TARGET_OS_TV
+- (UISplitViewControllerBackgroundStyle)primaryBackgroundStyle;
+#endif // !TARGET_OS_TV
+- (BOOL)presentsWithGesture;
+- (BOOL)showSecondaryToggleButton;
+- (BOOL)showInspector;
+
+- (double)minimumPrimaryColumnWidth;
+- (double)maximumPrimaryColumnWidth;
+- (double)preferredPrimaryColumnWidthOrFraction;
+- (double)minimumSupplementaryColumnWidth;
+- (double)maximumSupplementaryColumnWidth;
+- (double)preferredSupplementaryColumnWidthOrFraction;
+
+#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+- (double)minimumSecondaryColumnWidth;
+- (double)preferredSecondaryColumnWidthOrFraction;
+- (double)minimumInspectorColumnWidth;
+- (double)maximumInspectorColumnWidth;
+- (double)preferredInspectorColumnWidthOrFraction;
+#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
+
+- (RNSOrientation)orientation;
+- (UIUserInterfaceStyle)colorScheme;
+
+@end
+
+/**
+ * @brief Behavior consulted by the UISplitViewController delegate callbacks.
+ */
+@protocol RNSSplitHostBehaviorProvider <NSObject>
+
+- (BOOL)hasCustomTopColumnForCollapsing;
+- (UISplitViewControllerColumn)topColumnForCollapsingColumn;
+
+@end
+
+/**
+ * @brief Controllers of the columns mounted in the host, in React order, split by column type.
+ */
+@protocol RNSSplitHostColumnsProvider <NSObject>
+
+- (NSArray<RNSSplitScreenController *> *)columnControllers;
+- (NSArray<RNSSplitScreenController *> *)inspectorControllers;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/split/RNSSplitScreenComponentView.h

@@ -3,8 +3,6 @@
 #import "RNSEnums.h"
 #import "RNSReactBaseView.h"
 #import "RNSSafeAreaProviding.h"
-#import "RNSSplitScreenComponentEventEmitter.h"
-#import "RNSSplitScreenShadowStateProxy.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -25,26 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-#pragma mark - ShadowTreeState
-
-/**
- * @category ShadowTreeState
- * @brief Interactions between the host component and the associated ShadowNode.
- */
-@interface RNSSplitScreenComponentView ()
-
-/**
- * @brief Getter for the proxy object that interfaces with the Shadow Tree state for this screen.
- *
- * The ShadowStateProxy is the object that's responsible for sending layout updates coming from the Host tree to the
- * ShadowTree.
- *
- * @return A pointer to a RNSSplitScreenShadowStateProxy instance.
- */
-- (nonnull RNSSplitScreenShadowStateProxy *)shadowStateProxy;
-
-@end
-
 #pragma mark - Props
 
 /**
@@ -60,21 +38,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-#pragma mark - Events
-
-/**
- * @category Events
- * @brief APIs related to event emission to React Native.
- */
-@interface RNSSplitScreenComponentView ()
-
-/**
- * @brief Getter for the component's event emitter used for emitting events to React.
- *
- * @return A pointer to RNSSplitScreenComponentEventEmitter instance.
- */
-- (nonnull RNSSplitScreenComponentEventEmitter *)reactEventEmitter;
-
-@end
-
 NS_ASSUME_NONNULL_END

package/ios/split/RNSSplitScreenComponentView.mm

@@ -1,13 +1,18 @@
 #import "RNSSplitScreenComponentView.h"
 #import <React/RCTAssert.h>
 #import <React/RCTSurfaceTouchHandler.h>
-#import <rnscreens/RNSSplitScreenComponentDescriptor.h>
-#import "RNSConversions.h"
+#import <react/renderer/components/rnscreens/RNSSplitScreenComponentDescriptor.h>
+#import "RNSConversions-SplitView.h"
 #import "RNSSafeAreaViewNotifications.h"
+#import "RNSSplitScreenComponentEventEmitter.h"
 #import "RNSSplitScreenController.h"
+#import "RNSSplitScreenShadowStateProxy.h"
 
 namespace react = facebook::react;
 
+@interface RNSSplitScreenComponentView () <RNSSplitScreenControllerDelegate>
+@end
+
 @implementation RNSSplitScreenComponentView {
   RNSSplitScreenComponentEventEmitter *_Nonnull _reactEventEmitter;
   RNSSplitScreenController *_Nullable _controller;
@@ -49,6 +54,7 @@ namespace react = facebook::react;
 {
   _controller = [[RNSSplitScreenController alloc] initWithSplitScreenComponentView:self];
   _controller.view = self;
+  _controller.delegate = self;
 }
 
 - (void)didMoveToWindow
@@ -108,20 +114,31 @@ namespace react = facebook::react;
   [super layoutSubviews];
 }
 
-#pragma mark - ShadowTreeState
+#pragma mark - RNSSplitScreenControllerDelegate
+
+- (void)splitScreenController:(RNSSplitScreenController *)controller didChangeColumnFrame:(CGRect)frame
+{
+  [_shadowStateProxy updateShadowStateWithFrame:frame];
+}
+
+- (void)splitScreenControllerWillAppear:(RNSSplitScreenController *)controller
+{
+  [_reactEventEmitter emitOnWillAppear];
+}
 
-- (nonnull RNSSplitScreenShadowStateProxy *)shadowStateProxy
+- (void)splitScreenControllerDidAppear:(RNSSplitScreenController *)controller
 {
-  RCTAssert(_shadowStateProxy != nil, @"[RNScreens] Attempt to access uninitialized _shadowStateProxy");
-  return _shadowStateProxy;
+  [_reactEventEmitter emitOnDidAppear];
 }
 
-#pragma mark - Events
+- (void)splitScreenControllerWillDisappear:(RNSSplitScreenController *)controller
+{
+  [_reactEventEmitter emitOnWillDisappear];
+}
 
-- (nonnull RNSSplitScreenComponentEventEmitter *)reactEventEmitter
+- (void)splitScreenControllerDidDisappear:(RNSSplitScreenController *)controller
 {
-  RCTAssert(_reactEventEmitter != nil, @"[RNScreens] Attempt to access uninitialized _reactEventEmitter");
-  return _reactEventEmitter;
+  [_reactEventEmitter emitOnDidDisappear];
 }
 
 #pragma mark - RNSSafeAreaProviding

package/ios/split/RNSSplitScreenController.h

@@ -3,18 +3,41 @@
 #import <UIKit/UIKit.h>
 
 @class RNSSplitScreenComponentView;
+@class RNSSplitScreenController;
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ * @protocol RNSSplitScreenControllerDelegate
+ * @brief Receives layout and lifecycle notifications of a Split column from its controller.
+ */
+@protocol RNSSplitScreenControllerDelegate <NSObject>
+
+/**
+ * @brief Called whenever the column frame changes.
+ *
+ * @param frame The column frame in the coordinate space of the SplitHost controller's view, or the column view frame
+ * as is when the column is presented outside the SplitHost subtree (e.g. the inspector as a modal).
+ */
+- (void)splitScreenController:(RNSSplitScreenController *)controller didChangeColumnFrame:(CGRect)frame;
+
+- (void)splitScreenControllerWillAppear:(RNSSplitScreenController *)controller;
+- (void)splitScreenControllerDidAppear:(RNSSplitScreenController *)controller;
+- (void)splitScreenControllerWillDisappear:(RNSSplitScreenController *)controller;
+- (void)splitScreenControllerDidDisappear:(RNSSplitScreenController *)controller;
+
+@end
+
 /**
  * @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.
+ * It observes the column layout and lifecycle and reports them to its delegate.
  */
 @interface RNSSplitScreenController : UIViewController
 
+@property (nonatomic, weak, nullable) id<RNSSplitScreenControllerDelegate> delegate;
+
 - (instancetype)initWithSplitScreenComponentView:(RNSSplitScreenComponentView *)splitScreenComponentView;
 
 #pragma mark - Signals
@@ -33,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - Layout
 
 /**
- * @brief Request ShadowNode state update when the Split screen frame origin has changed.
+ * @brief Reports the column frame change after the Split repositioned its columns.
  *
  * @param splitViewController The UISplitViewController whose layout positioning changed, represented by
  * RNSSplitHostController.

package/ios/split/RNSSplitScreenController.mm

@@ -18,16 +18,6 @@
   return self;
 }
 
-- (RNSSplitScreenShadowStateProxy *)shadowStateProxy
-{
-  return [_splitScreenComponentView shadowStateProxy];
-}
-
-- (RNSSplitScreenComponentEventEmitter *)reactEventEmitter
-{
-  return [_splitScreenComponentView reactEventEmitter];
-}
-
 /**
  * @brief Searching for the SplitHost controller
  *
@@ -69,36 +59,29 @@
 {
   [super viewDidLayoutSubviews];
 
-  [self 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.
- */
-- (void)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 (![self isInSplitHostSubtree]) {
-    [[self shadowStateProxy] updateShadowStateOfComponent:_splitScreenComponentView];
+    [_delegate splitScreenController:self didChangeColumnFrame:self.view.frame];
     return;
   }
 
   UIView *ancestorView = [self findSplitHostController].view;
   RCTAssert(ancestorView != nil, @"[RNScreens] Expected to find RNSSplitHost component for RNSSplitScreen component");
 
-  [[self shadowStateProxy] updateShadowStateOfComponent:_splitScreenComponentView inContextOfAncestorView:ancestorView];
+  [self reportColumnFrameInContextOfView:ancestorView];
 }
 
 - (void)columnPositioningDidChangeInSplitViewController:(UISplitViewController *)splitViewController
 {
-  [[self shadowStateProxy] updateShadowStateOfComponent:_splitScreenComponentView
-                                inContextOfAncestorView:splitViewController.view];
+  [self reportColumnFrameInContextOfView:splitViewController.view];
+}
+
+- (void)reportColumnFrameInContextOfView:(UIView *)ancestorView
+{
+  CGRect frame = [self.view convertRect:self.view.frame toView:ancestorView];
+  [_delegate splitScreenController:self didChangeColumnFrame:frame];
 }
 
 #pragma mark - Events
@@ -106,25 +89,25 @@
 - (void)viewWillAppear:(BOOL)animated
 {
   [super viewWillAppear:animated];
-  [[self reactEventEmitter] emitOnWillAppear];
+  [_delegate splitScreenControllerWillAppear:self];
 }
 
 - (void)viewDidAppear:(BOOL)animated
 {
   [super viewDidAppear:animated];
-  [[self reactEventEmitter] emitOnDidAppear];
+  [_delegate splitScreenControllerDidAppear:self];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
 {
   [super viewWillDisappear:animated];
-  [[self reactEventEmitter] emitOnWillDisappear];
+  [_delegate splitScreenControllerWillDisappear:self];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
   [super viewDidDisappear:animated];
-  [[self reactEventEmitter] emitOnDidDisappear];
+  [_delegate splitScreenControllerDidDisappear:self];
 }
 
 @end