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

package/README.md

@@ -6,10 +6,6 @@
 
 This project aims to expose native navigation container components to React Native. It is not designed to be used as a standalone library but rather as a dependency of a [full-featured navigation library](https://github.com/react-navigation/react-navigation).
 
-## Fabric
-
-To learn about how to use `react-native-screens` with Fabric architecture, head over to [Fabric README](README-Fabric.md). Instructions on how to run Fabric Example within this repo can be found in the [FabricExample README](FabricExample/README.md).
-
 ## Supported platforms
 
 - [x] iOS

package/android/build.gradle

@@ -141,6 +141,7 @@ android {
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "RNS_DEBUG_LOGGING", areDebugLogsEnabled().toString()
+        consumerProguardFiles "consumer-rules.pro"
         ndk {
             abiFilters (*reactNativeArchitectures())
         }

package/android/consumer-rules.pro

@@ -0,0 +1,3 @@
+# RNScreensFragmentFactory recognises library fragments by their package-name prefix when
+# restoring saved state. Keep their names so R8 can't rename or repackage them.
+-keepnames class com.swmansion.rnscreens.** extends androidx.fragment.app.Fragment

package/android/src/fabric/java/com/swmansion/rnscreens/legacy/FabricEnabledHeaderConfigViewGroup.kt

@@ -71,6 +71,8 @@ abstract class FabricEnabledHeaderConfigViewGroup(
         mStateWrapper?.updateState(map)
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     companion object {
         private const val DELTA = 0.9f
     }

package/android/src/fabric/java/com/swmansion/rnscreens/legacy/FabricEnabledHeaderSubviewViewGroup.kt

@@ -72,6 +72,8 @@ abstract class FabricEnabledHeaderSubviewViewGroup(
         mStateWrapper?.updateState(map)
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     companion object {
         private const val DELTA = 0.9f
     }

package/android/src/fabric/java/com/swmansion/rnscreens/legacy/FabricEnabledViewGroup.kt

@@ -18,6 +18,14 @@ abstract class FabricEnabledViewGroup(
     private var lastHeight = 0f
     private var lastHeaderHeight = 0f
 
+    protected var isStateInvalidated = false
+        private set
+
+    // A detached screen can miss native layout changes while the commit hook resets its shadow state.
+    protected fun invalidateState() {
+        isStateInvalidated = true
+    }
+
     fun setStateWrapper(wrapper: StateWrapper?) {
         mStateWrapper = wrapper
     }
@@ -36,15 +44,20 @@ abstract class FabricEnabledViewGroup(
         val realHeaderHeight: Float = pxToDp(headerHeight.toFloat())
 
         // Check incoming state values. If they're already the correct value, return early to prevent
-        // infinite UpdateState/SetState loop.
+        // an infinite UpdateState/SetState loop. The state-invalidated flag forces the update when the
+        // commit hook has reset the state while the screen was detached from the native hierarchy
+        // - the screen may have missed some layout changes in the meantime (see #4336 and #4760).
         val delta = 0.9f
-        if (abs(lastWidth - realWidth) < delta &&
+        if (!isStateInvalidated &&
+            abs(lastWidth - realWidth) < delta &&
             abs(lastHeight - realHeight) < delta &&
             abs(lastHeaderHeight - realHeaderHeight) < delta
         ) {
             return
         }
 
+        val stateWrapper = mStateWrapper ?: return
+        isStateInvalidated = false
         lastWidth = realWidth
         lastHeight = realHeight
         lastHeaderHeight = realHeaderHeight
@@ -55,6 +68,8 @@ abstract class FabricEnabledViewGroup(
                 putDouble("contentOffsetX", 0.0)
                 putDouble("contentOffsetY", realHeaderHeight.toDouble())
             }
-        mStateWrapper?.updateState(map)
+        stateWrapper.updateState(map)
     }
+
+    override fun shouldDelayChildPressedState(): Boolean = false
 }

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

@@ -18,8 +18,8 @@ import com.swmansion.rnscreens.legacy.ScreenStackViewManager
 import com.swmansion.rnscreens.legacy.ScreenViewManager
 import com.swmansion.rnscreens.legacy.SearchBarManager
 import com.swmansion.rnscreens.legacy.utils.ScreenDummyLayoutHelper
-import com.swmansion.rnscreens.modals.formsheet.react.contentwrapper.FormSheetContentWrapperViewManager
-import com.swmansion.rnscreens.modals.formsheet.react.host.FormSheetHostViewManager
+import com.swmansion.rnscreens.react.modals.formsheet.contentwrapper.FormSheetContentWrapperViewManager
+import com.swmansion.rnscreens.react.modals.formsheet.host.FormSheetHostViewManager
 import com.swmansion.rnscreens.safearea.SafeAreaViewManager
 import com.swmansion.rnscreens.scrollviewmarker.ScrollViewMarkerViewManager
 import com.swmansion.rnscreens.stack.header.config.StackHeaderConfigViewManager

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

@@ -57,10 +57,14 @@ class ScreensModule(
     }
 
     private fun setupFabric() {
-        val fabricUIManager =
-            UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as FabricUIManager
+        // Null when the host has no live ReactInstance. In bridgeless mode this happens only while
+        // the instance owning this module is being torn down (reload / destroy): ReactHostImpl
+        // drops its instance reference before it stops the JS thread, so JS can still create this
+        // module. There is nothing to set up then, the module gets invalidated right after.
+        // See https://github.com/software-mansion/react-native-screens/issues/4699
+        val uiManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) ?: return
         proxy?.apply {
-            nativeAddMutationsListener(fabricUIManager)
+            nativeAddMutationsListener(uiManager as FabricUIManager)
         }
     }
 

package/android/src/main/java/com/swmansion/rnscreens/common/colorscheme/ColorSchemeCoordinator.kt

@@ -3,6 +3,7 @@ package com.swmansion.rnscreens.common.colorscheme
 import android.content.res.Configuration
 import android.view.View
 import android.view.ViewParent
+import java.lang.ref.WeakReference
 import kotlin.properties.Delegates
 
 internal typealias OnUiNightModeResolvedCallback = (nightMode: Int) -> Unit
@@ -16,6 +17,15 @@ internal class ColorSchemeCoordinator :
         }
     }
     private var parentProvider: ColorSchemeProviding? = null
+
+    /**
+     * Parent provider known from ownership, taking precedence over the view-tree walk
+     * in [setup]. Set it when the owner knows its provider statically (e.g. a fragment's
+     * root view always resolves through the container that created the fragment) - the
+     * walk is unreliable there: transitions reparent an exiting fragment's view into the
+     * container's ViewGroupOverlay, whose parent chain ends in null. Survives [teardown].
+     */
+    internal var explicitParentProvider: WeakReference<ColorSchemeProviding>? = null
     private var systemUiNightMode: Int = Configuration.UI_MODE_NIGHT_NO
     private var lastAppliedUiNightMode: Int? = null
     private val childListeners = mutableListOf<ColorSchemeListener>()
@@ -60,7 +70,7 @@ internal class ColorSchemeCoordinator :
 
         systemUiNightMode =
             hostView.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-        parentProvider = findParentColorSchemeProvider(hostView)
+        parentProvider = explicitParentProvider?.get() ?: findParentColorSchemeProvider(hostView)
         parentProvider?.addColorSchemeListener(this)
         onUiNightModeResolved = onUiNightModeResolvedCallback
         isSetUp = true

package/android/src/main/java/com/swmansion/rnscreens/common/container/Container.kt

@@ -17,4 +17,13 @@ interface Container {
      * in the subtree does.
      */
     fun wantsToPreventStackNativeDismiss(): ContainerItem?
+
+    /**
+     * Asks the container to pop its own stack to the root, if it can. If it has nothing
+     * to pop (or can't pop), the request is forwarded to the nested container of its
+     * active item.
+     *
+     * @return `true` if a pop was performed or requested (here or in a nested container), `false` otherwise.
+     */
+    fun requestPopToRoot(): Boolean
 }

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/coordinator/FormSheetAppearanceCoordinator.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+package com.swmansion.rnscreens.core.modals.formsheet.coordinator
 
 import android.os.Build
 import android.widget.FrameLayout
@@ -6,7 +6,7 @@ import androidx.core.view.doOnNextLayout
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetConfig
 import com.swmansion.rnscreens.utils.dpToPx
 
 internal class FormSheetAppearanceCoordinator(

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/coordinator/FormSheetBehaviorController.kt

@@ -1,9 +1,9 @@
-package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+package com.swmansion.rnscreens.core.modals.formsheet.coordinator
 
 import android.view.View
 import android.widget.FrameLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetDetents
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetDetents
 
 internal class FormSheetBehaviorController(
     private val sheetView: FrameLayout,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/coordinator/FormSheetDimensionsCoordinator.kt

@@ -1,14 +1,14 @@
-package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+package com.swmansion.rnscreens.core.modals.formsheet.coordinator
 
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetAvailableHeightProvider
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetContainer
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialog
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetDetents
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetAvailableHeightProvider
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetContainer
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetDialog
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetDetents
 
 internal class FormSheetDimensionsCoordinator(
     private val dialog: FormSheetDialog,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/coordinator/FormSheetKeyboardCoordinator.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+package com.swmansion.rnscreens.core.modals.formsheet.coordinator
 
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/coordinator/FormSheetNativeDismissCoordinator.kt

@@ -1,7 +1,7 @@
-package com.swmansion.rnscreens.modals.formsheet.native.coordinator
+package com.swmansion.rnscreens.core.modals.formsheet.coordinator
 
 import androidx.activity.OnBackPressedCallback
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialog
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetDialog
 
 internal class FormSheetNativeDismissCoordinator(
     private val dialog: FormSheetDialog,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native/core → core/modals/formsheet/dialog}/FormSheetAvailableHeightProvider.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.core
+package com.swmansion.rnscreens.core.modals.formsheet.dialog
 
 import android.content.Context
 import android.view.View

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native/core → core/modals/formsheet/dialog}/FormSheetContainer.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.core
+package com.swmansion.rnscreens.core.modals.formsheet.dialog
 
 import android.annotation.SuppressLint
 import android.content.Context

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native/core → core/modals/formsheet/dialog}/FormSheetDialog.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.core
+package com.swmansion.rnscreens.core.modals.formsheet.dialog
 
 import android.content.Context
 import android.os.Bundle

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native/core → core/modals/formsheet/dialog}/FormSheetDialogManager.kt

@@ -1,19 +1,26 @@
-package com.swmansion.rnscreens.modals.formsheet.native.core
+package com.swmansion.rnscreens.core.modals.formsheet.dialog
 
+import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.view.ContextThemeWrapper
 import android.view.View
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetDialogEventEmitter
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
-import com.swmansion.rnscreens.modals.formsheet.native.presentation.FormSheetDimmingManager
-import com.swmansion.rnscreens.modals.formsheet.native.presentation.FormSheetPresentation
-import com.swmansion.rnscreens.modals.formsheet.native.presentation.FormSheetPresentationManager
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetDialogEventEmitter
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetConfig
+import com.swmansion.rnscreens.core.modals.formsheet.presentation.FormSheetDimmingManager
+import com.swmansion.rnscreens.core.modals.formsheet.presentation.FormSheetPresentation
+import com.swmansion.rnscreens.core.modals.formsheet.presentation.FormSheetPresentationManager
 import kotlin.properties.Delegates
 
+/**
+ * @param activityProvider returns the activity whose decor view hosts the sheet's dimming. The default walks the
+ * [ContextWrapper] chain of [context]; hosts whose context does not wrap an activity must provide their own.
+ */
 class FormSheetDialogManager(
     context: Context,
     private val contentView: View,
+    activityProvider: () -> Activity? = { context.findActivity() },
 ) {
     private var formSheetConfig = FormSheetConfig()
 
@@ -45,7 +52,7 @@ class FormSheetDialogManager(
             }
         }
 
-    private val dimmingManager = FormSheetDimmingManager(context)
+    private val dimmingManager = FormSheetDimmingManager(activityProvider)
 
     private val presentationManager =
         FormSheetPresentationManager(
@@ -87,3 +94,14 @@ class FormSheetDialogManager(
         presentationManager.destroy()
     }
 }
+
+private fun Context.findActivity(): Activity? {
+    var current: Context? = this
+    while (current is ContextWrapper) {
+        if (current is Activity) {
+            return current
+        }
+        current = current.baseContext
+    }
+    return null
+}

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/interfaces/FormSheetContentSizeChangeDelegate.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.interfaces
+package com.swmansion.rnscreens.core.modals.formsheet.interfaces
 
 interface FormSheetContentSizeChangeDelegate {
     fun onContentHeightChanged(newHeight: Int)

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/interfaces/FormSheetContentSizeChangeProvider.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.interfaces
+package com.swmansion.rnscreens.core.modals.formsheet.interfaces
 
 interface FormSheetContentSizeChangeProvider {
     fun setContentSizeChangeDelegate(delegate: FormSheetContentSizeChangeDelegate?)

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/interfaces/FormSheetDialogEventEmitter.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.interfaces
+package com.swmansion.rnscreens.core.modals.formsheet.interfaces
 
 import com.swmansion.rnscreens.common.event.ViewAppearanceEventEmitter
 

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/model/FormSheetConfig.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.model
+package com.swmansion.rnscreens.core.modals.formsheet.model
 
 internal data class FormSheetConfig(
     val isOpen: Boolean = false,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/model/FormSheetDetents.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.model
+package com.swmansion.rnscreens.core.modals.formsheet.model
 
 import kotlin.math.roundToInt
 

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetAnimatorFactory.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 import android.animation.Animator
 import android.animation.AnimatorSet

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetDimmingManager.kt

@@ -1,18 +1,18 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 import android.app.Activity
-import android.content.Context
-import android.content.ContextWrapper
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.util.Log
 import android.view.View
-import com.facebook.react.bridge.ReactContext
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlin.math.roundToInt
 
+/**
+ * @param activityProvider returns the activity whose decor view hosts the dimming of the bottom-most sheet.
+ */
 internal class FormSheetDimmingManager(
-    private val context: Context,
+    private val activityProvider: () -> Activity?,
 ) {
     // TODO: @t0maboro - consider exposing as a prop
     internal val maxAlpha: Float = MAX_DIMMING_ALPHA_FRACTION
@@ -92,19 +92,7 @@ internal class FormSheetDimmingManager(
         )
     }
 
-    private fun resolveActivityDecorView(): View? {
-        var current: Context? = context
-        while (current is ContextWrapper) {
-            if (current is Activity) {
-                return current.window?.decorView
-            }
-            if (current is ReactContext) {
-                return current.currentActivity?.window?.decorView
-            }
-            current = current.baseContext
-        }
-        return null
-    }
+    private fun resolveActivityDecorView(): View? = activityProvider()?.window?.decorView
 
     companion object {
         const val TAG = "FormSheetDimmingManager"

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetDismissalOrigin.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 internal enum class FormSheetDismissalOrigin {
     /**

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetPresentation.kt

@@ -1,19 +1,19 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 import android.content.Context
 import android.util.Log
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetAppearanceCoordinator
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetBehaviorController
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetDimensionsCoordinator
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetKeyboardCoordinator
-import com.swmansion.rnscreens.modals.formsheet.native.coordinator.FormSheetNativeDismissCoordinator
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetContainer
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialog
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetDetents
+import com.swmansion.rnscreens.core.modals.formsheet.coordinator.FormSheetAppearanceCoordinator
+import com.swmansion.rnscreens.core.modals.formsheet.coordinator.FormSheetBehaviorController
+import com.swmansion.rnscreens.core.modals.formsheet.coordinator.FormSheetDimensionsCoordinator
+import com.swmansion.rnscreens.core.modals.formsheet.coordinator.FormSheetKeyboardCoordinator
+import com.swmansion.rnscreens.core.modals.formsheet.coordinator.FormSheetNativeDismissCoordinator
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetContainer
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetDialog
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetConfig
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetDetents
 
 internal class FormSheetPresentation(
     themedContext: Context,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetPresentationManager.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetPresentationState.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 internal enum class FormSheetPresentationState {
     /**

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/native → core/modals/formsheet}/presentation/FormSheetStackRegistry.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.native.presentation
+package com.swmansion.rnscreens.core.modals.formsheet.presentation
 
 internal object FormSheetStackRegistry {
     private val stack = mutableListOf<FormSheetPresentationManager>()

package/android/src/main/java/com/swmansion/rnscreens/ext/FragmentManagerExt.kt

@@ -0,0 +1,6 @@
+package com.swmansion.rnscreens.ext
+
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
+
+internal fun FragmentManager.createTransactionWithReordering(): FragmentTransaction = this.beginTransaction().setReorderingAllowed(true)

package/android/src/main/java/com/swmansion/rnscreens/helpers/FragmentManagerHelper.kt

@@ -6,7 +6,6 @@ import android.view.ViewParent
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentTransaction
 import com.facebook.react.ReactRootView
 import com.swmansion.rnscreens.common.FragmentProviding
 
@@ -75,5 +74,3 @@ object FragmentManagerHelper {
         }
     }
 }
-
-internal fun FragmentManager.createTransactionWithReordering(): FragmentTransaction = this.beginTransaction().setReorderingAllowed(true)

package/android/src/main/java/com/swmansion/rnscreens/helpers/NoTintDrawable.kt

@@ -0,0 +1,31 @@
+package com.swmansion.rnscreens.helpers
+
+import android.content.res.ColorStateList
+import android.content.res.Resources
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import androidx.appcompat.graphics.drawable.DrawableWrapperCompat
+
+// Ignores tinting so the wrapped icon keeps its own colors even when a host view
+// (e.g. BottomNavigationView) applies an itemIconTintList.
+internal class NoTintDrawable(
+    drawable: Drawable,
+) : DrawableWrapperCompat(drawable) {
+    override fun setTintList(tint: ColorStateList?) = Unit
+
+    override fun setTint(tintColor: Int) = Unit
+
+    override fun setTintMode(tintMode: PorterDuff.Mode?) = Unit
+
+    override fun getConstantState(): ConstantState? = drawable?.constantState?.let(::NoTintConstantState)
+
+    private class NoTintConstantState(
+        private val wrappedState: ConstantState,
+    ) : ConstantState() {
+        override fun newDrawable(): Drawable = NoTintDrawable(wrappedState.newDrawable())
+
+        override fun newDrawable(res: Resources?): Drawable = NoTintDrawable(wrappedState.newDrawable(res))
+
+        override fun getChangingConfigurations(): Int = wrappedState.changingConfigurations
+    }
+}

package/android/src/main/java/com/swmansion/rnscreens/helpers/ViewFinder.kt

@@ -5,7 +5,6 @@ import android.view.ViewGroup
 import android.widget.ScrollView
 import androidx.core.view.isNotEmpty
 import androidx.core.widget.NestedScrollView
-import com.swmansion.rnscreens.legacy.ScreenStack
 
 object ViewFinder {
     fun findScrollViewInFirstDescendantChain(view: View): ViewGroup? {
@@ -23,20 +22,4 @@ object ViewFinder {
 
         return null
     }
-
-    fun findScreenStackInFirstDescendantChain(view: View): ScreenStack? {
-        var currentView: View? = view
-
-        while (currentView != null) {
-            if (currentView is ScreenStack) {
-                return currentView
-            } else if (currentView is ViewGroup && currentView.isNotEmpty()) {
-                currentView = currentView.getChildAt(0)
-            } else {
-                break
-            }
-        }
-
-        return null
-    }
 }

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

@@ -27,6 +27,9 @@ import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.swmansion.rnscreens.common.FragmentProviding
+import com.swmansion.rnscreens.common.container.Container
+import com.swmansion.rnscreens.common.container.ContainerItem
+import com.swmansion.rnscreens.common.container.ContainerItemSupport
 import com.swmansion.rnscreens.legacy.bottomsheet.SheetAnimationCoordinator
 import com.swmansion.rnscreens.legacy.bottomsheet.SheetDetents
 import com.swmansion.rnscreens.legacy.bottomsheet.fitToContentsSheetHeight
@@ -46,7 +49,10 @@ class Screen(
     val reactContext: ThemedReactContext,
 ) : FabricEnabledViewGroup(reactContext),
     ScreenContentWrapper.OnLayoutCallback,
-    FragmentProviding {
+    FragmentProviding,
+    ContainerItem {
+    private val containerItemSupport = ContainerItemSupport()
+
     val fragment: Fragment?
         get() = fragmentWrapper?.fragment
 
@@ -236,7 +242,7 @@ class Screen(
     ) {
         // In case of form sheet we get layout notification a bit later, in `onBottomSheetBehaviorDidLayout`
         // after the attached behaviour laid out this view.
-        if (changed && isNativeStackScreen && !usesFormSheetPresentation()) {
+        if ((changed || isStateInvalidated) && isNativeStackScreen && !usesFormSheetPresentation()) {
             val width = r - l
             val height = b - t
 
@@ -565,6 +571,13 @@ class Screen(
         updateShadowNodeScreenSize(width, height, top + translationY.toInt())
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        // Rotation may reset the shadow state while this screen is covered. Republish it on the
+        // next layout, even if the native frame is identical to the one before detaching.
+        invalidateState()
+    }
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
@@ -619,6 +632,20 @@ class Screen(
         }
     }
 
+    // region ContainerItem
+
+    override fun registerNestedContainer(container: Container) = containerItemSupport.registerNestedContainer(container)
+
+    override fun unregisterNestedContainer(container: Container) = containerItemSupport.unregisterNestedContainer(container)
+
+    override fun resolveNestedContainer(): Container? = containerItemSupport.resolveNestedContainer()
+
+    override fun findContentScrollView(): ViewGroup? = containerItemSupport.findContentScrollView(this)
+
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? = resolveNestedContainer()?.wantsToPreventStackNativeDismiss()
+
+    // endregion
+
     enum class StackPresentation {
         PUSH,
         MODAL,