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

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

@@ -17,11 +17,15 @@ import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 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.ParentContainerItemRegistry
 import com.swmansion.rnscreens.legacy.events.ScreenDismissedEvent
 
 open class ScreenContainer(
     context: Context?,
-) : ViewGroup(context) {
+) : ViewGroup(context),
+    Container {
     @JvmField
     protected val screenWrappers = ArrayList<ScreenFragmentWrapper>()
 
@@ -43,6 +47,10 @@ open class ScreenContainer(
         }
     private var parentScreenWrapper: ScreenFragmentWrapper? = null
 
+    private val parentContainerRegistry = ParentContainerItemRegistry()
+
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     override fun onLayout(
         changed: Boolean,
         l: Int,
@@ -275,16 +283,27 @@ open class ScreenContainer(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
+        parentContainerRegistry.attach(this)
         isAttached = true
         setupFragmentManager()
     }
 
-    /** Removes fragments from fragment manager that are attached to this container  */
+    /**
+     * Removes fragments from fragment manager that are attached to this container, including
+     * fragments of screens already removed from it whose deferred removal hasn't run yet.
+     */
     private fun removeMyFragments(fragmentManager: FragmentManager) {
         val transaction = fragmentManager.beginTransaction()
         var hasFragments = false
         for (fragment in fragmentManager.fragments) {
-            if (fragment is ScreenFragment && fragment.screen.container === this) {
+            // `removeScreenAt` / `removeAllScreens` clear `screen.container` immediately but defer
+            // the fragment removal, so also match such orphans by the container view id.
+            if (fragment is ScreenFragment &&
+                (
+                    fragment.screen.container === this ||
+                        (fragment.screen.container == null && fragment.id == id)
+                )
+            ) {
                 transaction.remove(fragment)
                 hasFragments = true
             }
@@ -310,6 +329,7 @@ open class ScreenContainer(
 
         parentScreenWrapper?.removeChildScreenContainer(this)
         parentScreenWrapper = null
+        parentContainerRegistry.detach(this)
 
         super.onDetachedFromWindow()
         isAttached = false
@@ -444,4 +464,16 @@ open class ScreenContainer(
     protected open fun notifyContainerUpdate() {
         topScreen?.fragmentWrapper?.onContainerUpdate()
     }
+
+    // region Container
+
+    // Only the currently shown (top) screen is consulted.
+    override fun resolveCurrentContentScrollView(): ViewGroup? = topScreen?.findContentScrollView()
+
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? = topScreen?.wantsToPreventStackNativeDismiss()
+
+    // Nothing to pop here - the request goes to the shown screen's nested container.
+    override fun requestPopToRoot(): Boolean = topScreen?.resolveNestedContainer()?.requestPopToRoot() == true
+
+    // endregion
 }

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

@@ -6,6 +6,7 @@ import android.os.Build
 import android.view.View
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
+import com.swmansion.rnscreens.common.container.ContainerItem
 import com.swmansion.rnscreens.legacy.bottomsheet.requiresEnterTransitionPostponing
 import com.swmansion.rnscreens.legacy.bottomsheet.sheetShouldUseDimmingView
 import com.swmansion.rnscreens.legacy.bottomsheet.usesFormSheetPresentation
@@ -440,6 +441,18 @@ class ScreenStack(
         }
     }
 
+    // region Container
+
+    override fun wantsToPreventStackNativeDismiss(): ContainerItem? =
+        screenWrappers
+            .asReversed()
+            .filter { !dismissedWrappers.contains(it) }
+            .firstNotNullOfOrNull { it.screen.wantsToPreventStackNativeDismiss() }
+
+    override fun requestPopToRoot(): Boolean = popToRoot() || super.requestPopToRoot()
+
+    // endregion
+
     companion object {
         const val TAG = "ScreenStack"
 

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

@@ -231,7 +231,13 @@ class ScreenStackHeaderConfig(
 
     fun onUpdate() {
         val stack = screenStack
-        val isTop = stack == null || stack.topScreen == parent
+        // A screen that is not in a stack has nothing to configure a header for, and
+        // `canNavigateBack()` below asserts on exactly this condition. Treating a null
+        // stack as "is top" let a detached screen reach that assertion and throw.
+        if (stack == null) {
+            return
+        }
+        val isTop = stack.topScreen == parent
 
         if (!isAttachedToWindow || !isTop || isDestroyed) {
             return

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

@@ -47,6 +47,13 @@ class ScreenStackHeaderSubviewManager :
         Log.w("[RNScreens]", "hidesSharedBackground prop is not available on Android")
     }
 
+    override fun setVisibilityPriority(
+        view: ScreenStackHeaderSubview,
+        visibilityPriority: String?,
+    ) {
+        Log.w("[RNScreens]", "visibilityPriority prop is not available on Android")
+    }
+
     // synchronousShadowStateUpdatesEnabled is not available on Android atm,
     // however we must override their setters
     override fun setSynchronousShadowStateUpdatesEnabled(

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

@@ -77,6 +77,12 @@ class ScreenStackViewManager :
         value: Int?,
     ) = Unit
 
+    // tvOS-only: UIKit Menu back gesture handling lives on iOS/tvOS.
+    override fun setDisableDefaultMenuAction(
+        view: ScreenStack,
+        value: Boolean,
+    ) = Unit
+
     companion object {
         const val REACT_CLASS = "RNSScreenStack"
     }

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

@@ -51,6 +51,8 @@ internal class DimmingView(
         b: Int,
     ) = Unit
 
+    override fun shouldDelayChildPressedState(): Boolean = false
+
     // We do not want to have any action defined here. We just want listeners notified that the click happened.
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent?): Boolean {

package/android/src/main/java/com/swmansion/rnscreens/legacy/stack/views/ScreensCoordinatorLayout.kt

@@ -111,6 +111,8 @@ internal class ScreensCoordinatorLayout(
         }
     }
 
+    override fun shouldDelayChildPressedState(): Boolean = fragment.screen.usesFormSheetPresentation()
+
     override fun onLayout(
         changed: Boolean,
         l: Int,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/contentwrapper/FormSheetContentWrapper.kt

@@ -1,9 +1,9 @@
-package com.swmansion.rnscreens.modals.formsheet.react.contentwrapper
+package com.swmansion.rnscreens.react.modals.formsheet.contentwrapper
 
 import android.content.Context
 import com.facebook.react.views.view.ReactViewGroup
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeProvider
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeProvider
 
 class FormSheetContentWrapper(
     context: Context,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/contentwrapper/FormSheetContentWrapperViewManager.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.contentwrapper
+package com.swmansion.rnscreens.react.modals.formsheet.contentwrapper
 
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetDetentChangedEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetDidAppearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetDidDisappearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetDismissEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetNativeDismissEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetNativeDismissPreventedEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetSyncFlushEvent.kt

@@ -1,6 +1,6 @@
 // Implementation adapted from `expo`: https://github.com/expo/expo/pull/45775
 
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetWillAppearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/event/FormSheetWillDisappearEvent.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.event
+package com.swmansion.rnscreens.react.modals.formsheet.event
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/host/FormSheetContentView.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -17,9 +17,9 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeDelegate
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetContentSizeChangeProvider
 import com.swmansion.rnscreens.helpers.getFabricUIManagerNotNull
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeDelegate
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetContentSizeChangeProvider
 
 @OptIn(UnstableReactNativeAPI::class)
 @SuppressLint("ViewConstructor")

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/host/FormSheetHost.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import android.view.View
 import android.view.ViewGroup
@@ -6,8 +6,8 @@ import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.swmansion.rnscreens.common.ShadowStateProxy
-import com.swmansion.rnscreens.modals.formsheet.native.core.FormSheetDialogManager
-import com.swmansion.rnscreens.modals.formsheet.native.model.FormSheetConfig
+import com.swmansion.rnscreens.core.modals.formsheet.dialog.FormSheetDialogManager
+import com.swmansion.rnscreens.core.modals.formsheet.model.FormSheetConfig
 
 class FormSheetHost(
     val reactContext: ThemedReactContext,
@@ -42,6 +42,8 @@ class FormSheetHost(
         FormSheetDialogManager(
             context = context,
             contentView = sheetContentView,
+            // ReactContext wraps the application context, not the activity.
+            activityProvider = { reactContext.currentActivity },
         )
 
     init {

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/host/FormSheetHostEventEmitter.kt

@@ -1,17 +1,17 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import com.facebook.react.bridge.ReactContext
 import com.swmansion.rnscreens.common.event.BaseEventEmitter
-import com.swmansion.rnscreens.modals.formsheet.native.interfaces.FormSheetDialogEventEmitter
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDetentChangedEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidAppearEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidDisappearEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDismissEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissPreventedEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetSyncFlushEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillAppearEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillDisappearEvent
+import com.swmansion.rnscreens.core.modals.formsheet.interfaces.FormSheetDialogEventEmitter
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDetentChangedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidDisappearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissPreventedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetSyncFlushEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillDisappearEvent
 
 internal class FormSheetHostEventEmitter(
     reactContext: ReactContext,

package/android/src/main/java/com/swmansion/rnscreens/{modals/formsheet/react → react/modals/formsheet}/host/FormSheetHostViewManager.kt

@@ -1,4 +1,4 @@
-package com.swmansion.rnscreens.modals.formsheet.react.host
+package com.swmansion.rnscreens.react.modals.formsheet.host
 
 import android.view.View
 import com.facebook.react.bridge.ReadableArray
@@ -11,15 +11,15 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNSFormSheetHostManagerDelegate
 import com.facebook.react.viewmanagers.RNSFormSheetHostManagerInterface
 import com.swmansion.rnscreens.helpers.makeEventRegistrationInfo
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDetentChangedEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidAppearEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDidDisappearEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetDismissEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetNativeDismissPreventedEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetSyncFlushEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillAppearEvent
-import com.swmansion.rnscreens.modals.formsheet.react.event.FormSheetWillDisappearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDetentChangedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDidDisappearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetNativeDismissPreventedEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetSyncFlushEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillAppearEvent
+import com.swmansion.rnscreens.react.modals.formsheet.event.FormSheetWillDisappearEvent
 
 @ReactModule(name = FormSheetHostViewManager.REACT_CLASS)
 class FormSheetHostViewManager :

package/android/src/main/java/com/swmansion/rnscreens/safearea/OnInterfaceInsetsChangeListener.kt

@@ -0,0 +1,15 @@
+package com.swmansion.rnscreens.safearea
+
+/**
+ * Receives notifications about changes to **interface** safe area insets from a [SafeAreaProvider].
+ */
+interface OnInterfaceInsetsChangeListener {
+    /**
+     * Called by the [SafeAreaProvider] the listener is registered with when its **interface**
+     * safe area insets change. It may also be called with unchanged insets, so implementations
+     * should tolerate duplicate notifications.
+     *
+     * @param newInterfaceInsets the new **interface** safe area insets.
+     */
+    fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets)
+}

package/android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaProvider.kt

@@ -7,25 +7,25 @@ package com.swmansion.rnscreens.safearea
  * System insets (e.g. `systemBars`, `displayCutout`) are handled through Android inset
  * dispatch mechanism (via `onApplyWindowInsets`).
  *
- * Classes implementing this protocol are responsible for notifying `SafeAreaView`, which
- * registers as a listener, about changes to **interface** safe area insets.
+ * Classes implementing this protocol are responsible for notifying the registered
+ * [OnInterfaceInsetsChangeListener] about changes to **interface** safe area insets.
  */
 interface SafeAreaProvider {
     /**
      * Responsible for registering **interface** safe area insets listener.
      *
-     * @param listener `SafeAreaView` instance that wants to receive notifications
-     * about changes to **interface** safe area insets via `onInterfaceInsetsChange`.
+     * @param listener listener that wants to receive notifications about changes
+     * to **interface** safe area insets via `onInterfaceInsetsChange`.
      */
-    fun setOnInterfaceInsetsChangeListener(listener: SafeAreaView)
+    fun setOnInterfaceInsetsChangeListener(listener: OnInterfaceInsetsChangeListener)
 
     /**
      * Responsible for unregistering **interface** safe area insets listener.
      *
-     * @param listener `SafeAreaView` instance that wants to stop receiving notifications
-     * about changes to **interface** safe area insets.
+     * @param listener listener that wants to stop receiving notifications about changes
+     * to **interface** safe area insets.
      */
-    fun removeOnInterfaceInsetsChangeListener(listener: SafeAreaView)
+    fun removeOnInterfaceInsetsChangeListener(listener: OnInterfaceInsetsChangeListener)
 
     /**
      * Responsible for providing current **interface** safe area insets.

package/android/src/main/java/com/swmansion/rnscreens/safearea/SafeAreaView.kt

@@ -22,7 +22,8 @@ class SafeAreaView(
     private val reactContext: ThemedReactContext,
 ) : ReactViewGroup(reactContext),
     OnApplyWindowInsetsListener,
-    ViewTreeObserver.OnPreDrawListener {
+    ViewTreeObserver.OnPreDrawListener,
+    OnInterfaceInsetsChangeListener {
     private var provider = WeakReference<SafeAreaProvider>(null)
     private var currentInterfaceInsets: EdgeInsets = EdgeInsets.ZERO
     private var currentSystemInsets: EdgeInsets = EdgeInsets.ZERO
@@ -80,7 +81,7 @@ class SafeAreaView(
         return providerCandidate as? SafeAreaProvider
     }
 
-    fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets) {
+    override fun onInterfaceInsetsChange(newInterfaceInsets: EdgeInsets) {
         if (newInterfaceInsets != currentInterfaceInsets) {
             currentInterfaceInsets = newInterfaceInsets
 

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

@@ -35,7 +35,6 @@ import com.swmansion.rnscreens.stack.header.appbar.StackHeaderAppBarLayout
 import com.swmansion.rnscreens.stack.header.appbar.StackHeaderContentScrimDrawable
 import com.swmansion.rnscreens.stack.header.config.StackHeaderConfigurationProviding
 import com.swmansion.rnscreens.stack.header.config.StackHeaderType
-import com.swmansion.rnscreens.stack.header.subview.StackHeaderSubview
 import com.swmansion.rnscreens.utils.dpToPx
 import com.swmansion.rnscreens.utils.resolveColorAttr
 import com.swmansion.rnscreens.utils.resolveDrawableAttr
@@ -73,7 +72,6 @@ internal class StackHeaderApplicator(
         // Make sure that we receive insets, necessary when changing header mode in runtime.
         appBar.requestApplyInsets()
         populateAppBar(appBar, config)
-        maybeApplyRTLCollapsingToolbarLayoutWorkaround(coordinatorLayout, config, appBar)
         appBar.toolbar.requestLayout()
 
         return appBar
@@ -162,7 +160,6 @@ internal class StackHeaderApplicator(
     internal fun applyTitleAndSubtitle(
         appBar: StackHeaderAppBarLayout,
         config: StackHeaderConfigurationProviding,
-        isAppBarFullyCollapsed: Boolean,
     ) {
         when (appBar) {
             is StackHeaderAppBarLayout.Small -> {
@@ -182,15 +179,6 @@ internal class StackHeaderApplicator(
                 // title/subtitle vertical split is recomputed only in onLayout. Force a layout
                 // so toggling the subtitle at runtime reclaims the title space.
                 ctl.requestLayout()
-
-                // Material re-asserts the collapsed offset after a height change itself, but only
-                // when maxLines > 1 (CollapsingToolbarLayout.onMeasure). With maxLines == 1 it never
-                // does, so toggling the subtitle at runtime while collapsed leaves a stale offset —
-                // setExpanded(false, false) is the closest public equivalent of Material's private
-                // maybeSetPendingActionCollapsed().
-                if (config.maxLines == 1 && isAppBarFullyCollapsed) {
-                    appBar.setExpanded(false, false)
-                }
             }
         }
     }
@@ -611,46 +599,6 @@ internal class StackHeaderApplicator(
     private fun resolveDefaultOverflowIcon(toolbar: MaterialToolbar): Drawable? =
         AppCompatImageView(toolbar.context, null, androidx.appcompat.R.attr.actionOverflowButtonStyle).drawable
 
-    private fun maybeApplyRTLCollapsingToolbarLayoutWorkaround(
-        coordinatorLayout: StackHeaderCoordinatorLayout,
-        config: StackHeaderConfigurationProviding,
-        appBar: StackHeaderAppBarLayout,
-    ) {
-        // For collapsing headers, CTL lazily adds a MATCH_PARENT dummy view to the Toolbar
-        // during the first onMeasure (ensureToolbar). We need our subviews at higher indices
-        // than the dummy view so they get positioned first in RTL layout. Forcing a measure
-        // triggers the dummy view creation.
-        if (appBar is StackHeaderAppBarLayout.Collapsing && config.isRTL) {
-            appBar.measure(
-                View.MeasureSpec.makeMeasureSpec(coordinatorLayout.width, View.MeasureSpec.EXACTLY),
-                View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
-            )
-            moveDummyViewToFront(appBar.toolbar)
-        }
-    }
-
-    /**
-     * CollapsingToolbarLayout adds a MATCH_PARENT dummy view to the Toolbar for title bounds
-     * tracking. In RTL, the Toolbar iterates custom views in reverse child order — so the
-     * dummy view (if last) gets processed first and consumes the entire layout cursor.
-     * Moving it to index 0 ensures our subviews are processed first.
-     *
-     * See https://github.com/material-components/material-components-android/issues/1867.
-     */
-    private fun moveDummyViewToFront(toolbar: Toolbar) {
-        for (i in 0 until toolbar.childCount) {
-            val child = toolbar.getChildAt(i)
-            // Assumes only StackHeaderSubview children exist in Collapsing toolbar besides
-            // the CTL dummy view.
-            if (child !is StackHeaderSubview) {
-                val lp = child.layoutParams
-                toolbar.removeViewAt(i)
-                toolbar.addView(child, 0, lp)
-                return
-            }
-        }
-    }
-
     private fun buildTintList(
         normal: Int?,
         pressed: Int?,