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

package/ios/modals/form-sheet/RNSFormSheetConfigurationApplicator.mm

@@ -7,43 +7,33 @@
 #import "RNSFormSheetUpdateCoordinator.h"
 #import "RNSFormSheetUpdateFlags.h"
 
-@implementation RNSFormSheetConfigurationApplicator {
-  BOOL _initialDetentApplied;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _initialDetentApplied = NO;
-  }
-  return self;
-}
+@implementation RNSFormSheetConfigurationApplicator
 
-- (void)resetInitialDetent
-{
-  _initialDetentApplied = NO;
-}
-
-- (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
++ (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
                                         behaviorProvider:(id<RNSFormSheetBehaviorProvider>)behaviorProvider
                                               controller:(RNSFormSheetContentController *)controller
                                              coordinator:(RNSFormSheetUpdateCoordinator *)coordinator
 {
-  RNSFormSheetUpdateFlags configFlags = RNSFormSheetUpdateFlagsAppearance | RNSFormSheetUpdateFlagsBehavior;
+  RNSFormSheetUpdateFlags configFlags =
+      RNSFormSheetUpdateFlagsAppearance | RNSFormSheetUpdateFlagsBehavior | RNSFormSheetUpdateFlagsInitialDetent;
+
+  BOOL shouldSelectInitialDetent = [coordinator needsAny:RNSFormSheetUpdateFlagsInitialDetent];
 
   [coordinator updateIfAnyNeeded:configFlags
                performOperations:^{
                  [self applyConfigurationWithAppearanceProvider:appearanceProvider
                                                behaviorProvider:behaviorProvider
-                                                     controller:controller];
+                                                     controller:controller
+                                            selectInitialDetent:shouldSelectInitialDetent];
                }];
 }
 
 #pragma mark - Updaters
 
-- (void)applyConfigurationWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
++ (void)applyConfigurationWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
                                 behaviorProvider:(id<RNSFormSheetBehaviorProvider>)behaviorProvider
                                       controller:(RNSFormSheetContentController *)controller
+                             selectInitialDetent:(BOOL)selectInitialDetent
 {
 #if !TARGET_OS_TV
   UISheetPresentationController *sheet = controller.sheetPresentationController;
@@ -57,11 +47,10 @@
       [RNSFormSheetDetentResolver buildSheetDetentsWithBehaviorProvider:behaviorProvider];
 
   UISheetPresentationControllerDetentIdentifier initialDetentIdentifier = nil;
-  if (!_initialDetentApplied) {
+  if (selectInitialDetent) {
     initialDetentIdentifier =
         [RNSFormSheetDetentResolver initialDetentIdentifierForDetents:nativeDetents
                                                      atRequestedIndex:behaviorProvider.initialDetentIndex];
-    _initialDetentApplied = YES;
   }
 
   BOOL prefersScrollingExpands = behaviorProvider.prefersScrollingExpandsWhenScrolledToEdge;

package/ios/modals/form-sheet/RNSFormSheetContentController.h

@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setNeedsPresentationUpdate;
 - (void)setNeedsBehaviorUpdate;
 - (void)setNeedsAppearanceUpdate;
-- (void)setNeedsInitialDetentReset;
+- (void)setNeedsInitialDetentUpdate;
 
 #pragma mark - Updates
 

package/ios/modals/form-sheet/RNSFormSheetContentController.mm

@@ -20,12 +20,9 @@
 
 @implementation RNSFormSheetContentController {
   RNSFormSheetUpdateCoordinator *_Nonnull _updateCoordinator;
-  RNSFormSheetConfigurationApplicator *_Nonnull _configurationApplicator;
   RNSFormSheetPresentationManager *_Nonnull _presentationManager;
 
   UITapGestureRecognizer *_Nullable _backdropTapGestureRecognizer;
-
-  BOOL _needsInitialDetentReset;
 }
 
 - (instancetype)init
@@ -34,10 +31,7 @@
     self.modalPresentationStyle = UIModalPresentationFormSheet;
 
     _updateCoordinator = [RNSFormSheetUpdateCoordinator new];
-    _configurationApplicator = [RNSFormSheetConfigurationApplicator new];
     _presentationManager = [RNSFormSheetPresentationManager new];
-
-    _needsInitialDetentReset = NO;
   }
   return self;
 }
@@ -142,7 +136,7 @@
   // We must force a full configuration update for this new instance.
   [self setNeedsAppearanceUpdate];
   [self setNeedsBehaviorUpdate];
-  [self setNeedsInitialDetentReset];
+  [self setNeedsInitialDetentUpdate];
   [self updateConfigurationIfNeeded];
 }
 
@@ -160,15 +154,10 @@
     return;
   }
 
-  if (_needsInitialDetentReset) {
-    _needsInitialDetentReset = NO;
-    [_configurationApplicator resetInitialDetent];
-  }
-
-  [_configurationApplicator applyConfigurationIfNeededWithAppearanceProvider:appearanceProvider
-                                                            behaviorProvider:behaviorProvider
-                                                                  controller:self
-                                                                 coordinator:_updateCoordinator];
+  [RNSFormSheetConfigurationApplicator applyConfigurationIfNeededWithAppearanceProvider:appearanceProvider
+                                                                       behaviorProvider:behaviorProvider
+                                                                             controller:self
+                                                                            coordinator:_updateCoordinator];
 }
 
 #pragma mark - Signals
@@ -188,9 +177,9 @@
   [_updateCoordinator setNeeds:RNSFormSheetUpdateFlagsBehavior];
 }
 
-- (void)setNeedsInitialDetentReset
+- (void)setNeedsInitialDetentUpdate
 {
-  _needsInitialDetentReset = YES;
+  [_updateCoordinator setNeeds:RNSFormSheetUpdateFlagsInitialDetent];
 }
 
 #pragma mark - Updates

package/ios/modals/form-sheet/RNSFormSheetHostComponentView.mm

@@ -13,7 +13,7 @@
 #import <React/RCTSurfaceTouchHandler.h>
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
-#import <rnscreens/RNSFormSheetHostComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSFormSheetHostComponentDescriptor.h>
 
 namespace react = facebook::react;
 
@@ -246,9 +246,9 @@ namespace react = facebook::react;
       // because UIKit destroys the presentationController after the modal is dismissed.
       [_controller setNeedsAppearanceUpdate];
       [_controller setNeedsBehaviorUpdate];
-      // Reset the initial-detent applied flag when reopening so the
-      // configured initialDetentIndex can be applied again.
-      [_controller setNeedsInitialDetentReset];
+      // Request the configured initialDetentIndex to be selected
+      // again on the fresh presentation controller.
+      [_controller setNeedsInitialDetentUpdate];
     }
   }
 

package/ios/modals/form-sheet/RNSFormSheetHostShadowStateProxy.mm

@@ -1,8 +1,8 @@
 #import "RNSFormSheetHostShadowStateProxy.h"
 
 #import <React/RCTConversions.h>
-#import <rnscreens/RNSFormSheetHostShadowNode.h>
-#import <rnscreens/RNSFormSheetHostState.h>
+#import <react/renderer/components/rnscreens/RNSFormSheetHostShadowNode.h>
+#import <react/renderer/components/rnscreens/RNSFormSheetHostState.h>
 
 namespace react = facebook::react;
 

package/ios/modals/form-sheet/RNSFormSheetUpdateFlags.h

@@ -10,4 +10,7 @@ typedef NS_OPTIONS(NSUInteger, RNSFormSheetUpdateFlags) {
   RNSFormSheetUpdateFlagsAppearance = 1 << 1,
   // The sheet's behavioral layout (detents, scrolling config) needs to be re-applied.
   RNSFormSheetUpdateFlagsBehavior = 1 << 2,
+  // The sheet's selected detent needs to be (re)set to the configured `initialDetentIndex`.
+  // Requested once per presentation cycle, since UIKit recreates the presentation controller on every present.
+  RNSFormSheetUpdateFlagsInitialDetent = 1 << 3,
 };

package/ios/safe-area/RNSSafeAreaViewComponentView.mm

@@ -3,19 +3,16 @@
 
 #import "RNSSafeAreaViewComponentView.h"
 #import <React/RCTConversions.h>
-#import <React/RCTUtils.h>
 #import "RNSSafeAreaProviding.h"
 #import "RNSSafeAreaViewNotifications.h"
 
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
-#import <rnscreens/RNSSafeAreaViewComponentDescriptor.h>
-#import <rnscreens/RNSSafeAreaViewState.h>
+#import <react/renderer/components/rnscreens/RNSSafeAreaViewComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/RNSSafeAreaViewState.h>
 
 namespace react = facebook::react;
 
-static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold);
-
 #pragma mark - View implementation
 
 @implementation RNSSafeAreaViewComponentView {
@@ -87,7 +84,7 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
 
   UIEdgeInsets safeAreaInsets = _providerView.providerSafeAreaInsets;
 
-  if (UIEdgeInsetsEqualToEdgeInsetsWithThreshold(safeAreaInsets, _currentSafeAreaInsets, 1.0 / RCTScreenScale())) {
+  if (UIEdgeInsetsEqualToEdgeInsets(safeAreaInsets, _currentSafeAreaInsets)) {
     return;
   }
 
@@ -152,14 +149,6 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
 
 @end
 
-#pragma mark - Utility functions
-
-static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold)
-{
-  return ABS(insets1.left - insets2.left) <= threshold && ABS(insets1.right - insets2.right) <= threshold &&
-      ABS(insets1.top - insets2.top) <= threshold && ABS(insets1.bottom - insets2.bottom) <= threshold;
-}
-
 #pragma mark - View class exposure
 
 Class<RCTComponentViewProtocol> RNSSafeAreaView(void)

package/ios/{conversion → scroll-view-marker/conversion}/RNSConversions-ScrollViewMarker.mm

@@ -1,9 +1,6 @@
 #import "RNSConversions-ScrollViewMarker.h"
-
 #import <React/RCTLog.h>
 
-namespace react = facebook::react;
-
 #define SWITCH_EDGE_EFFECT(X)                              \
   switch (edgeEffect) {                                    \
     using enum react::X;                                   \
@@ -29,6 +26,8 @@ namespace react = facebook::react;
 
 namespace rnscreens::conversion {
 
+namespace react = facebook::react;
+
 EDGE_EFFECT_CONV_FUNC_IMPL(Left);
 EDGE_EFFECT_CONV_FUNC_IMPL(Top);
 EDGE_EFFECT_CONV_FUNC_IMPL(Right);

package/ios/split/RNSSplitAppearanceApplicator.h

@@ -2,8 +2,8 @@
 
 #import <Foundation/Foundation.h>
 #import "RNSSplitAppearanceCoordinator.h"
+#import "RNSSplitHostProviders.h"
 
-@class RNSSplitHostComponentView;
 @class RNSSplitHostController;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @brief - Class responsible for applying all upcoming updates to SplitView.
  *
  * This class is synchronizing UISplitViewController configuration props which are affecting the SplitView appearance
- * with props passed to RNSSplitHostComponentView from the ElementTree.
+ * with the configuration exposed by the appearance provider.
  */
 @interface RNSSplitAppearanceApplicator : NSObject
 
@@ -21,13 +21,13 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * It requests calling proper callbacks with batched SplitView updates on the AppearanceCoordinator object
  *
- * @param splitHost The view representing JS component which is sending updates.
+ * @param provider The provider of the appearance configuration.
  * @param splitHostController The controller associated with the SplitView component which receives updates and
  * manages the native layer.
  * @param appearanceCoordinator The coordinator which is checking whether the update needs to be applied and if so, it
  * executes the callback passed by this class.
  */
-- (void)updateAppearanceIfNeeded:(RNSSplitHostComponentView *)splitHost
+- (void)updateAppearanceIfNeeded:(id<RNSSplitHostAppearanceProvider>)provider
              splitHostController:(RNSSplitHostController *)splitHostController
            appearanceCoordinator:(RNSSplitAppearanceCoordinator *)appearanceCoordinator;
 

package/ios/split/RNSSplitAppearanceApplicator.mm

@@ -3,12 +3,11 @@
 #import <React/RCTAssert.h>
 #import "RNSDefines.h"
 #import "RNSScreenWindowTraits.h"
-#import "RNSSplitHostComponentView.h"
 #import "RNSSplitHostController.h"
 
 @implementation RNSSplitAppearanceApplicator
 
-- (void)updateAppearanceIfNeeded:(RNSSplitHostComponentView *)splitHost
+- (void)updateAppearanceIfNeeded:(id<RNSSplitHostAppearanceProvider>)provider
              splitHostController:(RNSSplitHostController *)splitHostController
            appearanceCoordinator:(RNSSplitAppearanceCoordinator *)appearanceCoordinator
 {
@@ -21,7 +20,7 @@
                              return;
                            }
 
-                           [strongSelf updateSplitViewConfigurationFor:splitHost withController:splitHostController];
+                           [strongSelf updateSplitViewConfigurationFor:provider withController:splitHostController];
                          }];
 
   [appearanceCoordinator updateIfNeeded:RNSSplitAppearanceUpdateFlagsSecondaryScreenNavBarUpdate
@@ -41,7 +40,7 @@
                              return;
                            }
 
-                           [strongSelf updateSplitViewDisplayModeFor:splitHost withController:splitHostController];
+                           [strongSelf updateSplitViewDisplayModeFor:provider withController:splitHostController];
                          }];
 
   [appearanceCoordinator updateIfNeeded:RNSSplitAppearanceUpdateFlagsOrientationUpdate
@@ -55,101 +54,99 @@
  *
  * It calls all setters on RNSSplitHostController that doesn't require any custom logic and conditions to be met.
  *
- * @param splitHost The view representing JS component which is sending updates.
+ * @param provider The provider of the appearance configuration.
  * @param splitHostController The controller associated with the SplitView component which receives updates and
  * manages the native layer.
  */
-- (void)updateSplitViewConfigurationFor:(RNSSplitHostComponentView *)splitHost
+- (void)updateSplitViewConfigurationFor:(id<RNSSplitHostAppearanceProvider>)provider
                          withController:(RNSSplitHostController *)splitHostController
 {
   // Step 1 - general settings
-  splitHostController.displayModeButtonVisibility = splitHost.displayModeButtonVisibility;
-  splitHostController.preferredSplitBehavior = splitHost.preferredSplitBehavior;
-  splitHostController.overrideUserInterfaceStyle = splitHost.colorScheme;
+  splitHostController.displayModeButtonVisibility = provider.displayModeButtonVisibility;
+  splitHostController.preferredSplitBehavior = provider.preferredSplitBehavior;
+  splitHostController.overrideUserInterfaceStyle = provider.colorScheme;
 #if !TARGET_OS_TV
-  splitHostController.primaryBackgroundStyle = splitHost.primaryBackgroundStyle;
+  splitHostController.primaryBackgroundStyle = provider.primaryBackgroundStyle;
 #endif
-  splitHostController.presentsWithGesture = splitHost.presentsWithGesture;
-  splitHostController.primaryEdge = splitHost.primaryEdge;
-  splitHostController.showsSecondaryOnlyButton = splitHost.showSecondaryToggleButton;
+  splitHostController.presentsWithGesture = provider.presentsWithGesture;
+  splitHostController.primaryEdge = provider.primaryEdge;
+  splitHostController.showsSecondaryOnlyButton = provider.showSecondaryToggleButton;
 
   // Step 2.1 - validating column constraints
-  [self validateColumnConstraintsWithMinWidth:splitHost.minimumPrimaryColumnWidth
-                                     maxWidth:splitHost.maximumPrimaryColumnWidth];
+  [self validateColumnConstraintsWithMinWidth:provider.minimumPrimaryColumnWidth
+                                     maxWidth:provider.maximumPrimaryColumnWidth];
 
-  [self validateColumnConstraintsWithMinWidth:splitHost.minimumSupplementaryColumnWidth
-                                     maxWidth:splitHost.maximumSupplementaryColumnWidth];
+  [self validateColumnConstraintsWithMinWidth:provider.minimumSupplementaryColumnWidth
+                                     maxWidth:provider.maximumSupplementaryColumnWidth];
 
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
   if (@available(iOS 26.0, *)) {
-    [self validateColumnConstraintsWithMinWidth:splitHost.minimumInspectorColumnWidth
-                                       maxWidth:splitHost.maximumInspectorColumnWidth];
+    [self validateColumnConstraintsWithMinWidth:provider.minimumInspectorColumnWidth
+                                       maxWidth:provider.maximumInspectorColumnWidth];
   }
 #endif
 
   // Step 2.2 - applying updates to columns
-  if (splitHost.minimumPrimaryColumnWidth >= 0) {
-    splitHostController.minimumPrimaryColumnWidth = splitHost.minimumPrimaryColumnWidth;
+  if (provider.minimumPrimaryColumnWidth >= 0) {
+    splitHostController.minimumPrimaryColumnWidth = provider.minimumPrimaryColumnWidth;
   }
 
-  if (splitHost.maximumPrimaryColumnWidth >= 0) {
-    splitHostController.maximumPrimaryColumnWidth = splitHost.maximumPrimaryColumnWidth;
+  if (provider.maximumPrimaryColumnWidth >= 0) {
+    splitHostController.maximumPrimaryColumnWidth = provider.maximumPrimaryColumnWidth;
   }
 
-  if (splitHost.preferredPrimaryColumnWidthOrFraction >= 0 && splitHost.preferredPrimaryColumnWidthOrFraction < 1) {
-    splitHostController.preferredPrimaryColumnWidthFraction = splitHost.preferredPrimaryColumnWidthOrFraction;
-  } else if (splitHost.preferredPrimaryColumnWidthOrFraction >= 1) {
-    splitHostController.preferredPrimaryColumnWidth = splitHost.preferredPrimaryColumnWidthOrFraction;
+  if (provider.preferredPrimaryColumnWidthOrFraction >= 0 && provider.preferredPrimaryColumnWidthOrFraction < 1) {
+    splitHostController.preferredPrimaryColumnWidthFraction = provider.preferredPrimaryColumnWidthOrFraction;
+  } else if (provider.preferredPrimaryColumnWidthOrFraction >= 1) {
+    splitHostController.preferredPrimaryColumnWidth = provider.preferredPrimaryColumnWidthOrFraction;
   }
 
-  if (splitHost.minimumSupplementaryColumnWidth >= 0) {
-    splitHostController.minimumSupplementaryColumnWidth = splitHost.minimumSupplementaryColumnWidth;
+  if (provider.minimumSupplementaryColumnWidth >= 0) {
+    splitHostController.minimumSupplementaryColumnWidth = provider.minimumSupplementaryColumnWidth;
   }
 
-  if (splitHost.maximumSupplementaryColumnWidth >= 0) {
-    splitHostController.maximumSupplementaryColumnWidth = splitHost.maximumSupplementaryColumnWidth;
+  if (provider.maximumSupplementaryColumnWidth >= 0) {
+    splitHostController.maximumSupplementaryColumnWidth = provider.maximumSupplementaryColumnWidth;
   }
 
-  if (splitHost.preferredSupplementaryColumnWidthOrFraction >= 0 &&
-      splitHost.preferredSupplementaryColumnWidthOrFraction < 1) {
+  if (provider.preferredSupplementaryColumnWidthOrFraction >= 0 &&
+      provider.preferredSupplementaryColumnWidthOrFraction < 1) {
     splitHostController.preferredSupplementaryColumnWidthFraction =
-        splitHost.preferredSupplementaryColumnWidthOrFraction;
-  } else if (splitHost.preferredSupplementaryColumnWidthOrFraction >= 1) {
-    splitHostController.preferredSupplementaryColumnWidth = splitHost.preferredSupplementaryColumnWidthOrFraction;
+        provider.preferredSupplementaryColumnWidthOrFraction;
+  } else if (provider.preferredSupplementaryColumnWidthOrFraction >= 1) {
+    splitHostController.preferredSupplementaryColumnWidth = provider.preferredSupplementaryColumnWidthOrFraction;
   }
 
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_TV
   if (@available(iOS 26.0, *)) {
-    if (splitHost.minimumSecondaryColumnWidth >= 0) {
-      splitHostController.minimumSecondaryColumnWidth = splitHost.minimumSecondaryColumnWidth;
+    if (provider.minimumSecondaryColumnWidth >= 0) {
+      splitHostController.minimumSecondaryColumnWidth = provider.minimumSecondaryColumnWidth;
     }
 
-    if (splitHost.preferredSecondaryColumnWidthOrFraction >= 0 &&
-        splitHost.preferredSecondaryColumnWidthOrFraction < 1) {
-      splitHostController.preferredSecondaryColumnWidthFraction = splitHost.preferredSecondaryColumnWidthOrFraction;
-    } else if (splitHost.preferredSecondaryColumnWidthOrFraction >= 1) {
-      splitHostController.preferredSecondaryColumnWidth = splitHost.preferredSecondaryColumnWidthOrFraction;
+    if (provider.preferredSecondaryColumnWidthOrFraction >= 0 && provider.preferredSecondaryColumnWidthOrFraction < 1) {
+      splitHostController.preferredSecondaryColumnWidthFraction = provider.preferredSecondaryColumnWidthOrFraction;
+    } else if (provider.preferredSecondaryColumnWidthOrFraction >= 1) {
+      splitHostController.preferredSecondaryColumnWidth = provider.preferredSecondaryColumnWidthOrFraction;
     }
 
-    if (splitHost.minimumInspectorColumnWidth >= 0) {
-      splitHostController.minimumInspectorColumnWidth = splitHost.minimumInspectorColumnWidth;
+    if (provider.minimumInspectorColumnWidth >= 0) {
+      splitHostController.minimumInspectorColumnWidth = provider.minimumInspectorColumnWidth;
     }
 
-    if (splitHost.maximumInspectorColumnWidth >= 0) {
-      splitHostController.maximumInspectorColumnWidth = splitHost.maximumInspectorColumnWidth;
+    if (provider.maximumInspectorColumnWidth >= 0) {
+      splitHostController.maximumInspectorColumnWidth = provider.maximumInspectorColumnWidth;
     }
 
-    if (splitHost.preferredInspectorColumnWidthOrFraction >= 0 &&
-        splitHost.preferredInspectorColumnWidthOrFraction < 1) {
-      splitHostController.preferredInspectorColumnWidthFraction = splitHost.preferredInspectorColumnWidthOrFraction;
-    } else if (splitHost.preferredInspectorColumnWidthOrFraction >= 1) {
-      splitHostController.preferredInspectorColumnWidth = splitHost.preferredInspectorColumnWidthOrFraction;
+    if (provider.preferredInspectorColumnWidthOrFraction >= 0 && provider.preferredInspectorColumnWidthOrFraction < 1) {
+      splitHostController.preferredInspectorColumnWidthFraction = provider.preferredInspectorColumnWidthOrFraction;
+    } else if (provider.preferredInspectorColumnWidthOrFraction >= 1) {
+      splitHostController.preferredInspectorColumnWidth = provider.preferredInspectorColumnWidthOrFraction;
     }
   }
 #endif
 
   // Step 2.3 - manipulating with inspector column
-  [splitHostController toggleSplitViewInspector:splitHost.showInspector];
+  [splitHostController toggleSplitViewInspector:provider.showInspector];
 }
 
 /**
@@ -160,14 +157,14 @@
  * executed natively, e. g. after showing/hiding a column by a swipe. In that case, any prop update incoming, would
  * reset `preferredDisplayMode` to the state from JS, what doesn't look good.
  *
- * @param splitHost The view representing JS component which is sending updates.
+ * @param provider The provider of the appearance configuration.
  * @param splitHostController The controller associated with the SplitView component which receives updates and
  * manages the native layer.
  */
-- (void)updateSplitViewDisplayModeFor:(RNSSplitHostComponentView *)splitHost
+- (void)updateSplitViewDisplayModeFor:(id<RNSSplitHostAppearanceProvider>)provider
                        withController:(RNSSplitHostController *)splitHostController
 {
-  splitHostController.preferredDisplayMode = splitHost.preferredDisplayMode;
+  splitHostController.preferredDisplayMode = provider.preferredDisplayMode;
 }
 
 - (void)validateColumnConstraintsWithMinWidth:(CGFloat)minWidth maxWidth:(CGFloat)maxWidth

package/ios/split/RNSSplitHostComponentEventEmitter.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 // Hide C++ symbols from C compiler used when building Swift module
 #if defined(__cplusplus)

package/ios/split/RNSSplitHostComponentEventEmitter.mm

@@ -1,7 +1,7 @@
 #import "RNSSplitHostComponentEventEmitter.h"
 #import <React/RCTConversions.h>
 #import <React/RCTLog.h>
-#import "RNSConversions.h"
+#import "RNSConversions-SplitView.h"
 
 @implementation RNSSplitHostComponentEventEmitter {
   std::shared_ptr<const react::RNSSplitHostEventEmitter> _reactEventEmitter;

package/ios/split/RNSSplitHostComponentView.h

@@ -3,7 +3,7 @@
 #import "RNSDefines.h"
 #import "RNSEnums.h"
 #import "RNSReactBaseView.h"
-#import "RNSSplitHostComponentEventEmitter.h"
+#import "RNSSplitHostProviders.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -17,7 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
  * Responsible for managing multi-column layouts via associated native UISplitViewController.
  * Manages updates to the layout properties, column configuration, and event emission.
  */
-@interface RNSSplitHostComponentView : RNSReactBaseView
+@interface RNSSplitHostComponentView
+    : RNSReactBaseView <RNSSplitHostAppearanceProvider, RNSSplitHostBehaviorProvider, RNSSplitHostColumnsProvider>
 
 - (nonnull NSMutableArray<RNSSplitScreenComponentView *> *)reactSubviews;
 
@@ -29,7 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * @category Props
- * @brief Definitions for React Native props.
+ * @brief Definitions for React Native props. They back the appearance and behavior providers of the Split host
+ * controller.
  */
 @interface RNSSplitHostComponentView ()
 
@@ -66,16 +68,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-#pragma mark - Events
-
-/**
- * @category Events
- * @brief APIs related to event emission to React Native.
- */
-@interface RNSSplitHostComponentView ()
-
-- (nonnull RNSSplitHostComponentEventEmitter *)reactEventEmitter;
-
-@end
-
 NS_ASSUME_NONNULL_END

package/ios/split/RNSSplitHostComponentView.mm

@@ -6,10 +6,12 @@
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 
 #import "RNSContainerHelpers.h"
-#import "RNSConversions.h"
+#import "RNSConversions-SplitView.h"
 #import "RNSDefines.h"
+#import "RNSSplitHostComponentEventEmitter.h"
 #import "RNSSplitHostController.h"
 #import "RNSSplitScreenComponentView.h"
+#import "RNSSplitScreenController.h"
 
 namespace react = facebook::react;
 
@@ -18,7 +20,9 @@ static const CGFloat epsilon = 1e-6;
 #define COLUMN_METRIC_CHANGED(OLD, NEW, PROPERTY_NAME, EPSILON) \
   (fabs((OLD).columnMetrics.PROPERTY_NAME - (NEW).columnMetrics.PROPERTY_NAME) > (EPSILON))
 
-@interface RNSSplitHostComponentView () <RCTMountingTransactionObserving, RCTRNSSplitHostViewProtocol>
+@interface RNSSplitHostComponentView () <RCTMountingTransactionObserving,
+                                         RCTRNSSplitHostViewProtocol,
+                                         RNSSplitHostControllerEventsDelegate>
 @end
 
 @implementation RNSSplitHostComponentView {
@@ -116,7 +120,11 @@ static const CGFloat epsilon = 1e-6;
   if (_controller == nil) {
     int numberOfColumns = [self getNumberOfColumns];
 
-    _controller = [[RNSSplitHostController alloc] initWithSplitHostComponentView:self numberOfColumns:numberOfColumns];
+    _controller = [[RNSSplitHostController alloc] initWithNumberOfColumns:numberOfColumns];
+    _controller.eventsDelegate = self;
+    _controller.appearanceProvider = self;
+    _controller.behaviorProvider = self;
+    _controller.columnsProvider = self;
   }
 }
 
@@ -399,10 +407,51 @@ RNS_IGNORE_SUPER_CALL_END
 
 #pragma mark - Events
 
-- (nonnull RNSSplitHostComponentEventEmitter *)reactEventEmitter
+#pragma mark - RNSSplitHostColumnsProvider
+
+- (NSArray<RNSSplitScreenController *> *)columnControllers
+{
+  return [self controllersOfColumnsWithType:RNSSplitScreenColumnTypeColumn];
+}
+
+- (NSArray<RNSSplitScreenController *> *)inspectorControllers
+{
+  return [self controllersOfColumnsWithType:RNSSplitScreenColumnTypeInspector];
+}
+
+- (NSArray<RNSSplitScreenController *> *)controllersOfColumnsWithType:(RNSSplitScreenColumnType)columnType
+{
+  NSMutableArray<RNSSplitScreenController *> *controllers = [NSMutableArray array];
+  for (RNSSplitScreenComponentView *column in _reactSubviews) {
+    if (column.columnType == columnType) {
+      [controllers addObject:column.controller];
+    }
+  }
+  return controllers;
+}
+
+#pragma mark - RNSSplitHostControllerEventsDelegate
+
+- (void)splitHostControllerDidCollapse:(RNSSplitHostController *)controller
+{
+  [_reactEventEmitter emitOnCollapse];
+}
+
+- (void)splitHostControllerDidExpand:(RNSSplitHostController *)controller
+{
+  [_reactEventEmitter emitOnExpand];
+}
+
+- (void)splitHostController:(RNSSplitHostController *)controller
+    willChangeDisplayModeFrom:(UISplitViewControllerDisplayMode)fromDisplayMode
+                           to:(UISplitViewControllerDisplayMode)toDisplayMode
+{
+  [_reactEventEmitter emitOnDisplayModeWillChangeFrom:fromDisplayMode to:toDisplayMode];
+}
+
+- (void)splitHostControllerDidHideInspector:(RNSSplitHostController *)controller
 {
-  RCTAssert(_reactEventEmitter != nil, @"[RNScreens] Attempt to access uninitialized _reactEventEmitter");
-  return _reactEventEmitter;
+  [_reactEventEmitter emitOnHideInspector];
 }
 
 #pragma mark - Dynamic frameworks support