react-native-screens 4.0.0-beta.9 → 4.1.0

package/README.md

@@ -106,9 +106,13 @@ Screens are already integrated with the React Native's most popular navigation l
 
 ## Supported react-native version
 
+### Support for Paper
+
+Paper is the default rendering system for React Native versions prior to 0.76.
+
 | library version | react-native version |
 | --------------- | -------------------- |
-| 3.33.0+         | 0.72.0+
+| 3.33.0+         | 0.72.0+              |
 | 3.32.0+         | 0.71.0+              |
 | 3.30.0+         | 0.68.0+              |
 | 3.14.0+         | 0.64.0+              |
@@ -123,6 +127,7 @@ Here's a table with summary of supported `react-native` versions when Fabric is
 
 | library version | react-native version |
 | --------------- | -------------------- |
+| 3.35.0+         | 0.76.0+              |
 | 3.33.0+         | 0.75.0+              |
 | 3.32.0+         | 0.74.0+              |
 | 3.28.0+         | 0.73.0+              |
@@ -133,6 +138,9 @@ Here's a table with summary of supported `react-native` versions when Fabric is
 
 ## Usage with [react-navigation](https://github.com/react-navigation/react-navigation)
 
+> [!CAUTION]
+> JS API of the native stack has been moved from `react-native-screens/native-stack` to `@react-navigation/native-stack` since version v6. Currently, native stack v5 (imported from `react-native-screens/native-stack`) is deprecated and will be removed in the upcoming **minor** release. `react-native-screens` v4 will support only `@react-navigation/native-stack` v7.
+
 Screens support is built into [react-navigation](https://github.com/react-navigation/react-navigation) starting from version [2.14.0](https://github.com/react-navigation/react-navigation/releases/tag/2.14.0) for all the different navigator types (stack, tab, drawer, etc).
 
 To configure react-navigation to use screens instead of plain RN Views for rendering screen views, simply add this library as a dependency to your project:
@@ -184,7 +192,6 @@ You can also disable the usage of native screens per navigator with [`detachInac
 To take advantage of the native stack navigator primitive for React Navigation that leverages `UINavigationController` on iOS and `Fragment` on Android, please refer:
 
 - for React Navigation >= v6 to the [Native Stack Navigator part of React Navigation documentation](https://reactnavigation.org/docs/native-stack-navigator)
-- for React Navigation v5 to the [README in react-native-screens/native-stack](https://github.com/software-mansion/react-native-screens/tree/main/native-stack)
 
 ## `FullWindowOverlay`
 

package/android/CMakeLists.txt

@@ -41,28 +41,37 @@ find_package(ReactAndroid REQUIRED CONFIG)
 if(${RNS_NEW_ARCH_ENABLED})
     find_package(fbjni REQUIRED CONFIG)
     
-    target_link_libraries(
-        rnscreens
+    if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+        target_link_libraries(rnscreens
+            ReactAndroid::reactnative
             ReactAndroid::jsi
-            ReactAndroid::react_nativemodule_core
-            ReactAndroid::react_utils
-            ReactAndroid::reactnativejni
-            ReactAndroid::fabricjni
-            ReactAndroid::react_debug
-            ReactAndroid::react_render_core
-            ReactAndroid::runtimeexecutor
-            ReactAndroid::react_render_graphics
-            ReactAndroid::rrc_view
-            ReactAndroid::yoga
-            ReactAndroid::rrc_text
-            ReactAndroid::glog
-            ReactAndroid::react_render_componentregistry
-            ReactAndroid::react_render_consistency
-            ReactAndroid::react_performance_timeline
-            ReactAndroid::react_render_observers_events
             fbjni::fbjni
             android
-    )
+        )
+    else()
+        target_link_libraries(
+            rnscreens
+                ReactAndroid::jsi
+                ReactAndroid::react_nativemodule_core
+                ReactAndroid::react_utils
+                ReactAndroid::reactnativejni
+                ReactAndroid::fabricjni
+                ReactAndroid::react_debug
+                ReactAndroid::react_render_core
+                ReactAndroid::runtimeexecutor
+                ReactAndroid::react_render_graphics
+                ReactAndroid::rrc_view
+                ReactAndroid::yoga
+                ReactAndroid::rrc_text
+                ReactAndroid::glog
+                ReactAndroid::react_render_componentregistry
+                ReactAndroid::react_render_consistency
+                ReactAndroid::react_performance_timeline
+                ReactAndroid::react_render_observers_events
+                fbjni::fbjni
+                android
+        )
+    endif()
 else()
     target_link_libraries(rnscreens
         ReactAndroid::jsi

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/CustomToolbar.kt

@@ -3,9 +3,11 @@ package com.swmansion.rnscreens
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
+import android.view.WindowManager
 import androidx.appcompat.widget.Toolbar
 import com.facebook.react.modules.core.ChoreographerCompat
 import com.facebook.react.modules.core.ReactChoreographer
+import com.facebook.react.uimanager.ThemedReactContext
 
 // This class is used to store config closer to search bar
 @SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
@@ -18,9 +20,11 @@ open class CustomToolbar(
         object : ChoreographerCompat.FrameCallback() {
             override fun doFrame(frameTimeNanos: Long) {
                 isLayoutEnqueued = false
+                // The following measure specs are selected to work only with Android APIs <= 29.
+                // See https://github.com/software-mansion/react-native-screens/pull/2439
                 measure(
-                    MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST),
+                    MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST),
                 )
                 layout(left, top, right, bottom)
             }
@@ -28,7 +32,13 @@ open class CustomToolbar(
 
     override fun requestLayout() {
         super.requestLayout()
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+        val softInputMode =
+            (context as ThemedReactContext)
+                .currentActivity
+                ?.window
+                ?.attributes
+                ?.softInputMode
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q && softInputMode == WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN) {
             // Below Android API 29, layout is not being requested when subviews are being added to the layout,
             // leading to having their subviews in position 0,0 of the toolbar (as Android don't calculate
             // the position of each subview, even if Yoga has correctly set their width and height).

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

@@ -0,0 +1,12 @@
+package com.swmansion.rnscreens
+
+interface NativeDismissalObserver {
+    /**
+     * Observed object should call this observer method when it has been natively dismissed,
+     * e.g. in the result of user gesture or other interaction.
+     *
+     * Prominent usage is for the screen with sheet presentation to notify its wrapper that
+     * it has been hidden and requires dismissal.
+     */
+    fun onNativeDismiss(dismissed: ScreenStackFragmentWrapper)
+}

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

@@ -27,6 +27,7 @@ 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.
 class Screen(
@@ -36,6 +37,8 @@ class Screen(
     val fragment: Fragment?
         get() = fragmentWrapper?.fragment
 
+    var contentWrapper = WeakReference<ScreenContentWrapper>(null)
+
     val sheetBehavior: BottomSheetBehavior<Screen>?
         get() = (layoutParams as? CoordinatorLayout.LayoutParams)?.behavior as? BottomSheetBehavior<Screen>
 
@@ -128,6 +131,7 @@ class Screen(
 
     fun registerLayoutCallbackForWrapper(wrapper: ScreenContentWrapper) {
         wrapper.delegate = this
+        this.contentWrapper = WeakReference(wrapper)
     }
 
     override fun dispatchSaveInstanceState(container: SparseArray<Parcelable>) {

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

@@ -24,7 +24,6 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.WindowInsetsCompat
-import androidx.fragment.app.commit
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
@@ -35,8 +34,12 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCa
 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.DimmingFragment
 import com.swmansion.rnscreens.bottomsheet.SheetUtils
+import com.swmansion.rnscreens.bottomsheet.isSheetFitToContents
+import com.swmansion.rnscreens.bottomsheet.useSingleDetent
+import com.swmansion.rnscreens.bottomsheet.useThreeDetents
+import com.swmansion.rnscreens.bottomsheet.useTwoDetents
+import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
 import com.swmansion.rnscreens.ext.recycle
 import com.swmansion.rnscreens.utils.DeviceUtils
 
@@ -53,6 +56,7 @@ class KeyboardVisible(
 class ScreenStackFragment :
     ScreenFragment,
     ScreenStackFragmentWrapper {
+    public var nativeDismissalObserver: NativeDismissalObserver? = null
     private var appBarLayout: AppBarLayout? = null
     private var toolbar: Toolbar? = null
     private var isToolbarShadowHidden = false
@@ -154,25 +158,25 @@ class ScreenStackFragment :
             ) {
                 if (SheetUtils.isStateStable(newState)) {
                     lastStableState = newState
-                    screen.notifySheetDetentChange(SheetUtils.detentIndexFromSheetState(lastStableState, screen.sheetDetents.count()), true)
+                    screen.notifySheetDetentChange(
+                        SheetUtils.detentIndexFromSheetState(
+                            lastStableState,
+                            screen.sheetDetents.count(),
+                        ),
+                        true,
+                    )
                 } else if (newState == BottomSheetBehavior.STATE_DRAGGING) {
                     screen.notifySheetDetentChange(
-                        SheetUtils.detentIndexFromSheetState(lastStableState, screen.sheetDetents.count()),
+                        SheetUtils.detentIndexFromSheetState(
+                            lastStableState,
+                            screen.sheetDetents.count(),
+                        ),
                         false,
                     )
                 }
 
                 if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-                    // If we are wrapped in DimmingFragment we want it to be removed alongside
-                    // => we use its fragment manager. Otherwise we just remove this fragment.
-                    if (this@ScreenStackFragment.parentFragment is DimmingFragment) {
-                        parentFragmentManager.commit {
-                            setReorderingAllowed(true)
-                            remove(this@ScreenStackFragment)
-                        }
-                    } else {
-                        this@ScreenStackFragment.dismissFromContainer()
-                    }
+                    nativeDismissalObserver?.onNativeDismiss(this@ScreenStackFragment)
                 }
             }
 
@@ -215,7 +219,7 @@ class ScreenStackFragment :
                     LinearLayout.LayoutParams.MATCH_PARENT,
                 ).apply {
                     behavior =
-                        if (screen.stackPresentation == Screen.StackPresentation.FORM_SHEET) {
+                        if (screen.usesFormSheetPresentation()) {
                             createAndConfigureBottomSheetBehaviour()
                         } else if (isToolbarTranslucent) {
                             null
@@ -224,7 +228,7 @@ class ScreenStackFragment :
                         }
                 }
 
-        if (screen.stackPresentation == Screen.StackPresentation.FORM_SHEET) {
+        if (screen.usesFormSheetPresentation()) {
             screen.clipToOutline = true
             // TODO(@kkafar): without this line there is no drawable / outline & nothing shows...? Determine what's going on here
             attachShapeToScreen(screen)
@@ -233,7 +237,7 @@ class ScreenStackFragment :
 
         coordinatorLayout.addView(screen.recycle())
 
-        if (screen.stackPresentation != Screen.StackPresentation.FORM_SHEET) {
+        if (!screen.usesFormSheetPresentation()) {
             appBarLayout =
                 context?.let { AppBarLayout(it) }?.apply {
                     // By default AppBarLayout will have a background color set but since we cover the whole layout
@@ -342,39 +346,37 @@ class ScreenStackFragment :
                 when (screen.sheetDetents.count()) {
                     1 ->
                         behavior.apply {
-                            state = BottomSheetBehavior.STATE_EXPANDED
-                            skipCollapsed = true
-                            isFitToContents = true
-                            maxHeight = (screen.sheetDetents.first() * containerHeight).toInt()
+                            val height =
+                                if (screen.isSheetFitToContents()) {
+                                    screen.contentWrapper.get()?.height
+                                } else {
+                                    (screen.sheetDetents.first() * containerHeight).toInt()
+                                }
+                            useSingleDetent(height = height)
                         }
 
                     2 ->
-                        behavior.apply {
+                        behavior.useTwoDetents(
                             state =
                                 SheetUtils.sheetStateFromDetentIndex(
                                     screen.sheetInitialDetentIndex,
                                     screen.sheetDetents.count(),
-                                )
-                            skipCollapsed = false
-                            isFitToContents = true
-                            peekHeight = (screen.sheetDetents[0] * containerHeight).toInt()
-                            maxHeight = (screen.sheetDetents[1] * containerHeight).toInt()
-                        }
+                                ),
+                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
+                            secondHeight = (screen.sheetDetents[1] * containerHeight).toInt(),
+                        )
 
                     3 ->
-                        behavior.apply {
+                        behavior.useThreeDetents(
                             state =
                                 SheetUtils.sheetStateFromDetentIndex(
                                     screen.sheetInitialDetentIndex,
                                     screen.sheetDetents.count(),
-                                )
-                            skipCollapsed = false
-                            isFitToContents = false
-                            peekHeight = (screen.sheetDetents[0] * containerHeight).toInt()
-                            expandedOffset = ((1 - screen.sheetDetents[2]) * containerHeight).toInt()
-                            halfExpandedRatio =
-                                (screen.sheetDetents[1] / screen.sheetDetents[2]).toFloat()
-                        }
+                                ),
+                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
+                            halfExpandedRatio = (screen.sheetDetents[1] / screen.sheetDetents[2]).toFloat(),
+                            expandedOffsetFromTop = ((1 - screen.sheetDetents[2]) * containerHeight).toInt(),
+                        )
 
                     else -> throw IllegalStateException(
                         "[RNScreens] Invalid detent count ${screen.sheetDetents.count()}. Expected at most 3.",
@@ -392,27 +394,24 @@ class ScreenStackFragment :
                 when (screen.sheetDetents.count()) {
                     1 ->
                         behavior.apply {
-                            state = BottomSheetBehavior.STATE_EXPANDED
-                            skipCollapsed = true
-                            isFitToContents = true
-                            maxHeight = newMaxHeight
+                            useSingleDetent(height = newMaxHeight)
                             addBottomSheetCallback(keyboardSheetCallback)
                         }
 
                     2 ->
                         behavior.apply {
-                            state = BottomSheetBehavior.STATE_EXPANDED
-                            skipCollapsed = false
-                            isFitToContents = true
-                            maxHeight = newMaxHeight
+                            useTwoDetents(
+                                state = BottomSheetBehavior.STATE_EXPANDED,
+                                secondHeight = newMaxHeight,
+                            )
                             addBottomSheetCallback(keyboardSheetCallback)
                         }
 
                     3 ->
                         behavior.apply {
-                            state = BottomSheetBehavior.STATE_EXPANDED
-                            skipCollapsed = false
-                            isFitToContents = false
+                            useThreeDetents(
+                                state = BottomSheetBehavior.STATE_EXPANDED,
+                            )
                             maxHeight = newMaxHeight
                             addBottomSheetCallback(keyboardSheetCallback)
                         }
@@ -431,29 +430,23 @@ class ScreenStackFragment :
                 behavior.removeBottomSheetCallback(keyboardSheetCallback)
                 when (screen.sheetDetents.count()) {
                     1 ->
-                        behavior.apply {
-                            skipCollapsed = true
-                            isFitToContents = true
-                            maxHeight = (screen.sheetDetents.first() * containerHeight).toInt()
-                        }
+                        behavior.useSingleDetent(
+                            height = (screen.sheetDetents.first() * containerHeight).toInt(),
+                            forceExpandedState = false,
+                        )
 
                     2 ->
-                        behavior.apply {
-                            skipCollapsed = false
-                            isFitToContents = true
-                            peekHeight = (screen.sheetDetents[0] * containerHeight).toInt()
-                            maxHeight = (screen.sheetDetents[1] * containerHeight).toInt()
-                        }
+                        behavior.useTwoDetents(
+                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
+                            secondHeight = (screen.sheetDetents[1] * containerHeight).toInt(),
+                        )
 
                     3 ->
-                        behavior.apply {
-                            skipCollapsed = false
-                            isFitToContents = false
-                            peekHeight = (screen.sheetDetents[0] * containerHeight).toInt()
-                            expandedOffset = ((1 - screen.sheetDetents[2]) * containerHeight).toInt()
-                            halfExpandedRatio =
-                                (screen.sheetDetents[1] / screen.sheetDetents[2]).toFloat()
-                        }
+                        behavior.useThreeDetents(
+                            firstHeight = (screen.sheetDetents[0] * containerHeight).toInt(),
+                            halfExpandedRatio = (screen.sheetDetents[1] / screen.sheetDetents[2]).toFloat(),
+                            expandedOffsetFromTop = ((1 - screen.sheetDetents[2]) * containerHeight).toInt(),
+                        )
 
                     else -> throw IllegalStateException(
                         "[RNScreens] Invalid detent count ${screen.sheetDetents.count()}. Expected at most 3.",
@@ -478,7 +471,10 @@ class ScreenStackFragment :
                     setTopRightCorner(CornerFamily.ROUNDED, cornerSize)
                 }.build()
         val shape = MaterialShapeDrawable(shapeAppearanceModel)
-        shape.setTint((screen.background as? ColorDrawable?)?.color ?: Color.TRANSPARENT)
+        val currentColor =
+            (screen.background as? ColorDrawable?)?.color
+                ?: (screen.background as? MaterialShapeDrawable?)?.tintList?.defaultColor
+        shape.setTint(currentColor ?: Color.TRANSPARENT)
         screen.background = shape
     }
 

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

@@ -0,0 +1,42 @@
+package com.swmansion.rnscreens.bottomsheet
+
+import android.view.View
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+
+internal fun <T : View> BottomSheetBehavior<T>.useSingleDetent(height: Int? = null, forceExpandedState: Boolean = true): BottomSheetBehavior<T> {
+    this.skipCollapsed = true
+    this.isFitToContents = true
+    if (forceExpandedState) {
+        this.state = BottomSheetBehavior.STATE_EXPANDED
+    }
+    height?.let { maxHeight = height }
+    return this
+}
+
+internal fun <T : View> BottomSheetBehavior<T>.useTwoDetents(
+    @BottomSheetBehavior.StableState state: Int? = null,
+    firstHeight: Int? = null,
+    secondHeight: Int? = null
+): BottomSheetBehavior<T> {
+    skipCollapsed = false
+    isFitToContents = true
+    state?.let { this.state = state }
+    firstHeight?.let { peekHeight = firstHeight }
+    secondHeight?.let { maxHeight = secondHeight }
+    return this
+}
+
+internal fun <T : View> BottomSheetBehavior<T>.useThreeDetents(
+    @BottomSheetBehavior.StableState state: Int? = null,
+    firstHeight: Int? = null,
+    halfExpandedRatio: Float? = null,
+    expandedOffsetFromTop: Int? = null
+): BottomSheetBehavior<T> {
+    skipCollapsed = false
+    isFitToContents = false
+    state?.let { this.state = state }
+    firstHeight?.let { this.peekHeight = firstHeight }
+    halfExpandedRatio?.let { this.halfExpandedRatio = halfExpandedRatio }
+    expandedOffsetFromTop?.let { this.expandedOffset = expandedOffsetFromTop }
+    return this
+}

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

@@ -27,6 +27,7 @@ import com.swmansion.rnscreens.KeyboardDidHide
 import com.swmansion.rnscreens.KeyboardNotVisible
 import com.swmansion.rnscreens.KeyboardState
 import com.swmansion.rnscreens.KeyboardVisible
+import com.swmansion.rnscreens.NativeDismissalObserver
 import com.swmansion.rnscreens.R
 import com.swmansion.rnscreens.Screen
 import com.swmansion.rnscreens.ScreenContainer
@@ -48,7 +49,8 @@ class DimmingFragment(
     LifecycleEventObserver,
     ScreenStackFragmentWrapper,
     Animation.AnimationListener,
-    OnApplyWindowInsetsListener {
+    OnApplyWindowInsetsListener,
+    NativeDismissalObserver {
     private lateinit var dimmingView: DimmingView
     private lateinit var containerView: GestureTransparentViewGroup
 
@@ -65,8 +67,15 @@ class DimmingFragment(
     private val insetsProxy = InsetsObserverProxy
 
     init {
-        // We register for our child lifecycle as we want to know when it's dismissed via native gesture
-        nestedFragment.fragment.lifecycle.addObserver(this)
+        assert(
+            nestedFragment.fragment is ScreenStackFragment,
+        ) { "[RNScreens] Dimming fragment is intended for use only with ScreenStackFragment" }
+        val fragment = nestedFragment.fragment as ScreenStackFragment
+
+        // We register for our child lifecycle as we want to know when it starts, because bottom sheet
+        // behavior is attached only then & we want to attach our own callbacks to it.
+        fragment.lifecycle.addObserver(this)
+        fragment.nativeDismissalObserver = this
     }
 
     /**
@@ -111,8 +120,8 @@ class DimmingFragment(
                     computeOffsetFromDetentIndex(
                         (screen.sheetLargestUndimmedDetentIndex + 1).coerceIn(
                             0,
-                            screen.sheetDetents.count() - 1
-                        )
+                            screen.sheetDetents.count() - 1,
+                        ),
                     )
                 assert(firstDimmedOffset >= largestUndimmedOffset) {
                     "[RNScreens] Invariant violation: firstDimmedOffset ($firstDimmedOffset) < largestDimmedOffset ($largestUndimmedOffset)"
@@ -173,7 +182,7 @@ class DimmingFragment(
         // We want dimming view to have always fade animation in current usages.
         AnimationUtils.loadAnimation(
             context,
-            if (enter) R.anim.rns_fade_in else R.anim.rns_fade_out
+            if (enter) R.anim.rns_fade_in else R.anim.rns_fade_out,
         )
 
     override fun onCreateView(
@@ -226,10 +235,6 @@ class DimmingFragment(
                 }
             }
 
-            Lifecycle.Event.ON_STOP -> {
-                dismissSelf(emitDismissedEvent = true)
-            }
-
             else -> {}
         }
     }
@@ -350,13 +355,9 @@ class DimmingFragment(
         nestedFragment.onViewAnimationEnd()
     }
 
-    override fun tryGetActivity(): Activity? {
-        return activity
-    }
+    override fun tryGetActivity(): Activity? = activity
 
-    override fun tryGetContext(): ReactContext? {
-        return context as? ReactContext?
-    }
+    override fun tryGetContext(): ReactContext? = context as? ReactContext?
 
     override val fragment: Fragment
         get() = this
@@ -417,7 +418,7 @@ class DimmingFragment(
             screen.sheetBehavior?.let {
                 (nestedFragment as ScreenStackFragment).configureBottomSheetBehaviour(
                     it,
-                    KeyboardVisible(imeInset.bottom)
+                    KeyboardVisible(imeInset.bottom),
                 )
             }
 
@@ -457,12 +458,12 @@ class DimmingFragment(
                 if (isKeyboardVisible) {
                     (nestedFragment as ScreenStackFragment).configureBottomSheetBehaviour(
                         it,
-                        KeyboardDidHide
+                        KeyboardDidHide,
                     )
                 } else if (keyboardState != KeyboardNotVisible) {
                     (nestedFragment as ScreenStackFragment).configureBottomSheetBehaviour(
                         it,
-                        KeyboardNotVisible
+                        KeyboardNotVisible,
                     )
                 } else {
                 }
@@ -485,4 +486,8 @@ class DimmingFragment(
                 ).build()
         }
     }
+
+    override fun onNativeDismiss(dismissed: ScreenStackFragmentWrapper) {
+        dismissSelf(emitDismissedEvent = true)
+    }
 }

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

@@ -5,6 +5,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPS
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
+import com.swmansion.rnscreens.Screen
 
 object SheetUtils {
     /**
@@ -125,3 +126,10 @@ object SheetUtils {
         return false
     }
 }
+
+fun Screen.isSheetFitToContents(): Boolean =
+    stackPresentation === Screen.StackPresentation.FORM_SHEET &&
+            sheetDetents.count() == 1 &&
+            sheetDetents.first() == Screen.SHEET_FIT_TO_CONTENTS
+
+fun Screen.usesFormSheetPresentation(): Boolean = stackPresentation === Screen.StackPresentation.FORM_SHEET

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

@@ -40,10 +40,17 @@ internal fun View.isInsideScrollViewWithRemoveClippedSubviews(): Boolean {
     }
     var parentView = this.parent
     while (parentView is ViewGroup && parentView !is ScreenStack) {
-        if (parentView is ReactScrollView) {
-            return parentView.removeClippedSubviews
+        when (parentView) {
+            is ReactHorizontalScrollView -> {
+                return parentView.removeClippedSubviews
+            }
+            is ReactScrollView -> {
+                return parentView.removeClippedSubviews
+            }
+            else -> {
+                parentView = parentView.parent
+            }
         }
-        parentView = parentView.parent
     }
     return false
 }