react-native-screens 4.10.0-beta.3 → 4.11.0-beta.0

package/RNScreens.podspec

@@ -3,7 +3,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-platform = new_arch_enabled ? "11.0" : "9.0"
+min_supported_ios_version = new_arch_enabled ? "15.1" : "15.1"
 source_files = new_arch_enabled ? 'ios/**/*.{h,m,mm,cpp}' : ["ios/**/*.{h,m,mm}", "cpp/RNScreensTurboModule.cpp", "cpp/RNScreensTurboModule.h"]
 
 Pod::Spec.new do |s|
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/software-mansion/react-native-screens"
   s.license      = "MIT"
   s.author       = { "author" => "author@domain.cn" }
-  s.platforms    = { :ios => platform, :tvos => "11.0", :visionos => "1.0" }
+  s.platforms    = { :ios => min_supported_ios_version, :tvos => "11.0", :visionos => "1.0" }
   s.source       = { :git => "https://github.com/software-mansion/react-native-screens.git", :tag => "#{s.version}" }
   s.source_files = source_files
   s.project_header_files = "cpp/**/*.h" # Don't expose C++ headers publicly to allow importing framework into Swift files

package/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt

@@ -14,8 +14,9 @@ abstract class FabricEnabledViewGroup(
 ) : ViewGroup(context) {
     private var mStateWrapper: StateWrapper? = null
 
-    private var lastSetWidth = 0f
-    private var lastSetHeight = 0f
+    private var lastWidth = 0f
+    private var lastHeight = 0f
+    private var lastHeaderHeight = 0f
 
     fun setStateWrapper(wrapper: StateWrapper?) {
         mStateWrapper = wrapper
@@ -42,14 +43,16 @@ abstract class FabricEnabledViewGroup(
         // Check incoming state values. If they're already the correct value, return early to prevent
         // infinite UpdateState/SetState loop.
         val delta = 0.9f
-        if (abs(lastSetWidth - realWidth) < delta &&
-            abs(lastSetHeight - realHeight) < delta
+        if (abs(lastWidth - realWidth) < delta &&
+            abs(lastHeight - realHeight) < delta &&
+            abs(lastHeaderHeight - realHeaderHeight) < delta
         ) {
             return
         }
 
-        lastSetWidth = realWidth
-        lastSetHeight = realHeight
+        lastWidth = realWidth
+        lastHeight = realHeight
+        lastHeaderHeight = realHeaderHeight
         val map: WritableMap =
             WritableNativeMap().apply {
                 putDouble("frameWidth", realWidth.toDouble())

package/android/src/fabric/java/com/swmansion/rnscreens/NativeProxy.kt

@@ -41,7 +41,8 @@ class NativeProxy {
         }
     }
 
-    // Called from native
+    // Called from native. Currently this method is called from MountingCoordinator thread,
+    // which usually is not UI thread.
     @DoNotStrip
     public fun notifyScreenRemoved(screenTag: Int) {
         // Since RN 0.78 the screenTag we receive as argument here might not belong to a screen

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

@@ -27,6 +27,7 @@ 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.bottomsheet.isSheetFitToContents
+import com.swmansion.rnscreens.bottomsheet.useSingleDetent
 import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
 import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
 import com.swmansion.rnscreens.events.SheetDetentChangedEvent
@@ -103,6 +104,9 @@ class Screen(
             field = value
         }
 
+    private val isNativeStackScreen: Boolean
+        get() = container is ScreenStack
+
     init {
         // we set layout params as WindowManager.LayoutParams to workaround the issue with TextInputs
         // not displaying modal menus (e.g., copy/paste or selection). The missing menus are due to the
@@ -132,11 +136,7 @@ class Screen(
         val height = bottom - top
 
         if (isSheetFitToContents()) {
-            sheetBehavior?.let {
-                if (it.maxHeight != height) {
-                    it.maxHeight = height
-                }
-            }
+            sheetBehavior?.useSingleDetent(height)
 
             if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
                 // On old architecture we delay enter transition in order to wait for initial frame.
@@ -173,23 +173,31 @@ class Screen(
         r: Int,
         b: Int,
     ) {
-        if (container is ScreenStack && changed) {
+        // In case of form sheet we get layout notification a bit later, in `onBottomSheetBehaviorDidLayout`
+        // after the attached behaviour laid out this view.
+        if (changed && isNativeStackScreen && !usesFormSheetPresentation()) {
             val width = r - l
             val height = b - t
 
-            if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                updateScreenSizeFabric(width, height, t)
-            } else {
-                updateScreenSizePaper(width, height)
-            }
+            dispatchShadowStateUpdate(width, height, t)
 
-            footer?.onParentLayout(changed, l, t, r, b, container!!.height)
+            // FormSheet has no header in current model.
             notifyHeaderHeightChange(t)
+        }
+    }
 
-            if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                maybeTriggerPostponedTransition()
-            }
+    internal fun onBottomSheetBehaviorDidLayout(coordinatorLayoutDidChange: Boolean) {
+        if (!usesFormSheetPresentation()) {
+            return
         }
+        if (coordinatorLayoutDidChange && isNativeStackScreen) {
+            dispatchShadowStateUpdate(width, height, top)
+        }
+        if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            maybeTriggerPostponedTransition()
+        }
+
+        footer?.onParentLayout(coordinatorLayoutDidChange, left, top, right, bottom, container!!.height)
     }
 
     private fun maybeTriggerPostponedTransition() {
@@ -214,6 +222,21 @@ class Screen(
         )
     }
 
+    /**
+     * @param offsetY ignored on old architecture
+     */
+    private fun dispatchShadowStateUpdate(
+        width: Int,
+        height: Int,
+        offsetY: Int,
+    ) {
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            updateScreenSizeFabric(width, height, offsetY)
+        } else {
+            updateScreenSizePaper(width, height)
+        }
+    }
+
     val headerConfig: ScreenStackHeaderConfig?
         get() = children.find { it is ScreenStackHeaderConfig } as? ScreenStackHeaderConfig
 
@@ -237,7 +260,10 @@ class Screen(
         )
     }
 
-    fun isTransparent(): Boolean =
+    /**
+     * Whether this screen allows to see the content underneath it.
+     */
+    fun isTranslucent(): Boolean =
         when (stackPresentation) {
             StackPresentation.TRANSPARENT_MODAL,
             StackPresentation.FORM_SHEET,
@@ -487,6 +513,11 @@ class Screen(
         isStable: Boolean,
     ) {
         dispatchSheetDetentChanged(detentIndex, isStable)
+        // There is no need to update shadow state for transient sheet states -
+        // we are unsure of the exact sheet position anyway.
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && isStable) {
+            updateScreenSizeFabric(width, height, top)
+        }
     }
 
     private fun dispatchSheetDetentChanged(

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

@@ -128,6 +128,9 @@ open class ScreenFragment :
         ScreenWindowTraits.trySetWindowTraits(screen, activity, tryGetContext())
     }
 
+    // Plain ScreenFragments can not be translucent
+    override fun isTranslucent() = false
+
     override fun tryGetActivity(): Activity? {
         activity?.let { return it }
         val context = screen.context

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

@@ -26,6 +26,15 @@ interface ScreenFragmentWrapper :
 
     fun onViewAnimationEnd()
 
+    // Fragment information
+
+    /**
+     * Whether this screen fragment makes it possible to see content underneath it
+     * (not fully opaque or does not fill full screen).
+     */
+    fun isTranslucent(): Boolean
+
+
     // Helpers
     fun tryGetActivity(): Activity?
 

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

@@ -92,6 +92,8 @@ class ScreenModalFragment :
         savedInstanceState: Bundle?,
     ): View? = null
 
+    override fun isTranslucent(): Boolean = true
+
     override fun dismissFromContainer() {
         check(container is ScreenStack)
         val container = container as ScreenStack

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

@@ -175,21 +175,18 @@ class ScreenStack(
         childDrawingOrderStrategy = null
 
         // Determine new first & last visible screens.
-        // Scope function to limit the scope of locals.
-        run {
-            val notDismissedWrappers =
-                screenWrappers
-                    .asReversed()
-                    .asSequence()
-                    .filter { !dismissedWrappers.contains(it) && it.screen.activityState !== Screen.ActivityState.INACTIVE }
-
-            newTop = notDismissedWrappers.firstOrNull()
-            visibleBottom =
-                notDismissedWrappers
-                    .dropWhile { it.screen.isTransparent() }
-                    .firstOrNull()
-                    ?.takeUnless { it === newTop }
-        }
+        val notDismissedWrappers =
+            screenWrappers
+                .asReversed()
+                .asSequence()
+                .filter { !dismissedWrappers.contains(it) && it.screen.activityState !== Screen.ActivityState.INACTIVE }
+
+        newTop = notDismissedWrappers.firstOrNull()
+        visibleBottom =
+            notDismissedWrappers
+                .dropWhile { it.isTranslucent() }
+                .firstOrNull()
+                ?.takeUnless { it === newTop }
 
         var shouldUseOpenAnimation = true
         var stackAnimation: StackAnimation? = null
@@ -241,8 +238,8 @@ class ScreenStack(
             childDrawingOrderStrategy = SwapLastTwo()
         } else if (newTop != null &&
             newTopAlreadyInStack &&
-            topScreenWrapper?.screen?.isTransparent() == true &&
-            newTop.screen.isTransparent() == false
+            topScreenWrapper?.isTranslucent() == true &&
+            newTop.isTranslucent() == false
         ) {
             // In case where we dismiss multiple transparent views we want to ensure
             // that they are drawn in correct order - Android swaps them by default,
@@ -253,7 +250,7 @@ class ScreenStack(
                     .asSequence()
                     .takeWhile {
                         it !== newTop &&
-                            it.screen.isTransparent()
+                            it.isTranslucent()
                     }.count()
             if (dismissedTransparentScreenApproxCount > 1) {
                 childDrawingOrderStrategy =
@@ -314,7 +311,7 @@ class ScreenStack(
     private fun turnOffA11yUnderTransparentScreen(visibleBottom: ScreenFragmentWrapper?) {
         if (screenWrappers.size > 1 && visibleBottom != null) {
             topScreenWrapper?.let {
-                if (it.screen.isTransparent()) {
+                if (it.isTranslucent()) {
                     val screenFragmentsBeneathTop = screenWrappers.slice(0 until screenWrappers.size - 1).asReversed()
                     // go from the top of the stack excluding the top screen
                     for (fragmentWrapper in screenFragmentsBeneathTop) {

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

@@ -86,6 +86,8 @@ class ScreenStackFragment :
         )
     }
 
+    override fun isTranslucent(): Boolean = screen.isTranslucent()
+
     override fun removeToolbar() {
         appBarLayout?.let {
             toolbar?.let { toolbar ->
@@ -380,7 +382,7 @@ class ScreenStackFragment :
         // If the screen is a transparent modal with hidden header we don't want to update the toolbar
         // menu because it may erase the menu of the previous screen (which is still visible in these
         // circumstances). See here: https://github.com/software-mansion/react-native-screens/issues/2271
-        if (!screen.isTransparent() || screen.headerConfig?.isHeaderHidden == false) {
+        if (!screen.isTranslucent() || screen.headerConfig?.isHeaderHidden == false) {
             updateToolbarMenu(menu)
         }
         return super.onPrepareOptionsMenu(menu)
@@ -480,7 +482,7 @@ class ScreenStackFragment :
         constructor(context: Context, fragment: ScreenStackFragment) : this(
             context,
             fragment,
-            ScreensCoordinatorLayoutPointerEventsImpl(),
+            PointerEventsBoxNoneImpl(),
         )
 
         override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets = super.onApplyWindowInsets(insets)
@@ -543,6 +545,20 @@ class ScreenStackFragment :
             }
         }
 
+        override fun onLayout(
+            changed: Boolean,
+            l: Int,
+            t: Int,
+            r: Int,
+            b: Int,
+        ) {
+            super.onLayout(changed, l, t, r, b)
+
+            if (fragment.screen.usesFormSheetPresentation()) {
+                fragment.screen.onBottomSheetBehaviorDidLayout(changed)
+            }
+        }
+
 //        override fun reactTagForTouch(touchX: Float, touchY: Float): Int {
 //            throw IllegalStateException("Screen wrapper should never be asked for the view tag")
 //        }

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

@@ -15,6 +15,7 @@ import androidx.fragment.app.Fragment
 import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.text.ReactTypefaceUtils
 import com.swmansion.rnscreens.events.HeaderAttachedEvent
@@ -23,7 +24,11 @@ import kotlin.math.max
 
 class ScreenStackHeaderConfig(
     context: Context,
-) : FabricEnabledHeaderConfigViewGroup(context) {
+    private val pointerEventsImpl: ReactPointerEventsView
+) : FabricEnabledHeaderConfigViewGroup(context), ReactPointerEventsView by pointerEventsImpl {
+
+    constructor(context: Context): this(context, pointerEventsImpl = PointerEventsBoxNoneImpl())
+
     private val configSubviews = ArrayList<ScreenStackHeaderSubview>(3)
     val toolbar: CustomToolbar
     var isHeaderHidden = false // named this way to avoid conflict with platform's isHidden

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

@@ -10,6 +10,14 @@ class ScreenStackHeaderSubview(
 ) : FabricEnabledHeaderSubviewViewGroup(context) {
     private var reactWidth = 0
     private var reactHeight = 0
+
+    /**
+     * Semantics: true iff we **believe** that SurfaceMountingManager has measured this view during mount item
+     * execution. We recognize this case by checking measure mode in `onMeasure`. If Androidx
+     * happens to use `EXACTLY` for both dimensions this property might convey invalid information.
+     */
+    private var isReactSizeSet = false
+
     var type = Type.RIGHT
 
     val config: ScreenStackHeaderConfig?
@@ -22,9 +30,10 @@ class ScreenStackHeaderSubview(
         if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY &&
             MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.EXACTLY
         ) {
-            // dimensions provided by react
+            // dimensions provided by react (with high probability)
             reactWidth = MeasureSpec.getSize(widthMeasureSpec)
             reactHeight = MeasureSpec.getSize(heightMeasureSpec)
+            isReactSizeSet = true
             val parent = parent
             if (parent != null) {
                 forceLayout()
@@ -44,7 +53,15 @@ class ScreenStackHeaderSubview(
         if (changed && BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             val width = r - l
             val height = b - t
-            updateSubviewFrameState(width, height, l, t)
+
+            // When setting subviews via `setOptions` from `useEffect` hook in a component, the first
+            // frame received might be computed by native layout & completely invalid (zero height).
+            // RN layout is the source of subview **size** (not origin) & we need to avoid sending
+            // this native size to ST. Doing otherwise might lead to problems.
+            // See: https://github.com/software-mansion/react-native-screens/pull/2812
+            if (isReactSizeSet) {
+                updateSubviewFrameState(width, height, l, t)
+            }
         }
     }
 

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

@@ -61,6 +61,7 @@ class ScreenStackViewManager :
         index: Int,
     ): View = parent.getScreenAt(index)
 
+    // Old architecture only.
     override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
 
     override fun needsCustomLayoutForChildren() = true

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

@@ -126,7 +126,7 @@ open class ScreenViewManager :
             when (presentation) {
                 "push" -> Screen.StackPresentation.PUSH
                 "formSheet" -> Screen.StackPresentation.FORM_SHEET
-                "modal", "containedModal", "fullScreenModal" ->
+                "modal", "containedModal", "fullScreenModal", "pageSheet" ->
                     Screen.StackPresentation.MODAL
                 "transparentModal", "containedTransparentModal" ->
                     Screen.StackPresentation.TRANSPARENT_MODAL

package/android/src/main/java/com/swmansion/rnscreens/bottomsheet/SheetDelegate.kt

@@ -130,10 +130,15 @@ class SheetDelegate(
                         behavior.apply {
                             val height =
                                 if (screen.isSheetFitToContents()) {
-                                    screen.contentWrapper
-                                        .get()
-                                        ?.height
-                                        .takeIf { screen.contentWrapper.get()?.isLaidOut == true }
+                                    screen.contentWrapper.get()?.let { contentWrapper ->
+                                        contentWrapper.height.takeIf {
+                                            // subtree might not be laid out, e.g. after fragment reattachment
+                                            // and view recreation, however since it is retained by
+                                            // react-native it has its height cached. We want to use it.
+                                            // Otherwise we would have to trigger RN layout manually.
+                                            contentWrapper.isLaidOut || contentWrapper.height > 0
+                                        }
+                                    }
                                 } else {
                                     (screen.sheetDetents.first() * containerHeight).toInt()
                                 }

package/android/src/versioned/pointerevents/77/com/swmansion/rnscreens/{ScreensCoordinatorLayoutPointerEventsImpl.kt → PointerEventsBoxNoneImpl.kt}

@@ -3,7 +3,7 @@ package com.swmansion.rnscreens
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
 
-internal class ScreensCoordinatorLayoutPointerEventsImpl : ReactPointerEventsView {
+internal class PointerEventsBoxNoneImpl() : ReactPointerEventsView {
     // We set pointer events to BOX_NONE, because we don't want the ScreensCoordinatorLayout
     // to be target of react gestures and effectively prevent interaction with screens
     // underneath the current screen (useful in `modal` & `formSheet` presentation).

package/android/src/versioned/pointerevents/latest/com/swmansion/rnscreens/{ScreensCoordinatorLayoutPointerEventsImpl.kt → PointerEventsBoxNoneImpl.kt}

@@ -3,7 +3,7 @@ package com.swmansion.rnscreens
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
 
-internal class ScreensCoordinatorLayoutPointerEventsImpl() : ReactPointerEventsView {
+internal class PointerEventsBoxNoneImpl() : ReactPointerEventsView {
     // We set pointer events to BOX_NONE, because we don't want the ScreensCoordinatorLayout
     // to be target of react gestures and effectively prevent interaction with screens
     // underneath the current screen (useful in `modal` & `formSheet` presentation).

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

@@ -7,9 +7,7 @@ extern const char RNSModalScreenComponentName[] = "RNSModalScreen";
 
 Point RNSModalScreenShadowNode::getContentOriginOffset(
     bool /*includeTransform*/) const {
-  auto stateData = getStateData();
-  auto contentOffset = stateData.contentOffset;
-  return {contentOffset.x, contentOffset.y};
+  return getStateData().contentOffset;
 }
 
 } // namespace react

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

@@ -34,17 +34,21 @@ class RNSScreenStackHeaderConfigComponentDescriptor final
         shadowNode.getState());
     auto stateData = state->getData();
 
-    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode.setSize(stateData.frameSize);
 #ifdef ANDROID
+    if (stateData.frameSize.width != 0) {
+      layoutableShadowNode.setSize({stateData.frameSize.width, YGUndefined});
       layoutableShadowNode.setPadding({
           stateData.paddingStart,
           0,
           stateData.paddingEnd,
           0,
       });
-#endif // ANDROID
     }
+#else
+    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
+      layoutableShadowNode.setSize(stateData.frameSize);
+    }
+#endif // ANDROID
 
     ConcreteComponentDescriptor::adopt(shadowNode);
 #if !defined(ANDROID) && !defined(NDEBUG)

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

@@ -32,7 +32,7 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final
 
     auto state = std::static_pointer_cast<
         const RNSScreenStackHeaderSubviewShadowNode::ConcreteState>(
-        shadowNode.getMostRecentState());
+        shadowNode.getState());
     auto stateData = state->getData();
 
     if (!isSizeEmpty(stateData.frameSize)) {

package/cpp/RNSScreenRemovalListener.cpp

@@ -8,9 +8,11 @@ std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
     const TransactionTelemetry &telemetry,
     ShadowViewMutationList mutations) const {
   for (const ShadowViewMutation &mutation : mutations) {
+    // When using RNSModalScreen on Android it should be added here.
     if (mutation.type == ShadowViewMutation::Type::Remove &&
         mutation.oldChildShadowView.componentName != nullptr &&
-        strcmp(mutation.oldChildShadowView.componentName, "RNSScreen") == 0) {
+        std::strcmp(mutation.oldChildShadowView.componentName, "RNSScreen") ==
+            0) {
       // We call the listener function even if this screen has not been owned
       // by RNSScreenStack as since RN 0.78 we do not have enough information
       // here. This final filter is applied later in NativeProxy.

package/ios/RNSConvert.mm

@@ -49,6 +49,8 @@
       return RNSScreenStackPresentationFullScreenModal;
     case FormSheet:
       return RNSScreenStackPresentationFormSheet;
+    case PageSheet:
+      return RNSScreenStackPresentationPageSheet;
     case ContainedModal:
       return RNSScreenStackPresentationContainedModal;
     case TransparentModal:

package/ios/RNSEnums.h

@@ -5,7 +5,8 @@ typedef NS_ENUM(NSInteger, RNSScreenStackPresentation) {
   RNSScreenStackPresentationContainedModal,
   RNSScreenStackPresentationContainedTransparentModal,
   RNSScreenStackPresentationFullScreenModal,
-  RNSScreenStackPresentationFormSheet
+  RNSScreenStackPresentationFormSheet,
+  RNSScreenStackPresentationPageSheet,
 };
 
 typedef NS_ENUM(NSInteger, RNSScreenStackAnimation) {

package/ios/RNSScreen.mm

@@ -246,8 +246,29 @@ RNS_IGNORE_SUPER_CALL_END
       }
 #else
       _controller.modalPresentationStyle = UIModalPresentationFullScreen;
+#endif
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_17_0) && \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_17_0 && !TARGET_OS_TV
+      if (@available(iOS 18.0, *)) {
+        UISheetPresentationController *sheetController = _controller.sheetPresentationController;
+        if (sheetController != nil) {
+          sheetController.prefersPageSizing = true;
+        } else {
+          RCTLogError(
+              @"[RNScreens] sheetPresentationController is null when attempting to set prefersPageSizing for modal");
+        }
+      }
+#endif
+      break;
+
+    case RNSScreenStackPresentationPageSheet:
+#if !TARGET_OS_TV
+      _controller.modalPresentationStyle = UIModalPresentationPageSheet;
+#else
+      _controller.modalPresentationStyle = UIModalPresentationFullScreen;
 #endif
       break;
+
     case RNSScreenStackPresentationFullScreenModal:
       _controller.modalPresentationStyle = UIModalPresentationFullScreen;
       break;
@@ -2024,6 +2045,7 @@ RCT_ENUM_CONVERTER(
       @"modal" : @(RNSScreenStackPresentationModal),
       @"fullScreenModal" : @(RNSScreenStackPresentationFullScreenModal),
       @"formSheet" : @(RNSScreenStackPresentationFormSheet),
+      @"pageSheet" : @(RNSScreenStackPresentationPageSheet),
       @"containedModal" : @(RNSScreenStackPresentationContainedModal),
       @"transparentModal" : @(RNSScreenStackPresentationTransparentModal),
       @"containedTransparentModal" : @(RNSScreenStackPresentationContainedTransparentModal)

package/ios/RNSScreenStack.mm

@@ -78,11 +78,13 @@ namespace react = facebook::react;
     BOOL isNotDismissingModal = screenController.presentedViewController == nil ||
         (screenController.presentedViewController != nil &&
          ![screenController.presentedViewController isBeingDismissed]);
+    BOOL isPresentingSearchController =
+        [screenController.presentedViewController isKindOfClass:UISearchController.class];
 
     // Calculate header height during simple transition from one screen to another.
     // If RNSScreen includes a navigation controller of type RNSNavigationController, it should not calculate
     // header height, as it could have nested stack.
-    if (![screenController hasNestedStack] && isNotDismissingModal) {
+    if (![screenController hasNestedStack] && (isPresentingSearchController || isNotDismissingModal)) {
       [screenController calculateAndNotifyHeaderHeightChangeIsModal:NO];
     }
 

package/ios/RNSScreenStackHeaderConfig.h

@@ -12,7 +12,7 @@
 
 @interface NSString (RNSStringUtil)
 
-+ (BOOL)RNSisBlank:(nullable NSString *)string;
++ (BOOL)rnscreens_isBlankOrNull:(nullable NSString *)string;
 
 @end