react-native-screens 5.0.0-alpha.1 → 5.0.0-alpha.3

package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuUpdateQueue.kt → update/StackHeaderToolbarMenuUpdateQueue.kt}

@@ -1,46 +1,4 @@
-package com.swmansion.rnscreens.stack.header.toolbar
-
-import android.graphics.drawable.Drawable
-
-/**
- * A single toolbar menu element update carried by an `updateToolbarMenuElements`
- * view command, before its icon (if any) has been resolved.
- */
-internal data class StackHeaderToolbarMenuElementRawUpdate(
-    val id: String,
-    val options: StackHeaderToolbarMenuElementOptions,
-    val iconSource: StackHeaderToolbarMenuItemIconSource?,
-)
-
-/**
- * A single toolbar menu element update whose icon has already been resolved and merged
- * into [options], ready to be applied to the toolbar.
- */
-internal data class StackHeaderToolbarMenuElementUpdate(
-    val id: String,
-    val options: StackHeaderToolbarMenuElementOptions,
-)
-
-/**
- * Resolves the icon for a single menu element update.
- *
- * [onResolved] must be invoked exactly once — synchronously or asynchronously, always on the
- * main thread — with the resolved icon to merge into the element's options.
- */
-internal fun interface StackHeaderToolbarMenuIconResolver {
-    fun resolve(
-        iconSource: StackHeaderToolbarMenuItemIconSource,
-        onResolved: (icon: StackHeaderToolbarFieldUpdate<Drawable>) -> Unit,
-    )
-}
-
-/**
- * Receives a fully-resolved batch of menu element updates, to be applied to the toolbar
- * atomically.
- */
-internal fun interface StackHeaderToolbarMenuUpdateQueueDelegate {
-    fun onUpdatesResolved(updates: List<StackHeaderToolbarMenuElementUpdate>)
-}
+package com.swmansion.rnscreens.stack.header.toolbar.update
 
 /**
  * Serial, FIFO queue for `updateToolbarMenuElements` view command batches.
@@ -65,6 +23,7 @@ internal class StackHeaderToolbarMenuUpdateQueue(
     private val pendingBatches = ArrayDeque<List<StackHeaderToolbarMenuElementRawUpdate>>()
     private var isProcessing = false
     private var isTornDown = false
+    private var generation = 0
 
     internal fun enqueue(batch: List<StackHeaderToolbarMenuElementRawUpdate>) {
         if (batch.isEmpty()) {
@@ -76,6 +35,18 @@ internal class StackHeaderToolbarMenuUpdateQueue(
         }
     }
 
+    /**
+     * Drops every batch that has not been applied yet, including one whose
+     * icons are still resolving — its eventual dispatch becomes a no-op. Used
+     * when the menu configuration is replaced: commands sent against the old
+     * menu must never touch the new one. The queue stays usable.
+     */
+    internal fun clearPending() {
+        pendingBatches.clear()
+        generation++
+        isProcessing = false
+    }
+
     internal fun tearDown() {
         pendingBatches.clear()
         isTornDown = true
@@ -90,11 +61,12 @@ internal class StackHeaderToolbarMenuUpdateQueue(
                 return
             }
             isProcessing = true
+            val batchGeneration = generation
 
             val updates = arrayOfNulls<StackHeaderToolbarMenuElementUpdate>(batch.size)
             var outstanding = batch.size
 
-            var isProcessingBatch = true
+            var inSyncDispatchLoop = true
 
             fun dispatchResolvedBatch() {
                 pendingBatches.removeFirst()
@@ -105,20 +77,20 @@ internal class StackHeaderToolbarMenuUpdateQueue(
                 index: Int,
                 options: StackHeaderToolbarMenuElementOptions,
             ) {
-                check(updates[index] == null) {
-                    "[RNScreens] Unexpected duplicated element resolution."
+                if (isTornDown || batchGeneration != generation) {
+                    return
                 }
 
-                if (isTornDown) {
-                    return
+                check(updates[index] == null) {
+                    "[RNScreens] Unexpected duplicated element resolution."
                 }
 
-                updates[index] = StackHeaderToolbarMenuElementUpdate(batch[index].id, options)
+                updates[index] = StackHeaderToolbarMenuElementUpdate(batch[index].id, options, batch[index].checked)
                 outstanding -= 1
 
                 // A synchronous completion is applied by the loop below; only an asynchronous one
                 // advances the queue processing from here.
-                if (outstanding == 0 && !isProcessingBatch) {
+                if (outstanding == 0 && !inSyncDispatchLoop) {
                     dispatchResolvedBatch()
                     processNext()
                 }
@@ -130,11 +102,11 @@ internal class StackHeaderToolbarMenuUpdateQueue(
                     onElementResolved(index, update.options)
                 } else {
                     iconResolver.resolve(iconSource) { icon ->
-                        onElementResolved(index, update.options.copy(icon = icon))
+                        onElementResolved(index, update.options.copy(icon = StackHeaderToolbarFieldUpdate.from(icon)))
                     }
                 }
             }
-            isProcessingBatch = false
+            inSyncDispatchLoop = false
 
             if (outstanding > 0) {
                 // An icon is still loading asynchronously; its callback will apply the batch

package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/update/StackHeaderToolbarMenuUpdateQueueDelegate.kt

@@ -0,0 +1,9 @@
+package com.swmansion.rnscreens.stack.header.toolbar.update
+
+/**
+ * Receives a fully-resolved batch of menu element updates, to be applied to the toolbar
+ * atomically.
+ */
+internal fun interface StackHeaderToolbarMenuUpdateQueueDelegate {
+    fun onUpdatesResolved(updates: List<StackHeaderToolbarMenuElementUpdate>)
+}

package/android/src/main/java/com/swmansion/rnscreens/stack/host/StackContainer.kt

@@ -2,18 +2,26 @@ package com.swmansion.rnscreens.stack.host
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.Configuration
 import android.util.Log
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import com.swmansion.rnscreens.common.colorscheme.ColorScheme
+import com.swmansion.rnscreens.common.colorscheme.ColorSchemeCoordinator
+import com.swmansion.rnscreens.common.colorscheme.ColorSchemeListener
+import com.swmansion.rnscreens.common.colorscheme.ColorSchemeProviding
 import com.swmansion.rnscreens.common.container.Container
+import com.swmansion.rnscreens.common.container.ContainerItem
 import com.swmansion.rnscreens.common.container.ParentContainerItemRegistry
 import com.swmansion.rnscreens.ext.isMeasured
 import com.swmansion.rnscreens.helpers.FragmentManagerHelper
 import com.swmansion.rnscreens.helpers.ViewIdGenerator
+import com.swmansion.rnscreens.stack.header.StackHeaderBackPressHandler
 import com.swmansion.rnscreens.stack.screen.StackScreen
 import com.swmansion.rnscreens.stack.screen.StackScreenFragment
+import com.swmansion.rnscreens.stack.screen.StackScreenFragmentDelegate
 import com.swmansion.rnscreens.utils.RNSLog
 import java.lang.ref.WeakReference
 
@@ -23,7 +31,10 @@ internal class StackContainer(
     private val delegate: WeakReference<StackContainerDelegate>,
 ) : FrameLayout(context),
     Container,
-    FragmentManager.OnBackStackChangedListener {
+    FragmentManager.OnBackStackChangedListener,
+    ColorSchemeProviding,
+    StackHeaderBackPressHandler,
+    StackScreenFragmentDelegate {
     private var fragmentManager: FragmentManager? = null
 
     private fun requireFragmentManager(): FragmentManager =
@@ -51,6 +62,20 @@ internal class StackContainer(
     private val fragmentOpExecutor: FragmentOperationExecutor = FragmentOperationExecutor()
     private val fragmentOps: MutableList<FragmentOperation> = arrayListOf()
 
+    // region Color Scheme
+
+    private val colorSchemeCoordinator = ColorSchemeCoordinator()
+
+    internal var colorScheme: ColorScheme by colorSchemeCoordinator::colorScheme
+
+    override fun getResolvedUiNightMode() = colorSchemeCoordinator.getResolvedUiNightMode()
+
+    override fun addColorSchemeListener(listener: ColorSchemeListener) = colorSchemeCoordinator.addColorSchemeListener(listener)
+
+    override fun removeColorSchemeListener(listener: ColorSchemeListener) = colorSchemeCoordinator.removeColorSchemeListener(listener)
+
+    // endregion
+
     init {
         id = ViewIdGenerator.generateViewId()
     }
@@ -62,6 +87,10 @@ internal class StackContainer(
         parentContainerRegistry.attach(this)
         setupFragmentManger()
 
+        // StackContainer only provides container-level color scheme configuration for its screens
+        // but doesn't use any color scheme-dependent views, so we don't need the callback.
+        colorSchemeCoordinator.setup(this, null)
+
         // Following line works with a couple of assumptions.
         // First, that this view is laid out by our parent view, which is a component view.
         // Component views on new architecture receive their first layout after the view hierarchy is
@@ -81,8 +110,16 @@ internal class StackContainer(
         requireFragmentManager().removeOnBackStackChangedListener(this)
         fragmentManager = null
         parentContainerRegistry.detach(this)
+        colorSchemeCoordinator.teardown()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration?) {
+        super.onConfigurationChanged(newConfig)
+        colorSchemeCoordinator.onConfigurationChanged(newConfig)
     }
 
+    override fun onFragmentConfigurationChanged(config: Configuration) = onConfigurationChanged(config)
+
     internal fun setupFragmentManger() {
         fragmentManager =
             checkNotNull(FragmentManagerHelper.findFragmentManagerForView(this)) {
@@ -164,7 +201,8 @@ internal class StackContainer(
         }
 
         pendingPushOperations.forEach { operation ->
-            val newFragment = createFragmentForScreen(operation.screen, canNavigateBack = stackModel.isNotEmpty())
+            val newFragment =
+                createFragmentForScreen(operation.screen, canNavigateBack = stackModel.isNotEmpty())
 
             fragmentOps.add(
                 AddAndSetAsPrimaryOp(
@@ -205,7 +243,12 @@ internal class StackContainer(
         screen: StackScreen,
         canNavigateBack: Boolean,
     ): StackScreenFragment =
-        StackScreenFragment(screen, canNavigateBack).also {
+        StackScreenFragment(
+            screen,
+            canNavigateBack,
+            WeakReference(this),
+            backPressHandler = WeakReference(this),
+        ).also {
             Log.d(TAG, "Created Fragment $it for screen ${screen.screenKey}")
         }
 
@@ -290,6 +333,63 @@ internal class StackContainer(
             ?.stackScreen
             ?.findContentScrollView()
 
+    // Asked when this container's whole subtree is about to be dismissed (the screen
+    // hosting this container is popped) - every item gets a vote, back-to-front, so
+    // the deepest preventing screen wins.
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? =
+        stackModel
+            .asReversed()
+            .firstNotNullOfOrNull { it.stackScreen.wantsToPreventStackNativeDismiss() }
+
+    // endregion
+
+    // region Header back button
+
+    override fun handleHeaderBackButtonPress(pressedScreen: StackScreen) {
+        val fragmentManager = fragmentManager
+        if (fragmentManager == null) {
+            Log.w(TAG, "[RNScreens] Ignoring header back button press - container is detached")
+            return
+        }
+
+        val topScreen = stackModel.lastOrNull()?.stackScreen
+        if (topScreen !== pressedScreen || stackModel.size <= 1) {
+            Log.w(
+                TAG,
+                "[RNScreens] Ignoring header back button press for non-top screen ${pressedScreen.screenKey}",
+            )
+            return
+        }
+
+        // This pop dismisses only the top screen (together with its subtree), therefore
+        // only the top item is asked - screens below the top get no vote at this level.
+        val vetoingItem = topScreen.wantsToPreventStackNativeDismiss()
+        if (vetoingItem != null) {
+            // Only a StackScreen can veto - TabsScreen has no own flag and only forwards.
+            val vetoingScreen = vetoingItem as? StackScreen
+            if (vetoingScreen != null) {
+                vetoingScreen.onNativeDismissPrevented()
+            } else {
+                Log.w(
+                    TAG,
+                    "[RNScreens] Unexpected vetoing item type: ${vetoingItem.javaClass.simpleName}",
+                )
+            }
+            return
+        }
+
+        // Mirrors FragmentManager's internal OnBackPressedCallback, which also runs
+        // popBackStackImmediate. The synchronous pop makes the top-screen guard above
+        // reliable against double taps: onBackStackChangeCommitted -> onNativeFragmentPop
+        // updates stackModel before this call returns.
+        fragmentManager.popBackStackImmediate(
+            // key MUST BE present, otherwise the navigation action will be delegated to child primary navigation
+            // fragment.
+            checkNotNull(pressedScreen.screenKey) { "[RNScreens] Screen key is required" },
+            FragmentManager.POP_BACK_STACK_INCLUSIVE,
+        )
+    }
+
     // endregion
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/stack/host/StackHost.kt

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.UIManagerListener
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
+import com.swmansion.rnscreens.common.colorscheme.ColorScheme
 import com.swmansion.rnscreens.helpers.getFabricUIManagerNotNull
 import com.swmansion.rnscreens.stack.screen.StackScreen
 import com.swmansion.rnscreens.utils.RNSLog
@@ -26,6 +27,8 @@ class StackHost(
     private val containerUpdateCoordinator = StackContainerUpdateCoordinator()
     private var isLayoutEnqueued = false
 
+    internal var colorScheme: ColorScheme by container::colorScheme
+
     init {
         addView(container)
 
@@ -119,6 +122,16 @@ class StackHost(
         refreshLayout()
     }
 
+    // On window configuration changes ViewRootImpl calls forceLayout() recursively on every view
+    // in the hierarchy, bypassing requestLayout(). React views never lay out their children during
+    // framework traversals, so nothing would clear the force-layout flags in our subtree — and once
+    // they are set, any subsequent requestLayout() from a descendant short-circuits before reaching
+    // the override above, permanently disabling the manual pass. Schedule it from here as well.
+    override fun forceLayout() {
+        super.forceLayout()
+        refreshLayout()
+    }
+
     private fun refreshLayout() {
         if (!isLayoutEnqueued) {
             isLayoutEnqueued = true

package/android/src/main/java/com/swmansion/rnscreens/stack/host/StackHostViewManager.kt

@@ -1,12 +1,14 @@
 package com.swmansion.rnscreens.stack.host
 
 import android.view.View
+import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNSStackHostManagerDelegate
 import com.facebook.react.viewmanagers.RNSStackHostManagerInterface
+import com.swmansion.rnscreens.common.colorscheme.ColorScheme
 import com.swmansion.rnscreens.stack.screen.StackScreen
 
 @ReactModule(name = StackHostViewManager.REACT_CLASS)
@@ -70,6 +72,18 @@ class StackHostViewManager :
      */
     override fun needsCustomLayoutForChildren() = true
 
+    override fun setColorScheme(
+        view: StackHost,
+        value: String?,
+    ) {
+        when (value) {
+            null, "inherit" -> view.colorScheme = ColorScheme.INHERIT
+            "light" -> view.colorScheme = ColorScheme.LIGHT
+            "dark" -> view.colorScheme = ColorScheme.DARK
+            else -> throw JSApplicationIllegalArgumentException("[RNScreens] Invalid color scheme: $value.")
+        }
+    }
+
     companion object {
         const val REACT_CLASS = "RNSStackHost"
     }

package/android/src/main/java/com/swmansion/rnscreens/stack/screen/StackScreen.kt

@@ -131,6 +131,7 @@ class StackScreen(
         scrollView: ViewGroup,
     ) {
         containerItemSupport.registerScrollView(scrollView)
+        headerConfig?.onContentScrollViewChanged()
     }
 
     // endregion
@@ -174,4 +175,8 @@ class StackScreen(
     override fun resolveNestedContainer(): Container? = containerItemSupport.resolveNestedContainer()
 
     override fun findContentScrollView(): ViewGroup? = containerItemSupport.findContentScrollView(this)
+
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? =
+        resolveNestedContainer()?.wantsToPreventStackNativeDismiss()
+            ?: takeIf { isPreventNativeDismissEnabled }
 }

package/android/src/main/java/com/swmansion/rnscreens/stack/screen/StackScreenFragment.kt

@@ -1,17 +1,23 @@
 package com.swmansion.rnscreens.stack.screen
 
+import android.content.res.Configuration
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.transition.Slide
+import com.swmansion.rnscreens.stack.header.StackHeaderBackPressHandler
 import com.swmansion.rnscreens.stack.header.StackHeaderCoordinatorLayout
+import java.lang.ref.WeakReference
 
 internal class StackScreenFragment(
     internal val stackScreen: StackScreen,
     private val canNavigateBack: Boolean,
+    private val delegate: WeakReference<StackScreenFragmentDelegate>,
+    private val backPressHandler: WeakReference<StackHeaderBackPressHandler>,
 ) : Fragment() {
     private var screenLifecycleEventEmitter: StackScreenAppearanceEventsEmitter? = null
 
@@ -45,7 +51,11 @@ internal class StackScreenFragment(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View = StackHeaderCoordinatorLayout(requireContext(), stackScreen, canNavigateBack)
+    ): View =
+        StackHeaderCoordinatorLayout(requireContext(), stackScreen, canNavigateBack) { pressedScreen ->
+            backPressHandler.get()?.handleHeaderBackButtonPress(pressedScreen)
+                ?: Log.w(TAG, "[RNScreens] Header back button press dropped - handler is gone")
+        }
 
     override fun onViewCreated(
         view: View,
@@ -71,6 +81,11 @@ internal class StackScreenFragment(
         teardownPreventNativeDismissCallback()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        delegate.get()?.onFragmentConfigurationChanged(newConfig)
+    }
+
     /**
      * Notifies this fragment that it has become "top fragment" in its fragment manager.
      * Call this only if the lifecycle of the fragment is at least at CREATED.
@@ -109,4 +124,8 @@ internal class StackScreenFragment(
         requireNativeDismissBackPressedCallback.remove()
         preventNativeDismissBackPressedCallback = null
     }
+
+    companion object {
+        private const val TAG = "StackScreenFragment"
+    }
 }

package/android/src/main/java/com/swmansion/rnscreens/stack/screen/StackScreenFragmentDelegate.kt

@@ -0,0 +1,12 @@
+package com.swmansion.rnscreens.stack.screen
+
+import android.content.res.Configuration
+
+internal interface StackScreenFragmentDelegate {
+    /**
+     * Notifies the delegate that the fragment received a configuration update,
+     * e.g. theme change from JS via Appearance.setColorScheme. Fragments are
+     * the only place where such updates are delivered reliably.
+     */
+    fun onFragmentConfigurationChanged(config: Configuration)
+}

package/android/src/main/java/com/swmansion/rnscreens/tabs/appearance/TabsAppearanceCoordinator.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.view.MenuItem
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.swmansion.rnscreens.tabs.container.TabsContainer
-import com.swmansion.rnscreens.tabs.container.menuItemIdForFragmentAtIndex
 import com.swmansion.rnscreens.tabs.screen.TabsScreen
 import com.swmansion.rnscreens.tabs.screen.TabsScreenFragment
 
@@ -28,13 +27,12 @@ internal class TabsAppearanceCoordinator(
         context: Context,
         tabsAppearance: TabsAppearance?,
     ) {
-        tabsScreenFragments.forEachIndexed { index, fragment ->
-            val menuItemId = menuItemIdForFragmentAtIndex(index)
+        tabsScreenFragments.forEach { fragment ->
+            val menuItemId = fragment.menuItemId
             val menuItem =
                 checkNotNull(bottomNavigationView.menu.findItem(menuItemId)) {
                     "[RNScreens] Missing MenuItem for id: $menuItemId"
                 }
-            check(menuItem.itemId == menuItemId) { "[RNScreens] Illegal state: menu items are shuffled" }
             updateMenuItemAppearance(context, menuItem, fragment.tabsScreen, tabsAppearance)
         }
     }

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

@@ -2,30 +2,12 @@ package com.swmansion.rnscreens.tabs.container
 
 import android.view.Menu
 import android.view.MenuItem
-import com.swmansion.rnscreens.tabs.screen.TabsScreen
+import com.swmansion.rnscreens.tabs.screen.TabsScreenFragment
 
-// MenuItem ids are offset by one, because 0 has special meaning in the BottomNavigationMenuView API.
-
-/**
- * Compute MenuItem id for a fragment at given index in "tabsModel" of TabsContainer
- */
-internal fun menuItemIdForFragmentAtIndex(fragmentIndex: Int): Int = fragmentIndex + 1
-
-/**
- * Compute fragment index in "tabsModel" of TabsContainer for a MenuItem with given id.
- */
-internal fun fragmentIndexForMenuItemId(menuItemId: Int): Int {
-    check(menuItemId >= 1) { "[RNScreens] MenuItem id must not be less than 1" }
-    return menuItemId - 1
-}
-
-internal fun Menu.getOrCreateMenuItemForFragmentAt(
-    index: Int,
-    tabsScreen: TabsScreen,
-): MenuItem =
-    this.findItem(menuItemIdForFragmentAtIndex(index)) ?: this.add(
+internal fun Menu.getOrCreateMenuItemForFragment(fragment: TabsScreenFragment): MenuItem =
+    this.findItem(fragment.menuItemId) ?: this.add(
         Menu.NONE,
-        menuItemIdForFragmentAtIndex(index),
+        fragment.menuItemId,
         Menu.NONE,
-        tabsScreen.tabTitle,
+        fragment.tabsScreen.tabTitle,
     )

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

@@ -24,6 +24,7 @@ import com.swmansion.rnscreens.common.colorscheme.ColorSchemeCoordinator
 import com.swmansion.rnscreens.common.colorscheme.ColorSchemeListener
 import com.swmansion.rnscreens.common.colorscheme.ColorSchemeProviding
 import com.swmansion.rnscreens.common.container.Container
+import com.swmansion.rnscreens.common.container.ContainerItem
 import com.swmansion.rnscreens.common.container.ParentContainerItemRegistry
 import com.swmansion.rnscreens.helpers.FragmentManagerHelper
 import com.swmansion.rnscreens.helpers.ViewFinder
@@ -67,7 +68,8 @@ class TabsContainer internal constructor(
             val selectedTabScreen = this@TabsContainer.selectedTab.tabsScreen
 
             if (selectedTabScreen.shouldUseRepeatedTabSelectionPopToRootSpecialEffect) {
-                val screenStack = ViewFinder.findScreenStackInFirstDescendantChain(selectedTabScreen)
+                val screenStack =
+                    ViewFinder.findScreenStackInFirstDescendantChain(selectedTabScreen)
                 if (screenStack != null && screenStack.popToRoot()) {
                     return true
                 }
@@ -492,7 +494,10 @@ class TabsContainer internal constructor(
 
     private fun performSelectedTabUpdate() {
         if (pendingStateUpdateRequest == null) {
-            RNSLog.w(TAG, "TabsContainer::performSelectedTabUpdate called w/o pending operation; skipping update")
+            RNSLog.w(
+                TAG,
+                "TabsContainer::performSelectedTabUpdate called w/o pending operation; skipping update",
+            )
             return
         }
 
@@ -516,7 +521,10 @@ class TabsContainer internal constructor(
         if (bottomNavigationView.selectedItemId != nextSelectedMenuItemId || navState.isEmpty()) {
             isInExternalOperationContext = true
             // This triggers on OnMenuItemClicked callback, where we perform actual update from
-            bottomNavigationView.setSelectedItemIdWithActionOrigin(nextSelectedMenuItemId, stateUpdateRequest.actionOrigin)
+            bottomNavigationView.setSelectedItemIdWithActionOrigin(
+                nextSelectedMenuItemId,
+                stateUpdateRequest.actionOrigin,
+            )
             isInExternalOperationContext = false
         } else {
             observerRegistry.emitOnNavigationStateUpdateRejected(
@@ -530,17 +538,19 @@ class TabsContainer internal constructor(
     }
 
     private fun updateNavigationMenuStructure() {
-        if (bottomNavigationView.menu.size != tabsModel.size) {
-            // Most likely first render or some tab has been removed. Let's nuke the menu (easiest option).
-            bottomNavigationView.menu.clear()
-        }
-        tabsModel.forEachIndexed { index, fragment ->
-            val menuItem =
-                bottomNavigationView.menu.getOrCreateMenuItemForFragmentAt(
-                    index,
-                    fragment.tabsScreen,
-                )
-            check(fragmentIndexForMenuItemId(menuItem.itemId) == index) { "[RNScreens] Illegal state: menu items are shuffled" }
+        val menu = bottomNavigationView.menu
+        val isMenuInSync =
+            menu.size == tabsModel.size &&
+                tabsModel.withIndex().all { (index, fragment) ->
+                    menu.getItem(index).itemId == fragment.menuItemId
+                }
+
+        if (isMenuInSync) {
+            return
+        }
+        menu.clear()
+        tabsModel.forEach { fragment ->
+            menu.getOrCreateMenuItemForFragment(fragment)
         }
     }
 
@@ -573,7 +583,10 @@ class TabsContainer internal constructor(
         }
 
         progressNavigationState(nextSelectedFragment.requireScreenKey, actionOrigin)
-        applyNextSelectedFragmentToFragmentManagerSync(currentSelectedFragment, nextSelectedFragment)
+        applyNextSelectedFragmentToFragmentManagerSync(
+            currentSelectedFragment,
+            nextSelectedFragment,
+        )
         return true
     }
 
@@ -643,7 +656,8 @@ class TabsContainer internal constructor(
             return false
         }
 
-        val stateChanged = updateNavigationStateAndSelectedFragment(nextSelectedFragment, actionOrigin)
+        val stateChanged =
+            updateNavigationStateAndSelectedFragment(nextSelectedFragment, actionOrigin)
 
         val hasTriggeredSpecialEffect =
             if (isRepeated) specialEffectsHandler.handleRepeatedTabSelection() else false
@@ -688,7 +702,8 @@ class TabsContainer internal constructor(
 
         // We expect at most a single fragment added (detached fragments are not returned from
         // FragmentManager.getFragments call) and it being the currently selected tab.
-        val isInUpToDateState = currentFragments.size == 1 && currentFragments.first() === selectedTab
+        val isInUpToDateState =
+            currentFragments.size == 1 && currentFragments.first() === selectedTab
         if (isInUpToDateState) {
             return
         } else if (currentFragments.isEmpty()) {
@@ -717,12 +732,10 @@ class TabsContainer internal constructor(
         appearanceCoordinator.updateTabAppearance(themedContext, this)
     }
 
-    private fun getFragmentForMenuItemId(itemId: Int): TabsScreenFragment? = tabsModel.getOrNull(fragmentIndexForMenuItemId(itemId))
+    private fun getFragmentForMenuItemId(itemId: Int): TabsScreenFragment? = tabsModel.find { it.menuItemId == itemId }
 
     private fun getMenuItemIdForFragment(tabsScreenFragment: TabsScreenFragment): Int? =
-        tabsModel.indexOfFirst { it === tabsScreenFragment }.takeIf { it != -1 }?.let {
-            menuItemIdForFragmentAtIndex(it)
-        }
+        tabsScreenFragment.menuItemId.takeIf { tabsModel.any { it === tabsScreenFragment } }
 
     private fun getSelectedTabsScreenFragmentId(): Int? =
         tabsModel
@@ -731,10 +744,9 @@ class TabsContainer internal constructor(
 
     private fun getMenuItemForTabsScreen(tabsScreen: TabsScreen): MenuItem? =
         tabsModel
-            .indexOfFirst { it.tabsScreen === tabsScreen }
-            .takeIf { it != -1 }
-            ?.let { index ->
-                bottomNavigationView.menu.findItem(menuItemIdForFragmentAtIndex(index))
+            .find { it.tabsScreen === tabsScreen }
+            ?.let { fragment ->
+                bottomNavigationView.menu.findItem(fragment.menuItemId)
             }
 
     private fun getFragmentForScreenKey(screenKey: String): TabsScreenFragment? = tabsModel.find { it.requireScreenKey == screenKey }
@@ -780,6 +792,15 @@ class TabsContainer internal constructor(
         return selectedTab.tabsScreen.findContentScrollView()
     }
 
+    // Only the active item is consulted - a preventing screen inside an inactive tab
+    // does not veto the dismissal.
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? =
+        if (navState.isNotEmpty()) {
+            selectedTab.tabsScreen.wantsToPreventStackNativeDismiss()
+        } else {
+            null
+        }
+
     // endregion
 
     companion object {