react-native-screens 3.13.1 → 3.14.0

package/README.md

@@ -18,7 +18,7 @@ To learn about how to use `react-native-screens` with Fabric architecture, head
 
 ### iOS
 
-Installation on iOS should be completely handled with auto-linking, if you have ensured pods are installed after adding this module, no other actions should be necessary
+Installation on iOS should be completely handled with auto-linking, if you have ensured pods are installed after adding this module, no other actions should be necessary.
 
 ### Android
 
@@ -174,7 +174,7 @@ React native screens library is licensed under [The MIT License](LICENSE).
 
 ## Credits
 
-This project has been build and is maintained thanks to the support from [Shopify](https://shopify.com), [Expo.io](https://expo.io) and [Software Mansion](https://swmansion.com)
+This project has been build and is maintained thanks to the support from [Shopify](https://shopify.com), [Expo.io](https://expo.io), and [Software Mansion](https://swmansion.com).
 
 [![shopify](https://avatars1.githubusercontent.com/u/8085?v=3&s=100 'Shopify.com')](https://shopify.com)
 [![expo](https://avatars2.githubusercontent.com/u/12504344?v=3&s=100 'Expo.io')](https://expo.io)

package/RNScreens.podspec

@@ -2,7 +2,7 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED']
+fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 # folly_version must match the version used in React Native
 # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
@@ -25,10 +25,11 @@ Pod::Spec.new do |s|
 
   if fabric_enabled
     s.pod_target_xcconfig = {
-      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly"'
+      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly"',
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
     }
     s.platforms       = { ios: '11.0', tvos: '11.0' }
-    s.compiler_flags  = folly_compiler_flags
+    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRN_FABRIC_ENABLED'
     s.source_files    = 'ios/**/*.{h,m,mm,cpp}'
     s.requires_arc    = true
   
@@ -46,7 +47,7 @@ Pod::Spec.new do |s|
       ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
     end
   else 
-    s.source_files = "ios/**/*.{h,m}"
+    s.source_files = "ios/**/*.{h,m,mm}"
     s.requires_arc = true
   
     s.dependency "React-Core"

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath('com.android.tools.build:gradle:4.2.2')
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.10')}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.6.21')}"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0"
     }
 }
@@ -32,9 +32,23 @@ if (isNewArchitectureEnabled()) {
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
 
+    // Used to override the NDK path/version on internal CI or by allowing
+    // users to customize the NDK path/version from their root project (e.g. for M1 support)
+    if (rootProject.hasProperty("ndkPath")) {
+        ndkPath rootProject.ext.ndkPath
+    }
+    if (rootProject.hasProperty("ndkVersion")) {
+        ndkVersion rootProject.ext.ndkVersion
+    }
+
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 22)
@@ -58,6 +72,9 @@ android {
                 }
             }
         }
+        ndk {
+            abiFilters (*reactNativeArchitectures())
+        }
     }
     lintOptions {
         abortOnError false

package/android/src/main/java/com/swmansion/rnscreens/ScreenStack.kt

@@ -15,7 +15,7 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     private val mStack = ArrayList<ScreenStackFragment>()
     private val mDismissed: MutableSet<ScreenStackFragment> = HashSet()
     private val drawingOpPool: MutableList<DrawingOp> = ArrayList()
-    private val drawingOps: MutableList<DrawingOp> = ArrayList()
+    private var drawingOps: MutableList<DrawingOp> = ArrayList()
     private var mTopScreen: ScreenStackFragment? = null
     private var mRemovalTransitionStarted = false
     private var isDetachingCurrentScreen = false
@@ -273,12 +273,16 @@ class ScreenStack(context: Context?) : ScreenContainer<ScreenStackFragment>(cont
     }
 
     private fun drawAndRelease() {
-        for (i in drawingOps.indices) {
-            val op = drawingOps[i]
+        // We make a copy of the drawingOps and use it to dispatch draws in order to be sure
+        // that we do not modify the original list. There are cases when `op.draw` can call
+        // `drawChild` which would modify the list through which we are iterating. See more:
+        // https://github.com/software-mansion/react-native-screens/pull/1406
+        val drawingOpsCopy = drawingOps
+        drawingOps = ArrayList()
+        for (op in drawingOpsCopy) {
             op.draw()
             drawingOpPool.add(op)
         }
-        drawingOps.clear()
     }
 
     override fun dispatchDraw(canvas: Canvas) {

package/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt

@@ -1,12 +1,9 @@
 package com.swmansion.rnscreens
 
-import androidx.annotation.NonNull
-import androidx.annotation.Nullable
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.ReactStylesDiffMap
-import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -38,8 +35,12 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
         return Screen(reactContext)
     }
 
+    override fun setActivityState(view: Screen, activityState: Float) {
+        setActivityState(view, activityState.toInt())
+    }
+
     @ReactProp(name = "activityState")
-    override fun setActivityState(view: Screen, activityState: Int) {
+    fun setActivityState(view: Screen, activityState: Int) {
         if (activityState == -1) {
             // Null will be provided when activityState is set as an animated value and we change
             // it from JS to be a plain value (non animated).
@@ -105,7 +106,7 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
         view.isStatusBarAnimated = animated
     }
 
-    @ReactProp(name = "statusBarColor")
+    @ReactProp(name = "statusBarColor", customType = "Color")
     override fun setStatusBarColor(view: Screen, statusBarColor: Int?) {
         view.statusBarColor = statusBarColor
     }
@@ -143,6 +144,23 @@ class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInterface<
         view.nativeBackButtonDismissalEnabled = nativeBackButtonDismissalEnabled
     }
 
+    // these props are not available on Android, however we must override their setters
+    override fun setFullScreenSwipeEnabled(view: Screen?, value: Boolean) = Unit
+
+    override fun setTransitionDuration(view: Screen?, value: Int) = Unit
+
+    override fun setHideKeyboardOnSwipe(view: Screen?, value: Boolean) = Unit
+
+    override fun setCustomAnimationOnSwipe(view: Screen?, value: Boolean) = Unit
+
+    override fun setGestureResponseDistance(view: Screen?, value: ReadableMap?) = Unit
+
+    override fun setHomeIndicatorHidden(view: Screen?, value: Boolean) = Unit
+
+    override fun setPreventNativeDismiss(view: Screen?, value: Boolean) = Unit
+
+    override fun setSwipeDirection(view: Screen?, value: String?) = Unit
+
     override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
         val map: MutableMap<String, Any> = MapBuilder.of(
             ScreenDismissedEvent.EVENT_NAME,

package/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt

@@ -8,9 +8,7 @@ import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.graphics.Color
 import android.os.Build
-import android.view.View
 import android.view.ViewParent
-import android.view.WindowManager
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -64,12 +62,12 @@ object ScreenWindowTraits {
         UiThreadUtil.runOnUiThread(
             object : GuardedRunnable(context) {
                 override fun runGuarded() {
-                    activity
-                        .window
-                        .addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-                    val curColor = activity.window.statusBarColor
+                    val window = activity.window
+                    val curColor: Int = window.statusBarColor
                     val colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), curColor, color)
-                    colorAnimation.addUpdateListener { animator -> activity.window.statusBarColor = (animator.animatedValue as Int) }
+                    colorAnimation.addUpdateListener { animator ->
+                        window.statusBarColor = animator.animatedValue as Int
+                    }
                     if (animated) {
                         colorAnimation.setDuration(300).startDelay = 0
                     } else {
@@ -89,13 +87,10 @@ object ScreenWindowTraits {
 
         UiThreadUtil.runOnUiThread {
             val decorView = activity.window.decorView
-            var systemUiVisibilityFlags = decorView.systemUiVisibility
-            systemUiVisibilityFlags = if ("dark" == style) {
-                systemUiVisibilityFlags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-            } else {
-                systemUiVisibilityFlags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
-            }
-            decorView.systemUiVisibility = systemUiVisibilityFlags
+            val window = activity.window
+            val controller = WindowInsetsControllerCompat(window, decorView)
+
+            controller.isAppearanceLightStatusBars = style == "dark"
         }
     }
 
@@ -140,13 +135,14 @@ object ScreenWindowTraits {
         }
         val screenForHidden = findScreenForTrait(screen, WindowTraits.HIDDEN)
         val hidden = screenForHidden?.isStatusBarHidden ?: false
+        val window = activity.window
+        val controller = WindowInsetsControllerCompat(window, window.decorView)
+
         UiThreadUtil.runOnUiThread {
             if (hidden) {
-                activity.window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-                activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+                controller.hide(WindowInsetsCompat.Type.statusBars())
             } else {
-                activity.window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
-                activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                controller.show(WindowInsetsCompat.Type.statusBars())
             }
         }
     }

package/android/src/main/jni/Android.mk

@@ -20,7 +20,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := libjsi \
     libfbjni \
     libglog \
-    libfolly_json \
+    libfolly_runtime \
     libyoga \
     libreact_nativemodule_core \
     libturbomodulejsijni \
@@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := libjsi \
     libreact_render_core \
     libreact_render_graphics \
     libfabricjni \
-    libfolly_futures \
     libreact_debug \
     libreact_render_componentregistry \
     libreact_render_debug \

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerDelegate.java

@@ -12,6 +12,7 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
 
@@ -22,17 +23,26 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
-      case "stackPresentation":
-        mViewManager.setStackPresentation(view, (String) value);
+      case "customAnimationOnSwipe":
+        mViewManager.setCustomAnimationOnSwipe(view, value == null ? false : (boolean) value);
         break;
-      case "stackAnimation":
-        mViewManager.setStackAnimation(view, (String) value);
+      case "fullScreenSwipeEnabled":
+        mViewManager.setFullScreenSwipeEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "homeIndicatorHidden":
+        mViewManager.setHomeIndicatorHidden(view, value == null ? false : (boolean) value);
+        break;
+      case "preventNativeDismiss":
+        mViewManager.setPreventNativeDismiss(view, value == null ? false : (boolean) value);
         break;
       case "gestureEnabled":
         mViewManager.setGestureEnabled(view, value == null ? true : (boolean) value);
         break;
-      case "replaceAnimation":
-        mViewManager.setReplaceAnimation(view, (String) value);
+      case "statusBarColor":
+        mViewManager.setStatusBarColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "statusBarHidden":
+        mViewManager.setStatusBarHidden(view, value == null ? false : (boolean) value);
         break;
       case "screenOrientation":
         mViewManager.setScreenOrientation(view, value == null ? null : (String) value);
@@ -40,17 +50,35 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
       case "statusBarAnimation":
         mViewManager.setStatusBarAnimation(view, value == null ? null : (String) value);
         break;
-      case "statusBarColor":
-        mViewManager.setStatusBarColor(view, ColorPropConverter.getColor(value, view.getContext()));
-        break;
       case "statusBarStyle":
         mViewManager.setStatusBarStyle(view, value == null ? null : (String) value);
         break;
       case "statusBarTranslucent":
         mViewManager.setStatusBarTranslucent(view, value == null ? false : (boolean) value);
         break;
-      case "statusBarHidden":
-        mViewManager.setStatusBarHidden(view, value == null ? false : (boolean) value);
+      case "gestureResponseDistance":
+        mViewManager.setGestureResponseDistance(view, (ReadableMap) value);
+        break;
+      case "stackPresentation":
+        mViewManager.setStackPresentation(view, (String) value);
+        break;
+      case "stackAnimation":
+        mViewManager.setStackAnimation(view, (String) value);
+        break;
+      case "transitionDuration":
+        mViewManager.setTransitionDuration(view, value == null ? 350 : ((Double) value).intValue());
+        break;
+      case "replaceAnimation":
+        mViewManager.setReplaceAnimation(view, (String) value);
+        break;
+      case "swipeDirection":
+        mViewManager.setSwipeDirection(view, (String) value);
+        break;
+      case "hideKeyboardOnSwipe":
+        mViewManager.setHideKeyboardOnSwipe(view, value == null ? false : (boolean) value);
+        break;
+      case "activityState":
+        mViewManager.setActivityState(view, value == null ? -1f : ((Double) value).floatValue());
         break;
       case "navigationBarColor":
         mViewManager.setNavigationBarColor(view, ColorPropConverter.getColor(value, view.getContext()));
@@ -61,9 +89,6 @@ public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerI
       case "nativeBackButtonDismissalEnabled":
         mViewManager.setNativeBackButtonDismissalEnabled(view, value == null ? false : (boolean) value);
         break;
-      case "activityState":
-        mViewManager.setActivityState(view, value == null ? -1 : ((Double) value).intValue());
-        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerInterface.java

@@ -11,20 +11,29 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableMap;
 
 public interface RNSScreenManagerInterface<T extends View> {
-  void setStackPresentation(T view, @Nullable String value);
-  void setStackAnimation(T view, @Nullable String value);
+  void setCustomAnimationOnSwipe(T view, boolean value);
+  void setFullScreenSwipeEnabled(T view, boolean value);
+  void setHomeIndicatorHidden(T view, boolean value);
+  void setPreventNativeDismiss(T view, boolean value);
   void setGestureEnabled(T view, boolean value);
-  void setReplaceAnimation(T view, @Nullable String value);
+  void setStatusBarColor(T view, @Nullable Integer value);
+  void setStatusBarHidden(T view, boolean value);
   void setScreenOrientation(T view, @Nullable String value);
   void setStatusBarAnimation(T view, @Nullable String value);
-  void setStatusBarColor(T view, @Nullable Integer value);
   void setStatusBarStyle(T view, @Nullable String value);
   void setStatusBarTranslucent(T view, boolean value);
-  void setStatusBarHidden(T view, boolean value);
+  void setGestureResponseDistance(T view, @Nullable ReadableMap value);
+  void setStackPresentation(T view, @Nullable String value);
+  void setStackAnimation(T view, @Nullable String value);
+  void setTransitionDuration(T view, int value);
+  void setReplaceAnimation(T view, @Nullable String value);
+  void setSwipeDirection(T view, @Nullable String value);
+  void setHideKeyboardOnSwipe(T view, boolean value);
+  void setActivityState(T view, float value);
   void setNavigationBarColor(T view, @Nullable Integer value);
   void setNavigationBarHidden(T view, boolean value);
   void setNativeBackButtonDismissalEnabled(T view, boolean value);
-  void setActivityState(T view, int value);
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerDelegate.java

@@ -91,12 +91,12 @@ public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends
       case "hideBackButton":
         mViewManager.setHideBackButton(view, value == null ? false : (boolean) value);
         break;
-      case "topInsetEnabled":
-        mViewManager.setTopInsetEnabled(view, value == null ? false : (boolean) value);
-        break;
       case "backButtonInCustomView":
         mViewManager.setBackButtonInCustomView(view, value == null ? false : (boolean) value);
         break;
+      case "topInsetEnabled":
+        mViewManager.setTopInsetEnabled(view, value == null ? false : (boolean) value);
+        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerInterface.java

@@ -36,6 +36,6 @@ public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {
   void setTitleColor(T view, @Nullable Integer value);
   void setDisableBackButtonMenu(T view, boolean value);
   void setHideBackButton(T view, boolean value);
-  void setTopInsetEnabled(T view, boolean value);
   void setBackButtonInCustomView(T view, boolean value);
+  void setTopInsetEnabled(T view, boolean value);
 }

package/common/cpp/Android.mk

@@ -15,7 +15,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := libjsi \
     libfbjni \
     libglog \
-    libfolly_json \
+    libfolly_runtime \
     libyoga \
     libreact_nativemodule_core \
     libturbomodulejsijni \
@@ -23,7 +23,6 @@ LOCAL_SHARED_LIBRARIES := libjsi \
     libreact_render_core \
     libreact_render_graphics \
     libfabricjni \
-    libfolly_futures \
     libreact_debug \
     libreact_render_componentregistry \
     libreact_render_debug \

package/createNativeStackNavigator/README.md

@@ -398,6 +398,10 @@ The search field background color.
 
 By default bar tint color is translucent.
 
+#### `tintColor`
+
+The color for the cursor caret and cancel button text.
+
 #### `cancelButtonText`
 
 The text to be used instead of default `Cancel` button text.

package/ios/RNSConvert.h

@@ -0,0 +1,30 @@
+#ifdef RN_FABRIC_ENABLED
+#import <react/renderer/components/rnscreens/Props.h>
+#import "RNSEnums.h"
+
+@interface RNSConvert : NSObject
+
++ (RNSScreenStackPresentation)RNSScreenStackPresentationFromCppEquivalent:
+    (facebook::react::RNSScreenStackPresentation)stackPresentation;
+
++ (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:
+    (facebook::react::RNSScreenStackAnimation)stackAnimation;
+
++ (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
+    (facebook::react::RNSScreenStackHeaderSubviewType)subviewType;
+
++ (RNSScreenReplaceAnimation)RNSScreenReplaceAnimationFromCppEquivalent:
+    (facebook::react::RNSScreenReplaceAnimation)replaceAnimation;
+
++ (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:
+    (facebook::react::RNSScreenSwipeDirection)swipeDirection;
+
++ (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
+    (const facebook::react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance;
+
++ (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
+    (facebook::react::RNSSearchBarAutoCapitalize)autoCapitalize;
+
+@end
+
+#endif // RN_FABRIC_ENABLED

package/ios/RNSConvert.mm

@@ -0,0 +1,120 @@
+#import "RNSConvert.h"
+
+#ifdef RN_FABRIC_ENABLED
+@implementation RNSConvert
+
++ (RNSScreenStackPresentation)RNSScreenStackPresentationFromCppEquivalent:
+    (facebook::react::RNSScreenStackPresentation)stackPresentation
+{
+  switch (stackPresentation) {
+    case facebook::react::RNSScreenStackPresentation::Push:
+      return RNSScreenStackPresentationPush;
+    case facebook::react::RNSScreenStackPresentation::Modal:
+      return RNSScreenStackPresentationModal;
+    case facebook::react::RNSScreenStackPresentation::FullScreenModal:
+      return RNSScreenStackPresentationFullScreenModal;
+    case facebook::react::RNSScreenStackPresentation::FormSheet:
+      return RNSScreenStackPresentationFormSheet;
+    case facebook::react::RNSScreenStackPresentation::ContainedModal:
+      return RNSScreenStackPresentationContainedModal;
+    case facebook::react::RNSScreenStackPresentation::TransparentModal:
+      return RNSScreenStackPresentationTransparentModal;
+    case facebook::react::RNSScreenStackPresentation::ContainedTransparentModal:
+      return RNSScreenStackPresentationContainedTransparentModal;
+  }
+}
+
++ (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:
+    (facebook::react::RNSScreenStackAnimation)stackAnimation
+{
+  switch (stackAnimation) {
+    // these three are intentionally grouped
+    case facebook::react::RNSScreenStackAnimation::Slide_from_right:
+    case facebook::react::RNSScreenStackAnimation::Slide_from_left:
+    case facebook::react::RNSScreenStackAnimation::Default:
+      return RNSScreenStackAnimationDefault;
+    case facebook::react::RNSScreenStackAnimation::Flip:
+      return RNSScreenStackAnimationFlip;
+    case facebook::react::RNSScreenStackAnimation::Simple_push:
+      return RNSScreenStackAnimationSimplePush;
+    case facebook::react::RNSScreenStackAnimation::None:
+      return RNSScreenStackAnimationNone;
+    case facebook::react::RNSScreenStackAnimation::Fade:
+      return RNSScreenStackAnimationFade;
+    case facebook::react::RNSScreenStackAnimation::Slide_from_bottom:
+      return RNSScreenStackAnimationSlideFromBottom;
+    case facebook::react::RNSScreenStackAnimation::Fade_from_bottom:
+      return RNSScreenStackAnimationFadeFromBottom;
+  }
+}
+
++ (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
+    (facebook::react::RNSScreenStackHeaderSubviewType)subviewType
+{
+  switch (subviewType) {
+    case facebook::react::RNSScreenStackHeaderSubviewType::Left:
+      return RNSScreenStackHeaderSubviewTypeLeft;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Right:
+      return RNSScreenStackHeaderSubviewTypeRight;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Title:
+      return RNSScreenStackHeaderSubviewTypeTitle;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Center:
+      return RNSScreenStackHeaderSubviewTypeCenter;
+    case facebook::react::RNSScreenStackHeaderSubviewType::SearchBar:
+      return RNSScreenStackHeaderSubviewTypeSearchBar;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Back:
+      return RNSScreenStackHeaderSubviewTypeBackButton;
+  }
+}
+
++ (RNSScreenReplaceAnimation)RNSScreenReplaceAnimationFromCppEquivalent:
+    (facebook::react::RNSScreenReplaceAnimation)replaceAnimation
+{
+  switch (replaceAnimation) {
+    case facebook::react::RNSScreenReplaceAnimation::Pop:
+      return RNSScreenReplaceAnimationPop;
+    case facebook::react::RNSScreenReplaceAnimation::Push:
+      return RNSScreenReplaceAnimationPush;
+  }
+}
+
++ (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:
+    (facebook::react::RNSScreenSwipeDirection)swipeDirection
+{
+  switch (swipeDirection) {
+    case facebook::react::RNSScreenSwipeDirection::Horizontal:
+      return RNSScreenSwipeDirectionHorizontal;
+    case facebook::react::RNSScreenSwipeDirection::Vertical:
+      return RNSScreenSwipeDirectionVertical;
+  }
+}
+
++ (NSDictionary *)gestureResponseDistanceDictFromCppStruct:
+    (const facebook::react::RNSScreenGestureResponseDistanceStruct &)gestureResponseDistance
+{
+  return @{
+    @"start" : @(gestureResponseDistance.start),
+    @"end" : @(gestureResponseDistance.end),
+    @"top" : @(gestureResponseDistance.top),
+    @"bottom" : @(gestureResponseDistance.bottom),
+  };
+}
+
++ (UITextAutocapitalizationType)UITextAutocapitalizationTypeFromCppEquivalent:
+    (facebook::react::RNSSearchBarAutoCapitalize)autoCapitalize
+{
+  switch (autoCapitalize) {
+    case facebook::react::RNSSearchBarAutoCapitalize::Words:
+      return UITextAutocapitalizationTypeWords;
+    case facebook::react::RNSSearchBarAutoCapitalize::Sentences:
+      return UITextAutocapitalizationTypeSentences;
+    case facebook::react::RNSSearchBarAutoCapitalize::Characters:
+      return UITextAutocapitalizationTypeAllCharacters;
+    case facebook::react::RNSSearchBarAutoCapitalize::None:
+      return UITextAutocapitalizationTypeNone;
+  }
+}
+
+@end
+
+#endif // RN_FABRIC_ENABLED

package/ios/RNSEnums.h

@@ -0,0 +1,59 @@
+typedef NS_ENUM(NSInteger, RNSScreenStackPresentation) {
+  RNSScreenStackPresentationPush,
+  RNSScreenStackPresentationModal,
+  RNSScreenStackPresentationTransparentModal,
+  RNSScreenStackPresentationContainedModal,
+  RNSScreenStackPresentationContainedTransparentModal,
+  RNSScreenStackPresentationFullScreenModal,
+  RNSScreenStackPresentationFormSheet
+};
+
+typedef NS_ENUM(NSInteger, RNSScreenStackAnimation) {
+  RNSScreenStackAnimationDefault,
+  RNSScreenStackAnimationNone,
+  RNSScreenStackAnimationFade,
+  RNSScreenStackAnimationFadeFromBottom,
+  RNSScreenStackAnimationFlip,
+  RNSScreenStackAnimationSlideFromBottom,
+  RNSScreenStackAnimationSimplePush,
+};
+
+typedef NS_ENUM(NSInteger, RNSScreenReplaceAnimation) {
+  RNSScreenReplaceAnimationPop,
+  RNSScreenReplaceAnimationPush,
+};
+
+typedef NS_ENUM(NSInteger, RNSScreenSwipeDirection) {
+  RNSScreenSwipeDirectionHorizontal,
+  RNSScreenSwipeDirectionVertical,
+};
+
+typedef NS_ENUM(NSInteger, RNSActivityState) {
+  RNSActivityStateInactive = 0,
+  RNSActivityStateTransitioningOrBelowTop = 1,
+  RNSActivityStateOnTop = 2
+};
+
+typedef NS_ENUM(NSInteger, RNSStatusBarStyle) {
+  RNSStatusBarStyleAuto,
+  RNSStatusBarStyleInverted,
+  RNSStatusBarStyleLight,
+  RNSStatusBarStyleDark,
+};
+
+typedef NS_ENUM(NSInteger, RNSWindowTrait) {
+  RNSWindowTraitStyle,
+  RNSWindowTraitAnimation,
+  RNSWindowTraitHidden,
+  RNSWindowTraitOrientation,
+  RNSWindowTraitHomeIndicatorHidden,
+};
+
+typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
+  RNSScreenStackHeaderSubviewTypeBackButton,
+  RNSScreenStackHeaderSubviewTypeLeft,
+  RNSScreenStackHeaderSubviewTypeRight,
+  RNSScreenStackHeaderSubviewTypeTitle,
+  RNSScreenStackHeaderSubviewTypeCenter,
+  RNSScreenStackHeaderSubviewTypeSearchBar,
+};