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

package/ios/conversion/RNSConversions.h

@@ -1,125 +1,24 @@
 #pragma once
 
 #if defined(__cplusplus)
-#import <React/RCTImageSource.h>
-#import <react/renderer/components/rnscreens/EventEmitters.h>
-#import <react/renderer/components/rnscreens/Props.h>
-#import <optional>
-#import "RNSDefines.h"
-#import "RNSEnums.h"
-#import "RNSTabsNavigationState.h"
-
+#import <UIKit/UIKit.h>
 #import <folly/dynamic.h>
+#import "RNSEnums.h"
 
 namespace rnscreens::conversion {
 
-namespace react = facebook::react;
-
 // copied from FollyConvert.mm
 id RNSConvertFollyDynamicToId(const folly::dynamic &dyn);
 
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromString(NSString *blurEffectString);
-
-UIBlurEffect *RNSUIBlurEffectFromString(NSString *blurEffectString);
-
-std::optional<UIBlurEffectStyle> RNSMaybeUIBlurEffectStyleFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect);
-
-UIBlurEffect *RNSUIBlurEffectFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffect);
-
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
-
-API_AVAILABLE(ios(26.0))
-UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabsHostTabBarMinimizeBehavior(
-    react::RNSTabsHostIOSTabBarMinimizeBehavior tabBarMinimizeBehavior);
-
-#endif // Check for iOS >= 26
-
-#if RNS_IPHONE_OS_VERSION_AVAILABLE(18_0)
-
-API_AVAILABLE(ios(18.0))
-UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode(
-    react::RNSTabsHostIOSTabBarControllerMode tabBarControllerMode);
-
-#endif // Check for iOS >= 18
-
-react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
-RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
-    RNSTabsNavigationStateRejectionReason reason);
-
-react::RNSTabsHostIOSEventEmitter::OnTabSelectedActionOrigin RNSOnTabSelectedActionOriginFromRNSTabsActionOrigin(
-    RNSTabsActionOrigin actionOrigin);
-
-RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType);
-
-RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
-    react::RNSTabsScreenIOSSystemItem systemItem);
-
-UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem);
-
-#if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
-
-API_AVAILABLE(ios(26.0))
-std::optional<react::RNSTabsBottomAccessoryEventEmitter::OnEnvironmentChangeEnvironment>
-RNSTabsBottomAccessoryOnEnvironmentChangePayloadFromUITabAccessoryEnvironment(UITabAccessoryEnvironment environment);
-
-RNSTabsBottomAccessoryEnvironment RNSTabsBottomAccessoryEnvironmentFromCppEquivalent(
-    react::RNSTabsBottomAccessoryContentEnvironment environment);
-
-#endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
-    react::RNSTabsScreenIOSUserInterfaceStyle userInterfaceStyle);
-
-RCTImageSource *RCTImageSourceFromImageSourceAndIconType(const facebook::react::ImageSource *imageSource,
-                                                         RNSTabsIconType iconType);
-
-RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenIOSOrientation orientation);
-
 #if !TARGET_OS_TV
-UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(RNSOrientation orientation);
+UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(
+    RNSOrientation orientation);
 
-RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(UIInterfaceOrientationMask orientationMask);
+// Currently unused in stack v5. Maybe remove after stopping support for v4.
+RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(
+    UIInterfaceOrientationMask orientationMask);
 #endif // !TARGET_OS_TV
 
-UITraitEnvironmentLayoutDirection UITraitEnvironmentLayoutDirectionFromTabsHostCppEquivalent(
-    react::RNSTabsHostIOSLayoutDirection layoutDirection);
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSTabsHostIOSColorScheme colorScheme);
-
-#pragma mark SplitHost props
-
-UISplitViewControllerSplitBehavior SplitViewPreferredSplitBehaviorFromHostProp(
-    react::RNSSplitHostPreferredSplitBehavior behavior);
-
-UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(react::RNSSplitHostPrimaryEdge primaryEdge);
-
-UISplitViewControllerDisplayMode SplitViewPreferredDisplayModeFromHostProp(
-    react::RNSSplitHostPreferredDisplayMode displayMode);
-
-#if !TARGET_OS_TV
-UISplitViewControllerBackgroundStyle SplitViewPrimaryBackgroundStyleFromHostProp(
-    react::RNSSplitHostPrimaryBackgroundStyle primaryBackgroundStyle);
-#endif // !TARGET_OS_TV
-
-UISplitViewControllerDisplayModeButtonVisibility SplitViewDisplayModeButtonVisibilityFromHostProp(
-    react::RNSSplitHostDisplayModeButtonVisibility displayModeButtonVisibility);
-
-std::string UISplitViewControllerDisplayModeToString(UISplitViewControllerDisplayMode displayMode);
-
-std::optional<UISplitViewControllerColumn> SplitViewTopColumnForCollapsingFromHostProp(
-    react::RNSSplitHostTopColumnForCollapsing topColumnForCollapsing);
-
-RNSOrientation RNSOrientationFromRNSSplitHostOrientation(react::RNSSplitHostOrientation orientation);
-
-UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSSplitHostColorScheme colorScheme);
-
-#pragma mark SplitScreen props
-
-RNSSplitScreenColumnType RNSSplitScreenColumnTypeFromScreenProp(react::RNSSplitScreenColumnType columnType);
-
 }; // namespace rnscreens::conversion
 
-#import "RNSConversions-ScrollViewMarker.h"
-#import "RNSConversions-Stack.h"
-
 #endif // defined(__cplusplus)

package/ios/legacy/RNSFullWindowOverlay.mm

@@ -9,7 +9,7 @@
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSFullWindowOverlayComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSFullWindowOverlayComponentDescriptor.h>
 
 @implementation RNSFullWindowOverlayContainer
 

package/ios/legacy/RNSModalScreen.mm

@@ -1,7 +1,7 @@
 #import "RNSModalScreen.h"
 
 #import <React/RCTFabricComponentsPlugins.h>
-#import <rnscreens/RNSModalScreenComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSModalScreenComponentDescriptor.h>
 
 @implementation RNSModalScreen
 

package/ios/legacy/RNSScreen.mm

@@ -14,7 +14,7 @@
 #import <react/renderer/components/rnscreens/EventEmitters.h>
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSScreenComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenComponentDescriptor.h>
 #import "RNSConvert.h"
 #import "RNSHeaderHeightChangeEvent.h"
 #import "RNSScreenViewEvent.h"
@@ -178,6 +178,13 @@ RNS_IGNORE_SUPER_CALL_END
 
 - (void)applyFrameCorrectionForDescendantScrollView
 {
+  // A dismissed sheet can still receive a layout pass after React has deleted it. By then Fabric
+  // may have recycled its scroll view into the screen that replaced the sheet, and sizing that
+  // scroll view to the sheet would clip the new screen. See #4651.
+  if (_invalidated) {
+    return;
+  }
+
   RCTScrollViewComponentView *scrollView = [self tryFindDescendantScrollView];
   if (_sheetsScrollView != scrollView) {
     [_sheetsScrollView removeObserver:self forKeyPath:@"bounds" context:nil];
@@ -1582,24 +1589,6 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   return NO;
 }
 
-- (CGSize)getStatusBarHeightIsModal:(BOOL)isModal
-{
-#if !TARGET_OS_TV && !TARGET_OS_VISION
-  CGSize fallbackStatusBarSize = [[UIApplication sharedApplication] statusBarFrame].size;
-
-  CGSize primaryStatusBarSize = self.view.window.windowScene.statusBarManager.statusBarFrame.size;
-  if (primaryStatusBarSize.height == 0 || primaryStatusBarSize.width == 0) {
-    return fallbackStatusBarSize;
-  }
-
-  return primaryStatusBarSize;
-
-#else
-  // TVOS does not have status bar.
-  return CGSizeMake(0, 0);
-#endif // !TARGET_OS_TV
-}
-
 - (UINavigationController *)getVisibleNavigationControllerIsModal:(BOOL)isModal
 {
   UINavigationController *navctr = self.navigationController;

package/ios/legacy/RNSScreenStackHeaderConfig.mm

@@ -14,7 +14,7 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import <react/utils/ManagedObjectWrapper.h>
-#import <rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenStackHeaderConfigComponentDescriptor.h>
 #import "RCTImageComponentView+RNSScreenStackHeaderConfig.h"
 #import "RNSBackBarButtonItem.h"
 #import "RNSBarButtonItem.h"
@@ -947,6 +947,7 @@ RNS_IGNORE_SUPER_CALL_END
   }
 }
 
+#ifndef NDEBUG
 static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
 {
   switch (resizeMode) {
@@ -965,6 +966,7 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
       return RCTResizeModeStretch;
   }
 }
+#endif // !NDEBUG
 
 + (RCTImageSource *)imageSourceFromImageView:(RCTImageComponentView *)view
 {

package/ios/legacy/RNSScreenStackHeaderSubview.mm

@@ -10,7 +10,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
-#import <rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h>
+#import <react/renderer/components/rnscreens/legacy/RNSScreenStackHeaderSubviewComponentDescriptor.h>
 
 namespace react = facebook::react;
 

package/ios/legacy/RNSScreenWindowTraits.mm

@@ -101,7 +101,8 @@
 {
 #if !TARGET_OS_TV && !TARGET_OS_VISION
   dispatch_async(dispatch_get_main_queue(), ^{
-    UIInterfaceOrientationMask orientationMask = [RCTKeyWindow().rootViewController supportedInterfaceOrientations];
+    UIWindow *window = RCTKeyWindow();
+    UIInterfaceOrientationMask orientationMask = [window.rootViewController supportedInterfaceOrientations];
 
     UIInterfaceOrientation currentDeviceOrientation =
         [RNSScreenWindowTraits interfaceOrientationFromDeviceOrientation:[[UIDevice currentDevice] orientation]];
@@ -130,17 +131,7 @@
     if (newOrientation != UIInterfaceOrientationUnknown) {
 #if RNS_IPHONE_OS_VERSION_AVAILABLE(16_0)
       if (@available(iOS 16.0, *)) {
-        NSArray *array = [[[UIApplication sharedApplication] connectedScenes] allObjects];
-
-        // when an app supports multiple scenes (e.g. CarPlay), it is possible that
-        // UIWindowScene is not the first scene, or it may not be present at all
-        UIWindowScene *scene = nil;
-        for (id connectedScene in array) {
-          if ([connectedScene isKindOfClass:[UIWindowScene class]]) {
-            scene = connectedScene;
-            break;
-          }
-        }
+        UIWindowScene *scene = window.windowScene;
 
         if (scene == nil) {
           return;
@@ -154,7 +145,8 @@
 
         // `attemptRotationToDeviceOrientation` is deprecated for modern OS versions
         // so we need to use `setNeedsUpdateOfSupportedInterfaceOrientations`
-        UIViewController *topController = [UIApplication sharedApplication].keyWindow.rootViewController;
+
+        UIViewController *topController = window.rootViewController;
         while (topController.presentedViewController) {
           topController = topController.presentedViewController;
         }

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

@@ -10,13 +10,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RNSFormSheetConfigurationApplicator : NSObject
 
-- (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
++ (void)applyConfigurationIfNeededWithAppearanceProvider:(id<RNSFormSheetAppearanceProvider>)appearanceProvider
                                         behaviorProvider:(id<RNSFormSheetBehaviorProvider>)behaviorProvider
                                               controller:(RNSFormSheetContentController *)controller
                                              coordinator:(RNSFormSheetUpdateCoordinator *)coordinator;
 
-- (void)resetInitialDetent;
-
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -9,8 +9,8 @@
 
 #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;
 

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;