react-native-screens 4.0.0 → 4.2.0

package/android/src/main/cpp/jni-adapter.cpp

@@ -18,6 +18,9 @@ Java_com_swmansion_rnscreens_ScreensModule_nativeInstall(
     return;
   }
   jsi::Runtime &rt = *runtime;
+  if (globalThis) {
+    env->DeleteGlobalRef(globalThis);
+  }
   globalThis = env->NewGlobalRef(thiz);
   JavaVM *jvm;
   env->GetJavaVM(&jvm);

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

@@ -23,10 +23,7 @@ object InsetsObserverProxy : OnApplyWindowInsetsListener {
     ): WindowInsetsCompat {
         var rollingInsets =
             if (shouldForwardInsetsToView) {
-                WindowInsetsCompat.toWindowInsetsCompat(
-                    v.onApplyWindowInsets(insets.toWindowInsets()),
-                    v,
-                )
+                ViewCompat.onApplyWindowInsets(v, insets)
             } else {
                 insets
             }
@@ -57,8 +54,10 @@ object InsetsObserverProxy : OnApplyWindowInsetsListener {
         }
     }
 
-    fun unregisterOnView(view: View) {
-        ViewCompat.setOnApplyWindowInsetsListener(view, null)
+    fun unregister() {
+        getObservedView()?.takeIf { hasBeenRegistered }?.let {
+            ViewCompat.setOnApplyWindowInsetsListener(it, null)
+        }
     }
 
     private fun getObservedView(): View? = eventSourceView.get()

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

@@ -20,13 +20,14 @@ import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.scroll.ReactHorizontalScrollView
+import com.facebook.react.views.scroll.ReactScrollView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
 import com.swmansion.rnscreens.events.SheetDetentChangedEvent
-import com.swmansion.rnscreens.ext.isInsideScrollViewWithRemoveClippedSubviews
 import java.lang.ref.WeakReference
 
 @SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
@@ -399,11 +400,12 @@ class Screen(
                     startTransitionRecursive(child.toolbar)
                 }
                 if (child is ViewGroup) {
-                    // The children are miscounted when there's a FlatList with
-                    // removeClippedSubviews set to true (default).
-                    // We add a simple view for each item in the list to make it work as expected.
-                    // See https://github.com/software-mansion/react-native-screens/pull/2383
-                    if (child.isInsideScrollViewWithRemoveClippedSubviews()) {
+                    // The children are miscounted when there's removeClippedSubviews prop
+                    // set to true (which is the default for FlatLists).
+                    // Unless the child is a ScrollView it's safe to assume that it's true
+                    // and add a simple view for each possibly clipped item to make it work as expected.
+                    // See https://github.com/software-mansion/react-native-screens/pull/2495
+                    if (child !is ReactScrollView && child !is ReactHorizontalScrollView) {
                         for (j in 0 until child.childCount) {
                             child.addView(View(context))
                         }

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

@@ -35,6 +35,7 @@ class ScreenFooter(
     private val sheetBehavior
         get() = requireScreenParent().sheetBehavior
 
+    private val hasReceivedInitialLayoutFromParent get() = lastContainerHeight > 0
 
     // Due to Android restrictions on layout flow, particularly
     // the fact that onMeasure must set `measuredHeight` & `measuredWidth` React calls `measure` on every
@@ -92,9 +93,10 @@ class ScreenFooter(
         }
 
     init {
-        val rootView = checkNotNull(reactContext.currentActivity) {
-            "[RNScreens] Context detached from activity while creating ScreenFooter"
-        }.window.decorView
+        val rootView =
+            checkNotNull(reactContext.currentActivity) {
+                "[RNScreens] Context detached from activity while creating ScreenFooter"
+            }.window.decorView
 
         // Note that we do override insets animation on given view. I can see it interfering e.g.
         // with reanimated keyboard or even other places in our code. Need to test this.
@@ -115,6 +117,9 @@ class ScreenFooter(
         bottom: Int,
     ) {
         super.onLayout(changed, left, top, right, bottom)
+        if (!hasReceivedInitialLayoutFromParent) {
+            return
+        }
         layoutFooterOnYAxis(
             lastContainerHeight,
             bottom - top,
@@ -219,11 +224,18 @@ class ScreenFooter(
      *
      * This method should not be used for sheet in stable state.
      *
+     * Currently the implementation assumes that the Screen's (sheet's) container starts at y: 0
+     * in global coordinates. Then we can use simply sheet's top. If that is for some reason
+     * unavailable, then we fallback to interpolation basing on values provided by sheet behaviour.
+     *
+     * We don't want to primarily rely on interpolation, because due to division rounding errors the footer
+     * will "flicker" (jump up / down a single pixel).
+     *
      * @param slideOffset sheet offset as reported by [BottomSheetCallback.onSlide]
      * @return position of sheet's top **relative to container**
      */
     private fun sheetTopWhileDragging(slideOffset: Float): Int =
-        MathUtils
+        screenParent?.top ?: MathUtils
             .lerp(
                 sheetTopInStableState(STATE_COLLAPSED).toFloat(),
                 sheetTopInStableState(

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

@@ -163,7 +163,6 @@ object ScreenWindowTraits {
                         InsetsObserverProxy.registerOnView(decorView)
                         InsetsObserverProxy.addOnApplyWindowInsetsListener(windowInsetsListener)
                     } else {
-                        InsetsObserverProxy.unregisterOnView(decorView)
                         InsetsObserverProxy.removeOnApplyWindowInsetsListener(windowInsetsListener)
                     }
                     ViewCompat.requestApplyInsets(decorView)

package/android/src/main/java/com/swmansion/rnscreens/ext/ViewExt.kt

@@ -3,9 +3,6 @@ package com.swmansion.rnscreens.ext
 import android.graphics.drawable.ColorDrawable
 import android.view.View
 import android.view.ViewGroup
-import com.facebook.react.views.scroll.ReactHorizontalScrollView
-import com.facebook.react.views.scroll.ReactScrollView
-import com.swmansion.rnscreens.ScreenStack
 
 internal fun View.parentAsView() = this.parent as? View
 
@@ -33,24 +30,3 @@ internal fun View.maybeBgColor(): Int? {
     }
     return null
 }
-
-internal fun View.isInsideScrollViewWithRemoveClippedSubviews(): Boolean {
-    if (this is ReactHorizontalScrollView || this is ReactScrollView) {
-        return false
-    }
-    var parentView = this.parent
-    while (parentView is ViewGroup && parentView !is ScreenStack) {
-        when (parentView) {
-            is ReactHorizontalScrollView -> {
-                return parentView.removeClippedSubviews
-            }
-            is ReactScrollView -> {
-                return parentView.removeClippedSubviews
-            }
-            else -> {
-                parentView = parentView.parent
-            }
-        }
-    }
-    return false
-}

package/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h

@@ -2,7 +2,7 @@
 
 #ifdef ANDROID
 #include <fbjni/fbjni.h>
-#endif
+#endif // ANDROID
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/components/rnscreens/Props.h>
 #include <react/renderer/components/rnscreens/utils/RectUtil.h>

package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp

@@ -26,10 +26,10 @@ findHeaderConfigChild(const YogaLayoutableShadowNode &screenShadowNode) {
   return {};
 }
 
+#ifdef ANDROID
 static constexpr const char *kScreenDummyLayoutHelperClass =
     "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper";
 
-#ifdef ANDROID
 std::optional<float> findHeaderHeight(
     const int fontSize,
     const bool isTitleEmpty) {

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h

@@ -38,6 +38,11 @@ class RNSScreenStackHeaderConfigComponentDescriptor final
         {stateData.getPaddingStart(), 0, stateData.getPaddingEnd(), 0});
 
     ConcreteComponentDescriptor::adopt(shadowNode);
+#if !defined(ANDROID) && !defined(NDEBUG)
+    std::weak_ptr<void> imageLoader =
+        contextContainer_->at<std::shared_ptr<void>>("RCTImageLoader");
+    configShadowNode.setImageLoader(imageLoader);
+#endif // !ANDROID && !NDEBUG
   }
 };
 

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigShadowNode.cpp

@@ -5,4 +5,18 @@ namespace facebook::react {
 extern const char RNSScreenStackHeaderConfigComponentName[] =
     "RNSScreenStackHeaderConfig";
 
+#if !defined(ANDROID) && !defined(NDEBUG)
+void RNSScreenStackHeaderConfigShadowNode::setImageLoader(
+    std::weak_ptr<void> imageLoader) {
+  getStateDataMutable().setImageLoader(imageLoader);
 }
+RNSScreenStackHeaderConfigShadowNode::StateData &
+RNSScreenStackHeaderConfigShadowNode::getStateDataMutable() {
+  // We assume that this method is called to mutate the data, so we ensure
+  // we're unsealed.
+  ensureUnsealed();
+  return const_cast<RNSScreenStackHeaderConfigShadowNode::StateData &>(
+      getStateData());
+}
+#endif // !ANDROID && !NDEBUG
+} // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigShadowNode.h

@@ -27,6 +27,14 @@ class JSI_EXPORT RNSScreenStackHeaderConfigShadowNode final
 #pragma mark - ShadowNode overrides
 
 #pragma mark - Custom interface
+#if !defined(ANDROID) && !defined(NDEBUG)
+  void setImageLoader(std::weak_ptr<void> imageLoader);
+#endif // !ANDROID && !NDEBUG
+
+ private:
+#if !defined(ANDROID) && !defined(NDEBUG)
+  StateData &getStateDataMutable();
+#endif // !ANDROID && !NDEBUG
 };
 
 } // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigState.cpp

@@ -8,8 +8,19 @@ folly::dynamic RNSScreenStackHeaderConfigState::getDynamic() const {
   return folly::dynamic::object("paddingStart", paddingStart_)(
       "paddingEnd_", paddingEnd_);
 }
+#else // ANDROID
+#ifndef NDEBUG
+void RNSScreenStackHeaderConfigState::setImageLoader(
+    std::weak_ptr<void> imageLoader) {
+  imageLoader_ = imageLoader;
+}
 
-#endif
+std::weak_ptr<void> RNSScreenStackHeaderConfigState::getImageLoader()
+    const noexcept {
+  return imageLoader_;
+}
+#endif // !NDEBUG
+#endif // ANDROID
 
 Float RNSScreenStackHeaderConfigState::getPaddingStart() const noexcept {
   return paddingStart_;

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderConfigState.h

@@ -33,8 +33,12 @@ class JSI_EXPORT RNSScreenStackHeaderConfigState final {
   MapBuffer getMapBuffer() const {
     return MapBufferBuilder::EMPTY();
   };
-
-#endif
+#else // ANDROID
+#ifndef NDEBUG
+  void setImageLoader(std::weak_ptr<void> imageLoader);
+  std::weak_ptr<void> getImageLoader() const noexcept;
+#endif // !NDEBUG
+#endif // ANDROID
 
 #pragma mark - Getters
 
@@ -45,6 +49,9 @@ class JSI_EXPORT RNSScreenStackHeaderConfigState final {
  private:
   Float paddingStart_{0.f};
   Float paddingEnd_{0.f};
+#if !defined(ANDROID) && !defined(NDEBUG)
+  std::weak_ptr<void> imageLoader_;
+#endif // !ANDROID && !NDEBUG
 };
 
 } // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h

@@ -2,7 +2,7 @@
 
 #ifdef ANDROID
 #include <fbjni/fbjni.h>
-#endif
+#endif // ANDROID
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/components/rnscreens/Props.h>
 #include <react/renderer/components/rnscreens/utils/RectUtil.h>

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewShadowNode.cpp

@@ -5,4 +5,4 @@ namespace facebook::react {
 extern const char RNSScreenStackHeaderSubviewComponentName[] =
     "RNSScreenStackHeaderSubview";
 
-}
+} // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewShadowNode.h

@@ -23,7 +23,6 @@ class JSI_EXPORT RNSScreenStackHeaderSubviewShadowNode final
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
   using StateData = ConcreteViewShadowNode::ConcreteStateData;
-
 #pragma mark - ShadowNode overrides
 
 #pragma mark - Custom interface

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.cpp

@@ -9,7 +9,7 @@ using namespace rnscreens;
 folly::dynamic RNSScreenStackHeaderSubviewState::getDynamic() const {
   return folly::dynamic::object();
 }
-#endif
+#endif // ANDROID
 
 } // namespace react
 } // namespace facebook

package/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewState.h

@@ -32,8 +32,7 @@ class JSI_EXPORT RNSScreenStackHeaderSubviewState final {
   MapBuffer getMapBuffer() const {
     return MapBufferBuilder::EMPTY();
   };
-#endif
-
+#endif // ANDROID
 #pragma mark - Getters
 };
 

package/common/cpp/react/renderer/components/rnscreens/RNSScreenState.cpp

@@ -29,7 +29,7 @@ const FrameCorrectionModes &RNSScreenState::getHeaderCorrectionModes()
   return headerCorrectionModes_;
 }
 
-#endif
+#endif // ANDROID
 
 } // namespace react
 } // namespace facebook

package/common/cpp/react/renderer/components/rnscreens/RNSScreenState.h

@@ -7,7 +7,7 @@
 #include <folly/dynamic.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
-#endif
+#endif // ANDROID
 
 #include "FrameCorrectionModes.h"
 
@@ -53,7 +53,7 @@ class JSI_EXPORT RNSScreenState final {
 
   const FrameCorrectionModes &getHeaderCorrectionModes() const noexcept;
 
-#endif
+#endif // ANDROID
 
  private:
 #ifdef ANDROID

package/ios/RNSConvert.h

@@ -43,8 +43,6 @@ namespace react = facebook::react;
 
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement;
 
-+ (NSMutableArray<NSNumber *> *)NSNumberMutableArrayFromFloatVector:(const std::vector<CGFloat> &)vector;
-
 + (NSMutableArray<NSNumber *> *)arrayFromVector:(const std::vector<CGFloat> &)vector;
 
 + (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect;

package/ios/RNSConvert.mm

@@ -11,9 +11,11 @@
     (react::RNSScreenStackHeaderConfigDirection)direction
 {
   switch (direction) {
-    case react::RNSScreenStackHeaderConfigDirection::Rtl:
+    using enum react::RNSScreenStackHeaderConfigDirection;
+
+    case Rtl:
       return UISemanticContentAttributeForceRightToLeft;
-    case react::RNSScreenStackHeaderConfigDirection::Ltr:
+    case Ltr:
       return UISemanticContentAttributeForceLeftToRight;
   }
 }
@@ -22,11 +24,13 @@
     (react::RNSScreenStackHeaderConfigBackButtonDisplayMode)backButtonDisplayMode
 {
   switch (backButtonDisplayMode) {
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Default:
+    using enum react::RNSScreenStackHeaderConfigBackButtonDisplayMode;
+
+    case Default:
       return UINavigationItemBackButtonDisplayModeDefault;
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Generic:
+    case Generic:
       return UINavigationItemBackButtonDisplayModeGeneric;
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Minimal:
+    case Minimal:
       return UINavigationItemBackButtonDisplayModeMinimal;
   }
 }
@@ -35,19 +39,21 @@
     (react::RNSScreenStackPresentation)stackPresentation
 {
   switch (stackPresentation) {
-    case react::RNSScreenStackPresentation::Push:
+    using enum react::RNSScreenStackPresentation;
+
+    case Push:
       return RNSScreenStackPresentationPush;
-    case react::RNSScreenStackPresentation::Modal:
+    case Modal:
       return RNSScreenStackPresentationModal;
-    case react::RNSScreenStackPresentation::FullScreenModal:
+    case FullScreenModal:
       return RNSScreenStackPresentationFullScreenModal;
-    case react::RNSScreenStackPresentation::FormSheet:
+    case FormSheet:
       return RNSScreenStackPresentationFormSheet;
-    case react::RNSScreenStackPresentation::ContainedModal:
+    case ContainedModal:
       return RNSScreenStackPresentationContainedModal;
-    case react::RNSScreenStackPresentation::TransparentModal:
+    case TransparentModal:
       return RNSScreenStackPresentationTransparentModal;
-    case react::RNSScreenStackPresentation::ContainedTransparentModal:
+    case ContainedTransparentModal:
       return RNSScreenStackPresentationContainedTransparentModal;
   }
 }
@@ -55,26 +61,27 @@
 + (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:(react::RNSScreenStackAnimation)stackAnimation
 {
   switch (stackAnimation) {
-    // these four are intentionally grouped
-    case react::RNSScreenStackAnimation::Slide_from_right:
-    case react::RNSScreenStackAnimation::Ios_from_right:
-    case react::RNSScreenStackAnimation::Default:
+    using enum react::RNSScreenStackAnimation;
+    // these three are intentionally grouped
+    case Slide_from_right:
+    case Ios_from_right:
+    case Default:
       return RNSScreenStackAnimationDefault;
     // these two are intentionally grouped
-    case react::RNSScreenStackAnimation::Slide_from_left:
-    case react::RNSScreenStackAnimation::Ios_from_left:
+    case Slide_from_left:
+    case Ios_from_left:
       return RNSScreenStackAnimationSlideFromLeft;
-    case react::RNSScreenStackAnimation::Flip:
+    case Flip:
       return RNSScreenStackAnimationFlip;
-    case react::RNSScreenStackAnimation::Simple_push:
+    case Simple_push:
       return RNSScreenStackAnimationSimplePush;
-    case react::RNSScreenStackAnimation::None:
+    case None:
       return RNSScreenStackAnimationNone;
-    case react::RNSScreenStackAnimation::Fade:
+    case Fade:
       return RNSScreenStackAnimationFade;
-    case react::RNSScreenStackAnimation::Slide_from_bottom:
+    case Slide_from_bottom:
       return RNSScreenStackAnimationSlideFromBottom;
-    case react::RNSScreenStackAnimation::Fade_from_bottom:
+    case Fade_from_bottom:
       return RNSScreenStackAnimationFadeFromBottom;
   }
 }
@@ -83,17 +90,19 @@
     (react::RNSScreenStackHeaderSubviewType)subviewType
 {
   switch (subviewType) {
-    case react::RNSScreenStackHeaderSubviewType::Left:
+    using enum react::RNSScreenStackHeaderSubviewType;
+
+    case Left:
       return RNSScreenStackHeaderSubviewTypeLeft;
-    case react::RNSScreenStackHeaderSubviewType::Right:
+    case Right:
       return RNSScreenStackHeaderSubviewTypeRight;
-    case react::RNSScreenStackHeaderSubviewType::Title:
+    case Title:
       return RNSScreenStackHeaderSubviewTypeTitle;
-    case react::RNSScreenStackHeaderSubviewType::Center:
+    case Center:
       return RNSScreenStackHeaderSubviewTypeCenter;
-    case react::RNSScreenStackHeaderSubviewType::SearchBar:
+    case SearchBar:
       return RNSScreenStackHeaderSubviewTypeSearchBar;
-    case react::RNSScreenStackHeaderSubviewType::Back:
+    case Back:
       return RNSScreenStackHeaderSubviewTypeBackButton;
   }
 }
@@ -102,9 +111,10 @@
     (react::RNSScreenReplaceAnimation)replaceAnimation
 {
   switch (replaceAnimation) {
-    case react::RNSScreenReplaceAnimation::Pop:
+    using enum react::RNSScreenReplaceAnimation;
+    case Pop:
       return RNSScreenReplaceAnimationPop;
-    case react::RNSScreenReplaceAnimation::Push:
+    case Push:
       return RNSScreenReplaceAnimationPush;
   }
 }
@@ -112,9 +122,10 @@
 + (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:(react::RNSScreenSwipeDirection)swipeDirection
 {
   switch (swipeDirection) {
-    case react::RNSScreenSwipeDirection::Horizontal:
+    using enum react::RNSScreenSwipeDirection;
+    case Horizontal:
       return RNSScreenSwipeDirectionHorizontal;
-    case react::RNSScreenSwipeDirection::Vertical:
+    case Vertical:
       return RNSScreenSwipeDirectionVertical;
   }
 }
@@ -144,13 +155,14 @@
     (react::RNSSearchBarAutoCapitalize)autoCapitalize
 {
   switch (autoCapitalize) {
-    case react::RNSSearchBarAutoCapitalize::Words:
+    using enum react::RNSSearchBarAutoCapitalize;
+    case Words:
       return UITextAutocapitalizationTypeWords;
-    case react::RNSSearchBarAutoCapitalize::Sentences:
+    case Sentences:
       return UITextAutocapitalizationTypeSentences;
-    case react::RNSSearchBarAutoCapitalize::Characters:
+    case Characters:
       return UITextAutocapitalizationTypeAllCharacters;
-    case react::RNSSearchBarAutoCapitalize::None:
+    case None:
       return UITextAutocapitalizationTypeNone;
   }
 }
@@ -159,11 +171,12 @@
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement
 {
   switch (placement) {
-    case react::RNSSearchBarPlacement::Stacked:
+    using enum react::RNSSearchBarPlacement;
+    case Stacked:
       return RNSSearchBarPlacementStacked;
-    case react::RNSSearchBarPlacement::Automatic:
+    case Automatic:
       return RNSSearchBarPlacementAutomatic;
-    case react::RNSSearchBarPlacement::Inline:
+    case Inline:
       return RNSSearchBarPlacementInline;
   }
 }
@@ -179,68 +192,69 @@
 
 + (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect
 {
+  using enum react::RNSScreenStackHeaderConfigBlurEffect;
 #if !TARGET_OS_TV && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
   if (@available(iOS 13.0, *)) {
     switch (blurEffect) {
-      case react::RNSScreenStackHeaderConfigBlurEffect::None:
+      case None:
         return RNSBlurEffectStyleNone;
-      case react::RNSScreenStackHeaderConfigBlurEffect::ExtraLight:
+      case ExtraLight:
         return RNSBlurEffectStyleExtraLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Light:
+      case Light:
         return RNSBlurEffectStyleLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Dark:
+      case Dark:
         return RNSBlurEffectStyleDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Regular:
+      case Regular:
         return RNSBlurEffectStyleRegular;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Prominent:
+      case Prominent:
         return RNSBlurEffectStyleProminent;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterial:
+      case SystemUltraThinMaterial:
         return RNSBlurEffectStyleSystemUltraThinMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterial:
+      case SystemThinMaterial:
         return RNSBlurEffectStyleSystemThinMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterial:
+      case SystemMaterial:
         return RNSBlurEffectStyleSystemMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterial:
+      case SystemThickMaterial:
         return RNSBlurEffectStyleSystemThickMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterial:
+      case SystemChromeMaterial:
         return RNSBlurEffectStyleSystemChromeMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterialLight:
+      case SystemUltraThinMaterialLight:
         return RNSBlurEffectStyleSystemUltraThinMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterialLight:
+      case SystemThinMaterialLight:
         return RNSBlurEffectStyleSystemThinMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterialLight:
+      case SystemMaterialLight:
         return RNSBlurEffectStyleSystemMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterialLight:
+      case SystemThickMaterialLight:
         return RNSBlurEffectStyleSystemThickMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterialLight:
+      case SystemChromeMaterialLight:
         return RNSBlurEffectStyleSystemChromeMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterialDark:
+      case SystemUltraThinMaterialDark:
         return RNSBlurEffectStyleSystemUltraThinMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterialDark:
+      case SystemThinMaterialDark:
         return RNSBlurEffectStyleSystemThinMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterialDark:
+      case SystemMaterialDark:
         return RNSBlurEffectStyleSystemMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterialDark:
+      case SystemThickMaterialDark:
         return RNSBlurEffectStyleSystemThickMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterialDark:
+      case SystemChromeMaterialDark:
         return RNSBlurEffectStyleSystemChromeMaterialDark;
     }
   }
 #endif
 
   switch (blurEffect) {
-    case react::RNSScreenStackHeaderConfigBlurEffect::None:
+    case None:
       return RNSBlurEffectStyleNone;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Light:
+    case Light:
       return RNSBlurEffectStyleLight;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Dark:
+    case Dark:
       return RNSBlurEffectStyleDark;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Regular:
+    case Regular:
       return RNSBlurEffectStyleRegular;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Prominent:
+    case Prominent:
       return RNSBlurEffectStyleProminent;
-    case react::RNSScreenStackHeaderConfigBlurEffect::ExtraLight:
+    case ExtraLight:
     default:
       return RNSBlurEffectStyleNone;
   }