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

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.react.host
 
 import android.view.View
 import android.view.ViewGroup
@@ -6,6 +6,8 @@ import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.swmansion.rnscreens.common.ShadowStateProxy
+import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialogManager
+import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
 
 class FormSheetHost(
     val reactContext: ThemedReactContext,
@@ -23,6 +25,8 @@ class FormSheetHost(
 
     internal var preferredCornerRadius = FormSheetConfig.SYSTEM_DEFAULT_CORNER_RADIUS
 
+    internal var preventNativeDismiss = false
+
     internal var nativeContainerBackgroundColor: Int? = null
 
     internal var detents: List<Double> = emptyList()
@@ -94,6 +98,7 @@ class FormSheetHost(
                 prefersGrabberVisible = this.prefersGrabberVisible,
                 initialDetentIndex = this.initialDetentIndex,
                 preferredCornerRadius = this.preferredCornerRadius,
+                preventNativeDismiss = this.preventNativeDismiss,
                 nativeContainerBackgroundColor = this.nativeContainerBackgroundColor,
             )
         dialogManager.applyConfig(config)

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

@@ -1,13 +1,29 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.react.host
 
 import com.facebook.react.bridge.ReactContext
 import com.swmansion.rnscreens.common.event.BaseEventEmitter
+import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetDialogEventEmitter
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDetentChangedEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidAppearEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidDisappearEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDismissEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissPreventedEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetSyncFlushEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillAppearEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillDisappearEvent
 
 internal class FormSheetHostEventEmitter(
     reactContext: ReactContext,
     viewTag: Int,
 ) : BaseEventEmitter(reactContext, viewTag),
     FormSheetDialogEventEmitter {
+    override fun emitOnDismissEvent() {
+        reactEventDispatcher.dispatchEvent(
+            FormSheetDismissEvent(surfaceId, viewTag),
+        )
+    }
+
     override fun emitOnNativeDismissEvent() {
         reactEventDispatcher.dispatchEvent(
             FormSheetNativeDismissEvent(surfaceId, viewTag),
@@ -49,4 +65,10 @@ internal class FormSheetHostEventEmitter(
             FormSheetDetentChangedEvent(surfaceId, viewTag, index),
         )
     }
+
+    override fun emitOnNativeDismissPreventedEvent() {
+        reactEventDispatcher.dispatchEvent(
+            FormSheetNativeDismissPreventedEvent(surfaceId, viewTag),
+        )
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet
+package com.swmansion.rnscreens.modals.formsheet.react.host
 
 import android.view.View
 import com.facebook.react.bridge.ReadableArray
@@ -11,6 +11,15 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNSFormSheetHostManagerDelegate
 import com.facebook.react.viewmanagers.RNSFormSheetHostManagerInterface
 import com.swmansion.rnscreens.helpers.makeEventRegistrationInfo
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDetentChangedEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidAppearEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidDisappearEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDismissEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissPreventedEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetSyncFlushEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillAppearEvent
+import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillDisappearEvent
 
 @ReactModule(name = FormSheetHostViewManager.REACT_CLASS)
 class FormSheetHostViewManager :
@@ -114,7 +123,7 @@ class FormSheetHostViewManager :
         view: FormSheetHost,
         value: Boolean,
     ) {
-        // TODO: @t0maboro - implement later
+        view.preventNativeDismiss = value
     }
 
     override fun setNativeContainerBackgroundColor(
@@ -126,6 +135,7 @@ class FormSheetHostViewManager :
 
     override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
         mutableMapOf(
+            makeEventRegistrationInfo(FormSheetDismissEvent),
             makeEventRegistrationInfo(FormSheetNativeDismissEvent),
             makeEventRegistrationInfo(FormSheetSyncFlushEvent),
             makeEventRegistrationInfo(FormSheetWillAppearEvent),
@@ -133,6 +143,7 @@ class FormSheetHostViewManager :
             makeEventRegistrationInfo(FormSheetWillDisappearEvent),
             makeEventRegistrationInfo(FormSheetDidDisappearEvent),
             makeEventRegistrationInfo(FormSheetDetentChangedEvent),
+            makeEventRegistrationInfo(FormSheetNativeDismissPreventedEvent),
         )
 
     override fun updateState(