@amazon-devices/react-native-screens 2.0.1758683737 → 3.0.9000000000

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

@@ -3,8 +3,12 @@ package com.swmansion.rnscreens
 import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.JSApplicationCausedNativeException
+import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.LayoutShadowNode
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -16,27 +20,49 @@ import com.swmansion.rnscreens.events.HeaderDetachedEvent
 import javax.annotation.Nonnull
 
 @ReactModule(name = ScreenStackHeaderConfigViewManager.REACT_CLASS)
-class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderConfig>(), RNSScreenStackHeaderConfigManagerInterface<ScreenStackHeaderConfig> {
-    private val mDelegate: ViewManagerDelegate<ScreenStackHeaderConfig>
+class ScreenStackHeaderConfigViewManager :
+    ViewGroupManager<ScreenStackHeaderConfig>(),
+    RNSScreenStackHeaderConfigManagerInterface<ScreenStackHeaderConfig> {
+    private val delegate: ViewManagerDelegate<ScreenStackHeaderConfig>
 
     init {
-        mDelegate = RNSScreenStackHeaderConfigManagerDelegate<ScreenStackHeaderConfig, ScreenStackHeaderConfigViewManager>(this)
+        delegate = RNSScreenStackHeaderConfigManagerDelegate<ScreenStackHeaderConfig, ScreenStackHeaderConfigViewManager>(this)
     }
 
     override fun getName(): String = REACT_CLASS
 
     override fun createViewInstance(reactContext: ThemedReactContext) = ScreenStackHeaderConfig(reactContext)
 
-    override fun addView(parent: ScreenStackHeaderConfig, child: View, index: Int) {
+    // This works only on Paper. On Fabric the shadow node is implemented in C++ layer.
+    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreenStackHeaderConfigShadowNode(context)
+
+    override fun addView(
+        parent: ScreenStackHeaderConfig,
+        child: View,
+        index: Int,
+    ) {
         if (child !is ScreenStackHeaderSubview) {
             throw JSApplicationCausedNativeException(
-                "Config children should be of type " + ScreenStackHeaderSubviewManager.REACT_CLASS
+                "Config children should be of type " + ScreenStackHeaderSubviewManager.REACT_CLASS,
             )
         }
         parent.addConfigSubview(child, index)
     }
 
-    override fun onDropViewInstance(@Nonnull view: ScreenStackHeaderConfig) {
+    override fun updateState(
+        view: ScreenStackHeaderConfig,
+        props: ReactStylesDiffMap?,
+        stateWrapper: StateWrapper?,
+    ): Any? {
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            view.setStateWrapper(stateWrapper)
+        }
+        return super.updateState(view, props, stateWrapper)
+    }
+
+    override fun onDropViewInstance(
+        @Nonnull view: ScreenStackHeaderConfig,
+    ) {
         view.destroy()
     }
 
@@ -44,13 +70,19 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
         parent.removeAllConfigSubviews()
     }
 
-    override fun removeViewAt(parent: ScreenStackHeaderConfig, index: Int) {
+    override fun removeViewAt(
+        parent: ScreenStackHeaderConfig,
+        index: Int,
+    ) {
         parent.removeConfigSubview(index)
     }
 
     override fun getChildCount(parent: ScreenStackHeaderConfig): Int = parent.configSubviewsCount
 
-    override fun getChildAt(parent: ScreenStackHeaderConfig, index: Int): View = parent.getConfigSubview(index)
+    override fun getChildAt(
+        parent: ScreenStackHeaderConfig,
+        index: Int,
+    ): View = parent.getConfigSubview(index)
 
     override fun needsCustomLayoutForChildren() = true
 
@@ -60,90 +92,128 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
     }
 
     @ReactProp(name = "title")
-    override fun setTitle(config: ScreenStackHeaderConfig, title: String?) {
+    override fun setTitle(
+        config: ScreenStackHeaderConfig,
+        title: String?,
+    ) {
         config.setTitle(title)
     }
 
     @ReactProp(name = "titleFontFamily")
-    override fun setTitleFontFamily(config: ScreenStackHeaderConfig, titleFontFamily: String?) {
+    override fun setTitleFontFamily(
+        config: ScreenStackHeaderConfig,
+        titleFontFamily: String?,
+    ) {
         config.setTitleFontFamily(titleFontFamily)
     }
 
     @ReactProp(name = "titleFontSize")
-    override fun setTitleFontSize(config: ScreenStackHeaderConfig, titleFontSize: Int) {
+    override fun setTitleFontSize(
+        config: ScreenStackHeaderConfig,
+        titleFontSize: Int,
+    ) {
         config.setTitleFontSize(titleFontSize.toFloat())
     }
 
     @ReactProp(name = "titleFontWeight")
-    override fun setTitleFontWeight(config: ScreenStackHeaderConfig, titleFontWeight: String?) {
+    override fun setTitleFontWeight(
+        config: ScreenStackHeaderConfig,
+        titleFontWeight: String?,
+    ) {
         config.setTitleFontWeight(titleFontWeight)
     }
 
     @ReactProp(name = "titleColor", customType = "Color")
-    override fun setTitleColor(config: ScreenStackHeaderConfig, titleColor: Int?) {
+    override fun setTitleColor(
+        config: ScreenStackHeaderConfig,
+        titleColor: Int?,
+    ) {
         if (titleColor != null) {
             config.setTitleColor(titleColor)
         }
     }
 
     @ReactProp(name = "backgroundColor", customType = "Color")
-    override fun setBackgroundColor(config: ScreenStackHeaderConfig, backgroundColor: Int?) {
+    override fun setBackgroundColor(
+        config: ScreenStackHeaderConfig,
+        backgroundColor: Int?,
+    ) {
         config.setBackgroundColor(backgroundColor)
     }
 
     @ReactProp(name = "hideShadow")
-    override fun setHideShadow(config: ScreenStackHeaderConfig, hideShadow: Boolean) {
+    override fun setHideShadow(
+        config: ScreenStackHeaderConfig,
+        hideShadow: Boolean,
+    ) {
         config.setHideShadow(hideShadow)
     }
 
     @ReactProp(name = "hideBackButton")
-    override fun setHideBackButton(config: ScreenStackHeaderConfig, hideBackButton: Boolean) {
+    override fun setHideBackButton(
+        config: ScreenStackHeaderConfig,
+        hideBackButton: Boolean,
+    ) {
         config.setHideBackButton(hideBackButton)
     }
 
     @ReactProp(name = "topInsetEnabled")
-    override fun setTopInsetEnabled(config: ScreenStackHeaderConfig, topInsetEnabled: Boolean) {
+    override fun setTopInsetEnabled(
+        config: ScreenStackHeaderConfig,
+        topInsetEnabled: Boolean,
+    ) {
         config.setTopInsetEnabled(topInsetEnabled)
     }
 
     @ReactProp(name = "color", customType = "Color")
-    override fun setColor(config: ScreenStackHeaderConfig, color: Int?) {
+    override fun setColor(
+        config: ScreenStackHeaderConfig,
+        color: Int?,
+    ) {
         config.setTintColor(color ?: 0)
     }
 
     @ReactProp(name = "hidden")
-    override fun setHidden(config: ScreenStackHeaderConfig, hidden: Boolean) {
+    override fun setHidden(
+        config: ScreenStackHeaderConfig,
+        hidden: Boolean,
+    ) {
         config.setHidden(hidden)
     }
 
     @ReactProp(name = "translucent")
-    override fun setTranslucent(config: ScreenStackHeaderConfig, translucent: Boolean) {
+    override fun setTranslucent(
+        config: ScreenStackHeaderConfig,
+        translucent: Boolean,
+    ) {
         config.setTranslucent(translucent)
     }
 
     @ReactProp(name = "backButtonInCustomView")
     override fun setBackButtonInCustomView(
         config: ScreenStackHeaderConfig,
-        backButtonInCustomView: Boolean
+        backButtonInCustomView: Boolean,
     ) {
         config.setBackButtonInCustomView(backButtonInCustomView)
     }
 
     @ReactProp(name = "direction")
-    override fun setDirection(config: ScreenStackHeaderConfig, direction: String?) {
+    override fun setDirection(
+        config: ScreenStackHeaderConfig,
+        direction: String?,
+    ) {
         config.setDirection(direction)
     }
 
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        return MapBuilder.of(
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? =
+        MapBuilder.of(
             HeaderAttachedEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onAttached"),
             HeaderDetachedEvent.EVENT_NAME,
             MapBuilder.of("registrationName", "onDetached"),
         )
-    }
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderConfig> = delegate
 
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderConfig"
@@ -151,54 +221,104 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
 
     // TODO: Find better way to handle platform specific props
     private fun logNotAvailable(propName: String) {
-        Log.w("RN SCREENS", "$propName prop is not available on Android")
+        Log.w("[RNScreens]", "$propName prop is not available on Android")
     }
 
-    override fun setBackTitle(view: ScreenStackHeaderConfig?, value: String?) {
+    override fun setBackTitle(
+        view: ScreenStackHeaderConfig?,
+        value: String?,
+    ) {
         logNotAvailable("backTitle")
     }
 
-    override fun setBackTitleFontFamily(view: ScreenStackHeaderConfig?, value: String?) {
+    override fun setBackTitleFontFamily(
+        view: ScreenStackHeaderConfig?,
+        value: String?,
+    ) {
         logNotAvailable("backTitleFontFamily")
     }
 
-    override fun setBackTitleFontSize(view: ScreenStackHeaderConfig?, value: Int) {
+    override fun setBackTitleFontSize(
+        view: ScreenStackHeaderConfig?,
+        value: Int,
+    ) {
         logNotAvailable("backTitleFontSize")
     }
 
-    override fun setBackTitleVisible(view: ScreenStackHeaderConfig?, value: Boolean) {
+    override fun setBackTitleVisible(
+        view: ScreenStackHeaderConfig?,
+        value: Boolean,
+    ) {
         logNotAvailable("backTitleVisible")
     }
 
-    override fun setLargeTitle(view: ScreenStackHeaderConfig?, value: Boolean) {
+    override fun setLargeTitle(
+        view: ScreenStackHeaderConfig?,
+        value: Boolean,
+    ) {
         logNotAvailable("largeTitle")
     }
 
-    override fun setLargeTitleFontFamily(view: ScreenStackHeaderConfig?, value: String?) {
+    override fun setLargeTitleFontFamily(
+        view: ScreenStackHeaderConfig?,
+        value: String?,
+    ) {
         logNotAvailable("largeTitleFontFamily")
     }
 
-    override fun setLargeTitleFontSize(view: ScreenStackHeaderConfig?, value: Int) {
+    override fun setLargeTitleFontSize(
+        view: ScreenStackHeaderConfig?,
+        value: Int,
+    ) {
         logNotAvailable("largeTitleFontSize")
     }
 
-    override fun setLargeTitleFontWeight(view: ScreenStackHeaderConfig?, value: String?) {
+    override fun setLargeTitleFontWeight(
+        view: ScreenStackHeaderConfig?,
+        value: String?,
+    ) {
         logNotAvailable("largeTitleFontWeight")
     }
 
-    override fun setLargeTitleBackgroundColor(view: ScreenStackHeaderConfig?, value: Int?) {
+    override fun setLargeTitleBackgroundColor(
+        view: ScreenStackHeaderConfig?,
+        value: Int?,
+    ) {
         logNotAvailable("largeTitleBackgroundColor")
     }
 
-    override fun setLargeTitleHideShadow(view: ScreenStackHeaderConfig?, value: Boolean) {
+    override fun setLargeTitleHideShadow(
+        view: ScreenStackHeaderConfig?,
+        value: Boolean,
+    ) {
         logNotAvailable("largeTitleHideShadow")
     }
 
-    override fun setLargeTitleColor(view: ScreenStackHeaderConfig?, value: Int?) {
+    override fun setLargeTitleColor(
+        view: ScreenStackHeaderConfig?,
+        value: Int?,
+    ) {
         logNotAvailable("largeTitleColor")
     }
 
-    override fun setDisableBackButtonMenu(view: ScreenStackHeaderConfig?, value: Boolean) {
+    override fun setDisableBackButtonMenu(
+        view: ScreenStackHeaderConfig?,
+        value: Boolean,
+    ) {
         logNotAvailable("disableBackButtonMenu")
     }
+
+    override fun setBackButtonDisplayMode(
+        view: ScreenStackHeaderConfig?,
+        value: String?,
+    ) {
+        logNotAvailable("backButtonDisplayMode")
+    }
+
+    override fun setBlurEffect(
+        view: ScreenStackHeaderConfig?,
+        value: String?,
+    ) {
+        logNotAvailable("blurEffect")
+    }
 }

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

@@ -6,33 +6,48 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.views.view.ReactViewGroup
 
 @SuppressLint("ViewConstructor")
-class ScreenStackHeaderSubview(context: ReactContext?) : ReactViewGroup(context) {
-    private var mReactWidth = 0
-    private var mReactHeight = 0
+class ScreenStackHeaderSubview(
+    context: ReactContext?,
+) : ReactViewGroup(context) {
+    private var reactWidth = 0
+    private var reactHeight = 0
     var type = Type.RIGHT
 
     val config: ScreenStackHeaderConfig?
         get() = (parent as? CustomToolbar)?.config
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    override fun onMeasure(
+        widthMeasureSpec: Int,
+        heightMeasureSpec: Int,
+    ) {
         if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY &&
             MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.EXACTLY
         ) {
             // dimensions provided by react
-            mReactWidth = MeasureSpec.getSize(widthMeasureSpec)
-            mReactHeight = MeasureSpec.getSize(heightMeasureSpec)
+            reactWidth = MeasureSpec.getSize(widthMeasureSpec)
+            reactHeight = MeasureSpec.getSize(heightMeasureSpec)
             val parent = parent
             if (parent != null) {
                 forceLayout()
                 (parent as View).requestLayout()
             }
         }
-        setMeasuredDimension(mReactWidth, mReactHeight)
+        setMeasuredDimension(reactWidth, reactHeight)
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) = Unit
+    override fun onLayout(
+        changed: Boolean,
+        left: Int,
+        top: Int,
+        right: Int,
+        bottom: Int,
+    ) = Unit
 
     enum class Type {
-        LEFT, CENTER, RIGHT, BACK, SEARCH_BAR
+        LEFT,
+        CENTER,
+        RIGHT,
+        BACK,
+        SEARCH_BAR,
     }
 }

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

@@ -10,11 +10,13 @@ import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerDelegat
 import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerInterface
 
 @ReactModule(name = ScreenStackHeaderSubviewManager.REACT_CLASS)
-class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubview>(), RNSScreenStackHeaderSubviewManagerInterface<ScreenStackHeaderSubview> {
-    private val mDelegate: ViewManagerDelegate<ScreenStackHeaderSubview>
+class ScreenStackHeaderSubviewManager :
+    ViewGroupManager<ScreenStackHeaderSubview>(),
+    RNSScreenStackHeaderSubviewManagerInterface<ScreenStackHeaderSubview> {
+    private val delegate: ViewManagerDelegate<ScreenStackHeaderSubview>
 
     init {
-        mDelegate = RNSScreenStackHeaderSubviewManagerDelegate<ScreenStackHeaderSubview, ScreenStackHeaderSubviewManager>(this)
+        delegate = RNSScreenStackHeaderSubviewManagerDelegate<ScreenStackHeaderSubview, ScreenStackHeaderSubviewManager>(this)
     }
 
     override fun getName() = REACT_CLASS
@@ -22,18 +24,22 @@ class ScreenStackHeaderSubviewManager : ViewGroupManager<ScreenStackHeaderSubvie
     override fun createViewInstance(context: ThemedReactContext) = ScreenStackHeaderSubview(context)
 
     @ReactProp(name = "type")
-    override fun setType(view: ScreenStackHeaderSubview, type: String?) {
-        view.type = when (type) {
-            "left" -> ScreenStackHeaderSubview.Type.LEFT
-            "center" -> ScreenStackHeaderSubview.Type.CENTER
-            "right" -> ScreenStackHeaderSubview.Type.RIGHT
-            "back" -> ScreenStackHeaderSubview.Type.BACK
-            "searchBar" -> ScreenStackHeaderSubview.Type.SEARCH_BAR
-            else -> throw JSApplicationIllegalArgumentException("Unknown type $type")
-        }
+    override fun setType(
+        view: ScreenStackHeaderSubview,
+        type: String?,
+    ) {
+        view.type =
+            when (type) {
+                "left" -> ScreenStackHeaderSubview.Type.LEFT
+                "center" -> ScreenStackHeaderSubview.Type.CENTER
+                "right" -> ScreenStackHeaderSubview.Type.RIGHT
+                "back" -> ScreenStackHeaderSubview.Type.BACK
+                "searchBar" -> ScreenStackHeaderSubview.Type.SEARCH_BAR
+                else -> throw JSApplicationIllegalArgumentException("Unknown type $type")
+            }
     }
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStackHeaderSubview> = delegate
 
     companion object {
         const val REACT_CLASS = "RNSScreenStackHeaderSubview"

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

@@ -1,7 +1,6 @@
 package com.swmansion.rnscreens
 
 import android.view.View
-import android.view.ViewGroup
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.LayoutShadowNode
@@ -13,61 +12,65 @@ import com.facebook.react.viewmanagers.RNSScreenStackManagerInterface
 import com.swmansion.rnscreens.events.StackFinishTransitioningEvent
 
 @ReactModule(name = ScreenStackViewManager.REACT_CLASS)
-class ScreenStackViewManager : ViewGroupManager<ScreenStack>(), RNSScreenStackManagerInterface<ScreenStack> {
-    private val mDelegate: ViewManagerDelegate<ScreenStack>
+class ScreenStackViewManager :
+    ViewGroupManager<ScreenStack>(),
+    RNSScreenStackManagerInterface<ScreenStack> {
+    private val delegate: ViewManagerDelegate<ScreenStack>
 
     init {
-        mDelegate = RNSScreenStackManagerDelegate<ScreenStack, ScreenStackViewManager>(this)
+        delegate = RNSScreenStackManagerDelegate<ScreenStack, ScreenStackViewManager>(this)
     }
 
     override fun getName() = REACT_CLASS
 
     override fun createViewInstance(reactContext: ThemedReactContext) = ScreenStack(reactContext)
 
-    override fun addView(parent: ScreenStack, child: View, index: Int) {
+    override fun addView(
+        parent: ScreenStack,
+        child: View,
+        index: Int,
+    ) {
         require(child is Screen) { "Attempt attach child that is not of type RNScreen" }
+        NativeProxy.addScreenToMap(child.id, child)
         parent.addScreen(child, index)
     }
 
-    override fun removeViewAt(parent: ScreenStack, index: Int) {
-        prepareOutTransition(parent.getScreenAt(index))
+    override fun removeViewAt(
+        parent: ScreenStack,
+        index: Int,
+    ) {
+        val screen = parent.getScreenAt(index)
+        prepareOutTransition(screen)
         parent.removeScreenAt(index)
+        NativeProxy.removeScreenFromMap(screen.id)
     }
 
     private fun prepareOutTransition(screen: Screen?) {
-        startTransitionRecursive(screen)
+        screen?.startRemovalTransition()
     }
 
-    private fun startTransitionRecursive(parent: ViewGroup?) {
-        parent?.let {
-            for (i in 0 until it.childCount) {
-                val child = it.getChildAt(i)
-                child?.let { view -> it.startViewTransition(view) }
-                if (child is ScreenStackHeaderConfig) {
-                    // we want to start transition on children of the toolbar too,
-                    // which is not a child of ScreenStackHeaderConfig
-                    startTransitionRecursive(child.toolbar)
-                }
-                if (child is ViewGroup) {
-                    startTransitionRecursive(child)
-                }
-            }
-        }
+    override fun invalidate() {
+        super.invalidate()
+        NativeProxy.clearMapOnInvalidate()
     }
 
     override fun getChildCount(parent: ScreenStack) = parent.screenCount
 
-    override fun getChildAt(parent: ScreenStack, index: Int): View = parent.getScreenAt(index)
+    override fun getChildAt(
+        parent: ScreenStack,
+        index: Int,
+    ): View = parent.getScreenAt(index)
 
     override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
 
     override fun needsCustomLayoutForChildren() = true
 
-    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = mDelegate
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = delegate
 
-    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> = mutableMapOf(
-        StackFinishTransitioningEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFinishTransitioning")
-    )
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+        mutableMapOf(
+            StackFinishTransitioningEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFinishTransitioning"),
+        )
 
     companion object {
         const val REACT_CLASS = "RNSScreenStack"