react-native-screens 4.19.0-nightly-20251113-5110795ca → 4.19.0-nightly-20251115-10ffdf7ce

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

@@ -92,21 +92,10 @@ open class CustomToolbar(
         // 3. edge-to-edge with translucent navigation buttons bar.
         //
         // Additionally we need to gracefully handle possible display cutouts.
-
-        // We use rootWindowInsets in lieu of insets or unhandledInsets here,
-        // because cutout sometimes (only in certain scenarios, e.g. with headerLeft view present)
-        // happen to be Insets.ZERO and is not reliable.
-        val rootWindowInsets = rootWindowInsets
         val cutoutInsets =
-            resolveInsetsOrZero(WindowInsetsCompat.Type.displayCutout(), rootWindowInsets)
+            resolveInsetsOrZero(WindowInsetsCompat.Type.displayCutout(), unhandledInsets)
         val systemBarInsets =
-            resolveInsetsOrZero(WindowInsetsCompat.Type.systemBars(), rootWindowInsets)
-        val statusBarInsetsStable =
-            resolveInsetsOrZero(
-                WindowInsetsCompat.Type.systemBars(),
-                rootWindowInsets,
-                ignoreVisibility = true,
-            )
+            resolveInsetsOrZero(WindowInsetsCompat.Type.systemBars(), unhandledInsets)
 
         // This seems to work fine in all tested configurations, because cutout & system bars overlap
         // only in portrait mode & top inset is controlled separately, therefore we don't count
@@ -125,7 +114,7 @@ open class CustomToolbar(
         val verticalInsets =
             InsetsCompat.of(
                 0,
-                max(cutoutInsets.top, if (shouldApplyTopInset) statusBarInsetsStable.top else 0),
+                max(cutoutInsets.top, if (shouldApplyTopInset) systemBarInsets.top else 0),
                 0,
                 max(cutoutInsets.bottom, 0),
             )

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

@@ -3,6 +3,7 @@
 package com.swmansion.rnscreens.safearea
 
 import android.annotation.SuppressLint
+import android.os.Build
 import android.util.Log
 import android.view.View
 import android.view.ViewTreeObserver
@@ -114,28 +115,45 @@ class SafeAreaView(
             }
         }
 
-        return WindowInsetsCompat
-            .Builder(insets)
-            .apply {
-                if (insetType.containsSystem()) {
-                    setInsets(
-                        WindowInsetsCompat.Type.systemBars(),
-                        getConsumedInsetsFromSelectedEdges(
-                            insets.getInsets(
-                                WindowInsetsCompat.Type.systemBars(),
-                            ),
-                        ),
-                    )
-                    setInsets(
-                        WindowInsetsCompat.Type.displayCutout(),
-                        getConsumedInsetsFromSelectedEdges(
-                            insets.getInsets(
-                                WindowInsetsCompat.Type.displayCutout(),
-                            ),
-                        ),
-                    )
-                }
-            }.build()
+        var shouldConsumeDisplayCutout = false
+        var consumedInsets =
+            WindowInsetsCompat
+                .Builder(insets)
+                .apply {
+                    if (insetType.containsSystem()) {
+                        val consumedSystemBarsInsets =
+                            getConsumedInsetsFromSelectedEdges(
+                                insets.getInsets(
+                                    WindowInsetsCompat.Type.systemBars(),
+                                ),
+                            )
+
+                        val consumedDisplayCutoutInsets =
+                            getConsumedInsetsFromSelectedEdges(
+                                insets.getInsets(
+                                    WindowInsetsCompat.Type.displayCutout(),
+                                ),
+                            )
+                        shouldConsumeDisplayCutout = consumedDisplayCutoutInsets == Insets.NONE
+
+                        setInsets(
+                            WindowInsetsCompat.Type.systemBars(),
+                            consumedSystemBarsInsets,
+                        )
+                        setInsets(
+                            WindowInsetsCompat.Type.displayCutout(),
+                            consumedDisplayCutoutInsets,
+                        )
+                    }
+                }.build()
+
+        // On Android versions prior to R, setInsets(WindowInsetsCompat.Type.displayCutout(), ...)
+        // does not work. We need to use previous API.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R && shouldConsumeDisplayCutout) {
+            consumedInsets = consumedInsets.consumeDisplayCutout()
+        }
+
+        return consumedInsets
     }
 
     private fun updateInsetsIfNeeded(): Boolean {

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

@@ -22,7 +22,10 @@ internal fun View.resolveInsetsOrZero(
         return InsetsCompat.NONE
     }
 
-    val windowInsetsCompat = WindowInsetsCompat.toWindowInsetsCompat(sourceWindowInsets, this)
+    // We don't use root view-aware WindowInsetsCompat to make sure we get information about display
+    // cutout inset being consumed by one of the ancestor views. Refer to WindowInsetsCompat
+    // `Impl20` implementation of getInsetsForType (case Type.DISPLAY_CUTOUT).
+    val windowInsetsCompat = WindowInsetsCompat.toWindowInsetsCompat(sourceWindowInsets)
     return if (!ignoreVisibility) {
         windowInsetsCompat.getInsets(insetType)
     } else {

package/ios/RNSScreen.mm

@@ -1723,10 +1723,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
 
   _isSwiping = NO;
   _shouldNotify = YES;
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-  [self traverseForScrollView:self.screenView];
-#endif
+
   if (@available(iOS 26, *)) {
     // Reenable interactions, see willMoveToWindow
     [RNSScreenView.viewInteractionManagerInstance enableInteractionsForLastSubtree];
@@ -2188,33 +2185,7 @@ Class<RCTComponentViewProtocol> RNSScreenCls(void)
   }
 }
 
-#else
-#pragma mark - Paper specific
-
-- (void)traverseForScrollView:(UIView *)view
-{
-  if (![[self.view valueForKey:@"_bridge"] valueForKey:@"_jsThread"]) {
-    // we don't want to send `scrollViewDidEndDecelerating` event to JS before the JS thread is ready
-    return;
-  }
-
-  if ([NSStringFromClass([view class]) isEqualToString:@"AVPlayerView"]) {
-    // Traversing through AVPlayerView is an uncommon edge case that causes the disappearing screen
-    // to an excessive traversal through all video player elements
-    // (e.g., for react-native-video, this includes all controls and additional video views).
-    // Thus, we want to avoid unnecessary traversals through these views.
-    return;
-  }
-
-  if ([view isKindOfClass:[UIScrollView class]] &&
-      ([[(UIScrollView *)view delegate] respondsToSelector:@selector(scrollViewDidEndDecelerating:)])) {
-    [[(UIScrollView *)view delegate] scrollViewDidEndDecelerating:(id)view];
-  }
-  [view.subviews enumerateObjectsUsingBlock:^(__kindof UIView *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
-    [self traverseForScrollView:obj];
-  }];
-}
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 @end
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.19.0-nightly-20251113-5110795ca",
+  "version": "4.19.0-nightly-20251115-10ffdf7ce",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",