react-native-screens 3.24.0 → 3.26.0

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

@@ -9,6 +9,7 @@ import android.content.pm.ActivityInfo
 import android.graphics.Color
 import android.os.Build
 import android.view.ViewParent
+import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -115,12 +116,31 @@ object ScreenWindowTraits {
                     if (translucent) {
                         ViewCompat.setOnApplyWindowInsetsListener(decorView) { v, insets ->
                             val defaultInsets = ViewCompat.onApplyWindowInsets(v, insets)
-                            defaultInsets.replaceSystemWindowInsets(
-                                defaultInsets.systemWindowInsetLeft,
-                                0,
-                                defaultInsets.systemWindowInsetRight,
-                                defaultInsets.systemWindowInsetBottom
-                            )
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                val windowInsets =
+                                    defaultInsets.getInsets(WindowInsetsCompat.Type.statusBars())
+
+                                WindowInsetsCompat
+                                    .Builder()
+                                    .setInsets(
+                                        WindowInsetsCompat.Type.statusBars(),
+                                        Insets.of(
+                                            windowInsets.left,
+                                            0,
+                                            windowInsets.right,
+                                            windowInsets.bottom
+                                        )
+                                    )
+                                    .build()
+                            } else {
+                                defaultInsets.replaceSystemWindowInsets(
+                                    defaultInsets.systemWindowInsetLeft,
+                                    0,
+                                    defaultInsets.systemWindowInsetRight,
+                                    defaultInsets.systemWindowInsetBottom
+                                )
+                            }
                         }
                     } else {
                         ViewCompat.setOnApplyWindowInsetsListener(decorView, null)
@@ -239,7 +259,7 @@ object ScreenWindowTraits {
         screen: Screen?,
         trait: WindowTraits
     ): Screen? {
-        screen?.fragment?.let {
+        screen?.fragmentWrapper?.let {
             for (sc in it.childScreenContainers) {
                 // we check only the top screen for the trait
                 val topScreen = sc.topScreen

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

@@ -11,7 +11,7 @@ internal class ScreensShadowNode(private var mContext: ReactContext) : LayoutSha
         super.onBeforeLayout(nativeViewHierarchyOptimizer)
         (mContext.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
             val view = nativeViewHierarchyManager.resolveView(reactTag)
-            if (view is ScreenContainer<*>) {
+            if (view is ScreenContainer) {
                 view.performUpdates()
             }
         }

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

@@ -32,15 +32,19 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
 
     private var mAreListenersSet: Boolean = false
 
-    private val screenStackFragment: ScreenStackFragment?
+    private val headerConfig: ScreenStackHeaderConfig?
         get() {
             val currentParent = parent
             if (currentParent is ScreenStackHeaderSubview) {
-                return currentParent.config?.screenFragment
+                return currentParent.config
             }
+
             return null
         }
 
+    private val screenStackFragment: ScreenStackFragment?
+        get() = headerConfig?.screenFragment
+
     fun onUpdate() {
         setSearchViewProps()
     }
@@ -101,23 +105,25 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
     }
 
     private fun handleTextChange(newText: String?) {
-        sendEvent(SearchBarChangeTextEvent(id, newText))
+        sendEvent(SearchBarChangeTextEvent(surfaceId, id, newText))
     }
 
     private fun handleFocusChange(hasFocus: Boolean) {
-        sendEvent(if (hasFocus) SearchBarFocusEvent(id) else SearchBarBlurEvent(id))
+        sendEvent(if (hasFocus) SearchBarFocusEvent(surfaceId, id) else SearchBarBlurEvent(surfaceId, id))
     }
 
     private fun handleClose() {
-        sendEvent(SearchBarCloseEvent(id))
+        sendEvent(SearchBarCloseEvent(surfaceId, id))
+        setToolbarElementsVisibility(VISIBLE)
     }
 
     private fun handleOpen() {
-        sendEvent(SearchBarOpenEvent(id))
+        sendEvent(SearchBarOpenEvent(surfaceId, id))
+        setToolbarElementsVisibility(GONE)
     }
 
     private fun handleTextSubmit(newText: String?) {
-        sendEvent(SearchBarSearchButtonPressEvent(id, newText))
+        sendEvent(SearchBarSearchButtonPressEvent(surfaceId, id, newText))
     }
 
     private fun sendEvent(event: Event<*>) {
@@ -144,6 +150,16 @@ class SearchBarView(reactContext: ReactContext?) : ReactViewGroup(reactContext)
         text?.let { screenStackFragment?.searchView?.setText(it) }
     }
 
+    private fun setToolbarElementsVisibility(visibility: Int) {
+        for (i in 0..(headerConfig?.configSubviewsCount?.minus(1) ?: 0)) {
+            val subview = headerConfig?.getConfigSubview(i)
+            if (subview?.type != ScreenStackHeaderSubview.Type.SEARCH_BAR)
+                subview?.visibility = visibility
+        }
+    }
+
+    private val surfaceId = UIManagerHelper.getSurfaceId(this)
+
     enum class SearchBarAutoCapitalize {
         NONE, WORDS, SENTENCES, CHARACTERS
     }

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderAttachedEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class HeaderAttachedEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class HeaderAttachedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class HeaderAttachedEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topAttached"

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderBackButtonClickedEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class HeaderBackButtonClickedEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class HeaderBackButtonClickedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class HeaderBackButtonClickedEvent(viewId: Int) : Event<ScreenAppearEvent>(viewI
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topHeaderBackButtonClickedEvent"

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderDetachedEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class HeaderDetachedEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class HeaderDetachedEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class HeaderDetachedEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topDetached"

package/android/src/main/java/com/swmansion/rnscreens/events/HeaderHeightChangeEvent.kt

@@ -0,0 +1,26 @@
+package com.swmansion.rnscreens.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+class HeaderHeightChangeEvent(
+    viewId: Int,
+    private val mHeaderHeight: Double
+) : Event<HeaderHeightChangeEvent>(viewId) {
+
+    override fun getEventName() = EVENT_NAME
+
+    // As the same header height could appear twice, use header height as a coalescing key.
+    override fun getCoalescingKey(): Short = mHeaderHeight.toInt().toShort()
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+        val map = Arguments.createMap()
+        map.putDouble("headerHeight", mHeaderHeight)
+        rctEventEmitter.receiveEvent(viewTag, eventName, map)
+    }
+
+    companion object {
+        const val EVENT_NAME = "topHeaderHeightChange"
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenAppearEvent.kt

@@ -1,18 +1,16 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class ScreenAppearEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class ScreenAppearEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topAppear"

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenDisappearEvent.kt

@@ -1,18 +1,16 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class ScreenDisappearEvent(viewId: Int) : Event<ScreenDisappearEvent>(viewId) {
+class ScreenDisappearEvent(surfaceId: Int, viewId: Int) : Event<ScreenDisappearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topDisappear"

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenDismissedEvent.kt

@@ -1,20 +1,17 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class ScreenDismissedEvent(viewId: Int) : Event<ScreenDismissedEvent>(viewId) {
+class ScreenDismissedEvent(surfaceId: Int, viewId: Int) : Event<ScreenDismissedEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        val args = Arguments.createMap()
-        // on Android we always dismiss one screen at a time
-        args.putInt("dismissCount", 1)
-        rctEventEmitter.receiveEvent(viewTag, eventName, args)
+    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
+        putInt("dismissCount", 1)
     }
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenTransitionProgressEvent.kt

@@ -1,16 +1,17 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
 class ScreenTransitionProgressEvent(
+    surfaceId: Int,
     viewId: Int,
     private val mProgress: Float,
     private val mClosing: Boolean,
     private val mGoingForward: Boolean,
     private val mCoalescingKey: Short
-) : Event<ScreenAppearEvent?>(viewId) {
+) : Event<ScreenAppearEvent?>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -19,12 +20,10 @@ class ScreenTransitionProgressEvent(
         return mCoalescingKey
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        val map = Arguments.createMap()
-        map.putDouble("progress", mProgress.toDouble())
-        map.putInt("closing", if (mClosing) 1 else 0)
-        map.putInt("goingForward", if (mGoingForward) 1 else 0)
-        rctEventEmitter.receiveEvent(viewTag, eventName, map)
+    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
+        putDouble("progress", mProgress.toDouble())
+        putInt("closing", if (mClosing) 1 else 0)
+        putInt("goingForward", if (mGoingForward) 1 else 0)
     }
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenWillAppearEvent.kt

@@ -1,18 +1,16 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class ScreenWillAppearEvent(viewId: Int) : Event<ScreenWillAppearEvent>(viewId) {
+class ScreenWillAppearEvent(surfaceId: Int, viewId: Int) : Event<ScreenWillAppearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topWillAppear"

package/android/src/main/java/com/swmansion/rnscreens/events/ScreenWillDisappearEvent.kt

@@ -1,18 +1,16 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class ScreenWillDisappearEvent(viewId: Int) : Event<ScreenWillDisappearEvent>(viewId) {
+class ScreenWillDisappearEvent(surfaceId: Int, viewId: Int) : Event<ScreenWillDisappearEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topWillDisappear"

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarBlurEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class SearchBarBlurEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class SearchBarBlurEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class SearchBarBlurEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topBlur"

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarChangeTextEvent.kt

@@ -1,13 +1,14 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
 class SearchBarChangeTextEvent(
+    surfaceId: Int,
     viewId: Int,
     private val text: String?,
-) : Event<ScreenAppearEvent>(viewId) {
+) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -17,10 +18,8 @@ class SearchBarChangeTextEvent(
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        val map = Arguments.createMap()
-        map.putString("text", text)
-        rctEventEmitter.receiveEvent(viewTag, eventName, map)
+    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
+        putString("text", text)
     }
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarCloseEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class SearchBarCloseEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class SearchBarCloseEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class SearchBarCloseEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topClose"

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarFocusEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class SearchBarFocusEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class SearchBarFocusEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class SearchBarFocusEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topFocus"

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarOpenEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class SearchBarOpenEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
+class SearchBarOpenEvent(surfaceId: Int, viewId: Int) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,9 +14,7 @@ class SearchBarOpenEvent(viewId: Int) : Event<ScreenAppearEvent>(viewId) {
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topOpen"

package/android/src/main/java/com/swmansion/rnscreens/events/SearchBarSearchButtonPressEvent.kt

@@ -1,10 +1,10 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class SearchBarSearchButtonPressEvent(viewId: Int, private val text: String?) : Event<ScreenAppearEvent>(viewId) {
+class SearchBarSearchButtonPressEvent(surfaceId: Int, viewId: Int, private val text: String?) : Event<ScreenAppearEvent>(surfaceId, viewId) {
     override fun getEventName(): String {
         return EVENT_NAME
     }
@@ -14,10 +14,8 @@ class SearchBarSearchButtonPressEvent(viewId: Int, private val text: String?) :
         return 0
     }
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        val map = Arguments.createMap()
-        map.putString("text", text)
-        rctEventEmitter.receiveEvent(viewTag, eventName, map)
+    override fun getEventData(): WritableMap? = Arguments.createMap().apply {
+        putString("text", text)
     }
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/events/StackFinishTransitioningEvent.kt

@@ -1,18 +1,16 @@
 package com.swmansion.rnscreens.events
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class StackFinishTransitioningEvent(viewId: Int) : Event<StackFinishTransitioningEvent>(viewId) {
+class StackFinishTransitioningEvent(surfaceId: Int, viewId: Int) : Event<StackFinishTransitioningEvent>(surfaceId, viewId) {
     override fun getEventName() = EVENT_NAME
 
     // All events for a given view can be coalesced.
     override fun getCoalescingKey(): Short = 0
 
-    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-        rctEventEmitter.receiveEvent(viewTag, eventName, Arguments.createMap())
-    }
+    override fun getEventData(): WritableMap? = Arguments.createMap()
 
     companion object {
         const val EVENT_NAME = "topFinishTransitioning"

package/android/src/main/java/com/swmansion/rnscreens/utils/DeviceUtils.kt

@@ -0,0 +1,12 @@
+package com.swmansion.rnscreens.utils
+
+import android.content.Context
+import android.content.pm.PackageManager
+
+object DeviceUtils {
+
+    fun isPlatformAndroidTV(context: Context?): Boolean {
+        return context?.packageManager?.hasSystemFeature(PackageManager.FEATURE_LEANBACK) == true
+    }
+
+}

package/android/src/main/res/v33/anim-v33/rns_default_enter_out.xml

@@ -11,7 +11,7 @@
         android:fillAfter="true"
         android:interpolator="@anim/rns_standard_accelerate_interpolator"
         android:startOffset="0"
-        android:duration="450" />
+        android:duration="83" />
 
     <translate
         android:fromXDelta="0"

package/ios/RNSFullWindowOverlay.mm

@@ -127,9 +127,9 @@
   [window addSubview:_container];
 }
 
-- (void)didMoveToWindow
+- (void)didMoveToSuperview
 {
-  if (self.window == nil) {
+  if (self.superview == nil) {
     if (_container != nil) {
       [_container removeFromSuperview];
       [_touchHandler detachFromView:_container];

package/ios/RNSScreen.h

@@ -35,6 +35,8 @@ namespace react = facebook::react;
 
 - (instancetype)initWithView:(UIView *)view;
 - (UIViewController *)findChildVCForConfigAndTrait:(RNSWindowTrait)trait includingModals:(BOOL)includingModals;
+- (BOOL)hasNestedStack;
+- (void)calculateAndNotifyHeaderHeightChangeIsModal:(BOOL)isModal;
 - (void)notifyFinishTransitioning;
 - (RNSScreenView *)screenView;
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -100,6 +102,7 @@ namespace react = facebook::react;
 @property (nonatomic, copy) RCTDirectEventBlock onAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onDisappear;
 @property (nonatomic, copy) RCTDirectEventBlock onDismissed;
+@property (nonatomic, copy) RCTDirectEventBlock onHeaderHeightChange;
 @property (nonatomic, copy) RCTDirectEventBlock onWillAppear;
 @property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
 @property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
@@ -108,6 +111,7 @@ namespace react = facebook::react;
 #endif // RCT_NEW_ARCH_ENABLED
 
 - (void)notifyFinishTransitioning;
+- (void)notifyHeaderHeightChange:(double)height;
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)notifyWillAppear;
@@ -122,6 +126,7 @@ namespace react = facebook::react;
 - (void)notifyTransitionProgress:(double)progress closing:(BOOL)closing goingForward:(BOOL)goingForward;
 - (void)notifyDismissCancelledWithDismissCount:(int)dismissCount;
 - (BOOL)isModal;
+- (BOOL)isPresentedAsNativeModal;
 
 /// Looks for header configuration in instance's `reactSubviews` and returns it. If not present returns `nil`.
 - (RNSScreenStackHeaderConfig *_Nullable)findHeaderConfig;