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

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

@@ -231,7 +231,13 @@ class ScreenStackHeaderConfig(
 
     fun onUpdate() {
         val stack = screenStack
-        val isTop = stack == null || stack.topScreen == parent
+        // A screen that is not in a stack has nothing to configure a header for, and
+        // `canNavigateBack()` below asserts on exactly this condition. Treating a null
+        // stack as "is top" let a detached screen reach that assertion and throw.
+        if (stack == null) {
+            return
+        }
+        val isTop = stack.topScreen == parent
 
         if (!isAttachedToWindow || !isTop || isDestroyed) {
             return

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

@@ -47,6 +47,13 @@ class ScreenStackHeaderSubviewManager :
         Log.w("[RNScreens]", "hidesSharedBackground prop is not available on Android")
     }
 
+    override fun setVisibilityPriority(
+        view: ScreenStackHeaderSubview,
+        visibilityPriority: String?,
+    ) {
+        Log.w("[RNScreens]", "visibilityPriority prop is not available on Android")
+    }
+
     // synchronousShadowStateUpdatesEnabled is not available on Android atm,
     // however we must override their setters
     override fun setSynchronousShadowStateUpdatesEnabled(

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

@@ -77,6 +77,12 @@ class ScreenStackViewManager :
         value: Int?,
     ) = Unit
 
+    // tvOS-only: UIKit Menu back gesture handling lives on iOS/tvOS.
+    override fun setDisableDefaultMenuAction(
+        view: ScreenStack,
+        value: Boolean,
+    ) = Unit
+
     companion object {
         const val REACT_CLASS = "RNSScreenStack"
     }

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

@@ -51,6 +51,8 @@ internal class DimmingView(
         b: Int,
     ) = Unit
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     // We do not want to have any action defined here. We just want listeners notified that the click happened.
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent?): Boolean {

package/android/src/main/java/com/swmansion/rnscreens/legacy/stack/views/ScreensCoordinatorLayout.kt

@@ -111,6 +111,8 @@ internal class ScreensCoordinatorLayout(
         }
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = fragment.screen.usesFormSheetPresentation()
+
     override fun onLayout(
         changed: Boolean,
         l: Int,

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

@@ -1,9 +1,9 @@
-package com.swmansion.rnscreens.modals.formsheet.react.contentwrapper
+package com.swmansion.rnscreens.react.modals.formsheet.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
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeProvider
 
 class FormSheetContentWrapper(
     context: Context,

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

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

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

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

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

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

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

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

package/android/src/main/java/com/swmansion/rnscreens/react/modals/formsheet/event/FormSheetDismissEvent.kt

@@ -0,0 +1,29 @@
+package com.swmansion.rnscreens.react.modals.formsheet.event
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.swmansion.rnscreens.common.event.NamingAwareEventType
+
+class FormSheetDismissEvent(
+    surfaceId: Int,
+    viewId: Int,
+) : Event<FormSheetDismissEvent>(surfaceId, viewId),
+    NamingAwareEventType {
+    override fun getEventName(): String = EVENT_NAME
+
+    override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+
+    override fun getEventData(): WritableMap? = Arguments.createMap()
+
+    override fun canCoalesce(): Boolean = false
+
+    companion object : NamingAwareEventType {
+        const val EVENT_NAME = "topDismiss"
+        const val EVENT_REGISTRATION_NAME = "onDismiss"
+
+        override fun getEventName() = EVENT_NAME
+
+        override fun getEventRegistrationName() = EVENT_REGISTRATION_NAME
+    }
+}

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

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

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

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

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

@@ -1,6 +1,6 @@
 // Implementation adapted from `expo`: https://github.com/expo/expo/pull/45775
 
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -17,9 +17,9 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeProvider
 import com.swmansion.rnscreens.helpers.getFabricUIManagerNotNull
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeProvider
 
 @OptIn(UnstableReactNativeAPI::class)
 @SuppressLint("ViewConstructor")

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import android.view.View
 import android.view.ViewGroup
@@ -6,8 +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
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetDialogManager
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetConfig
 
 class FormSheetHost(
     val reactContext: ThemedReactContext,
@@ -42,6 +42,8 @@ class FormSheetHost(
         FormSheetDialogManager(
             context = context,
             contentView = sheetContentView,
+            // ReactContext wraps the application context, not the activity.
+            activityProvider = { reactContext.currentActivity },
         )
 
     init {

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

@@ -1,22 +1,29 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.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.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
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetDialogEventEmitter
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDetentChangedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidDisappearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissPreventedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetSyncFlushEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.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),

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

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import android.view.View
 import com.facebook.react.bridge.ReadableArray
@@ -11,14 +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.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
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDetentChangedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidDisappearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissPreventedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetSyncFlushEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillDisappearEvent
 
 @ReactModule(name = FormSheetHostViewManager.REACT_CLASS)
 class FormSheetHostViewManager :
@@ -134,6 +135,7 @@ class FormSheetHostViewManager :
 
     override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
         mutableMapOf(
+            makeEventRegistrationInfo(FormSheetDismissEvent),
             makeEventRegistrationInfo(FormSheetNativeDismissEvent),
             makeEventRegistrationInfo(FormSheetSyncFlushEvent),
             makeEventRegistrationInfo(FormSheetWillAppearEvent),

package/android/src/main/java/com/swmansion/rnscreens/safearea/OnInterfaceInsetsChangeListener.kt

@@ -0,0 +1,15 @@
+package com.swmansion.rnscreens.safearea
+
+/**
+ * Receives notifications about changes to **interface** safe area insets from a [SafeAreaProvider].
+ */
+interface OnInterfaceInsetsChangeListener {
+    /**
+     * Called by the [SafeAreaProvider] the listener is registered with when its **interface**
+     * safe area insets change. It may also be called with unchanged insets, so implementations
+     * should tolerate duplicate notifications.
+     *
+     * @param newInterfaceInsets the new **interface** safe area insets.
+     */
+    fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets)
+}

package/android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaProvider.kt

@@ -7,25 +7,25 @@ package com.swmansion.rnscreens.safearea
  * System insets (e.g. `systemBars`, `displayCutout`) are handled through Android inset
  * dispatch mechanism (via `onApplyWindowInsets`).
  *
- * Classes implementing this protocol are responsible for notifying `SafeAreaView`, which
- * registers as a listener, about changes to **interface** safe area insets.
+ * Classes implementing this protocol are responsible for notifying the registered
+ * [OnInterfaceInsetsChangeListener] about changes to **interface** safe area insets.
  */
 interface SafeAreaProvider {
     /**
      * Responsible for registering **interface** safe area insets listener.
      *
-     * @param listener `SafeAreaView` instance that wants to receive notifications
-     * about changes to **interface** safe area insets via `onInterfaceInsetsChange`.
+     * @param listener listener that wants to receive notifications about changes
+     * to **interface** safe area insets via `onInterfaceInsetsChange`.
      */
-    fun setOnInterfaceInsetsChangeListener(listener: SafeAreaView)
+    fun setOnInterfaceInsetsChangeListener(listener: OnInterfaceInsetsChangeListener)
 
     /**
      * Responsible for unregistering **interface** safe area insets listener.
      *
-     * @param listener `SafeAreaView` instance that wants to stop receiving notifications
-     * about changes to **interface** safe area insets.
+     * @param listener listener that wants to stop receiving notifications about changes
+     * to **interface** safe area insets.
      */
-    fun removeOnInterfaceInsetsChangeListener(listener: SafeAreaView)
+    fun removeOnInterfaceInsetsChangeListener(listener: OnInterfaceInsetsChangeListener)
 
     /**
      * Responsible for providing current **interface** safe area insets.

package/android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaView.kt

@@ -22,7 +22,8 @@ class SafeAreaView(
     private val reactContext: ThemedReactContext,
 ) : ReactViewGroup(reactContext),
     OnApplyWindowInsetsListener,
-    ViewTreeObserver.OnPreDrawListener {
+    ViewTreeObserver.OnPreDrawListener,
+    OnInterfaceInsetsChangeListener {
     private var provider = WeakReference<SafeAreaProvider>(null)
     private var currentInterfaceInsets: EdgeInsets = EdgeInsets.ZERO
     private var currentSystemInsets: EdgeInsets = EdgeInsets.ZERO
@@ -80,7 +81,7 @@ class SafeAreaView(
         return providerCandidate as? SafeAreaProvider
     }
 
-    fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets) {
+    override fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets) {
         if (newInterfaceInsets != currentInterfaceInsets) {
             currentInterfaceInsets = newInterfaceInsets