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

package/README.md

@@ -121,6 +121,7 @@ Here's a table with summary of supported `react-native` versions:
 
 | library version | react-native version |
 | --------------- | -------------------- |
+| 4.25.0+         | 0.82.0+              |
 | 4.19.0+         | 0.81.0+              |
 | 4.14.0+         | 0.79.0+              |
 | 4.5.0+          | 0.77.0+              |
@@ -130,17 +131,20 @@ Here's a table with summary of supported `react-native` versions:
 
 Paper is the legacy rendering system. 
 
-Here's a table with summary of supported `react-native` versions with old architecture turned on:
+> [!caution]
+> Since version 4.25.0 of this library, it no longer supports the legacy architecture.
+
+Here's a table with summary of supported `react-native` versions with the legacy architecture turned on:
 
 | library version | react-native version |
 | --------------- | -------------------- |
+| 4.25.0+         | NOT SUPPORTED        |
 | 4.19.0+         | 0.80.0+              |
 | 4.14.0+         | 0.79.0+              |
 | 4.9.0+          | 0.76.0+              |
 | 4.5.0+          | 0.74.0+              |
 | 4.0.0+          | 0.72.0+              |
 
-
 ## Usage with [react-navigation](https://github.com/react-navigation/react-navigation)
 
 > [!CAUTION]
@@ -200,7 +204,7 @@ To take advantage of the native stack navigator primitive for React Navigation t
 
 ## `FullWindowOverlay`
 
-Native `iOS` component for rendering views straight under the `Window`. Based on `RCTPerfMonitor`. You should treat it as a wrapper, providing full-screen, transparent view which receives no props and should ideally render one child `View`, being the root of its view hierarchy. For the example usage, see https://github.com/software-mansion/react-native-screens/blob/main/apps/src/tests/Test1096.tsx
+Native `iOS` component for rendering views straight under the `Window`. Based on `RCTPerfMonitor`. You should treat it as a wrapper, providing full-screen, transparent view which receives no props and should ideally render one child `View`, being the root of its view hierarchy. For the example usage, see https://github.com/software-mansion/react-native-screens/blob/main/apps/src/tests/issue-tests/Test1096.tsx
 
 ## Interop with [react-native-navigation](https://github.com/wix/react-native-navigation)
 

package/RNScreens.podspec

@@ -4,7 +4,8 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 gamma_project_enabled = ENV['RNS_GAMMA_ENABLED'] == '1'
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-debug_logging = ENV['RNS_DEBUG_LOGGING'] == '1'
+debug_logging_enabled = ENV['RNS_DEBUG_LOGGING'] == '1'
+
 
 source_files_exts = new_arch_enabled ? '{h,m,mm,cpp,swift}' : '{h,m,mm,swift}'
 source_files = ["ios/**/*.#{source_files_exts}"]
@@ -18,12 +19,17 @@ min_supported_tvos_version = "15.1"
 min_supported_visionos_version = "1.0"
 
 rnscreens_cpp_flags = []
+rnscreens_swift_flags = []
 
-rnscreens_cpp_flags << "-DRNS_DEBUG_LOGGING=1" if debug_logging
+if debug_logging_enabled
+  rnscreens_cpp_flags << "-DRNS_DEBUG_LOGGING=1"
+  rnscreens_swift_flags << "-DRNS_DEBUG_LOGGING"
+end
 rnscreens_cpp_flags << "-DRNS_GAMMA_ENABLED=1" if gamma_project_enabled
 
 rnscreens_config  =  {
-  'OTHER_CPLUSPLUSFLAGS' => rnscreens_cpp_flags.join(" ")
+  'OTHER_CPLUSPLUSFLAGS' => rnscreens_cpp_flags.join(" "),
+  'OTHER_SWIFT_FLAGS' => rnscreens_swift_flags.join(" ")
 }
 
 if gamma_project_enabled
@@ -59,6 +65,10 @@ Pod::Spec.new do |s|
     Pod::UI.puts "[RNScreens] Gamma project enabled. Including source files."
   end
 
+  if debug_logging_enabled
+    Pod::UI.puts "[RNScreens] Debug logging enabled."
+  end
+
   s.pod_target_xcconfig = rnscreens_config
 
   install_modules_dependencies(s)

package/android/CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.9.0)
 
 project(rnscreens)
 
-if(${RNS_NEW_ARCH_ENABLED})
 add_library(rnscreens
     SHARED
     ../cpp/RNScreensTurboModule.cpp
@@ -11,13 +10,6 @@ add_library(rnscreens
     ./src/main/cpp/NativeProxy.cpp
     ./src/main/cpp/OnLoad.cpp
 )
-else()
-add_library(rnscreens
-    SHARED
-    ../cpp/RNScreensTurboModule.cpp
-    ./src/main/cpp/jni-adapter.cpp
-)
-endif()
 
 include_directories(
     ../cpp
@@ -37,18 +29,11 @@ target_compile_definitions(
 )
 
 find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
 
-if(${RNS_NEW_ARCH_ENABLED})
-    find_package(fbjni REQUIRED CONFIG)
-    target_link_libraries(rnscreens
-        ReactAndroid::reactnative
-        ReactAndroid::jsi
-        fbjni::fbjni
-        android
-    )
-else()
-    target_link_libraries(rnscreens
-        ReactAndroid::jsi
-        android
-    )
-endif()
+target_link_libraries(rnscreens
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+    android
+)

package/android/build.gradle

@@ -30,14 +30,6 @@ def isRunningInContextOfScreensRepo() {
     return project == rootProject
 }
 
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
-
 def areDebugLogsEnabled() {
     return project.hasProperty("rnsDebugLogsEnabled") && project.rnsDebugLogsEnabled == "true"
 }
@@ -85,12 +77,12 @@ def resolveReactNativeDirectory() {
             "You should set project extension property (in `app/build.gradle`) `REACT_NATIVE_NODE_MODULES_DIR` with path to react-native.")
 }
 
-// spotless is only accessible within react-native-screens repo
+// spotless is only accessible within react-native-screens repo, while the RN Gradle
+// plugin is registered by the host app's settings.gradle — it's not on the classpath
+// in standalone repo context, so applying it here would fail during Gradle configuration.
 if (isRunningInContextOfScreensRepo()) {
     apply from: 'spotless.gradle'
-}
-
-if (isNewArchitectureEnabled()) {
+} else {
     apply plugin: "com.facebook.react"
 }
 apply plugin: 'com.android.library'
@@ -114,8 +106,6 @@ file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { rea
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
-def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
-
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', rnsDefaultCompileSdkVersion)
     namespace "com.swmansion.rnscreens"
@@ -134,16 +124,14 @@ android {
         targetSdkVersion safeExtGet(['targetSdkVersion', 'targetSdk'], rnsDefaultTargetSdkVersion)
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
-        buildConfigField "boolean", "RNS_DEBUG_LOGGING", areDebugLogsEnabled().toString()
         buildConfigField "boolean", "RNS_GAMMA_ENABLED", isGammaEnabled().toString()
+        buildConfigField "boolean", "RNS_DEBUG_LOGGING", areDebugLogsEnabled().toString()
         ndk {
             abiFilters (*reactNativeArchitectures())
         }
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared",
-                        "-DRNS_NEW_ARCH_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}",
                         "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
             }
         }
@@ -181,23 +169,16 @@ android {
                 // Some of above lib* names could be removed after we remove support for 0.76.
                 // https://github.com/facebook/react-native/pull/43909
                 // https://github.com/facebook/react-native/pull/46059
-                "**/libfbjni.so", 
+                "**/libfbjni.so",
                 "**/libreactnative.so"
         ]
     }
     sourceSets.main {
         ext.androidResDir = "src/main/res"
         java {
-            // Architecture specific
-            if (IS_NEW_ARCHITECTURE_ENABLED) {
-                srcDirs += [
-                    "src/fabric/java",
-                ]
-            } else {
-                srcDirs += [
-                    "src/paper/java",
-                ]
-            }
+            srcDirs += [
+                "src/fabric/java",
+            ]
         }
         res {
             if (safeExtGet(['compileSdkVersion', 'compileSdk'], rnsDefaultCompileSdkVersion) >= 33) {

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

@@ -29,11 +29,9 @@ abstract class FabricEnabledHeaderConfigViewGroup(
         paddingStart: Int,
         paddingEnd: Int,
     ) {
-        // Implementation of this method differs between Fabric & Paper!
         updateState(width, height, paddingStart, paddingEnd)
     }
 
-    // Implementation of this method differs between Fabric & Paper!
     @UiThread
     private fun updateState(
         width: Int,

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

@@ -22,14 +22,6 @@ abstract class FabricEnabledViewGroup(
         mStateWrapper = wrapper
     }
 
-    protected fun updateScreenSizeFabric(
-        width: Int,
-        height: Int,
-        headerHeight: Int,
-    ) {
-        updateState(width, height, headerHeight)
-    }
-
     @UiThread
     fun updateState(
         width: Int,

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

@@ -11,6 +11,7 @@ import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.ThemedReactContext
 import com.swmansion.rnscreens.utils.InsetsCompat
+import com.swmansion.rnscreens.utils.getDecorViewTopInset
 import com.swmansion.rnscreens.utils.resolveInsetsOrZero
 import kotlin.math.max
 
@@ -34,14 +35,14 @@ open class CustomToolbar(
 
     private val shouldApplyTopInset = true
 
-    private var shouldApplyLayoutCorrectionForTopInset = false
-
     private var lastInsets = InsetsCompat.NONE
 
     private var isForceShadowStateUpdateOnLayoutRequested = false
 
     private var isLayoutEnqueued = false
 
+    private var insetsAppliedFromListener = false
+
     init {
         // Ensure ActionMenuView is initialized as soon as the Toolbar is created.
         //
@@ -76,16 +77,6 @@ open class CustomToolbar(
     override fun requestLayout() {
         super.requestLayout()
 
-        val maybeAppBarLayout = parent as? CustomAppBarLayout
-        maybeAppBarLayout?.let {
-            if (shouldApplyLayoutCorrectionForTopInset && !it.isInLayout) {
-                // In `applyToolbarLayoutCorrection`, we call and immediate layout on AppBarLayout
-                // to update it right away and avoid showing a potentially wrong UI state.
-                it.applyToolbarLayoutCorrection(paddingTop)
-                shouldApplyLayoutCorrectionForTopInset = false
-            }
-        }
-
         val softInputMode =
             (context as ThemedReactContext)
                 .currentActivity
@@ -113,7 +104,34 @@ open class CustomToolbar(
         }
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        applyDecorViewTopInsetIfNeeded()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        resetInsetsState()
+        clearPaddingIfNeeded()
+    }
+
+    private fun applyDecorViewTopInsetIfNeeded() {
+        if (config.legacyTopInsetBehavior || !config.consumeTopInset || insetsAppliedFromListener) return
+
+        val activity = (context as? ThemedReactContext)?.currentActivity ?: return
+        val decorView = activity.window.decorView
+        val topInset = getDecorViewTopInset(decorView)
+
+        if (topInset > 0) {
+            applyExactPadding(paddingLeft, topInset, paddingRight, paddingBottom)
+        }
+    }
+
     override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets? {
+        insetsAppliedFromListener = true
+
         val unhandledInsets = super.onApplyWindowInsets(insets)
 
         // There are few UI modes we could be running in
@@ -139,6 +157,14 @@ open class CustomToolbar(
                 0,
             )
 
+        val shouldHandleTopInset = if (config.legacyTopInsetBehavior) true else config.consumeTopInset
+
+        if (!shouldHandleTopInset) {
+            resetInsetsState()
+            clearPaddingIfNeeded()
+            return unhandledInsets
+        }
+
         // We want to handle display cutout always, no matter the HeaderConfig prop values.
         // If there are no cutout displays, we want to apply the additional padding to
         // respect the status bar.
@@ -192,11 +218,21 @@ open class CustomToolbar(
         right: Int,
         bottom: Int,
     ) {
-        shouldApplyLayoutCorrectionForTopInset = true
         requestForceShadowStateUpdateOnLayout()
         setPadding(left, top, right, bottom)
     }
 
+    private fun resetInsetsState() {
+        insetsAppliedFromListener = false
+        lastInsets = InsetsCompat.NONE
+    }
+
+    private fun clearPaddingIfNeeded() {
+        if (paddingTop != 0 || paddingBottom != 0 || paddingLeft != 0 || paddingRight != 0) {
+            applyExactPadding(0, 0, 0, 0)
+        }
+    }
+
     private fun requestForceShadowStateUpdateOnLayout() {
         isForceShadowStateUpdateOnLayoutRequested = shouldAvoidDisplayCutout
     }

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

@@ -7,10 +7,13 @@ import com.facebook.react.module.annotations.ReactModuleList
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
+import com.swmansion.rnscreens.gamma.scrollviewmarker.ScrollViewMarkerViewManager
+import com.swmansion.rnscreens.gamma.stack.header.config.StackHeaderConfigViewManager
+import com.swmansion.rnscreens.gamma.stack.header.subview.StackHeaderSubviewViewManager
 import com.swmansion.rnscreens.gamma.stack.host.StackHostViewManager
 import com.swmansion.rnscreens.gamma.stack.screen.StackScreenViewManager
-import com.swmansion.rnscreens.gamma.tabs.TabsHostViewManager
-import com.swmansion.rnscreens.gamma.tabs.TabsScreenViewManager
+import com.swmansion.rnscreens.gamma.tabs.host.TabsHostViewManager
+import com.swmansion.rnscreens.gamma.tabs.screen.TabsScreenViewManager
 import com.swmansion.rnscreens.safearea.SafeAreaViewManager
 import com.swmansion.rnscreens.utils.ScreenDummyLayoutHelper
 
@@ -32,9 +35,7 @@ class RNScreensPackage : BaseReactPackage() {
         // installing its C++ bindings - so we are safe in terms of creating this helper
         // before RN starts creating shadow nodes.
         // See https://github.com/software-mansion/react-native-screens/pull/2169
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            screenDummyLayoutHelper = ScreenDummyLayoutHelper(reactContext)
-        }
+        screenDummyLayoutHelper = ScreenDummyLayoutHelper(reactContext)
 
         // Proxy needs to register for lifecycle events in order to unregister itself
         // on activity restarts.
@@ -55,6 +56,9 @@ class RNScreensPackage : BaseReactPackage() {
             SafeAreaViewManager(),
             StackHostViewManager(),
             StackScreenViewManager(),
+            ScrollViewMarkerViewManager(),
+            StackHeaderConfigViewManager(),
+            StackHeaderSubviewViewManager(),
         )
     }
 
@@ -71,7 +75,6 @@ class RNScreensPackage : BaseReactPackage() {
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
         ReactModuleInfoProvider {
             val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
-            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
             moduleInfos[ScreensModule.NAME] =
                 ReactModuleInfo(
                     ScreensModule.NAME,
@@ -80,7 +83,7 @@ class RNScreensPackage : BaseReactPackage() {
                     false, // needsEagerInit
                     true, // hasConstants
                     false, // isCxxModule
-                    isTurboModule,
+                    true, // isTurboModule
                 )
             moduleInfos
         }

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

@@ -9,7 +9,6 @@ import android.util.SparseArray
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.view.WindowInsets
 import android.view.WindowManager
 import android.webkit.WebView
 import android.widget.ImageView
@@ -18,12 +17,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.children
 import androidx.fragment.app.Fragment
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.shape.CornerFamily
@@ -38,9 +35,7 @@ import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
 import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
 import com.swmansion.rnscreens.events.SheetDetentChangedEvent
 import com.swmansion.rnscreens.ext.asScreenStackFragment
-import com.swmansion.rnscreens.ext.parentAsViewGroup
 import com.swmansion.rnscreens.gamma.common.FragmentProviding
-import com.swmansion.rnscreens.utils.getDecorViewTopInset
 import kotlin.math.max
 
 @SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
@@ -58,8 +53,6 @@ class Screen(
     val reactEventDispatcher: EventDispatcher?
         get() = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
 
-    var insetsApplied = false
-
     var fragmentWrapper: ScreenFragmentWrapper? = null
     var container: ScreenContainer? = null
     var activityState: ActivityState? = null
@@ -99,10 +92,6 @@ class Screen(
     var sheetDefaultResizeAnimationEnabled = true
 
     /**
-     * On Paper, when using form sheet presentation we want to delay enter transition in order
-     * to wait for initial layout from React, otherwise the animator-based animation will look
-     * glitchy.
-     *
      * On Fabric, the view layout is completed before window insets are applied.
      * To ensure the BottomSheet correctly respects insets during its enter transition,
      * we delay the transition until both layout and insets have been applied.
@@ -171,20 +160,17 @@ class Screen(
                     updateSheetContentHeightWithoutAnimation(sheetBehavior, height)
                 }
             }
-
-            if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                // On old architecture we delay enter transition in order to wait for initial frame.
-                shouldTriggerPostponedTransitionAfterLayout = true
-                val parent = parentAsViewGroup()
-                if (parent != null && !parent.isInLayout) {
-                    // There are reported cases (irreproducible) when Screen is not laid out after
-                    // maxHeight is set on behaviour.
-                    parent.requestLayout()
-                }
-            }
         }
     }
 
+    private fun updateShadowNodeScreenSize(
+        width: Int,
+        height: Int,
+        headerHeight: Int,
+    ) {
+        updateState(width, height, headerHeight)
+    }
+
     /**
      * This should be used only with sheet in `fitToContents` mode.
      */
@@ -300,9 +286,7 @@ class Screen(
         // internal offsets with the new maxHeight. This prevents the sheet from snapping back
         // to its old position when the user starts a gesture.
         parent.requestLayout()
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            updateScreenSizeFabric(width, clampedHeight, top + translationY.toInt())
-        }
+        updateShadowNodeScreenSize(width, clampedHeight, top + translationY.toInt())
     }
 
     private fun setupInitialSheetContentHeight(
@@ -358,20 +342,7 @@ class Screen(
             val width = r - l
             val height = b - t
 
-            if (!insetsApplied && headerConfig?.isHeaderHidden == false && headerConfig?.isHeaderTranslucent == false) {
-                val topLevelDecorView =
-                    requireNotNull(
-                        reactContext.currentActivity?.window?.decorView,
-                    ) { "[RNScreens] DecorView is required for applying inset correction, but was null." }
-
-                val topInset = getDecorViewTopInset(topLevelDecorView)
-                val correctedHeight = height - topInset
-                val correctedOffsetY = t + topInset
-
-                dispatchShadowStateUpdate(width, correctedHeight, correctedOffsetY)
-            } else {
-                dispatchShadowStateUpdate(width, height, t)
-            }
+            updateShadowNodeScreenSize(width, height, t)
         }
     }
 
@@ -387,24 +358,17 @@ class Screen(
         }
 
         if (coordinatorLayoutDidChange) {
-            dispatchShadowStateUpdate(width, height, top)
+            updateShadowNodeScreenSize(width, height, top)
         }
 
         footer?.onParentLayout(coordinatorLayoutDidChange, left, top, right, bottom, container!!.height)
-
-        if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // When using form sheet presentation we want to delay enter transition **on Paper** in order
-            // to wait for initial layout from React, otherwise the animator-based animation will look
-            // glitchy. *This seems to not be needed on Fabric*.
-            triggerPostponedEnterTransitionIfNeeded()
-        }
     }
 
     // On Fabric, the view layout is completed before window insets are applied.
     // To ensure the BottomSheet correctly respects insets during its enter transition,
     // we delay the transition until both layout and insets have been applied.
     internal fun requestTriggeringPostponedEnterTransition() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && !sheetShouldOverflowTopInset) {
+        if (!sheetShouldOverflowTopInset) {
             shouldTriggerPostponedTransitionAfterLayout = true
         }
     }
@@ -417,36 +381,6 @@ class Screen(
         }
     }
 
-    private fun updateScreenSizePaper(
-        width: Int,
-        height: Int,
-    ) {
-        reactContext.runOnNativeModulesQueueThread(
-            object : GuardedRunnable(reactContext.exceptionHandler) {
-                override fun runGuarded() {
-                    reactContext
-                        .getNativeModule(UIManagerModule::class.java)
-                        ?.updateNodeSize(id, width, height)
-                }
-            },
-        )
-    }
-
-    /**
-     * @param offsetY ignored on old architecture
-     */
-    private fun dispatchShadowStateUpdate(
-        width: Int,
-        height: Int,
-        offsetY: Int,
-    ) {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            updateScreenSizeFabric(width, height, offsetY)
-        } else {
-            updateScreenSizePaper(width, height)
-        }
-    }
-
     val headerConfig: ScreenStackHeaderConfig?
         get() = children.find { it is ScreenStackHeaderConfig } as? ScreenStackHeaderConfig
 
@@ -705,7 +639,7 @@ class Screen(
         dispatchSheetDetentChanged(detentIndex, isStable)
         // There is no need to update shadow state for transient sheet states -
         // we are unsure of the exact sheet position anyway.
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && isStable) {
+        if (isStable) {
             onSheetYTranslationChanged()
         }
 
@@ -718,16 +652,8 @@ class Screen(
     }
 
     internal fun onSheetYTranslationChanged() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // Translation is relative to the bottom edge, therefore it returns negative values.
-            updateScreenSizeFabric(width, height, top + translationY.toInt())
-        }
-    }
-
-    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets? {
-        insetsApplied = true
-
-        return super.onApplyWindowInsets(insets)
+        // Translation is relative to the bottom edge, therefore it returns negative values.
+        updateShadowNodeScreenSize(width, height, top + translationY.toInt())
     }
 
     override fun onAttachedToWindow() {

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

@@ -341,29 +341,28 @@ open class ScreenContainer(
     }
 
     private fun onScreenChanged() {
-        // we perform update in `onBeforeLayout` of `ScreensShadowNode` by adding an UIBlock
-        // which is called after updating children of the ScreenContainer.
-        // We do it there because `onUpdate` logic requires all changes of children to be already
-        // made in order to provide proper animation for fragment transition for ScreenStack
-        // and this in turn makes nested ScreenContainers detach too early and disappear
-        // before transition if also not dispatched after children updates.
-        // The exception to this rule is `updateImmediately` which is triggered by actions
-        // not connected to React view hierarchy changes, but rather internal events
+        // We schedule the update to run after the current Fabric commit has finished updating
+        // children of the ScreenContainer. The `onUpdate` logic requires all children changes
+        // to already be applied in order to provide proper animation for fragment transitions
+        // in ScreenStack — without this deferral, nested ScreenContainers may detach too early
+        // and disappear before the transition completes.
+        // The exception to this rule is `performUpdatesNow` which is triggered by actions
+        // not connected to React view hierarchy changes, but rather internal events.
         needsUpdate = true
         (context as ThemedReactContext).reactApplicationContext.runOnUiQueueThread {
             // We schedule the update here because LayoutAnimations of `react-native-reanimated`
-            // sometimes attach/detach screens after the layout block of `ScreensShadowNode` has
-            // already run, and we want to update the container then too. In the other cases,
-            // this code will do nothing since it will run after the UIBlock when `mNeedUpdate`
+            // sometimes attach/detach screens after the Fabric mount phase has completed,
+            // and we want to update the container then too. In the other cases,
+            // this code will do nothing since it will run after the mount phase when `needsUpdate`
             // will already be false.
             performUpdates()
         }
     }
 
     protected fun performUpdatesNow() {
-        // we want to update immediately when the fragment manager is set or native back button
-        // dismiss is dispatched or Screen's activityState changes since it is not connected to React
-        // view hierarchy changes and will not trigger `onBeforeLayout` method of `ScreensShadowNode`
+        // We want to update immediately when the fragment manager is set, when a native back button
+        // dismiss is dispatched, or when Screen's activityState changes, since these events are not
+        // connected to React view hierarchy changes and will not trigger a Fabric commit or mount.
         needsUpdate = true
         performUpdates()
     }