react-native-screens 3.35.0 → 3.37.0

package/README.md

@@ -108,7 +108,9 @@ Screens are already integrated with the React Native's most popular navigation l
 
 | library version | react-native version |
 | --------------- | -------------------- |
-| 3.33.0+         | 0.72.0+
+| 3.37.0+         | 0.76.0+              |
+| 3.36.0+         | 0.73.0+              |
+| 3.33.0+         | 0.72.0+              |
 | 3.32.0+         | 0.71.0+              |
 | 3.30.0+         | 0.68.0+              |
 | 3.14.0+         | 0.64.0+              |
@@ -123,6 +125,7 @@ Here's a table with summary of supported `react-native` versions when Fabric is
 
 | library version | react-native version |
 | --------------- | -------------------- |
+| 3.36.0+         | 0.77.0+              |
 | 3.33.0+         | 0.75.0+              |
 | 3.32.0+         | 0.74.0+              |
 | 3.28.0+         | 0.73.0+              |

package/android/build.gradle

@@ -16,7 +16,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:4.2.2')
+        classpath('com.android.tools.build:gradle:8.2.1')
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', rnsDefaultKotlinVersion)}"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
     }
@@ -59,13 +59,7 @@ def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', rnsDefaultCompileSdkVersion)
-    def agpVersion = Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-        namespace "com.swmansion.rnscreens"
-        buildFeatures {
-            buildConfig true
-        }
-    }
+    namespace "com.swmansion.rnscreens"
 
     // Used to override the NDK path/version on internal CI or by allowing
     // users to customize the NDK path/version from their root project (e.g. for M1 support)
@@ -94,6 +88,7 @@ android {
     }
     buildFeatures {
         prefab true
+        buildConfig true
     }
     externalNativeBuild {
         cmake {
@@ -119,7 +114,13 @@ android {
                 "**/libc++_shared.so",
                 "**/libreact_render*.so",
                 "**/libreactnativejni.so",
-                "**/libreact_performance_timeline.so"
+                "**/libreact_performance_timeline.so",
+                // In 0.76 multiple react-native's libraries were merged and these are the main new artifacts we're using.
+                // 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", 
+                "**/libreactnative.so"
         ]
     }
     sourceSets.main {

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

@@ -41,13 +41,26 @@ class NativeProxy {
         }
     }
 
+    // Called from native
     @DoNotStrip
     public fun notifyScreenRemoved(screenTag: Int) {
-        val screen = viewsMap[screenTag]?.get()
+        // Since RN 0.78 the screenTag we receive as argument here might not belong to a screen
+        // owned by native stack, but e.g. to one parented by plain ScreenContainer, for which we
+        // currently do not want to start exiting transitions. Therefore is it left to caller to
+        // ensure that NativeProxy.viewsMap is filled only with screens belonging to screen stacks.
+
+        val weakScreeRef = viewsMap[screenTag]
+
+        // `screenTag` belongs to not observed screen or screen with such tag no longer exists.
+        if (weakScreeRef == null) {
+            return
+        }
+
+        val screen = weakScreeRef.get()
         if (screen is Screen) {
             screen.startRemovalTransition()
         } else {
-            Log.w("[RNScreens]", "Did not find view with tag $screenTag.")
+            Log.w("[RNScreens]", "Reference stored in NativeProxy for tag $screenTag no longer points to valid object.")
         }
     }
 }

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.swmansion.rnscreens">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

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

@@ -1,6 +1,6 @@
 package com.swmansion.rnscreens
 
-import com.facebook.react.TurboReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModuleList
@@ -9,12 +9,14 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.swmansion.rnscreens.utils.ScreenDummyLayoutHelper
 
+// Fool autolinking for older versions that do not support BaseReactPackage.
+// public class RNScreensPackage implements TurboReactPackage {
 @ReactModuleList(
     nativeModules = [
         ScreensModule::class,
     ],
 )
-class RNScreensPackage : TurboReactPackage() {
+class RNScreensPackage : BaseReactPackage() {
     // We just retain it here. This object helps us tackle jumping content when using native header.
     // See: https://github.com/software-mansion/react-native-screens/pull/2169
     private var screenDummyLayoutHelper: ScreenDummyLayoutHelper? = null

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

@@ -160,9 +160,21 @@ class ScreenStack(
                                 R.anim.rns_no_animation_medium,
                             )
                         StackAnimation.FADE_FROM_BOTTOM -> it.setCustomAnimations(R.anim.rns_fade_from_bottom, R.anim.rns_no_animation_350)
-                        StackAnimation.IOS -> it.setCustomAnimations(R.anim.rns_ios_from_right_foreground_open, R.anim.rns_ios_from_right_background_open)
-                        StackAnimation.IOS_FROM_RIGHT -> it.setCustomAnimations(R.anim.rns_ios_from_right_foreground_open, R.anim.rns_ios_from_right_background_open)
-                        StackAnimation.IOS_FROM_LEFT -> it.setCustomAnimations(R.anim.rns_ios_from_left_foreground_open, R.anim.rns_ios_from_left_background_open)
+                        StackAnimation.IOS ->
+                            it.setCustomAnimations(
+                                R.anim.rns_ios_from_right_foreground_open,
+                                R.anim.rns_ios_from_right_background_open,
+                            )
+                        StackAnimation.IOS_FROM_RIGHT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_ios_from_right_foreground_open,
+                                R.anim.rns_ios_from_right_background_open,
+                            )
+                        StackAnimation.IOS_FROM_LEFT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_ios_from_left_foreground_open,
+                                R.anim.rns_ios_from_left_background_open,
+                            )
                     }
                 } else {
                     when (stackAnimation) {
@@ -185,9 +197,21 @@ class ScreenStack(
                                 R.anim.rns_slide_out_to_bottom,
                             )
                         StackAnimation.FADE_FROM_BOTTOM -> it.setCustomAnimations(R.anim.rns_no_animation_250, R.anim.rns_fade_to_bottom)
-                        StackAnimation.IOS -> it.setCustomAnimations(R.anim.rns_ios_from_right_foreground_close, R.anim.rns_ios_from_right_background_close)
-                        StackAnimation.IOS_FROM_RIGHT -> it.setCustomAnimations(R.anim.rns_ios_from_right_background_close, R.anim.rns_ios_from_right_foreground_close)
-                        StackAnimation.IOS_FROM_LEFT -> it.setCustomAnimations(R.anim.rns_ios_from_left_background_close, R.anim.rns_ios_from_left_foreground_close)
+                        StackAnimation.IOS ->
+                            it.setCustomAnimations(
+                                R.anim.rns_ios_from_right_foreground_close,
+                                R.anim.rns_ios_from_right_background_close,
+                            )
+                        StackAnimation.IOS_FROM_RIGHT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_ios_from_right_background_close,
+                                R.anim.rns_ios_from_right_foreground_close,
+                            )
+                        StackAnimation.IOS_FROM_LEFT ->
+                            it.setCustomAnimations(
+                                R.anim.rns_ios_from_left_background_close,
+                                R.anim.rns_ios_from_left_foreground_close,
+                            )
                     }
                 }
             }

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

@@ -11,7 +11,10 @@ internal class ScreensShadowNode(
 ) : LayoutShadowNode() {
     override fun onBeforeLayout(nativeViewHierarchyOptimizer: NativeViewHierarchyOptimizer) {
         super.onBeforeLayout(nativeViewHierarchyOptimizer)
-        (context.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager ->
+        (context.getNativeModule(UIManagerModule::class.java))?.addUIBlock { nativeViewHierarchyManager: NativeViewHierarchyManager? ->
+            if (nativeViewHierarchyManager == null) {
+                return@addUIBlock
+            }
             val view = nativeViewHierarchyManager.resolveView(reactTag)
             if (view is ScreenContainer) {
                 view.performUpdates()

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

@@ -82,7 +82,9 @@ internal class ScreenDummyLayoutHelper(
         // We need to use activity here, as react context does not have theme attributes required by
         // AppBarLayout attached leading to crash.
         val contextWithTheme =
-            requireNotNull(reactContext.currentActivity) { "[RNScreens] Attempt to use context detached from activity. This could happen only due to race-condition." }
+            requireNotNull(reactContext.currentActivity) {
+                "[RNScreens] Attempt to use context detached from activity. This could happen only due to race-condition."
+            }
 
         synchronized(this) {
             // The layout could have been initialised when this thread waited for access to critical section.
@@ -166,7 +168,7 @@ internal class ScreenDummyLayoutHelper(
                 // is still null at this execution point. We don't wanna crash in such case, thus returning zeroed height.
                 Log.e(
                     TAG,
-                    "[RNScreens] Failed to late-init layout while computing header height. This is most likely a race-condition-bug in react-native-screens, please file an issue at https://github.com/software-mansion/react-native-screens/issues"
+                    "[RNScreens] Failed to late-init layout while computing header height. This is most likely a race-condition-bug in react-native-screens, please file an issue at https://github.com/software-mansion/react-native-screens/issues",
                 )
                 return 0.0f
             }
@@ -214,7 +216,8 @@ internal class ScreenDummyLayoutHelper(
     private fun requireReactContext(lazyMessage: (() -> Any)? = null): ReactApplicationContext =
         requireNotNull(
             reactContextRef.get(),
-            lazyMessage ?: { "[RNScreens] Attempt to require missing react context" })
+            lazyMessage ?: { "[RNScreens] Attempt to require missing react context" },
+        )
 
     private fun requireActivity(): Activity =
         requireNotNull(requireReactContext().currentActivity) {

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerDelegate.java

@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNSScreenContainerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNSScreenContainerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenContainerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNSScreenContainerManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerInterface.java

@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 
-public interface RNSScreenContainerManagerInterface<T extends View> {
+
+public interface RNSScreenContainerManagerInterface<T extends View>  {
   // No props
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerDelegate.java

@@ -13,10 +13,11 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNSScreenManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNSScreenManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerInterface.java

@@ -13,7 +13,8 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 
-public interface RNSScreenManagerInterface<T extends View> {
+
+public interface RNSScreenManagerInterface<T extends View>  {
   void setSheetAllowedDetents(T view, @Nullable String value);
   void setSheetLargestUndimmedDetent(T view, @Nullable String value);
   void setSheetGrabberVisible(T view, boolean value);

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerDelegate.java

@@ -12,10 +12,11 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenStackHeaderConfigManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNSScreenStackHeaderConfigManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenStackHeaderConfigManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNSScreenStackHeaderConfigManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerInterface.java

@@ -12,7 +12,8 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 
-public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {
+
+public interface RNSScreenStackHeaderConfigManagerInterface<T extends View>  {
   void setBackgroundColor(T view, @Nullable Integer value);
   void setBackTitle(T view, @Nullable String value);
   void setBackTitleFontFamily(T view, @Nullable String value);

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderSubviewManagerDelegate.java

@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNSScreenStackHeaderSubviewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenStackHeaderSubviewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNSScreenStackHeaderSubviewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenStackHeaderSubviewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNSScreenStackHeaderSubviewManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderSubviewManagerInterface.java

@@ -12,6 +12,7 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 
-public interface RNSScreenStackHeaderSubviewManagerInterface<T extends View> {
+
+public interface RNSScreenStackHeaderSubviewManagerInterface<T extends View>  {
   void setType(T view, @Nullable String value);
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackManagerDelegate.java

@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNSScreenStackManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSScreenStackManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNSScreenStackManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSScreenStackManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNSScreenStackManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackManagerInterface.java

@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 
-public interface RNSScreenStackManagerInterface<T extends View> {
+
+public interface RNSScreenStackManagerInterface<T extends View>  {
   // No props
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSSearchBarManagerDelegate.java

@@ -13,10 +13,11 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNSSearchBarManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNSSearchBarManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNSSearchBarManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSSearchBarManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNSSearchBarManagerDelegate(U viewManager) {
     super(viewManager);
   }
@@ -74,7 +75,7 @@ public class RNSSearchBarManagerDelegate<T extends View, U extends BaseViewManag
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, ReadableArray args) {
+  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
     switch (commandName) {
       case "blur":
         mViewManager.blur(view);

package/android/src/paper/java/com/facebook/react/viewmanagers/RNSSearchBarManagerInterface.java

@@ -12,7 +12,8 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 
-public interface RNSSearchBarManagerInterface<T extends View> {
+
+public interface RNSSearchBarManagerInterface<T extends View>  {
   void setHideWhenScrolling(T view, boolean value);
   void setAutoCapitalize(T view, @Nullable String value);
   void setPlaceholder(T view, @Nullable String value);

package/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp

@@ -26,10 +26,10 @@ findHeaderConfigChild(const YogaLayoutableShadowNode &screenShadowNode) {
   return {};
 }
 
+#ifdef ANDROID
 static constexpr const char *kScreenDummyLayoutHelperClass =
     "com/swmansion/rnscreens/utils/ScreenDummyLayoutHelper";
 
-#ifdef ANDROID
 std::optional<float> findHeaderHeight(
     const int fontSize,
     const bool isTitleEmpty) {

package/cpp/RNSScreenRemovalListener.cpp

@@ -10,8 +10,10 @@ std::optional<MountingTransaction> RNSScreenRemovalListener::pullTransaction(
   for (const ShadowViewMutation &mutation : mutations) {
     if (mutation.type == ShadowViewMutation::Type::Remove &&
         mutation.oldChildShadowView.componentName != nullptr &&
-        strcmp(mutation.parentShadowView.componentName, "RNSScreenStack") ==
-            0) {
+        strcmp(mutation.oldChildShadowView.componentName, "RNSScreen") == 0) {
+      // We call the listener function even if this screen has not been owned
+      // by RNSScreenStack as since RN 0.78 we do not have enough information
+      // here. This final filter is applied later in NativeProxy.
       listenerFunction_(mutation.oldChildShadowView.tag);
     }
   }

package/ios/RNSEnums.h

@@ -60,8 +60,8 @@ typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
 };
 
 typedef NS_ENUM(NSInteger, RNSScreenDetentType) {
-  RNSScreenDetentTypeMedium,
   RNSScreenDetentTypeLarge,
+  RNSScreenDetentTypeMedium,
   RNSScreenDetentTypeAll,
 };
 

package/ios/RNSFullWindowOverlay.mm

@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
 
+#import "RNSDefines.h"
 #import "RNSFullWindowOverlay.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -198,6 +199,8 @@
   [childComponentView removeFromSuperview];
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
+// We do not set frame for ouselves, but rather for the container.
 - (void)updateLayoutMetrics:(react::LayoutMetrics const &)layoutMetrics
            oldLayoutMetrics:(react::LayoutMetrics const &)oldLayoutMetrics
 {
@@ -205,6 +208,7 @@
   _reactFrame = frame;
   [_container setFrame:frame];
 }
+RNS_IGNORE_SUPER_CALL_END
 
 #else
 #pragma mark - Paper specific

package/ios/RNSScreen.mm

@@ -25,6 +25,7 @@
 #import "RNSScreenStack.h"
 #import "RNSScreenStackHeaderConfig.h"
 
+#import "RNSDefines.h"
 #import "UIView+RNSUtility.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -109,10 +110,12 @@ namespace react = facebook::react;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (NSArray<UIView *> *)reactSubviews
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 #endif
 
 - (void)updateBounds
@@ -291,10 +294,12 @@ namespace react = facebook::react;
 }
 #endif
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (UIView *)reactSuperview
 {
   return _reactSuperview;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)addSubview:(UIView *)view
 {
@@ -1619,7 +1624,7 @@ RCT_ENUM_CONVERTER(
       @"medium" : @(RNSScreenDetentTypeMedium),
       @"all" : @(RNSScreenDetentTypeAll),
     }),
-    RNSScreenDetentTypeAll,
+    RNSScreenDetentTypeLarge,
     integerValue)
 
 + (UIInterfaceOrientationMask)UIInterfaceOrientationMask:(id)json

package/ios/RNSScreenContainer.mm

@@ -1,4 +1,5 @@
 #import "RNSScreenContainer.h"
+#import "RNSDefines.h"
 #import "RNSScreen.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -89,6 +90,9 @@ namespace react = facebook::react;
   [self updateContainer];
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
+// We do not call super as we do not want to update UIKit model. It will
+// be updated after we receive all mutations.
 - (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex
 {
   subview.reactSuperview = self;
@@ -106,6 +110,7 @@ namespace react = facebook::react;
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (UIViewController *)reactViewController
 {

package/ios/RNSScreenStack.mm

@@ -20,6 +20,7 @@
 #import "RCTTouchHandler+RNSUtility.h"
 #endif // RCT_NEW_ARCH_ENABLED
 
+#import "RNSDefines.h"
 #import "RNSScreen.h"
 #import "RNSScreenStack.h"
 #import "RNSScreenStackAnimator.h"
@@ -257,10 +258,12 @@ namespace react = facebook::react;
   }
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (NSArray<UIView *> *)reactSubviews
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)didMoveToWindow
 {
@@ -1048,6 +1051,9 @@ namespace react = facebook::react;
 
 #endif // !TARGET_OS_TV
 
+RNS_IGNORE_SUPER_CALL_BEGIN
+// We hijack the udpates as we don't want to update UIKit model yet.
+// This is done after all mutations are processed.
 - (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex
 {
   if (![subview isKindOfClass:[RNSScreenView class]]) {
@@ -1063,6 +1069,7 @@ namespace react = facebook::react;
   subview.reactSuperview = nil;
   [_reactSubviews removeObject:subview];
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)didUpdateReactSubviews
 {
@@ -1186,7 +1193,7 @@ namespace react = facebook::react;
                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
 {
   for (const auto &mutation : transaction.getMutations()) {
-    if (mutation.parentShadowView.tag == self.tag &&
+    if (MUTATION_PARENT_TAG(mutation) == self.tag &&
         (mutation.type == react::ShadowViewMutation::Type::Insert ||
          mutation.type == react::ShadowViewMutation::Type::Remove)) {
       // we need to wait until children have their layout set. At this point they don't have the layout

package/ios/RNSScreenStackHeaderConfig.h

@@ -11,7 +11,7 @@
 
 @interface NSString (RNSStringUtil)
 
-+ (BOOL)RNSisBlank:(NSString *)string;
++ (BOOL)RNSisBlank:(nullable NSString *)string;
 
 @end
 
@@ -30,6 +30,8 @@
 @property (nonatomic) BOOL hide;
 #endif
 
+NS_ASSUME_NONNULL_BEGIN
+
 @property (nonatomic, retain) NSString *title;
 @property (nonatomic, retain) NSString *titleFontFamily;
 @property (nonatomic, retain) NSNumber *titleFontSize;
@@ -57,9 +59,11 @@
 @property (nonatomic) UINavigationItemBackButtonDisplayMode backButtonDisplayMode;
 @property (nonatomic) RNSBlurEffectStyle blurEffect;
 
-+ (void)willShowViewController:(UIViewController *)vc
+NS_ASSUME_NONNULL_END
+
++ (void)willShowViewController:(nonnull UIViewController *)vc
                       animated:(BOOL)animated
-                    withConfig:(RNSScreenStackHeaderConfig *)config;
+                    withConfig:(nonnull RNSScreenStackHeaderConfig *)config;
 
 @end
 
@@ -69,8 +73,7 @@
 
 @interface RCTConvert (RNSScreenStackHeader)
 
-+ (UIBlurEffectStyle)UIBlurEffectStyle:(id)json;
-+ (UISemanticContentAttribute)UISemanticContentAttribute:(id)json;
-+ (UINavigationItemBackButtonDisplayMode)UINavigationItemBackButtonDisplayMode:(id)json;
++ (UISemanticContentAttribute)UISemanticContentAttribute:(nonnull id)json;
++ (UINavigationItemBackButtonDisplayMode)UINavigationItemBackButtonDisplayMode:(nonnull id)json;
 
 @end