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

package/ios/conversion/RNSConversions-ScrollViewMarker.mm

@@ -0,0 +1,44 @@
+#import "RNSConversions-ScrollViewMarker.h"
+
+#if RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
+
+#import <React/RCTLog.h>
+
+namespace react = facebook::react;
+
+#define SWITCH_EDGE_EFFECT(X)                              \
+  switch (edgeEffect) {                                    \
+    using enum react::X;                                   \
+    case Automatic:                                        \
+      return RNSScrollEdgeEffectAutomatic;                 \
+    case Hard:                                             \
+      return RNSScrollEdgeEffectHard;                      \
+    case Soft:                                             \
+      return RNSScrollEdgeEffectSoft;                      \
+    case Hidden:                                           \
+      return RNSScrollEdgeEffectHidden;                    \
+    default:                                               \
+      RCTLogError(@"[RNScreens] unsupported edge effect"); \
+      return RNSScrollEdgeEffectAutomatic;                 \
+  }
+
+#define EDGE_EFFECT_CONV_FUNC_IMPL(direction)                             \
+  RNSScrollEdgeEffect RNSScrollEdgeEffectFromSVM##direction##EdgeEffect(  \
+      react::RNSScrollViewMarker##direction##ScrollEdgeEffect edgeEffect) \
+  {                                                                       \
+    SWITCH_EDGE_EFFECT(RNSScrollViewMarker##direction##ScrollEdgeEffect); \
+  }
+
+namespace rnscreens::conversion {
+
+EDGE_EFFECT_CONV_FUNC_IMPL(Left);
+EDGE_EFFECT_CONV_FUNC_IMPL(Top);
+EDGE_EFFECT_CONV_FUNC_IMPL(Right);
+EDGE_EFFECT_CONV_FUNC_IMPL(Bottom);
+
+}; // namespace rnscreens::conversion
+
+#undef EDGE_EFFECT_CONV_FUNC_IMPL
+#undef SWITCH_EDGE_EFFECT
+
+#endif // RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED

package/ios/conversion/RNSConversions-SplitView.mm

@@ -2,12 +2,12 @@
 
 namespace rnscreens::conversion {
 
-#pragma mark SplitViewHost props
+#pragma mark SplitHost props
 
 UISplitViewControllerSplitBehavior SplitViewPreferredSplitBehaviorFromHostProp(
-    facebook::react::RNSSplitViewHostPreferredSplitBehavior splitBehavior)
+    facebook::react::RNSSplitHostPreferredSplitBehavior splitBehavior)
 {
-  using enum facebook::react::RNSSplitViewHostPreferredSplitBehavior;
+  using enum facebook::react::RNSSplitHostPreferredSplitBehavior;
 
   switch (splitBehavior) {
     case Displace:
@@ -22,10 +22,9 @@ UISplitViewControllerSplitBehavior SplitViewPreferredSplitBehaviorFromHostProp(
   }
 }
 
-UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(
-    facebook::react::RNSSplitViewHostPrimaryEdge primaryEdge)
+UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(facebook::react::RNSSplitHostPrimaryEdge primaryEdge)
 {
-  using enum facebook::react::RNSSplitViewHostPrimaryEdge;
+  using enum facebook::react::RNSSplitHostPrimaryEdge;
 
   switch (primaryEdge) {
     case Trailing:
@@ -37,9 +36,9 @@ UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(
 }
 
 UISplitViewControllerDisplayMode SplitViewPreferredDisplayModeFromHostProp(
-    facebook::react::RNSSplitViewHostPreferredDisplayMode displayMode)
+    facebook::react::RNSSplitHostPreferredDisplayMode displayMode)
 {
-  using enum facebook::react::RNSSplitViewHostPreferredDisplayMode;
+  using enum facebook::react::RNSSplitHostPreferredDisplayMode;
 
   switch (displayMode) {
     case SecondaryOnly:
@@ -62,9 +61,9 @@ UISplitViewControllerDisplayMode SplitViewPreferredDisplayModeFromHostProp(
 
 #if !TARGET_OS_TV
 UISplitViewControllerBackgroundStyle SplitViewPrimaryBackgroundStyleFromHostProp(
-    facebook::react::RNSSplitViewHostPrimaryBackgroundStyle primaryBackgroundStyle)
+    facebook::react::RNSSplitHostPrimaryBackgroundStyle primaryBackgroundStyle)
 {
-  using enum facebook::react::RNSSplitViewHostPrimaryBackgroundStyle;
+  using enum facebook::react::RNSSplitHostPrimaryBackgroundStyle;
 
   switch (primaryBackgroundStyle) {
     case None:
@@ -80,9 +79,9 @@ UISplitViewControllerBackgroundStyle SplitViewPrimaryBackgroundStyleFromHostProp
 #endif // !TARGET_OS_TV
 
 UISplitViewControllerDisplayModeButtonVisibility SplitViewDisplayModeButtonVisibilityFromHostProp(
-    react::RNSSplitViewHostDisplayModeButtonVisibility displayModeButtonVisibility)
+    react::RNSSplitHostDisplayModeButtonVisibility displayModeButtonVisibility)
 {
-  using enum facebook::react::RNSSplitViewHostDisplayModeButtonVisibility;
+  using enum facebook::react::RNSSplitHostDisplayModeButtonVisibility;
 
   switch (displayModeButtonVisibility) {
     case Always:
@@ -116,9 +115,9 @@ std::string UISplitViewControllerDisplayModeToString(UISplitViewControllerDispla
   }
 }
 
-RNSOrientation RNSOrientationFromRNSSplitViewHostOrientation(react::RNSSplitViewHostOrientation orientation)
+RNSOrientation RNSOrientationFromRNSSplitHostOrientation(react::RNSSplitHostOrientation orientation)
 {
-  using enum facebook::react::RNSSplitViewHostOrientation;
+  using enum facebook::react::RNSSplitHostOrientation;
 
   switch (orientation) {
     case Inherit:
@@ -146,9 +145,9 @@ RNSOrientation RNSOrientationFromRNSSplitViewHostOrientation(react::RNSSplitView
 }
 
 std::optional<UISplitViewControllerColumn> SplitViewTopColumnForCollapsingFromHostProp(
-    facebook::react::RNSSplitViewHostTopColumnForCollapsing topColumnForCollapsing)
+    facebook::react::RNSSplitHostTopColumnForCollapsing topColumnForCollapsing)
 {
-  using enum facebook::react::RNSSplitViewHostTopColumnForCollapsing;
+  using enum facebook::react::RNSSplitHostTopColumnForCollapsing;
 
   switch (topColumnForCollapsing) {
     case Primary:
@@ -163,19 +162,18 @@ std::optional<UISplitViewControllerColumn> SplitViewTopColumnForCollapsingFromHo
   }
 }
 
-#pragma mark SplitViewScreen props
+#pragma mark SplitScreen props
 
-RNSSplitViewScreenColumnType RNSSplitViewScreenColumnTypeFromScreenProp(
-    facebook::react::RNSSplitViewScreenColumnType columnType)
+RNSSplitScreenColumnType RNSSplitScreenColumnTypeFromScreenProp(facebook::react::RNSSplitScreenColumnType columnType)
 {
-  using enum facebook::react::RNSSplitViewScreenColumnType;
+  using enum facebook::react::RNSSplitScreenColumnType;
 
   switch (columnType) {
     case Inspector:
-      return RNSSplitViewScreenColumnTypeInspector;
+      return RNSSplitScreenColumnTypeInspector;
     case Column:
     default:
-      return RNSSplitViewScreenColumnTypeColumn;
+      return RNSSplitScreenColumnTypeColumn;
   }
 }
 

package/ios/conversion/RNSConversions-Stack.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
+#if defined(__cplusplus) && RNS_GAMMA_ENABLED
 
 #import <react/renderer/components/rnscreens/Props.h>
 #import "RNSStackScreenComponentView.h"
@@ -20,4 +20,4 @@ RNSStackScreenActivityMode convert(react::RNSStackScreenActivityMode mode);
 
 }; // namespace rnscreens::conversion
 
-#endif // RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
+#endif // defined(__cplusplus) && RNS_GAMMA_ENABLED

package/ios/conversion/RNSConversions-Stack.mm

@@ -1,6 +1,6 @@
 #import "RNSConversions-Stack.h"
 
-#if RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
+#if RNS_GAMMA_ENABLED
 
 namespace rnscreens::conversion {
 
@@ -14,4 +14,4 @@ RNSStackScreenActivityMode convert(react::RNSStackScreenActivityMode mode)
 
 }; // namespace rnscreens::conversion
 
-#endif // RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
+#endif // RNS_GAMMA_ENABLED

package/ios/conversion/RNSConversions-Tabs.mm

@@ -144,9 +144,9 @@ UIBlurEffect *RNSUIBlurEffectFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffec
 #if RCT_NEW_ARCH_ENABLED
 API_AVAILABLE(ios(26.0))
 UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabsHostTabBarMinimizeBehavior(
-    react::RNSTabsHostTabBarMinimizeBehavior tabBarMinimizeBehavior)
+    react::RNSTabsHostIOSTabBarMinimizeBehavior tabBarMinimizeBehavior)
 {
-  using enum facebook::react::RNSTabsHostTabBarMinimizeBehavior;
+  using enum facebook::react::RNSTabsHostIOSTabBarMinimizeBehavior;
 
   switch (tabBarMinimizeBehavior) {
     case Never:
@@ -184,9 +184,9 @@ UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabBarMinimizeBehavior(
 #if RCT_NEW_ARCH_ENABLED
 API_AVAILABLE(ios(18.0))
 UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode(
-    react::RNSTabsHostTabBarControllerMode tabBarControllerMode)
+    react::RNSTabsHostIOSTabBarControllerMode tabBarControllerMode)
 {
-  using enum facebook::react::RNSTabsHostTabBarControllerMode;
+  using enum facebook::react::RNSTabsHostIOSTabBarControllerMode;
 
   switch (tabBarControllerMode) {
     case Automatic:
@@ -218,9 +218,24 @@ UITabBarControllerMode UITabBarControllerModeFromRNSTabBarControllerMode(RNSTabB
 
 #endif // Check for iOS >= 18
 
-RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIconType iconType)
+react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
+RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
+    RNSTabsNavigationStateRejectionReason reason)
 {
-  using enum facebook::react::RNSTabsScreenIconType;
+  using enum facebook::react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason;
+  switch (reason) {
+    case RNSTabsNavigationStateRejectionReasonStale:
+      return Stale;
+    case RNSTabsNavigationStateRejectionReasonRepeated:
+      return Repeated;
+    default:
+      return Stale;
+  }
+}
+
+RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType)
+{
+  using enum facebook::react::RNSTabsScreenIOSIconType;
   switch (iconType) {
     case Image:
       return RNSTabsIconTypeImage;
@@ -259,9 +274,9 @@ RCTImageSource *RCTImageSourceFromImageSourceAndIconType(
   return iconImageSource;
 }
 
-RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenOrientation orientation)
+RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenIOSOrientation orientation)
 {
-  using enum facebook::react::RNSTabsScreenOrientation;
+  using enum facebook::react::RNSTabsScreenIOSOrientation;
 
   switch (orientation) {
     case Inherit:
@@ -289,9 +304,9 @@ RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenOr
 }
 
 RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
-    react::RNSTabsScreenSystemItem systemItem)
+    react::RNSTabsScreenIOSSystemItem systemItem)
 {
-  using enum facebook::react::RNSTabsScreenSystemItem;
+  using enum facebook::react::RNSTabsScreenIOSSystemItem;
 
   switch (systemItem) {
     case None:
@@ -360,48 +375,6 @@ UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSyst
   return UITabBarSystemItemSearch;
 }
 
-#define SWITCH_EDGE_EFFECT(X)                              \
-  switch (edgeEffect) {                                    \
-    using enum react::X;                                   \
-    case Automatic:                                        \
-      return RNSScrollEdgeEffectAutomatic;                 \
-    case Hard:                                             \
-      return RNSScrollEdgeEffectHard;                      \
-    case Soft:                                             \
-      return RNSScrollEdgeEffectSoft;                      \
-    case Hidden:                                           \
-      return RNSScrollEdgeEffectHidden;                    \
-    default:                                               \
-      RCTLogError(@"[RNScreens] unsupported edge effect"); \
-      return RNSScrollEdgeEffectAutomatic;                 \
-  }
-
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenBottomScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenBottomScrollEdgeEffect edgeEffect)
-{
-  SWITCH_EDGE_EFFECT(RNSTabsScreenBottomScrollEdgeEffect);
-}
-
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenLeftScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenLeftScrollEdgeEffect edgeEffect)
-{
-  SWITCH_EDGE_EFFECT(RNSTabsScreenLeftScrollEdgeEffect);
-}
-
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenRightScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenRightScrollEdgeEffect edgeEffect)
-{
-  SWITCH_EDGE_EFFECT(RNSTabsScreenRightScrollEdgeEffect);
-}
-
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenTopScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenTopScrollEdgeEffect edgeEffect)
-{
-  SWITCH_EDGE_EFFECT(RNSTabsScreenTopScrollEdgeEffect);
-}
-
-#undef SWITCH_EDGE_EFFECT
-
 #if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
 #if RCT_NEW_ARCH_ENABLED
@@ -469,9 +442,9 @@ NSString *RNSTabsBottomAccessoryOnEnvironmentChangePayloadFromUITabAccessoryEnvi
 #endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
 UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
-    react::RNSTabsScreenUserInterfaceStyle userInterfaceStyle)
+    react::RNSTabsScreenIOSUserInterfaceStyle userInterfaceStyle)
 {
-  using enum facebook::react::RNSTabsScreenUserInterfaceStyle;
+  using enum facebook::react::RNSTabsScreenIOSUserInterfaceStyle;
   switch (userInterfaceStyle) {
     case Unspecified:
       return UIUserInterfaceStyleUnspecified;
@@ -484,4 +457,37 @@ UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
   }
 }
 
+UITraitEnvironmentLayoutDirection UITraitEnvironmentLayoutDirectionFromTabsHostCppEquivalent(
+    react::RNSTabsHostIOSLayoutDirection layoutDirection)
+{
+  using enum facebook::react::RNSTabsHostIOSLayoutDirection;
+  switch (layoutDirection) {
+    case Inherit:
+      return UITraitEnvironmentLayoutDirectionUnspecified;
+    case Ltr:
+      return UITraitEnvironmentLayoutDirectionLeftToRight;
+    case Rtl:
+      return UITraitEnvironmentLayoutDirectionRightToLeft;
+    default:
+      RCTLogError(@"[RNScreens] unsupported layout direction");
+      return UITraitEnvironmentLayoutDirectionUnspecified;
+  }
+}
+
+UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSTabsHostIOSColorScheme colorScheme)
+{
+  using enum facebook::react::RNSTabsHostIOSColorScheme;
+  switch (colorScheme) {
+    case Inherit:
+      return UIUserInterfaceStyleUnspecified;
+    case Light:
+      return UIUserInterfaceStyleLight;
+    case Dark:
+      return UIUserInterfaceStyleDark;
+    default:
+      RCTLogError(@"[RNScreens] unsupported color scheme");
+      return UIUserInterfaceStyleUnspecified;
+  }
+}
+
 }; // namespace rnscreens::conversion

package/ios/conversion/RNSConversions.h

@@ -7,6 +7,7 @@
 #import <optional>
 #import "RNSDefines.h"
 #import "RNSEnums.h"
+#import "RNSTabsNavigationState.h"
 
 #if RCT_NEW_ARCH_ENABLED
 #import <folly/dynamic.h>
@@ -36,7 +37,7 @@ UIBlurEffect *RNSUIBlurEffectFromRNSBlurEffectStyle(RNSBlurEffectStyle blurEffec
 #if RCT_NEW_ARCH_ENABLED
 API_AVAILABLE(ios(26.0))
 UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabsHostTabBarMinimizeBehavior(
-    react::RNSTabsHostTabBarMinimizeBehavior tabBarMinimizeBehavior);
+    react::RNSTabsHostIOSTabBarMinimizeBehavior tabBarMinimizeBehavior);
 #else // RCT_NEW_ARCH_ENABLED
 API_AVAILABLE(ios(26.0))
 UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabBarMinimizeBehavior(
@@ -50,7 +51,7 @@ UITabBarMinimizeBehavior UITabBarMinimizeBehaviorFromRNSTabBarMinimizeBehavior(
 #if RCT_NEW_ARCH_ENABLED
 API_AVAILABLE(ios(18.0))
 UITabBarControllerMode UITabBarControllerModeFromRNSTabsHostTabBarControllerMode(
-    react::RNSTabsHostTabBarControllerMode tabBarControllerMode);
+    react::RNSTabsHostIOSTabBarControllerMode tabBarControllerMode);
 #else // RCT_NEW_ARCH_ENABLED
 API_AVAILABLE(ios(18.0))
 UITabBarControllerMode UITabBarControllerModeFromRNSTabBarControllerMode(RNSTabBarControllerMode tabBarControllerMode);
@@ -58,22 +59,17 @@ UITabBarControllerMode UITabBarControllerModeFromRNSTabBarControllerMode(RNSTabB
 
 #endif // Check for iOS >= 18
 
-RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIconType iconType);
+react::RNSTabsHostIOSEventEmitter::OnTabSelectionRejectedRejectionReason
+RNSOnTabSelectionRejectedRejectionReasonFromRNSTabsNavigationStateRejectionReason(
+    RNSTabsNavigationStateRejectionReason reason);
+
+RNSTabsIconType RNSTabsIconTypeFromIcon(react::RNSTabsScreenIOSIconType iconType);
 
 RNSTabsScreenSystemItem RNSTabsScreenSystemItemFromReactRNSTabsScreenSystemItem(
-    react::RNSTabsScreenSystemItem systemItem);
+    react::RNSTabsScreenIOSSystemItem systemItem);
 
 UITabBarSystemItem RNSTabsScreenSystemItemToUITabBarSystemItem(RNSTabsScreenSystemItem systemItem);
 
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenBottomScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenBottomScrollEdgeEffect edgeEffect);
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenLeftScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenLeftScrollEdgeEffect edgeEffect);
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenRightScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenRightScrollEdgeEffect edgeEffect);
-RNSScrollEdgeEffect RNSTabsScrollEdgeEffectFromTabsScreenTopScrollEdgeEffectCppEquivalent(
-    react::RNSTabsScreenTopScrollEdgeEffect edgeEffect);
-
 #if RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
 #if RCT_NEW_ARCH_ENABLED
@@ -94,13 +90,13 @@ NSString *_Nullable RNSTabsBottomAccessoryOnEnvironmentChangePayloadFromUITabAcc
 #endif // RNS_TABS_BOTTOM_ACCESSORY_AVAILABLE
 
 UIUserInterfaceStyle UIUserInterfaceStyleFromTabsScreenCppEquivalent(
-    react::RNSTabsScreenUserInterfaceStyle userInterfaceStyle);
+    react::RNSTabsScreenIOSUserInterfaceStyle userInterfaceStyle);
 
 RCTImageSource *RCTImageSourceFromImageSourceAndIconType(
     const facebook::react::ImageSource *imageSource,
     RNSTabsIconType iconType);
 
-RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenOrientation orientation);
+RNSOrientation RNSOrientationFromRNSTabsScreenOrientation(react::RNSTabsScreenIOSOrientation orientation);
 
 #if !TARGET_OS_TV
 UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(RNSOrientation orientation);
@@ -108,41 +104,47 @@ UIInterfaceOrientationMask UIInterfaceOrientationMaskFromRNSOrientation(RNSOrien
 RNSOrientation RNSOrientationFromUIInterfaceOrientationMask(UIInterfaceOrientationMask orientationMask);
 #endif // !TARGET_OS_TV
 
-#pragma mark SplitViewHost props
+UITraitEnvironmentLayoutDirection UITraitEnvironmentLayoutDirectionFromTabsHostCppEquivalent(
+    react::RNSTabsHostIOSLayoutDirection layoutDirection);
+
+UIUserInterfaceStyle UIUserInterfaceStyleFromHostProp(react::RNSTabsHostIOSColorScheme colorScheme);
+
+#pragma mark SplitHost props
 
 UISplitViewControllerSplitBehavior SplitViewPreferredSplitBehaviorFromHostProp(
-    react::RNSSplitViewHostPreferredSplitBehavior behavior);
+    react::RNSSplitHostPreferredSplitBehavior behavior);
 
-UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(react::RNSSplitViewHostPrimaryEdge primaryEdge);
+UISplitViewControllerPrimaryEdge SplitViewPrimaryEdgeFromHostProp(react::RNSSplitHostPrimaryEdge primaryEdge);
 
 UISplitViewControllerDisplayMode SplitViewPreferredDisplayModeFromHostProp(
-    react::RNSSplitViewHostPreferredDisplayMode displayMode);
+    react::RNSSplitHostPreferredDisplayMode displayMode);
 
 #if !TARGET_OS_TV
 UISplitViewControllerBackgroundStyle SplitViewPrimaryBackgroundStyleFromHostProp(
-    react::RNSSplitViewHostPrimaryBackgroundStyle primaryBackgroundStyle);
+    react::RNSSplitHostPrimaryBackgroundStyle primaryBackgroundStyle);
 #endif // !TARGET_OS_TV
 
 UISplitViewControllerDisplayModeButtonVisibility SplitViewDisplayModeButtonVisibilityFromHostProp(
-    react::RNSSplitViewHostDisplayModeButtonVisibility displayModeButtonVisibility);
+    react::RNSSplitHostDisplayModeButtonVisibility displayModeButtonVisibility);
 
 std::string UISplitViewControllerDisplayModeToString(UISplitViewControllerDisplayMode displayMode);
 
 std::optional<UISplitViewControllerColumn> SplitViewTopColumnForCollapsingFromHostProp(
-    react::RNSSplitViewHostTopColumnForCollapsing topColumnForCollapsing);
+    react::RNSSplitHostTopColumnForCollapsing topColumnForCollapsing);
 
-RNSOrientation RNSOrientationFromRNSSplitViewHostOrientation(react::RNSSplitViewHostOrientation orientation);
+RNSOrientation RNSOrientationFromRNSSplitHostOrientation(react::RNSSplitHostOrientation orientation);
 
-#pragma mark SplitViewScreen props
+#pragma mark SplitScreen props
 
-RNSSplitViewScreenColumnType RNSSplitViewScreenColumnTypeFromScreenProp(react::RNSSplitViewScreenColumnType columnType);
+RNSSplitScreenColumnType RNSSplitScreenColumnTypeFromScreenProp(react::RNSSplitScreenColumnType columnType);
 
 }; // namespace rnscreens::conversion
 
-#if RCT_NEW_ARCH_ENABLED
+#if RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
 
+#import "RNSConversions-ScrollViewMarker.h"
 #import "RNSConversions-Stack.h"
 
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED && RNS_GAMMA_ENABLED
 
-#endif
+#endif // defined(__cplusplus)

package/ios/gamma/scroll-view-marker/RNSScrollViewMarkerComponentView.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#import "RNSReactBaseView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSScrollViewMarkerComponentView : RNSReactBaseView
+
+@end
+
+NS_ASSUME_NONNULL_END