react-native-screens 4.25.0-beta.1 → 4.25.0-beta.2

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/StackHeaderAppBarLayout.kt

@@ -7,9 +7,6 @@ import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.google.android.material.R
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.appbar.MaterialToolbar
 import com.swmansion.rnscreens.gamma.stack.header.config.StackHeaderType
@@ -21,7 +18,10 @@ internal sealed class StackHeaderAppBarLayout(
     abstract val toolbar: MaterialToolbar
 
     init {
-        layoutParams = CoordinatorLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+        layoutParams =
+            CoordinatorLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT).apply {
+                behavior = StackHeaderAppBarLayoutBehavior()
+            }
 
         // TODO: this should be exposed in the future via prop. Also, it might not work correctly
         //       until we set liftOnScrollView manually. Also, we should disable it in transparent
@@ -39,11 +39,7 @@ internal sealed class StackHeaderAppBarLayout(
         override val toolbar =
             MaterialToolbar(context).apply {
                 elevation = 0f
-                layoutParams =
-                    LayoutParams(MATCH_PARENT, WRAP_CONTENT).apply {
-                        // TODO: debug only for small header, must be moved to config
-                        scrollFlags = SCROLL_FLAG_NO_SCROLL
-                    }
+                layoutParams = LayoutParams(MATCH_PARENT, WRAP_CONTENT)
             }
 
         init {
@@ -80,15 +76,11 @@ internal sealed class StackHeaderAppBarLayout(
                         else -> error("[RNScreens] Invalid header mode.")
                     }
                 CollapsingToolbarLayout(context, null, styleAttr).apply {
-                    fitsSystemWindows = false
                     layoutParams =
                         LayoutParams(
                             MATCH_PARENT,
                             resolveDimensionAttr(context, sizeAttr),
-                        ).apply {
-                            // TODO: debug only for medium/large header, must be moved to config
-                            scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
-                        }
+                        )
                     addView(toolbar)
                 }
             }

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/StackHeaderAppBarLayoutBehavior.kt

@@ -0,0 +1,29 @@
+package com.swmansion.rnscreens.gamma.stack.header
+
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.appbar.AppBarLayout
+
+/**
+ * Pre-clamps nested down-scroll so the AppBar offset cannot exceed 0 (its natural rest).
+ *
+ * Without this, AppBarLayout has a bug where SCROLL | ENTER_ALWAYS | EXIT_UNTIL_COLLAPSED
+ * combined with non-zero top window insets sets max = +topInset in onNestedPreScroll, allowing
+ * pull-down overshoot that snap-back animates away on release. The downNestedPreScrollRange
+ * inset clamp in AppBarLayout only fires when topInset > minimumHeight, which is rarely true
+ * (typical actionBarSize ~56dp vs status bar ~24dp).
+ */
+internal class StackHeaderAppBarLayoutBehavior : AppBarLayout.Behavior() {
+    override fun onNestedPreScroll(
+        coordinatorLayout: CoordinatorLayout,
+        child: AppBarLayout,
+        target: View,
+        dx: Int,
+        dy: Int,
+        consumed: IntArray,
+        type: Int,
+    ) {
+        val adjustedDy = if (dy < 0) maxOf(dy, topAndBottomOffset) else dy
+        super.onNestedPreScroll(coordinatorLayout, child, target, dx, adjustedDy, consumed, type)
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/StackHeaderCoordinator.kt

@@ -16,6 +16,11 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.widget.TextViewCompat
 import com.google.android.material.R
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS_COLLAPSED
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.appbar.MaterialToolbar
 import com.swmansion.rnscreens.ext.detachFromCurrentParent
@@ -56,6 +61,8 @@ internal class StackHeaderCoordinator(
     private var lastBackButtonTintColor: Int? = null
     private var lastBackButtonIcon: Drawable? = null
 
+    private var lastScrollFlags: Int? = null
+
     // For small header, we need to use custom title view in order to
     // render a subview to the leading side of the title.
     private var managedTitleView: AppCompatTextView? = null
@@ -154,6 +161,7 @@ internal class StackHeaderCoordinator(
         lastBackButtonVisible = null
         lastBackButtonTintColor = null
         lastBackButtonIcon = null
+        lastScrollFlags = null
         clearCachedRebuildTriggers()
     }
 
@@ -323,6 +331,7 @@ internal class StackHeaderCoordinator(
             }
         }
 
+        applyScrollFlags(appBar, config)
         applyBackButton(appBar.toolbar, config)
     }
 
@@ -336,6 +345,53 @@ internal class StackHeaderCoordinator(
         }
     }
 
+    private fun applyScrollFlags(
+        appBar: StackHeaderAppBarLayout,
+        config: StackHeaderConfigProviding,
+    ) {
+        val desired = computeScrollFlags(config)
+
+        if (desired == lastScrollFlags) return
+        lastScrollFlags = desired
+
+        warnInvalidScrollFlagCombinations(config)
+
+        val target: View =
+            when (appBar) {
+                is StackHeaderAppBarLayout.Small -> appBar.toolbar
+                is StackHeaderAppBarLayout.Collapsing -> appBar.collapsingToolbarLayout
+            }
+        val params = target.layoutParams as AppBarLayout.LayoutParams
+        params.scrollFlags = desired
+        target.layoutParams = params
+        // Snap back to expanded so the visible state matches the new flags.
+        appBar.setExpanded(true, false)
+    }
+
+    private fun computeScrollFlags(config: StackHeaderConfigProviding): Int {
+        var flags = 0
+        if (config.scrollFlagScroll) flags = flags or SCROLL_FLAG_SCROLL
+        if (config.scrollFlagEnterAlways) flags = flags or SCROLL_FLAG_ENTER_ALWAYS
+        if (config.scrollFlagEnterAlwaysCollapsed) flags = flags or SCROLL_FLAG_ENTER_ALWAYS_COLLAPSED
+        if (config.scrollFlagExitUntilCollapsed) flags = flags or SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
+        if (config.scrollFlagSnap) flags = flags or SCROLL_FLAG_SNAP
+        return flags
+    }
+
+    private fun warnInvalidScrollFlagCombinations(config: StackHeaderConfigProviding) {
+        val anyDependentFlag =
+            config.scrollFlagEnterAlways ||
+                config.scrollFlagEnterAlwaysCollapsed ||
+                config.scrollFlagExitUntilCollapsed ||
+                config.scrollFlagSnap
+        if (anyDependentFlag && !config.scrollFlagScroll) {
+            Log.e(TAG, "[RNScreens] scrollFlag* requires scrollFlagScroll to take effect.")
+        }
+        if (config.scrollFlagEnterAlwaysCollapsed && !config.scrollFlagEnterAlways) {
+            Log.e(TAG, "[RNScreens] scrollFlagEnterAlwaysCollapsed requires scrollFlagEnterAlways to take effect.")
+        }
+    }
+
     // endregion
 
     // region Back button

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/config/StackHeaderConfig.kt

@@ -34,6 +34,17 @@ class StackHeaderConfig(
     override var backButtonIcon: Drawable? = null
         internal set
 
+    override var scrollFlagScroll: Boolean = false
+        internal set
+    override var scrollFlagEnterAlways: Boolean = false
+        internal set
+    override var scrollFlagEnterAlwaysCollapsed: Boolean = false
+        internal set
+    override var scrollFlagExitUntilCollapsed: Boolean = false
+        internal set
+    override var scrollFlagSnap: Boolean = false
+        internal set
+
     // Staging fields for back button icon resolution.
     // Both props may arrive in any order within a single update batch.
     // Resolution happens in resolveBackButtonIconIfNeeded(), called from onAfterUpdateTransaction.

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/config/StackHeaderConfigProviding.kt

@@ -11,6 +11,11 @@ interface StackHeaderConfigProviding {
     val backButtonHidden: Boolean
     val backButtonTintColor: Int?
     val backButtonIcon: Drawable?
+    val scrollFlagScroll: Boolean
+    val scrollFlagEnterAlways: Boolean
+    val scrollFlagEnterAlwaysCollapsed: Boolean
+    val scrollFlagExitUntilCollapsed: Boolean
+    val scrollFlagSnap: Boolean
     val leadingSubview: StackHeaderSubviewProviding?
     val centerSubview: StackHeaderSubviewProviding?
     val trailingSubview: StackHeaderSubviewProviding?

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/config/StackHeaderConfigViewManager.kt

@@ -151,6 +151,41 @@ open class StackHeaderConfigViewManager :
         view.backButtonImageIconUri = value?.getString("uri")
     }
 
+    override fun setScrollFlagScroll(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.scrollFlagScroll = value
+    }
+
+    override fun setScrollFlagEnterAlways(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.scrollFlagEnterAlways = value
+    }
+
+    override fun setScrollFlagEnterAlwaysCollapsed(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.scrollFlagEnterAlwaysCollapsed = value
+    }
+
+    override fun setScrollFlagExitUntilCollapsed(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.scrollFlagExitUntilCollapsed = value
+    }
+
+    override fun setScrollFlagSnap(
+        view: StackHeaderConfig,
+        value: Boolean,
+    ) {
+        view.scrollFlagSnap = value
+    }
+
     companion object {
         const val REACT_CLASS = "RNSStackHeaderConfigAndroid"
     }

package/android/src/main/java/com/swmansion/rnscreens/gamma/stack/header/subview/StackHeaderSubview.kt

@@ -68,13 +68,9 @@ class StackHeaderSubview(
             }
         }
 
-        if (yogaWidth > 0 && yogaHeight > 0) {
-            setMeasuredDimension(yogaWidth, yogaHeight)
-            if (invalidated && !isInLayout) {
-                requestLayout()
-            }
-        } else {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        setMeasuredDimension(yogaWidth, yogaHeight)
+        if (invalidated && !isInLayout) {
+            requestLayout()
         }
     }
 

package/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/container/TabsActionOrigin.kt

@@ -0,0 +1,26 @@
+package com.swmansion.rnscreens.gamma.tabs.container
+
+/**
+ * Origin (actor) that requested a tab transition. Mirrors the public `actionOrigin` event field.
+ *
+ * - [USER] — direct native UI interaction (tab bar tap).
+ * - [PROGRAMMATIC_JS] — JS-initiated request delivered via the `navStateRequest` prop.
+ * - [PROGRAMMATIC_NATIVE] — request initiated from the native side by a downstream library
+ *   integrating directly against [TabsContainer] (not produced by this library itself).
+ *
+ * The `implicit` origin defined on the public TS API is iOS-only at the moment;
+ * Android does not currently produce it.
+ */
+enum class TabsActionOrigin {
+    USER,
+    PROGRAMMATIC_JS,
+    PROGRAMMATIC_NATIVE,
+    ;
+
+    override fun toString(): String =
+        when (this) {
+            USER -> "user"
+            PROGRAMMATIC_JS -> "programmatic-js"
+            PROGRAMMATIC_NATIVE -> "programmatic-native"
+        }
+}