react-native-screens 4.24.0 → 4.25.0-beta.2

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

@@ -1,9 +1,7 @@
 package com.swmansion.rnscreens
 
 import android.view.View
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -53,8 +51,6 @@ class ScreenContainerViewManager :
         index: Int,
     ): View = parent.getScreenAt(index)
 
-    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
-
     override fun needsCustomLayoutForChildren(): Boolean = true
 
     companion object {

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

@@ -292,8 +292,10 @@ open class ScreenFragment :
         // since we subscribe to parent's animation start/end and dispatch events in child from there
         // check for `isTransitioning` should be enough since the child's animation should take only
         // 20ms due to always being `StackAnimation.NONE` when nested stack being pushed
+        // When the parent is not a ScreenFragment (e.g. when RN is loaded inside a ReactFragment
+        // in a brownfield setup), we always dispatch. Such parents don't participate in screen transitions.
         val parent = parentFragment
-        if (parent == null || (parent is ScreenFragment && !parent.isTransitioning)) {
+        if (parent == null || parent !is ScreenFragment || !parent.isTransitioning) {
             // onViewAnimationStart/End is triggered from View#onAnimationStart/End method of the fragment's root
             // view. We override an appropriate method of the StackFragment's
             // root view in order to achieve this.

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

@@ -10,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewParent
 import android.view.WindowManager
-import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -187,7 +186,7 @@ class ScreenModalFragment :
 
     override fun removeToolbar(): Unit = throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
 
-    override fun setToolbar(toolbar: Toolbar): Unit =
+    override fun setToolbar(toolbar: CustomToolbar): Unit =
         throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
 
     override fun setToolbarShadowHidden(hidden: Boolean): Unit =

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

@@ -14,6 +14,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.Animation
 import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
@@ -52,11 +53,13 @@ class KeyboardVisible(
 class ScreenStackFragment :
     ScreenFragment,
     ScreenStackFragmentWrapper {
-    private var appBarLayout: CustomAppBarLayout? = null
+    private var appBarLayout: AppBarLayout? = null
     private var toolbar: Toolbar? = null
     private var isToolbarShadowHidden = false
     private var isToolbarTranslucent = false
 
+    private var lastActiveHeaderConfig: ScreenStackHeaderConfig? = null
+
     private lateinit var sheetTransitionCoordinator: BottomSheetTransitionCoordinator
 
     private var lastFocusedChild: View? = null
@@ -103,7 +106,8 @@ class ScreenStackFragment :
         toolbar = null
     }
 
-    override fun setToolbar(toolbar: Toolbar) {
+    override fun setToolbar(toolbar: CustomToolbar) {
+        lastActiveHeaderConfig = toolbar.config
         appBarLayout?.addView(toolbar)
         toolbar.layoutParams =
             AppBarLayout
@@ -204,7 +208,7 @@ class ScreenStackFragment :
 
         if (!screen.usesFormSheetPresentation()) {
             appBarLayout =
-                context?.let { CustomAppBarLayout(it) }?.apply {
+                context?.let { AppBarLayout(it) }?.apply {
                     // By default AppBarLayout will have a background color set but since we cover the whole layout
                     // with toolbar (that can be semi-transparent) the bar layout background color does not pay a
                     // role. On top of that it breaks screens animations when alfa offscreen compositing is off
@@ -301,6 +305,25 @@ class ScreenStackFragment :
         super.onViewCreated(view, savedInstanceState)
     }
 
+    override fun onDestroyView() {
+        // ScreenStackHeaderConfig.onUpdate() calls activity.setSupportActionBar(toolbar) each time
+        // the top screen updates. AppCompatDelegateImpl stores the resulting ToolbarActionBar in
+        // its mActionBar field for the lifetime of the activity. When a screen is popped and the new
+        // top screen does not install a replacement action bar (e.g. headerShown: false),
+        // the stale ToolbarActionBar — and the entire object graph hanging off the toolbar is never released.
+        // When this fragment is being removed, we're clearing the activity's support action bar if it
+        // still belongs to us. This will break the retention chain:
+        // - AppCompatDelegateImpl.mActionBar
+        // - ToolbarActionBar.mDecorToolbar
+        // - ToolbarWidgetWrapper.mToolbar
+        // - DebugMenuToolbar.config
+        // - ScreenStackHeaderConfig.mParent
+        // - Screen.fragment
+        lastActiveHeaderConfig?.clearActionBarIfOwned(activity as? AppCompatActivity)
+        lastActiveHeaderConfig = null
+        super.onDestroyView()
+    }
+
     override fun onCreateAnimation(
         transit: Int,
         enter: Boolean,

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

@@ -1,12 +1,10 @@
 package com.swmansion.rnscreens
 
-import androidx.appcompat.widget.Toolbar
-
 interface ScreenStackFragmentWrapper : ScreenFragmentWrapper {
     // Toolbar management
     fun removeToolbar()
 
-    fun setToolbar(toolbar: Toolbar)
+    fun setToolbar(toolbar: CustomToolbar)
 
     fun setToolbarShadowHidden(hidden: Boolean)
 

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

@@ -9,6 +9,7 @@ import android.view.Gravity
 import android.view.View.OnClickListener
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
@@ -21,6 +22,7 @@ import com.facebook.react.views.text.ReactTypefaceUtils
 import com.swmansion.rnscreens.events.HeaderAttachedEvent
 import com.swmansion.rnscreens.events.HeaderDetachedEvent
 import kotlin.math.max
+import kotlin.properties.Delegates
 
 class ScreenStackHeaderConfig(
     context: Context,
@@ -34,6 +36,19 @@ class ScreenStackHeaderConfig(
     var isHeaderHidden = false // named this way to avoid conflict with platform's isHidden
     var isHeaderTranslucent =
         false // named this way to avoid conflict with platform's isTranslucent
+
+    var consumeTopInset by Delegates.observable(false) { _, oldValue, newValue ->
+        if (oldValue != newValue && isAttachedToWindow) {
+            toolbar.requestApplyInsets()
+        }
+    }
+
+    var legacyTopInsetBehavior by Delegates.observable(false) { _, oldValue, newValue ->
+        if (oldValue != newValue && isAttachedToWindow) {
+            toolbar.requestApplyInsets()
+        }
+    }
+
     private var title: String? = null
     private var titleColor = 0
     private var titleFontFamily: String? = null
@@ -44,6 +59,7 @@ class ScreenStackHeaderConfig(
     private var isBackButtonHidden = false
     private var isShadowHidden = false
     private var isDestroyed = false
+    private var actionBar: ActionBar? = null
     private var backButtonInCustomView = false
     private var tintColor = 0
     private var isAttachedToWindow = false
@@ -99,6 +115,17 @@ class ScreenStackHeaderConfig(
         isDestroyed = true
     }
 
+    internal fun clearActionBarIfOwned(activity: AppCompatActivity?) {
+        actionBar?.let { ownedActionBar ->
+            activity?.let { appCompat ->
+                if (appCompat.supportActionBar === ownedActionBar) {
+                    appCompat.setSupportActionBar(null)
+                }
+            }
+        }
+        actionBar = null
+    }
+
     /**
      * Native toolbar should notify the header config component that it has completed its layout.
      */
@@ -130,7 +157,6 @@ class ScreenStackHeaderConfig(
 
         headerHeightUpdateProxy.updateHeaderHeightIfNeeded(this, screen)
 
-        // Note that implementation of the callee differs between architectures.
         updateHeaderConfigState(
             toolbar.width,
             toolbar.height,
@@ -230,15 +256,16 @@ class ScreenStackHeaderConfig(
 
         activity.setSupportActionBar(toolbar)
         // non-null toolbar is set in the line above and it is used here
-        val actionBar = requireNotNull(activity.supportActionBar)
+        val newActionBar = requireNotNull(activity.supportActionBar)
+        actionBar = newActionBar
 
         // hide back button
-        actionBar.setDisplayHomeAsUpEnabled(
+        newActionBar.setDisplayHomeAsUpEnabled(
             screenFragment?.canNavigateBack() == true && !isBackButtonHidden,
         )
 
         // title
-        actionBar.title = title
+        newActionBar.title = title
         if (TextUtils.isEmpty(title)) {
             isTitleEmpty = true
         }
@@ -312,7 +339,7 @@ class ScreenStackHeaderConfig(
                         ?: throw JSApplicationIllegalArgumentException(
                             "Back button header config view should have Image as first child",
                         )
-                actionBar.setHomeAsUpIndicator(firstChild.drawable)
+                newActionBar.setHomeAsUpIndicator(firstChild.drawable)
                 i++
                 continue
             }
@@ -431,17 +458,10 @@ class ScreenStackHeaderConfig(
         config: ScreenStackHeaderConfig,
     ) : CustomToolbar(context, config) {
         override fun showOverflowMenu(): Boolean {
-            if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                (context.applicationContext as ReactApplication)
-                    .reactHost
-                    ?.devSupportManager
-                    ?.showDevOptionsDialog()
-            } else {
-                (context.applicationContext as ReactApplication)
-                    .reactNativeHost
-                    .reactInstanceManager
-                    .showDevOptionsDialog()
-            }
+            (context.applicationContext as ReactApplication)
+                .reactHost
+                ?.devSupportManager
+                ?.showDevOptionsDialog()
             return true
         }
     }

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

@@ -1,18 +1,14 @@
 package com.swmansion.rnscreens
 
-import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.JSApplicationCausedNativeException
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNSScreenStackHeaderConfigManagerDelegate
 import com.facebook.react.viewmanagers.RNSScreenStackHeaderConfigManagerInterface
 import com.swmansion.rnscreens.events.HeaderAttachedEvent
@@ -33,9 +29,6 @@ class ScreenStackHeaderConfigViewManager :
 
     override fun createViewInstance(reactContext: ThemedReactContext) = ScreenStackHeaderConfig(reactContext)
 
-    // This works only on Paper. On Fabric the shadow node is implemented in C++ layer.
-    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreenStackHeaderConfigShadowNode(context)
-
     override fun addView(
         parent: ScreenStackHeaderConfig,
         child: View,
@@ -54,9 +47,7 @@ class ScreenStackHeaderConfigViewManager :
         props: ReactStylesDiffMap?,
         stateWrapper: StateWrapper?,
     ): Any? {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            view.setStateWrapper(stateWrapper)
-        }
+        view.setStateWrapper(stateWrapper)
         return super.updateState(view, props, stateWrapper)
     }
 
@@ -91,7 +82,20 @@ class ScreenStackHeaderConfigViewManager :
         parent.onUpdate()
     }
 
-    @ReactProp(name = "title")
+    override fun setConsumeTopInset(
+        config: ScreenStackHeaderConfig,
+        consumeTopInset: Boolean,
+    ) {
+        config.consumeTopInset = consumeTopInset
+    }
+
+    override fun setLegacyTopInsetBehavior(
+        config: ScreenStackHeaderConfig,
+        legacyTopInsetBehavior: Boolean,
+    ) {
+        config.legacyTopInsetBehavior = legacyTopInsetBehavior
+    }
+
     override fun setTitle(
         config: ScreenStackHeaderConfig,
         title: String?,
@@ -99,7 +103,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setTitle(title)
     }
 
-    @ReactProp(name = "titleFontFamily")
     override fun setTitleFontFamily(
         config: ScreenStackHeaderConfig,
         titleFontFamily: String?,
@@ -107,7 +110,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setTitleFontFamily(titleFontFamily)
     }
 
-    @ReactProp(name = "titleFontSize")
     override fun setTitleFontSize(
         config: ScreenStackHeaderConfig,
         titleFontSize: Int,
@@ -115,7 +117,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setTitleFontSize(titleFontSize.toFloat())
     }
 
-    @ReactProp(name = "titleFontWeight")
     override fun setTitleFontWeight(
         config: ScreenStackHeaderConfig,
         titleFontWeight: String?,
@@ -123,7 +124,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setTitleFontWeight(titleFontWeight)
     }
 
-    @ReactProp(name = "titleColor", customType = "Color")
     override fun setTitleColor(
         config: ScreenStackHeaderConfig,
         titleColor: Int?,
@@ -133,7 +133,6 @@ class ScreenStackHeaderConfigViewManager :
         }
     }
 
-    @ReactProp(name = "backgroundColor", customType = "Color")
     override fun setBackgroundColor(
         config: ScreenStackHeaderConfig,
         backgroundColor: Int?,
@@ -141,7 +140,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setBackgroundColor(backgroundColor)
     }
 
-    @ReactProp(name = "hideShadow")
     override fun setHideShadow(
         config: ScreenStackHeaderConfig,
         hideShadow: Boolean,
@@ -149,7 +147,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setHideShadow(hideShadow)
     }
 
-    @ReactProp(name = "hideBackButton")
     override fun setHideBackButton(
         config: ScreenStackHeaderConfig,
         hideBackButton: Boolean,
@@ -157,15 +154,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setHideBackButton(hideBackButton)
     }
 
-    @ReactProp(name = "topInsetEnabled")
-    override fun setTopInsetEnabled(
-        config: ScreenStackHeaderConfig,
-        topInsetEnabled: Boolean,
-    ) {
-        logNotAvailable("topInsetEnabled")
-    }
-
-    @ReactProp(name = "color", customType = "Color")
     override fun setColor(
         config: ScreenStackHeaderConfig,
         color: Int?,
@@ -173,7 +161,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setTintColor(color ?: 0)
     }
 
-    @ReactProp(name = "hidden")
     override fun setHidden(
         config: ScreenStackHeaderConfig,
         hidden: Boolean,
@@ -181,7 +168,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setHidden(hidden)
     }
 
-    @ReactProp(name = "translucent")
     override fun setTranslucent(
         config: ScreenStackHeaderConfig,
         translucent: Boolean,
@@ -189,7 +175,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setTranslucent(translucent)
     }
 
-    @ReactProp(name = "backButtonInCustomView")
     override fun setBackButtonInCustomView(
         config: ScreenStackHeaderConfig,
         backButtonInCustomView: Boolean,
@@ -197,7 +182,6 @@ class ScreenStackHeaderConfigViewManager :
         config.setBackButtonInCustomView(backButtonInCustomView)
     }
 
-    @ReactProp(name = "direction")
     override fun setDirection(
         config: ScreenStackHeaderConfig,
         direction: String?,
@@ -224,127 +208,95 @@ class ScreenStackHeaderConfigViewManager :
         const val REACT_CLASS = "RNSScreenStackHeaderConfig"
     }
 
-    // TODO: Find better way to handle platform specific props
-    private fun logNotAvailable(propName: String) {
-        Log.w("[RNScreens]", "$propName prop is not available on Android")
-    }
+    // iOS only
 
     override fun setBackTitle(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("backTitle")
-    }
+    ) = Unit
 
     override fun setBackTitleFontFamily(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("backTitleFontFamily")
-    }
+    ) = Unit
 
     override fun setBackTitleFontSize(
         view: ScreenStackHeaderConfig?,
         value: Int,
-    ) {
-        logNotAvailable("backTitleFontSize")
-    }
+    ) = Unit
 
     override fun setBackTitleVisible(
         view: ScreenStackHeaderConfig?,
         value: Boolean,
-    ) {
-        logNotAvailable("backTitleVisible")
-    }
+    ) = Unit
 
     override fun setLargeTitle(
         view: ScreenStackHeaderConfig?,
         value: Boolean,
-    ) {
-        logNotAvailable("largeTitle")
-    }
+    ) = Unit
 
     override fun setLargeTitleFontFamily(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("largeTitleFontFamily")
-    }
+    ) = Unit
 
     override fun setLargeTitleFontSize(
         view: ScreenStackHeaderConfig?,
         value: Int,
-    ) {
-        logNotAvailable("largeTitleFontSize")
-    }
+    ) = Unit
 
     override fun setLargeTitleFontWeight(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("largeTitleFontWeight")
-    }
+    ) = Unit
 
     override fun setLargeTitleBackgroundColor(
         view: ScreenStackHeaderConfig?,
         value: Int?,
-    ) {
-        logNotAvailable("largeTitleBackgroundColor")
-    }
+    ) = Unit
 
     override fun setLargeTitleHideShadow(
         view: ScreenStackHeaderConfig?,
         value: Boolean,
-    ) {
-        logNotAvailable("largeTitleHideShadow")
-    }
+    ) = Unit
 
     override fun setLargeTitleColor(
         view: ScreenStackHeaderConfig?,
         value: Int?,
-    ) {
-        logNotAvailable("largeTitleColor")
-    }
+    ) = Unit
 
     override fun setDisableBackButtonMenu(
         view: ScreenStackHeaderConfig?,
         value: Boolean,
-    ) {
-        logNotAvailable("disableBackButtonMenu")
-    }
+    ) = Unit
 
     override fun setBackButtonDisplayMode(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("backButtonDisplayMode")
-    }
+    ) = Unit
 
     override fun setBlurEffect(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("blurEffect")
-    }
+    ) = Unit
+
+    override fun setTopInsetEnabled(
+        config: ScreenStackHeaderConfig,
+        topInsetEnabled: Boolean,
+    ) = Unit
 
     override fun setHeaderLeftBarButtonItems(
         view: ScreenStackHeaderConfig?,
         value: ReadableArray?,
-    ) {
-        logNotAvailable("headerLeftBarButtonItems")
-    }
+    ) = Unit
 
     override fun setHeaderRightBarButtonItems(
         view: ScreenStackHeaderConfig?,
         value: ReadableArray?,
-    ) {
-        logNotAvailable("headerRightBarButtonItems")
-    }
+    ) = Unit
 
     override fun setUserInterfaceStyle(
         view: ScreenStackHeaderConfig?,
         value: String?,
-    ) {
-        logNotAvailable("userInterfaceStyle")
-    }
+    ) = Unit
 }

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

@@ -50,7 +50,7 @@ class ScreenStackHeaderSubview(
         r: Int,
         b: Int,
     ) {
-        if (changed && BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        if (changed) {
             val width = r - l
             val height = b - t
 

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

@@ -8,7 +8,6 @@ import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerDelegate
 import com.facebook.react.viewmanagers.RNSScreenStackHeaderSubviewManagerInterface
 
@@ -26,7 +25,6 @@ class ScreenStackHeaderSubviewManager :
 
     override fun createViewInstance(context: ThemedReactContext) = ScreenStackHeaderSubview(context)
 
-    @ReactProp(name = "type")
     override fun setType(
         view: ScreenStackHeaderSubview,
         type: String?,
@@ -42,7 +40,6 @@ class ScreenStackHeaderSubviewManager :
             }
     }
 
-    @ReactProp(name = "hidesSharedBackground")
     override fun setHidesSharedBackground(
         view: ScreenStackHeaderSubview,
         hidesSharedBackground: Boolean,
@@ -62,9 +59,7 @@ class ScreenStackHeaderSubviewManager :
         props: ReactStylesDiffMap?,
         stateWrapper: StateWrapper?,
     ): Any? {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            view.setStateWrapper(stateWrapper)
-        }
+        view.setStateWrapper(stateWrapper)
         return super.updateState(view, props, stateWrapper)
     }
 

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

@@ -1,9 +1,7 @@
 package com.swmansion.rnscreens
 
 import android.view.View
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -61,9 +59,6 @@ class ScreenStackViewManager :
         index: Int,
     ): View = parent.getScreenAt(index)
 
-    // Old architecture only.
-    override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode = ScreensShadowNode(context)
-
     override fun needsCustomLayoutForChildren() = true
 
     protected override fun getDelegate(): ViewManagerDelegate<ScreenStack> = delegate
@@ -74,12 +69,27 @@ class ScreenStackViewManager :
         )
 
     // iosPreventReattachmentOfDismissedScreens is not available on Android,
-    // however we must override their setters
+    // however we must override the setter
     override fun setIosPreventReattachmentOfDismissedScreens(
         view: ScreenStack?,
         value: Boolean,
     ) = Unit
 
+    // iosPreventReattachmentOfDismissedModals is not available on Android,
+    // however we must override the setter
+    override fun setIosPreventReattachmentOfDismissedModals(
+        view: ScreenStack?,
+        value: Boolean,
+    ) = Unit
+
+    // nativeContainerBackgroundColor is iOS-only because the native view hierarchy
+    // differs between platforms. On Android, ScreenStack is used directly as the
+    // container, so `style.backgroundColor` achieves the same effect.
+    override fun setNativeContainerBackgroundColor(
+        view: ScreenStack,
+        value: Int?,
+    ) = Unit
+
     companion object {
         const val REACT_CLASS = "RNSScreenStack"
     }