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

package/README.md

@@ -256,9 +256,8 @@ React native screens library is licensed under [The MIT License](LICENSE).
 
 ## Credits
 
-This project has been build and is maintained thanks to the support from [Shopify](https://shopify.com), [Expo.io](https://expo.io), and [Software Mansion](https://swmansion.com).
+This project has been built and is maintained thanks to the support from [Expo.io](https://expo.io) and [Software Mansion](https://swmansion.com).
 
-[![shopify](https://avatars1.githubusercontent.com/u/8085?v=3&s=100 'Shopify.com')](https://shopify.com)
 [![expo](https://avatars2.githubusercontent.com/u/12504344?v=3&s=100 'Expo.io')](https://expo.io)
 [![swm](https://logo.swmansion.com/logo?color=white&variant=desktop&width=150&tag=react-native-reanimated-github 'Software Mansion')](https://swmansion.com)
 

package/RNScreens.podspec

@@ -6,7 +6,7 @@ debug_logging_enabled = ENV['RNS_DEBUG_LOGGING'] == '1'
 use_cxxbridge = ENV['RNS_USE_CXXBRIDGE'] == '1'
 
 
-source_files_exts = '{h,m,mm,cpp,swift}'
+source_files_exts = '{h,m,mm,cpp}'
 source_files = ["ios/**/*.#{source_files_exts}"]
 
 min_supported_ios_version = "15.1"
@@ -14,17 +14,14 @@ min_supported_tvos_version = "15.1"
 min_supported_visionos_version = "1.0"
 
 rnscreens_cpp_flags = []
-rnscreens_swift_flags = []
 
 if debug_logging_enabled
   rnscreens_cpp_flags << "-DRNS_DEBUG_LOGGING=1"
-  rnscreens_swift_flags << "-DRNS_DEBUG_LOGGING"
 end
 rnscreens_cpp_flags << "-DRNS_USE_CXXBRIDGE=1" if use_cxxbridge
 
 rnscreens_config  =  {
-  'OTHER_CPLUSPLUSFLAGS' => rnscreens_cpp_flags.join(" "),
-  'OTHER_SWIFT_FLAGS' => rnscreens_swift_flags.join(" ")
+  'OTHER_CPLUSPLUSFLAGS' => rnscreens_cpp_flags.join(" ")
 }
 
 rnscreens_config['DEFINES_MODULE'] = 'YES'
@@ -42,7 +39,6 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_supported_ios_version, :tvos => min_supported_tvos_version, :visionos => min_supported_visionos_version }
   s.source       = { :git => "https://github.com/software-mansion/react-native-screens.git", :tag => "#{s.version}" }
   s.source_files = source_files
-  s.project_header_files = "ios/bridging/Swift-Bridging.h"
   s.requires_arc = true
 
   if debug_logging_enabled

package/android/build.gradle

@@ -82,7 +82,27 @@ if (isRunningInContextOfScreensRepo()) {
     apply plugin: "com.facebook.react"
 }
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+
+// AGP 9 ships built-in Kotlin support enabled by default. When it is active, AGP compiles 
+// our Kotlin sources itself and *additionally* applying the Kotlin Android plugin fails the build.
+// Consuming apps may opt out with `android.builtInKotlin=false` in which case AGP does NOT
+// provide Kotlin and we MUST apply the plugin ourselves.
+// AGP < 9 had no built-in Kotlin at all, so we always apply it there.
+def shouldEnableAgpFallback() {
+    def agpMajorVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
+    if (agpMajorVersion <= 8) {
+        return true
+    }
+
+    def propertyVal = providers.gradleProperty("android.builtInKotlin").orNull
+    def isBuiltInKotlinEnabled = propertyVal != null ? propertyVal.toBoolean() : true
+
+    return !isBuiltInKotlinEnabled
+}
+
+if (shouldEnableAgpFallback()) {
+    apply plugin: 'kotlin-android'
+}
 
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
@@ -165,6 +185,11 @@ android {
     }
     sourceSets.main {
         ext.androidResDir = "src/main/res"
+        kotlin {
+            srcDirs += [
+                "src/fabric/java",
+            ]
+        }
         java {
             srcDirs += [
                 "src/fabric/java",

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

@@ -64,6 +64,11 @@ class NativeProxy {
 
         val screen = weakScreeRef.get()
         if (screen is Screen) {
+            // Fabric's mounting transaction removes the screen on a Choreographer frame callback,
+            // which can execute before `startRemovalTransition` (scheduled via `Handler.post`).
+            // To prevent `Screen.isBeingRemoved` from being read as false during teardown,
+            // we must set this flag synchronously here.
+            screen.markAsBeingRemoved()
             val isScheduled =
                 screen.post {
                     screen.startRemovalTransition()

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

@@ -18,8 +18,8 @@ import com.swmansion.rnscreens.legacy.ScreenStackViewManager
 import com.swmansion.rnscreens.legacy.ScreenViewManager
 import com.swmansion.rnscreens.legacy.SearchBarManager
 import com.swmansion.rnscreens.legacy.utils.ScreenDummyLayoutHelper
-import com.swmansion.rnscreens.modals.formsheet.FormSheetContentWrapperViewManager
-import com.swmansion.rnscreens.modals.formsheet.FormSheetHostViewManager
+import com.swmansion.rnscreens.modals.formsheet.react.contentwrapper.FormSheetContentWrapperViewManager
+import com.swmansion.rnscreens.modals.formsheet.react.host.FormSheetHostViewManager
 import com.swmansion.rnscreens.safearea.SafeAreaViewManager
 import com.swmansion.rnscreens.scrollviewmarker.ScrollViewMarkerViewManager
 import com.swmansion.rnscreens.stack.header.config.StackHeaderConfigViewManager

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

@@ -71,7 +71,14 @@ class Screen(
         private set
     var screenId: String? = null
     var isStatusBarAnimated: Boolean? = null
+
+    // Can be set on the mounting coordinator's thread (see `markAsBeingRemoved`), read on the UI thread.
+    @Volatile
     var isBeingRemoved = false
+        private set
+
+    // Keeps `startTransitionRecursive` / `endTransitionRecursive` calls paired. Should be used on UI thread only.
+    private var isRemovalTransitionStarted = false
 
     // Props for controlling modal presentation
     var isSheetGrabberVisible: Boolean = false
@@ -439,19 +446,28 @@ class Screen(
 
     var nativeBackButtonDismissalEnabled: Boolean = true
 
+    /**
+     * Marks this screen as being removed from the native stack. Safe to call off the UI thread;
+     * must run before the mount transaction removing this screen executes.
+     */
+    fun markAsBeingRemoved() {
+        isBeingRemoved = true
+    }
+
     fun startRemovalTransition() {
-        if (!isBeingRemoved) {
-            isBeingRemoved = true
+        isBeingRemoved = true
+        if (!isRemovalTransitionStarted) {
+            isRemovalTransitionStarted = true
             startTransitionRecursive(this)
         }
     }
 
     fun endRemovalTransition() {
-        if (!isBeingRemoved) {
-            return
+        if (isRemovalTransitionStarted) {
+            isRemovalTransitionStarted = false
+            isBeingRemoved = false
+            endTransitionRecursive(this)
         }
-        isBeingRemoved = false
-        endTransitionRecursive(this)
     }
 
     private fun endTransitionRecursive(parent: ViewGroup) {

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

@@ -85,6 +85,12 @@ class ScreenStackFragment :
 
     private var lastInsetsCompat: WindowInsetsCompat? = null
 
+    // Container reference is captured at registration, because `screen.container` is already
+    // null during teardown. Necessary for unregistering inset & layout listeners in `onDestroyView`.
+    private var containerWithSheetListeners: ScreenContainer? = null
+    private var containerOnLayoutChangeListener: View.OnLayoutChangeListener? = null
+    private var containerOnApplyWindowInsetsListener: View.OnApplyWindowInsetsListener? = null
+
     @SuppressLint("ValidFragment")
     constructor(screenView: Screen) : super(screenView)
 
@@ -337,6 +343,7 @@ class ScreenStackFragment :
         // - Screen.fragment
         lastActiveHeaderConfig?.clearActionBarIfOwned(activity as? AppCompatActivity)
         lastActiveHeaderConfig = null
+        detachInsetsAndLayoutListenersFromContainer()
         super.onDestroyView()
     }
 
@@ -522,15 +529,20 @@ class ScreenStackFragment :
     // Mark: Avoiding top inset by BottomSheet
 
     private fun attachInsetsAndLayoutListenersToBottomSheet(sheetTransitionCoordinator: BottomSheetTransitionCoordinator) {
-        screen.container?.apply {
+        screen.container?.let { container ->
+            containerWithSheetListeners = container
+
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                setOnApplyWindowInsetsListener { _, insets ->
-                    val insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
-                    handleInsetsUpdateAndNotifyTransition(
-                        insetsCompat,
-                    )
-                    insets
-                }
+                val insetsListener =
+                    View.OnApplyWindowInsetsListener { _, insets ->
+                        val insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets, container)
+                        handleInsetsUpdateAndNotifyTransition(
+                            insetsCompat,
+                        )
+                        insets
+                    }
+                containerOnApplyWindowInsetsListener = insetsListener
+                container.setOnApplyWindowInsetsListener(insetsListener)
             } else {
                 val bottomSheetWindowInsetListenerChain = requireBottomSheetWindowInsetsListenerChain()
                 bottomSheetWindowInsetListenerChain.addListener { _, windowInsets ->
@@ -540,11 +552,28 @@ class ScreenStackFragment :
                     windowInsets
                 }
             }
+
+            val layoutChangeListener =
+                View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                    sheetTransitionCoordinator.onScreenContainerLayoutChanged(screen)
+                }
+            containerOnLayoutChangeListener = layoutChangeListener
+            container.addOnLayoutChangeListener(layoutChangeListener)
         }
+    }
 
-        screen.container?.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
-            sheetTransitionCoordinator.onScreenContainerLayoutChanged(screen)
+    private fun detachInsetsAndLayoutListenersFromContainer() {
+        containerWithSheetListeners?.let { container ->
+            if (containerOnLayoutChangeListener != null) {
+                container.removeOnLayoutChangeListener(containerOnLayoutChangeListener)
+            }
+            if (containerOnApplyWindowInsetsListener != null) {
+                container.setOnApplyWindowInsetsListener(null)
+            }
         }
+        containerWithSheetListeners = null
+        containerOnLayoutChangeListener = null
+        containerOnApplyWindowInsetsListener = null
     }
 
     private fun handleInsetsUpdateAndNotifyTransition(insetsCompat: WindowInsetsCompat) {

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

@@ -323,6 +323,11 @@ open class ScreenViewManager :
         value: Boolean,
     ) = Unit
 
+    override fun setIosOrientationInheritanceFixEnabled(
+        view: Screen?,
+        value: Boolean,
+    ) = Unit
+
     // END mark: iOS-only
 
     override fun setAndroidResetScreenShadowStateOnOrientationChangeEnabled(

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetAppearanceCoordinator.kt → native/coordinator/FormSheetAppearanceCoordinator.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.coordinator
 
 import android.os.Build
 import android.widget.FrameLayout
@@ -6,6 +6,7 @@ import androidx.core.view.doOnNextLayout
 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.modals.formsheet.native.model.FormSheetConfig
 import com.swmansion.rnscreens.utils.dpToPx
 
 internal class FormSheetAppearanceCoordinator(

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetBehaviorController.kt → native/coordinator/FormSheetBehaviorController.kt}

@@ -1,8 +1,9 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.coordinator
 
 import android.view.View
 import android.widget.FrameLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetDetents
 
 internal class FormSheetBehaviorController(
     private val sheetView: FrameLayout,
@@ -12,6 +13,7 @@ internal class FormSheetBehaviorController(
 
     private var currentDetentsCount: Int = 1
     private var lastEmittedDetentIndex: Int = FORM_SHEET_UNKNOWN_DETENT_INDEX
+    private var lastStableState: Int = BottomSheetBehavior.STATE_COLLAPSED
 
     private val bottomSheetCallback =
         object : BottomSheetBehavior.BottomSheetCallback() {
@@ -19,6 +21,8 @@ internal class FormSheetBehaviorController(
                 bottomSheet: View,
                 newState: Int,
             ) {
+                rememberStateIfStable(newState)
+
                 val index = mapStateToDetentIndex(newState)
                 if (index != FORM_SHEET_UNKNOWN_DETENT_INDEX && index != lastEmittedDetentIndex) {
                     lastEmittedDetentIndex = index
@@ -34,6 +38,7 @@ internal class FormSheetBehaviorController(
 
     init {
         behavior.isHideable = true
+        rememberStateIfStable(behavior.state)
     }
 
     internal fun setup() {
@@ -44,6 +49,25 @@ internal class FormSheetBehaviorController(
         behavior.removeBottomSheetCallback(bottomSheetCallback)
     }
 
+    internal fun restoreLastStableState() {
+        if (behavior.state != BottomSheetBehavior.STATE_HIDDEN) {
+            return
+        }
+
+        behavior.state = lastStableState
+    }
+
+    private fun rememberStateIfStable(state: Int) {
+        val isVisibleRestingState =
+            state == BottomSheetBehavior.STATE_EXPANDED ||
+                state == BottomSheetBehavior.STATE_COLLAPSED ||
+                state == BottomSheetBehavior.STATE_HALF_EXPANDED
+
+        if (isVisibleRestingState) {
+            lastStableState = state
+        }
+    }
+
     /**
      * @param detents - parsed detents configuration.
      * @param sheetAvailableSpace - the full window height that detent fractions are measured against.

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.coordinator
 
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -6,6 +6,9 @@ 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.FormSheetContainer
+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,

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

@@ -0,0 +1,50 @@
+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 {
+    private val preventNativeDismissBackPressCallback =
+        object : OnBackPressedCallback(false) {
+            override fun handleOnBackPressed() {
+                handleCancelRequest()
+            }
+        }
+
+    internal var shouldPreventDismiss: Boolean = false
+        set(value) {
+            field = value
+            preventNativeDismissBackPressCallback.isEnabled = value
+        }
+
+    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() {
+        if (shouldPreventDismiss) {
+            onDismissPrevented()
+            behaviorController?.restoreLastStableState()
+            return
+        }
+
+        onDismissAllowed()
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContainer.kt → native/core/FormSheetContainer.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.core
 
 import android.annotation.SuppressLint
 import android.content.Context

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.core
 
 import android.content.Context
 import android.os.Bundle
@@ -20,6 +20,19 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 internal class FormSheetDialog(
     context: Context,
 ) : BottomSheetDialog(context) {
+    internal fun interface CancelRequestInterceptor {
+        /**
+         * Invoked in place of the dialog's default cancellation whenever an interceptor is attached.
+         *
+         * The interceptor fully owns the outcome - either for native dismissal prevention or for driving
+         * a custom animated dismissal when allowed. Either way, the dialog skips
+         * [BottomSheetDialog.cancel], which would tear the window down synchronously.
+         */
+        fun handleCancelRequest()
+    }
+
+    internal var cancelRequestInterceptor: CancelRequestInterceptor? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -35,6 +48,16 @@ internal class FormSheetDialog(
         forceEdgeToEdge()
     }
 
+    override fun cancel() {
+        val interceptor = cancelRequestInterceptor
+        if (interceptor == null) {
+            super.cancel()
+            return
+        }
+
+        interceptor.handleCancelRequest()
+    }
+
     /**
      * Material's [BottomSheetDialog] only draws edge-to-edge when its theme opts in via the
      * `enableEdgeToEdge` attribute AND the navigation bar is translucent (see

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.core
 
 import android.content.Context
 import android.util.Log
@@ -6,6 +6,15 @@ 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.FormSheetPresentationManager
 import kotlin.properties.Delegates
 
 class FormSheetDialogManager(
@@ -60,6 +69,15 @@ class FormSheetDialogManager(
             onNativeDismiss = { eventEmitter?.emitOnNativeDismissEvent() },
         )
 
+    private val nativeDismissCoordinator =
+        FormSheetNativeDismissCoordinator(
+            dialog = dialog,
+            behaviorController = behaviorController,
+            dimmingManager = dimmingManager,
+            onDismissAllowed = { presentationManager.handleNativeDismiss() },
+            onDismissPrevented = { eventEmitter?.emitOnNativeDismissPreventedEvent() },
+        )
+
     internal var eventEmitter: FormSheetDialogEventEmitter? by Delegates.observable(null) { _, _, newValue ->
         presentationManager.appearanceEventEmitter = newValue
     }
@@ -69,6 +87,7 @@ class FormSheetDialogManager(
 
     init {
         presentationManager.setup()
+        nativeDismissCoordinator.setup()
         appearanceCoordinator.setup()
         dimensionsCoordinator.setup()
         behaviorController?.setup()
@@ -103,6 +122,10 @@ class FormSheetDialogManager(
             appearanceCoordinator.updateBackgroundColor(newConfig.nativeContainerBackgroundColor)
         }
 
+        if (oldConfig.shouldPreventNativeDismiss != newConfig.shouldPreventNativeDismiss) {
+            nativeDismissCoordinator.shouldPreventDismiss = newConfig.shouldPreventNativeDismiss
+        }
+
         if (oldConfig.isOpen != newConfig.isOpen) {
             presentationManager.updatePresentationState(newConfig.isOpen)
         }
@@ -127,6 +150,7 @@ class FormSheetDialogManager(
 
     internal fun destroy() {
         behaviorController?.destroy()
+        nativeDismissCoordinator.destroy()
         presentationManager.destroy()
         dimensionsCoordinator.destroy()
         dialog.dismiss()

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentSizeChangeDelegate.kt → native/interfaces/FormSheetContentSizeChangeDelegate.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.interfaces
 
 interface FormSheetContentSizeChangeDelegate {
     fun onContentHeightChanged(newHeight: Int)

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentSizeChangeProvider.kt → native/interfaces/FormSheetContentSizeChangeProvider.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.interfaces
 
 interface FormSheetContentSizeChangeProvider {
     fun setContentSizeChangeDelegate(delegate: FormSheetContentSizeChangeDelegate?)

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

@@ -1,9 +1,11 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.interfaces
 
 import com.swmansion.rnscreens.common.event.ViewAppearanceEventEmitter
 
 internal interface FormSheetDialogEventEmitter : ViewAppearanceEventEmitter {
     fun emitOnNativeDismissEvent()
 
+    fun emitOnNativeDismissPreventedEvent()
+
     fun emitOnDetentChanged(index: Int)
 }

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetConfig.kt → native/model/FormSheetConfig.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.model
 
 internal data class FormSheetConfig(
     val isOpen: Boolean = false,
@@ -6,8 +6,12 @@ internal data class FormSheetConfig(
     val prefersGrabberVisible: Boolean = false,
     val initialDetentIndex: Int = 0,
     val preferredCornerRadius: Float = SYSTEM_DEFAULT_CORNER_RADIUS,
+    val preventNativeDismiss: Boolean = false,
     val nativeContainerBackgroundColor: Int? = null,
 ) {
+    val shouldPreventNativeDismiss: Boolean
+        get() = preventNativeDismiss && isOpen
+
     companion object {
         const val SYSTEM_DEFAULT_CORNER_RADIUS = -1f
     }

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDetents.kt → native/model/FormSheetDetents.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.model
 
 internal class FormSheetDetents(
     rawDetents: List<Double>,

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetAnimatorFactory.kt → native/presentation/FormSheetAnimatorFactory.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.presentation
 
 import android.animation.Animator
 import android.animation.AnimatorSet

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetPresentationManager.kt → native/presentation/FormSheetPresentationManager.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.presentation
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -6,6 +6,7 @@ import android.view.View
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.swmansion.rnscreens.common.event.ViewAppearanceEventEmitter
 import com.swmansion.rnscreens.modals.dimmingview.DimmingViewManager
+import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialog
 
 internal class FormSheetPresentationManager(
     private val dialog: FormSheetDialog,
@@ -21,18 +22,10 @@ internal class FormSheetPresentationManager(
     private val animatorFactory = FormSheetAnimatorFactory(dimmingManager)
     private var currentSheetAnimator: Animator? = null
 
-    private val nativeDismissCoordinator =
-        FormSheetNativeDismissCoordinator(
-            dialog = dialog,
-            dimmingManager = dimmingManager,
-            onNativeDismiss = { handleNativeDismiss() },
-        )
-
     internal fun setup() {
         bottomSheetView?.let { view ->
             dimmingManager.attachToBehavior(BottomSheetBehavior.from(view))
         }
-        nativeDismissCoordinator.setup()
     }
 
     internal fun updatePresentationState(isOpen: Boolean) {
@@ -164,7 +157,7 @@ internal class FormSheetPresentationManager(
         }
     }
 
-    private fun handleNativeDismiss() {
+    internal fun handleNativeDismiss() {
         if (state == FormSheetPresentationState.DISMISSING || state == FormSheetPresentationState.DISMISSED) {
             return
         }
@@ -201,7 +194,5 @@ internal class FormSheetPresentationManager(
         dialog.setOnShowListener(null)
 
         state = FormSheetPresentationState.DISMISSED
-
-        nativeDismissCoordinator.destroy()
     }
 }

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetPresentationState.kt → native/presentation/FormSheetPresentationState.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.native.presentation
 
 internal enum class FormSheetPresentationState {
     /**

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentWrapper.kt → react/contentwrapper/FormSheetContentWrapper.kt}

@@ -1,7 +1,9 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.react.contentwrapper
 
 import android.content.Context
 import com.facebook.react.views.view.ReactViewGroup
+import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeProvider
 
 class FormSheetContentWrapper(
     context: Context,

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentWrapperViewManager.kt → react/contentwrapper/FormSheetContentWrapperViewManager.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.react.contentwrapper
 
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext

package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDetentChangedEvent.kt → react/event/FormSheetDetentChangedEvent.kt}

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.react.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap