react-native-screens 5.0.0-alpha.2 → 5.0.0-alpha.3

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/coordinator/FormSheetDimensionsCoordinator.kt

@@ -4,63 +4,56 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.doOnLayout
-import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetAvailableHeightProvider
 import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetContainer
+import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialog
 import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
 import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetDetents
 
 internal class FormSheetDimensionsCoordinator(
-    private val dialog: BottomSheetDialog,
+    private val dialog: FormSheetDialog,
     private val container: FormSheetContainer,
-    private val bottomSheetView: FrameLayout?,
     private val behaviorController: FormSheetBehaviorController?,
-) : FormSheetContentSizeChangeDelegate {
+) : FormSheetContentSizeChangeDelegate,
+    FormSheetAvailableHeightProvider.OnAvailableHeightMeasuredListener {
     private var lastTopInset = 0
     private var lastBottomInset = 0
+    private var lastImeInset = 0
     private var currentDetents: FormSheetDetents? = null
     private var currentInitialDetentIndex: Int = 0
     private var shouldApplyInitialDetent: Boolean = false
 
     private var currentContentHeight: Int = 0
 
+    // Height the metrics were last resolved against. Any other value reported by the measure pass
+    // means the window has been resized and metrics have to be recomputed.
+    private var resolvedAvailableSpace: Int = 0
+    private var isGeometryDirty: Boolean = false
+
     internal fun setup() {
+        dialog.availableHeightProvider.availableHeightListener = this
         setupWindowInsetsListener()
-
-        bottomSheetView?.let { view ->
-            disableMaterialInsetsAnimationCallback(view)
-        }
     }
 
     private fun setupWindowInsetsListener() {
         ViewCompat.setOnApplyWindowInsetsListener(container) { _, insets ->
-            lastTopInset = getTopInset(insets)
-            lastBottomInset = getBottomInset(insets)
-            updateNativeContainerHeight()
+            val topInset = getTopInset(insets)
+            val bottomInset = getBottomInset(insets)
+            val imeInset = getImeInset(insets)
+            if (topInset != lastTopInset || bottomInset != lastBottomInset || imeInset != lastImeInset) {
+                lastTopInset = topInset
+                lastBottomInset = bottomInset
+                lastImeInset = imeInset
+                invalidateGeometry()
+            }
             insets
         }
     }
 
-    /**
-     * BottomSheetBehavior registers an internal `WindowInsetsAnimationCallback` on the
-     * sheet view during its first `onLayoutChild`. That callback drives `translationY` to follow
-     * animated inset changes, what interferes with our slide-in custom animation.
-     *
-     * We manage insets ourselves by setting a fixed height for FormSheetContainer, so we can
-     * clear the Material's callback to remove the conflict entirely.
-     *
-     * This method must run after the first layout pass.
-     */
-    private fun disableMaterialInsetsAnimationCallback(view: FrameLayout) {
-        view.doOnLayout {
-            ViewCompat.setWindowInsetsAnimationCallback(it, null)
-        }
-    }
-
     override fun onContentHeightChanged(newHeight: Int) {
         if (currentContentHeight != newHeight) {
             currentContentHeight = newHeight
-            updateNativeContainerHeight()
+            invalidateGeometry()
         }
     }
 
@@ -72,7 +65,25 @@ internal class FormSheetDimensionsCoordinator(
         currentDetents = detents
         currentInitialDetentIndex = initialDetentIndex
         shouldApplyInitialDetent = applyInitialDetent
-        updateNativeContainerHeight()
+        invalidateGeometry()
+    }
+
+    // Schedules a measure pass; the metrics are resolved from there. The provider is a sibling of the sheet
+    // subtree, not an ancestor, so it has to be asked for a re-measure explicitly. No-op while the dialog
+    // is not shown - the first traversal after `show()` measures everything anyway.
+    private fun invalidateGeometry() {
+        isGeometryDirty = true
+        dialog.availableHeightProvider.requestLayout()
+        container.requestLayout()
+    }
+
+    override fun onAvailableHeightMeasured(height: Int) {
+        if (!isGeometryDirty && height == resolvedAvailableSpace) {
+            return
+        }
+        isGeometryDirty = false
+        resolvedAvailableSpace = height
+        resolveGeometry(height)
     }
 
     /**
@@ -81,20 +92,18 @@ internal class FormSheetDimensionsCoordinator(
      * status bar or display cutout. This causes Yoga to recalculate the layout, resulting in UI flickering
      * during the drag gesture. By calculating and enforcing a static height that explicitly subtracts
      * the system insets, we completely bypass these redundant layout passes.
+     *
+     * Runs inside the measure pass of `FormSheetAvailableHeightProvider`, i.e. before Material's container, the sheet and
+     * our container are measured, so the values applied here are picked up by the very same traversal.
      */
-    private fun updateNativeContainerHeight() {
-        val dialogDecorHeight = dialog.window?.decorView?.height ?: 0
-
-        if (dialogDecorHeight <= 0) {
-            return
-        }
-
+    private fun resolveGeometry(sheetAvailableSpace: Int) {
         currentDetents?.let { detents ->
             behaviorController?.updateSheetBehavior(
                 detents = detents,
-                sheetAvailableSpace = dialogDecorHeight,
+                sheetAvailableSpace = sheetAvailableSpace,
                 contentHeightForFitToContents = currentContentHeight,
                 nativeContainerPaddingBottom = lastBottomInset,
+                keyboardLift = keyboardLift,
                 initialDetentIndex = currentInitialDetentIndex,
                 applyInitialDetent = shouldApplyInitialDetent,
             )
@@ -102,8 +111,13 @@ internal class FormSheetDimensionsCoordinator(
         }
 
         val sheetContainerHeight =
-            currentDetents?.sheetContainerHeight(dialogDecorHeight, lastTopInset, lastBottomInset, currentContentHeight)
-                ?: (dialogDecorHeight - lastTopInset - lastBottomInset).coerceAtLeast(0)
+            currentDetents?.sheetContainerHeight(
+                sheetAvailableSpace,
+                lastTopInset,
+                lastBottomInset,
+                currentContentHeight,
+                keyboardLift,
+            ) ?: (sheetAvailableSpace - lastTopInset - lastBottomInset - keyboardLift).coerceAtLeast(0)
 
         val layoutParams =
             container.layoutParams
@@ -116,6 +130,16 @@ internal class FormSheetDimensionsCoordinator(
         }
     }
 
+    /**
+     * The part of the keyboard inset that sticks out above the bottom system inset. Material pads the sheet by
+     * the larger of the two, so this is exactly how much the sheet has to be extended to keep its detent-sized
+     * part above the keyboard.
+     */
+    private val keyboardLift: Int
+        get() = (lastImeInset - lastBottomInset).coerceAtLeast(0)
+
+    private fun getImeInset(insetsCompat: WindowInsetsCompat): Int = insetsCompat.getInsets(WindowInsetsCompat.Type.ime()).bottom
+
     private fun getTopInset(insetsCompat: WindowInsetsCompat): Int =
         insetsCompat
             .getInsets(
@@ -129,6 +153,7 @@ internal class FormSheetDimensionsCoordinator(
             ).bottom
 
     internal fun destroy() {
+        dialog.availableHeightProvider.availableHeightListener = null
         ViewCompat.setOnApplyWindowInsetsListener(container, null)
     }
 }

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/coordinator/FormSheetKeyboardCoordinator.kt

@@ -0,0 +1,101 @@
+package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+
+import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsAnimationCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.doOnLayout
+
+internal class FormSheetKeyboardCoordinator(
+    private val bottomSheetView: FrameLayout,
+) {
+    /**
+     * Whether the sheet should track the keyboard animation. Kept `false` while an enter / exit
+     * transition owns `translationY`. Tracking the keyboard (`true`) should be allowed only when
+     * the sheet is in PRESENTED state.
+     */
+    internal var isTrackingEnabled: Boolean = false
+
+    private val insetsAnimationCallback = KeyboardInsetsAnimationCallback()
+
+    internal fun setup() {
+        // BottomSheetBehavior registers an internal `WindowInsetsAnimationCallback` on the
+        // sheet view during its first `onLayoutChild`. That callback drives `translationY` to track
+        // animated inset changes, what interferes with our slide-in custom animation.
+        //
+        // We manage insets ourselves by setting a fixed height for FormSheetContainer, so we can
+        // clear the Material's callback to remove the conflict entirely.
+        //
+        // This method must run after the first layout pass.
+        bottomSheetView.doOnLayout {
+            ViewCompat.setWindowInsetsAnimationCallback(it, insetsAnimationCallback)
+        }
+    }
+
+    internal fun destroy() {
+        ViewCompat.setWindowInsetsAnimationCallback(bottomSheetView, null)
+    }
+
+    private inner class KeyboardInsetsAnimationCallback : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_STOP) {
+        private var startTop = 0
+        private var startTranslationY = 0f
+
+        // Decided once per keyboard animation, in `onPrepare`. Tracking can't be picked up mid-animation
+        // because of no start position to translate from.
+        private var isTracking = false
+
+        private val isActive: Boolean
+            get() = isTracking && isTrackingEnabled
+
+        override fun onPrepare(animation: WindowInsetsAnimationCompat) {
+            if (!animation.isKeyboardAnimation() || !isTrackingEnabled) {
+                return
+            }
+
+            // Saving sheet's position before applying keyboard insets.
+            startTop = bottomSheetView.top
+            isTracking = true
+        }
+
+        override fun onStart(
+            animation: WindowInsetsAnimationCompat,
+            bounds: WindowInsetsAnimationCompat.BoundsCompat,
+        ): WindowInsetsAnimationCompat.BoundsCompat {
+            if (!animation.isKeyboardAnimation() || !isActive) {
+                return bounds
+            }
+
+            // The end sheet position is known - move the sheet and let the animation progress
+            // bring it to the new position.
+            startTranslationY = (startTop - bottomSheetView.top).toFloat()
+            bottomSheetView.translationY = startTranslationY
+            return bounds
+        }
+
+        override fun onProgress(
+            insets: WindowInsetsCompat,
+            runningAnimations: List<WindowInsetsAnimationCompat>,
+        ): WindowInsetsCompat {
+            if (!isActive) {
+                return insets
+            }
+
+            val keyboardAnimation = runningAnimations.firstOrNull { it.isKeyboardAnimation() } ?: return insets
+            bottomSheetView.translationY = startTranslationY * (1f - keyboardAnimation.interpolatedFraction)
+            return insets
+        }
+
+        override fun onEnd(animation: WindowInsetsAnimationCompat) {
+            if (!animation.isKeyboardAnimation()) {
+                return
+            }
+
+            if (isActive) {
+                bottomSheetView.translationY = 0f
+            }
+            isTracking = false
+        }
+
+        private fun WindowInsetsAnimationCompat.isKeyboardAnimation(): Boolean = typeMask and WindowInsetsCompat.Type.ime() != 0
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/coordinator/FormSheetNativeDismissCoordinator.kt

@@ -1,13 +1,11 @@
 package com.swmansion.rnscreens.modals.formsheet.native.coordinator
 
 import androidx.activity.OnBackPressedCallback
-import com.swmansion.rnscreens.modals.dimmingview.DimmingViewManager
 import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialog
 
 internal class FormSheetNativeDismissCoordinator(
     private val dialog: FormSheetDialog,
     private val behaviorController: FormSheetBehaviorController?,
-    private val dimmingManager: DimmingViewManager,
     private val onDismissAllowed: () -> Unit,
     private val onDismissPrevented: () -> Unit,
 ) : FormSheetDialog.CancelRequestInterceptor {
@@ -27,15 +25,11 @@ internal class FormSheetNativeDismissCoordinator(
     internal fun setup() {
         dialog.cancelRequestInterceptor = this
         dialog.onBackPressedDispatcher.addCallback(preventNativeDismissBackPressCallback)
-        // Backdrop taps go through `cancel()` rather than dismissing directly, so that they are
-        // subject to the very same interception as the back press and the swipe down.
-        dimmingManager.setOnBackdropClickListener { dialog.cancel() }
     }
 
     internal fun destroy() {
         dialog.cancelRequestInterceptor = null
         preventNativeDismissBackPressCallback.remove()
-        dimmingManager.setOnBackdropClickListener(null)
     }
 
     override fun handleCancelRequest() {

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/core/FormSheetAvailableHeightProvider.kt

@@ -0,0 +1,44 @@
+package com.swmansion.rnscreens.modals.formsheet.native.core
+
+import android.content.Context
+import android.view.View
+
+/**
+ * View installed as the first child of the window's `android.R.id.content`, as a sibling
+ * of Material's dialog `container` - nothing in Material's hierarchy is moved.
+ *
+ * Every metric we hand to `BottomSheetBehavior` and the height of [FormSheetContainer] is derived from
+ * the height the sheet is measured against. The measure pass is the only point where that height is known
+ * *before* the sheet gets measured. `FrameLayout` measures its children in index order, so the provider reports
+ * the height right before Material's `container`, the coordinator and the sheet are measured in the same
+ * traversal, keeping those values in sync with window resizes, e.g. orientation change.
+ */
+internal class FormSheetAvailableHeightProvider(
+    context: Context,
+) : View(context) {
+    internal fun interface OnAvailableHeightMeasuredListener {
+        /**
+         * Invoked at the beginning of every measure pass with the height the sheet is about
+         * to be measured against.
+         */
+        fun onAvailableHeightMeasured(height: Int)
+    }
+
+    internal var availableHeightListener: OnAvailableHeightMeasuredListener? = null
+
+    init {
+        visibility = INVISIBLE
+        importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
+    }
+
+    override fun onMeasure(
+        widthMeasureSpec: Int,
+        heightMeasureSpec: Int,
+    ) {
+        val height = MeasureSpec.getSize(heightMeasureSpec)
+        if (MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.UNSPECIFIED && height > 0) {
+            availableHeightListener?.onAvailableHeightMeasured(height)
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/core/FormSheetDialog.kt

@@ -2,6 +2,7 @@ package com.swmansion.rnscreens.modals.formsheet.native.core
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
@@ -14,8 +15,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
  * A custom BottomSheetDialog override used to render the FormSheet native component.
  *
  * We enforce edge-to-edge rendering, bypassing standard Material checks.
- * This enforcement is required because our custom dimming view must span the entire screen.
- * The FormSheetContainer is sized manually against the system insets.
+ * This is required because our custom dimming logic needs the Dialog to span
+ * the entire screen. The FormSheetContainer is sized manually against the system insets.
  */
 internal class FormSheetDialog(
     context: Context,
@@ -33,6 +34,12 @@ internal class FormSheetDialog(
 
     internal var cancelRequestInterceptor: CancelRequestInterceptor? = null
 
+    /**
+     * Installed next to Material's content once the dialog is created. Reports the height the sheet
+     * is measured against so the sheet metrics can be resolved before the sheet itself is measured.
+     */
+    internal val availableHeightProvider = FormSheetAvailableHeightProvider(context)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -40,6 +47,7 @@ internal class FormSheetDialog(
         disableNativeWindowAnimation(window)
 
         setupBottomSheetHeight()
+        installAvailableHeightProvider()
     }
 
     override fun onAttachedToWindow() {
@@ -63,7 +71,8 @@ internal class FormSheetDialog(
      * `enableEdgeToEdge` attribute AND the navigation bar is translucent (see
      * `BottomSheetDialog#onAttachedToWindow`).
      *
-     * We force edge-to-edge on every API level so the custom dimming view covers the whole screen.
+     * We force edge-to-edge on every API level so the window content always spans the whole
+     * screen.
      */
     private fun forceEdgeToEdge() {
         val window = window ?: return
@@ -80,4 +89,27 @@ internal class FormSheetDialog(
         val bottomSheetView = findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
         bottomSheetView?.layoutParams?.height = ViewGroup.LayoutParams.MATCH_PARENT
     }
+
+    private fun installAvailableHeightProvider() {
+        if (availableHeightProvider.parent != null) {
+            return
+        }
+
+        val contentParent = findViewById<ViewGroup>(android.R.id.content)
+        if (contentParent == null) {
+            Log.e(TAG, "[RNScreens] Window content view not found; the sheet dimensions won't be resolved.")
+            return
+        }
+
+        // FrameLayout measures its children in order, so the provider reports the height before Material's container
+        contentParent.addView(
+            availableHeightProvider,
+            0,
+            FrameLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT),
+        )
+    }
+
+    companion object {
+        private const val TAG = "FormSheetDialog"
+    }
 }

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/core/FormSheetDialogManager.kt

@@ -1,19 +1,13 @@
 package com.swmansion.rnscreens.modals.formsheet.native.core
 
 import android.content.Context
-import android.util.Log
 import android.view.ContextThemeWrapper
 import android.view.View
-import android.widget.FrameLayout
-import com.swmansion.rnscreens.modals.dimmingview.DimmingViewManager
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetAppearanceCoordinator
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetBehaviorController
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetDimensionsCoordinator
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetNativeDismissCoordinator
 import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
 import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetDialogEventEmitter
 import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetDetents
+import com.swmansion.rnscreens.modals.formsheet.native.presentation.FormSheetDimmingManager
+import com.swmansion.rnscreens.modals.formsheet.native.presentation.FormSheetPresentation
 import com.swmansion.rnscreens.modals.formsheet.native.presentation.FormSheetPresentationManager
 import kotlin.properties.Delegates
 
@@ -32,131 +26,64 @@ class FormSheetDialogManager(
     // Eagerly create the container so it's always ready for the provided content view
     private val container = FormSheetContainer(themedContext, contentView)
 
-    // Eagerly create the dialog and attach the container
-    private val dialog =
-        FormSheetDialog(themedContext).apply {
-            setContentView(container)
-            setCanceledOnTouchOutside(false)
-        }
-
-    private val bottomSheetView = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
+    // The React content only reports height changes, so a new presentation is seeded with the
+    // last known value.
+    private var lastContentHeight = 0
 
-    private val behaviorController =
-        bottomSheetView?.let {
-            FormSheetBehaviorController(it) { index -> eventEmitter?.emitOnDetentChanged(index) }
-        }
+    private val presentationCallbacks =
+        object : FormSheetPresentation.Callbacks {
+            override fun onDetentChanged(index: Int) {
+                eventEmitter?.emitOnDetentChanged(index)
+            }
 
-    private val dimmingManager = DimmingViewManager(context, dialog)
+            override fun onNativeDismissAllowed() {
+                presentationManager.handleNativeDismiss()
+            }
 
-    private val appearanceCoordinator =
-        FormSheetAppearanceCoordinator(
-            bottomSheetView = bottomSheetView,
-        )
+            override fun onNativeDismissPrevented() {
+                eventEmitter?.emitOnNativeDismissPreventedEvent()
+            }
+        }
 
-    private val dimensionsCoordinator =
-        FormSheetDimensionsCoordinator(
-            dialog = dialog,
-            container = container,
-            bottomSheetView = bottomSheetView,
-            behaviorController = behaviorController,
-        )
+    private val dimmingManager = FormSheetDimmingManager(context)
 
     private val presentationManager =
         FormSheetPresentationManager(
-            dialog = dialog,
-            bottomSheetView = bottomSheetView,
+            presentationFactory = ::createPresentation,
             dimmingManager = dimmingManager,
             onNativeDismiss = { eventEmitter?.emitOnNativeDismissEvent() },
-        )
-
-    private val nativeDismissCoordinator =
-        FormSheetNativeDismissCoordinator(
-            dialog = dialog,
-            behaviorController = behaviorController,
-            dimmingManager = dimmingManager,
-            onDismissAllowed = { presentationManager.handleNativeDismiss() },
-            onDismissPrevented = { eventEmitter?.emitOnNativeDismissPreventedEvent() },
+            onDismiss = { eventEmitter?.emitOnDismissEvent() },
         )
 
     internal var eventEmitter: FormSheetDialogEventEmitter? by Delegates.observable(null) { _, _, newValue ->
         presentationManager.appearanceEventEmitter = newValue
     }
 
-    internal val contentSizeChangeDelegate: FormSheetContentSizeChangeDelegate
-        get() = dimensionsCoordinator
+    internal val contentSizeChangeDelegate: FormSheetContentSizeChangeDelegate =
+        object : FormSheetContentSizeChangeDelegate {
+            override fun onContentHeightChanged(newHeight: Int) {
+                lastContentHeight = newHeight
+                presentationManager.currentPresentation?.onContentHeightChanged(newHeight)
+            }
+        }
 
-    init {
-        presentationManager.setup()
-        nativeDismissCoordinator.setup()
-        appearanceCoordinator.setup()
-        dimensionsCoordinator.setup()
-        behaviorController?.setup()
-    }
+    private fun createPresentation(): FormSheetPresentation =
+        FormSheetPresentation(themedContext, container, presentationCallbacks).also {
+            it.applyInitialConfig(formSheetConfig, lastContentHeight)
+        }
 
     internal fun applyConfig(newConfig: FormSheetConfig) {
         val oldConfig = formSheetConfig
         formSheetConfig = newConfig
 
-        val reopened = !oldConfig.isOpen && newConfig.isOpen
-
-        // ALWAYS refresh dimensions when reopening to ensure that BottomSheet
-        // state and layout are synchronized with native behavior.
-        val dimensionsChanged = oldConfig.detents != newConfig.detents
-        if (dimensionsChanged || reopened) {
-            dimensionsCoordinator.updateFormSheetDimensions(
-                resolveDetents(newConfig.detents),
-                newConfig.initialDetentIndex,
-                reopened,
-            )
-        }
-
-        if (oldConfig.prefersGrabberVisible != newConfig.prefersGrabberVisible) {
-            container.setGrabberVisible(newConfig.prefersGrabberVisible)
-        }
-
-        if (oldConfig.preferredCornerRadius != newConfig.preferredCornerRadius) {
-            appearanceCoordinator.updateCornerRadius(newConfig.preferredCornerRadius)
-        }
-
-        if (oldConfig.nativeContainerBackgroundColor != newConfig.nativeContainerBackgroundColor) {
-            appearanceCoordinator.updateBackgroundColor(newConfig.nativeContainerBackgroundColor)
-        }
-
-        if (oldConfig.shouldPreventNativeDismiss != newConfig.shouldPreventNativeDismiss) {
-            nativeDismissCoordinator.shouldPreventDismiss = newConfig.shouldPreventNativeDismiss
-        }
+        presentationManager.currentPresentation?.applyConfigUpdate(oldConfig, newConfig)
 
         if (oldConfig.isOpen != newConfig.isOpen) {
-            presentationManager.updatePresentationState(newConfig.isOpen)
-        }
-    }
-
-    private fun resolveDetents(rawDetents: List<Double>): FormSheetDetents {
-        if (rawDetents.isEmpty()) {
-            return FormSheetDetents(listOf(LARGE_DETENT_FRACTION))
-        }
-
-        return try {
-            FormSheetDetents(rawDetents)
-        } catch (e: IllegalArgumentException) {
-            Log.e(
-                "[RNScreens]",
-                "Invalid FormSheet detents: $rawDetents. Falling back to large detent.",
-                e,
-            )
-            FormSheetDetents(listOf(LARGE_DETENT_FRACTION))
+            presentationManager.requestProgrammaticStateUpdate(newConfig.isOpen)
         }
     }
 
     internal fun destroy() {
-        behaviorController?.destroy()
-        nativeDismissCoordinator.destroy()
         presentationManager.destroy()
-        dimensionsCoordinator.destroy()
-        dialog.dismiss()
-    }
-
-    companion object {
-        private const val LARGE_DETENT_FRACTION = 1.0
     }
 }

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/interfaces/FormSheetDialogEventEmitter.kt

@@ -3,6 +3,8 @@ package com.swmansion.rnscreens.modals.formsheet.native.interfaces
 import com.swmansion.rnscreens.common.event.ViewAppearanceEventEmitter
 
 internal interface FormSheetDialogEventEmitter : ViewAppearanceEventEmitter {
+    fun emitOnDismissEvent()
+
     fun emitOnNativeDismissEvent()
 
     fun emitOnNativeDismissPreventedEvent()