react-native-screens 4.25.1 → 4.25.2

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

@@ -248,7 +248,7 @@ class Screen(
         }
 
         if (coordinatorLayoutDidChange) {
-            updateShadowNodeScreenSize(width, height, top)
+            updateShadowNodeScreenSize(width, height, top + translationY.toInt())
         }
 
         footer?.onParentLayout(coordinatorLayoutDidChange, left, top, right, bottom, container!!.height)

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

@@ -0,0 +1,37 @@
+package com.swmansion.rnscreens.gamma.tabs.container
+
+import android.annotation.SuppressLint
+import android.content.Context
+import com.google.android.material.bottomnavigation.BottomNavigationView
+
+@SuppressLint("ViewConstructor") // Should not be restored & should only be constructed by us.
+class CustomBottomNavigationView(
+    context: Context,
+    val container: TabsContainer,
+) : BottomNavigationView(context) {
+    private var actionOrigin: TabsActionOrigin? = null
+
+    internal fun setSelectedItemIdWithActionOrigin(
+        itemId: Int,
+        actionOrigin: TabsActionOrigin,
+    ) {
+        require(actionOrigin !== TabsActionOrigin.USER) {
+            "[RNScreens] User-triggered actions should be processed via regular setSelectedItemId callback"
+        }
+        this.actionOrigin = actionOrigin
+        selectedItemId = itemId
+        this.actionOrigin = null
+    }
+
+    override fun setSelectedItemId(itemId: Int) {
+        if (this.actionOrigin == null) {
+            this.actionOrigin = TabsActionOrigin.USER
+        }
+
+        val actionOrigin = checkNotNull(this.actionOrigin)
+        super.setSelectedItemId(itemId)
+        container.onAfterSetSelectedItemId(itemId, actionOrigin)
+
+        this.actionOrigin = null
+    }
+}

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

@@ -109,8 +109,8 @@ class TabsContainer internal constructor(
             R.style.Theme_Material3_DayNight_NoActionBar,
         )
 
-    internal val bottomNavigationView: BottomNavigationView =
-        BottomNavigationView(themedContext).apply {
+    internal val bottomNavigationView: CustomBottomNavigationView =
+        CustomBottomNavigationView(themedContext, this).apply {
             layoutParams =
                 LayoutParams(
                     LayoutParams.MATCH_PARENT,
@@ -256,6 +256,16 @@ class TabsContainer internal constructor(
         setPendingNavigationStateUpdate(null)
     }
 
+    internal fun onAfterSetSelectedItemId(
+        itemId: Int,
+        actionOrigin: TabsActionOrigin,
+    ) {
+        if (actionOrigin === TabsActionOrigin.USER) {
+            // For non-user actions these will be performed in [performContainerUpdate]
+            performPostSelectedTabUpdateActions()
+        }
+    }
+
     // endregion
 
     // region View lifecycle / insets / appearance
@@ -406,27 +416,62 @@ class TabsContainer internal constructor(
 
     // region Private helpers
 
+    /**
+     * This is where programmatic update flow starts.
+     * This includes any JS-triggered action (navigation state update, prop update, etc.)
+     * and native programmatic actions - tab change.
+     *
+     * This method is supposed to perform all the necessary steps, satisfying all invalidation
+     * signals in a coordinated manner.
+     *
+     * The update actions are split into three phases: pre-, selection change, and post-.
+     * Pre-selection actions are run only here, in programmatic flow. This is not a hard requirement,
+     * it is just not needed now.
+     *
+     * Post-selection actions are performed here or in parallel flow triggered on user selection.
+     *
+     * The selected tab update takes place here only for programmatic changes.
+     * User triggered changes have separate entry-point.
+     */
     private fun performContainerUpdate() {
+        performPreSelectedTabUpdateActions()
+        performSelectedTabUpdateIfNeeded()
+        performPostSelectedTabUpdateActions()
+    }
+
+    private fun performPreSelectedTabUpdateActions() {
+        updateNavigationMenuStructureIfNeeded()
+    }
+
+    private fun performPostSelectedTabUpdateActions() {
+        updateBottomNavigationViewAppearanceIfNeeded()
+    }
+
+    private fun updateNavigationMenuStructureIfNeeded() {
         if (invalidationFlags.isNavigationMenuStructureInvalidated) {
             invalidationFlags.isNavigationMenuStructureInvalidated = false
             updateNavigationMenuStructure()
         }
+    }
 
+    private fun performSelectedTabUpdateIfNeeded() {
         if (invalidationFlags.isSelectedTabInvalidated) {
             invalidationFlags.isSelectedTabInvalidated = false
-            performOperation()
+            performSelectedTabUpdate()
         }
+    }
 
+    private fun updateBottomNavigationViewAppearanceIfNeeded() {
         if (invalidationFlags.isNavigationMenuAppearanceInvalidated) {
             invalidationFlags.isNavigationMenuAppearanceInvalidated = false
-            this.updateBottomNavigationViewAppearance()
+            updateBottomNavigationViewAppearance()
             a11yCoordinator.setA11yPropertiesToAllTabItems()
         }
     }
 
-    private fun performOperation() {
+    private fun performSelectedTabUpdate() {
         if (pendingStateUpdateRequest == null) {
-            RNSLog.w(TAG, "TabsContainer::performOperation called w/o pending operation; skipping update")
+            RNSLog.w(TAG, "TabsContainer::performSelectedTabUpdate called w/o pending operation; skipping update")
             return
         }
 
@@ -450,7 +495,7 @@ class TabsContainer internal constructor(
         if (bottomNavigationView.selectedItemId != nextSelectedMenuItemId || navState.isEmpty()) {
             isInExternalOperationContext = true
             // This triggers on OnMenuItemClicked callback, where we perform actual update from
-            bottomNavigationView.selectedItemId = nextSelectedMenuItemId
+            bottomNavigationView.setSelectedItemIdWithActionOrigin(nextSelectedMenuItemId, stateUpdateRequest.actionOrigin)
             isInExternalOperationContext = false
         } else {
             observerRegistry.emitOnNavigationStateUpdateRejected(
@@ -559,6 +604,13 @@ class TabsContainer internal constructor(
         val hasTriggeredSpecialEffect =
             if (isRepeated) specialEffectsHandler.handleRepeatedTabSelection() else false
 
+        if (stateChanged && !isRepeated) {
+            // If we've effectively changed the tab, we need to raise appropriate flags.
+            // This line assumes that any required e.g. appearance actions will be performed
+            // synchronously later in the flow.
+            invalidationFlags.invalidateOnSelectedTabChanged()
+        }
+
         if (stateChanged) {
             observerRegistry.emitOnNavigationStateUpdate(
                 navState,
@@ -694,4 +746,8 @@ internal class TabsContainerInvalidationFlags(
         isNavigationMenuAppearanceInvalidated = true
         isNavigationMenuStructureInvalidated = true
     }
+
+    internal fun invalidateOnSelectedTabChanged() {
+        isNavigationMenuAppearanceInvalidated = true
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.25.1",
+  "version": "4.25.2",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",