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

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 {

package/android/src/main/java/com/swmansion/rnscreens/tabs/host/TabsHost.kt

@@ -161,6 +161,16 @@ class TabsHost(
         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 forceSubtreeMeasureAndLayoutPass() {
         measure(
             MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),

package/android/src/main/java/com/swmansion/rnscreens/tabs/host/TabsHostA11yCoordinator.kt

@@ -3,6 +3,9 @@ package com.swmansion.rnscreens.tabs.host
 import android.os.Build
 import android.view.MenuItem
 import android.view.View
+import androidx.core.view.AccessibilityDelegateCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.core.view.children
 import androidx.core.view.get
 import com.google.android.material.bottomnavigation.BottomNavigationView
@@ -23,8 +26,26 @@ class TabsHostA11yCoordinator(
             menuItem.contentDescription = tabsScreen.tabBarItemAccessibilityLabel
         }
 
-        // when matching view by id, espresso driver seems to look for tag property
-        findTabItemView(menuItem.itemId)?.tag = tabsScreen.tabBarItemTestID
+        findTabItemView(menuItem.itemId)?.let { tabItemView ->
+            // when matching view by id, espresso driver seems to look for tag property
+            tabItemView.tag = tabsScreen.tabBarItemTestID
+
+            // UiAutomator-based drivers (Maestro, Appium) read the node's viewIdResourceName instead,
+            // so expose the testID there as well — this is what React Native's ReactAccessibilityDelegate
+            // does for every other view. Read through to the screen so a prop update is reflected.
+            ViewCompat.setAccessibilityDelegate(
+                tabItemView,
+                object : AccessibilityDelegateCompat() {
+                    override fun onInitializeAccessibilityNodeInfo(
+                        host: View,
+                        info: AccessibilityNodeInfoCompat,
+                    ) {
+                        super.onInitializeAccessibilityNodeInfo(host, info)
+                        info.viewIdResourceName = tabsScreen.tabBarItemTestID
+                    }
+                },
+            )
+        }
     }
 
     // Third-party SDKs can freely assign their own ids to id-less views in CustomBottomNavigationView's subtree and there is no way to

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreen.kt

@@ -2,6 +2,8 @@ package com.swmansion.rnscreens.tabs.screen
 
 import android.content.res.Configuration
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
+import android.util.SparseArray
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.facebook.react.uimanager.ThemedReactContext
@@ -127,6 +129,17 @@ class TabsScreen(
         b: Int,
     ) = Unit
 
+    override fun dispatchSaveInstanceState(container: SparseArray<Parcelable>) {
+        // Do nothing. React Native owns this view hierarchy and keeps it alive, so there is no
+        // need to serialize/deserialize native view state. View ids in this subtree are react
+        // tags, which are not stable identities - restoring state by id can apply state saved
+        // by one view type to a different one, crashing e.g. in CompoundButton (see #4523).
+    }
+
+    override fun dispatchRestoreInstanceState(container: SparseArray<Parcelable>) {
+        // Ignore restoring instance state too, as we are not saving anything anyways.
+    }
+
     internal fun setTabsScreenDelegate(delegate: TabsScreenDelegate?) {
         tabsScreenDelegate = WeakReference(delegate)
     }
@@ -176,6 +189,10 @@ class TabsScreen(
 
     override fun findContentScrollView(): ViewGroup? = containerItemSupport.findContentScrollView(this)
 
+    // TabsScreen has no `preventNativeDismiss` flag of its own - it only forwards
+    // the question to its nested container.
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? = resolveNestedContainer()?.wantsToPreventStackNativeDismiss()
+
     // endregion
 
     companion object {

package/android/src/main/java/com/swmansion/rnscreens/tabs/screen/TabsScreenFragment.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import com.swmansion.rnscreens.helpers.ViewIdGenerator
 
 class TabsScreenFragment(
     internal val tabsScreen: TabsScreen,
@@ -13,6 +14,8 @@ class TabsScreenFragment(
     internal val requireScreenKey: String by tabsScreen::requireScreenKey
     internal val isPreventNativeSelectionEnabled: Boolean by tabsScreen::preventNativeSelection
 
+    internal val menuItemId: Int = ViewIdGenerator.generateViewId()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

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

@@ -49,6 +49,13 @@ internal fun dpToPx(
  */
 internal fun View.dpToPx(dp: Float): Float = dpToPx(dp, resources.displayMetrics.density)
 
+/**
+ * Converts an SP value to pixels using the density of the display this [View] is
+ * attached to (including the current font scale). Uses the view's own resources
+ * rather than the process-global density read by [PixelUtil]. See [pxToDp].
+ */
+internal fun View.spToPx(sp: Float): Float = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, resources.displayMetrics)
+
 internal fun resolveDimensionAttr(
     context: Context,
     attrId: Int,

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

@@ -0,0 +1,22 @@
+package com.swmansion.rnscreens.utils
+
+import android.content.Context
+import android.util.TypedValue
+import androidx.annotation.StyleRes
+
+/**
+ * Resolves a theme attribute pointing at a style (e.g. `?attr/textAppearanceTitleLarge`)
+ * to its concrete style resource id. Used to recover Material's default text
+ * appearances so they can be re-applied at runtime.
+ */
+@StyleRes
+internal fun resolveStyleResAttr(
+    context: Context,
+    attr: Int,
+): Int {
+    val typedValue = TypedValue()
+    require(context.theme.resolveAttribute(attr, typedValue, true)) {
+        "[RNScreens] Unable to resolve Material theme style attribute."
+    }
+    return typedValue.resourceId
+}

package/android/src/main/res/base/layout/rns_collapsing_toolbar_large_available_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutLargeStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+    app:collapsedTitleGravityMode="availableSpace" />

package/android/src/main/res/base/layout/rns_collapsing_toolbar_large_entire_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutLargeStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+    app:collapsedTitleGravityMode="entireSpace" />

package/android/src/main/res/base/layout/rns_collapsing_toolbar_medium_available_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutMediumStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+    app:collapsedTitleGravityMode="availableSpace" />

package/android/src/main/res/base/layout/rns_collapsing_toolbar_medium_entire_space.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.CollapsingToolbarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/collapsingToolbarLayoutMediumStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+    app:collapsedTitleGravityMode="entireSpace" />

package/cpp/legacy/RNSScreenRemovalListener.cpp

@@ -1,12 +1,42 @@
 #include "RNSScreenRemovalListener.h"
 #include <react/renderer/mounting/ShadowViewMutation.h>
+#include <utility>
 using namespace facebook::react;
 
+uint64_t RNSScreenRemovalListener::setListener(
+    std::function<void(int)> &&listenerFunction) {
+  std::lock_guard<std::mutex> lock(listenerMutex_);
+  listenerFunction_ = std::move(listenerFunction);
+  return ++currentToken_;
+}
+
+void RNSScreenRemovalListener::clearListener(uint64_t token) {
+  std::lock_guard<std::mutex> lock(listenerMutex_);
+  if (token == currentToken_) {
+    listenerFunction_ = nullptr;
+  }
+}
+
 std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
     SurfaceId surfaceId,
     MountingTransaction::Number transactionNumber,
     const TransactionTelemetry &telemetry,
     ShadowViewMutationList mutations) const {
+  // Copy under the lock, invoke outside it: the callback makes a JNI call and
+  // must not run while holding a lock the module thread also takes.
+  std::function<void(int)> listener;
+  {
+    std::lock_guard<std::mutex> lock(listenerMutex_);
+    listener = listenerFunction_;
+  }
+
+  if (!listener) {
+    // Orphaned between module teardown and the next install: pass the
+    // transaction through untouched.
+    return MountingTransaction{
+        surfaceId, transactionNumber, std::move(mutations), telemetry};
+  }
+
   for (const ShadowViewMutation &mutation : mutations) {
     // When using RNSModalScreen on Android it should be added here.
     if (mutation.type == ShadowViewMutation::Type::Remove &&
@@ -16,7 +46,7 @@ std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
       // We call the listener function even if this screen has not been owned
       // by RNSScreenStack as since RN 0.78 we do not have enough information
       // here. This final filter is applied later in NativeProxy.
-      listenerFunction_(mutation.oldChildShadowView.tag);
+      listener(mutation.oldChildShadowView.tag);
     }
   }
 

package/cpp/legacy/RNSScreenRemovalListener.h

@@ -4,12 +4,22 @@
 #include <react/renderer/mounting/MountingOverrideDelegate.h>
 #include <react/renderer/mounting/ShadowView.h>
 
+#include <cstdint>
+#include <functional>
+#include <mutex>
+
 using namespace facebook::react;
 
 struct RNSScreenRemovalListener : public MountingOverrideDelegate {
-  std::function<void(int)> listenerFunction_;
-  RNSScreenRemovalListener(std::function<void(int)> &&listenerFunction_)
-      : listenerFunction_(std::move(listenerFunction_)) {}
+  RNSScreenRemovalListener() = default;
+
+  // RN core lacks a `removeMountingOverrideDelegate` API, so this instance is
+  // process-immortal and swaps its callback instead of being replaced. The
+  // ownership token keeps a stale proxy's teardown from clearing a newer
+  // proxy's listener.
+  // See https://github.com/software-mansion/react-native-screens/pull/4413
+  uint64_t setListener(std::function<void(int)> &&listenerFunction);
+  void clearListener(uint64_t token);
 
   bool shouldOverridePullTransaction() const override;
   std::optional<MountingTransaction> pullTransaction(
@@ -17,4 +27,9 @@ struct RNSScreenRemovalListener : public MountingOverrideDelegate {
       MountingTransaction::Number number,
       const TransactionTelemetry &telemetry,
       ShadowViewMutationList mutations) const override;
+
+ private:
+  mutable std::mutex listenerMutex_;
+  std::function<void(int)> listenerFunction_;
+  uint64_t currentToken_{0};
 };

package/ios/RNSEnums.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#import <UIKit/UIKit.h>
+
 typedef NS_ENUM(NSInteger, RNSScrollEdgeEffect) {
   RNSScrollEdgeEffectAutomatic,
   RNSScrollEdgeEffectHard,