react-native-screens 4.0.0 → 4.1.0

package/android/src/main/cpp/jni-adapter.cpp

@@ -18,6 +18,9 @@ Java_com_swmansion_rnscreens_ScreensModule_nativeInstall(
     return;
   }
   jsi::Runtime &rt = *runtime;
+  if (globalThis) {
+    env->DeleteGlobalRef(globalThis);
+  }
   globalThis = env->NewGlobalRef(thiz);
   JavaVM *jvm;
   env->GetJavaVM(&jvm);

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/ios/RNSConvert.h

@@ -43,8 +43,6 @@ namespace react = facebook::react;
 
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement;
 
-+ (NSMutableArray<NSNumber *> *)NSNumberMutableArrayFromFloatVector:(const std::vector<CGFloat> &)vector;
-
 + (NSMutableArray<NSNumber *> *)arrayFromVector:(const std::vector<CGFloat> &)vector;
 
 + (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect;

package/ios/RNSConvert.mm

@@ -11,9 +11,11 @@
     (react::RNSScreenStackHeaderConfigDirection)direction
 {
   switch (direction) {
-    case react::RNSScreenStackHeaderConfigDirection::Rtl:
+    using enum react::RNSScreenStackHeaderConfigDirection;
+
+    case Rtl:
       return UISemanticContentAttributeForceRightToLeft;
-    case react::RNSScreenStackHeaderConfigDirection::Ltr:
+    case Ltr:
       return UISemanticContentAttributeForceLeftToRight;
   }
 }
@@ -22,11 +24,13 @@
     (react::RNSScreenStackHeaderConfigBackButtonDisplayMode)backButtonDisplayMode
 {
   switch (backButtonDisplayMode) {
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Default:
+    using enum react::RNSScreenStackHeaderConfigBackButtonDisplayMode;
+
+    case Default:
       return UINavigationItemBackButtonDisplayModeDefault;
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Generic:
+    case Generic:
       return UINavigationItemBackButtonDisplayModeGeneric;
-    case react::RNSScreenStackHeaderConfigBackButtonDisplayMode::Minimal:
+    case Minimal:
       return UINavigationItemBackButtonDisplayModeMinimal;
   }
 }
@@ -35,19 +39,21 @@
     (react::RNSScreenStackPresentation)stackPresentation
 {
   switch (stackPresentation) {
-    case react::RNSScreenStackPresentation::Push:
+    using enum react::RNSScreenStackPresentation;
+
+    case Push:
       return RNSScreenStackPresentationPush;
-    case react::RNSScreenStackPresentation::Modal:
+    case Modal:
       return RNSScreenStackPresentationModal;
-    case react::RNSScreenStackPresentation::FullScreenModal:
+    case FullScreenModal:
       return RNSScreenStackPresentationFullScreenModal;
-    case react::RNSScreenStackPresentation::FormSheet:
+    case FormSheet:
       return RNSScreenStackPresentationFormSheet;
-    case react::RNSScreenStackPresentation::ContainedModal:
+    case ContainedModal:
       return RNSScreenStackPresentationContainedModal;
-    case react::RNSScreenStackPresentation::TransparentModal:
+    case TransparentModal:
       return RNSScreenStackPresentationTransparentModal;
-    case react::RNSScreenStackPresentation::ContainedTransparentModal:
+    case ContainedTransparentModal:
       return RNSScreenStackPresentationContainedTransparentModal;
   }
 }
@@ -55,26 +61,27 @@
 + (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:(react::RNSScreenStackAnimation)stackAnimation
 {
   switch (stackAnimation) {
-    // these four are intentionally grouped
-    case react::RNSScreenStackAnimation::Slide_from_right:
-    case react::RNSScreenStackAnimation::Ios_from_right:
-    case react::RNSScreenStackAnimation::Default:
+    using enum react::RNSScreenStackAnimation;
+    // these three are intentionally grouped
+    case Slide_from_right:
+    case Ios_from_right:
+    case Default:
       return RNSScreenStackAnimationDefault;
     // these two are intentionally grouped
-    case react::RNSScreenStackAnimation::Slide_from_left:
-    case react::RNSScreenStackAnimation::Ios_from_left:
+    case Slide_from_left:
+    case Ios_from_left:
       return RNSScreenStackAnimationSlideFromLeft;
-    case react::RNSScreenStackAnimation::Flip:
+    case Flip:
       return RNSScreenStackAnimationFlip;
-    case react::RNSScreenStackAnimation::Simple_push:
+    case Simple_push:
       return RNSScreenStackAnimationSimplePush;
-    case react::RNSScreenStackAnimation::None:
+    case None:
       return RNSScreenStackAnimationNone;
-    case react::RNSScreenStackAnimation::Fade:
+    case Fade:
       return RNSScreenStackAnimationFade;
-    case react::RNSScreenStackAnimation::Slide_from_bottom:
+    case Slide_from_bottom:
       return RNSScreenStackAnimationSlideFromBottom;
-    case react::RNSScreenStackAnimation::Fade_from_bottom:
+    case Fade_from_bottom:
       return RNSScreenStackAnimationFadeFromBottom;
   }
 }
@@ -83,17 +90,19 @@
     (react::RNSScreenStackHeaderSubviewType)subviewType
 {
   switch (subviewType) {
-    case react::RNSScreenStackHeaderSubviewType::Left:
+    using enum react::RNSScreenStackHeaderSubviewType;
+
+    case Left:
       return RNSScreenStackHeaderSubviewTypeLeft;
-    case react::RNSScreenStackHeaderSubviewType::Right:
+    case Right:
       return RNSScreenStackHeaderSubviewTypeRight;
-    case react::RNSScreenStackHeaderSubviewType::Title:
+    case Title:
       return RNSScreenStackHeaderSubviewTypeTitle;
-    case react::RNSScreenStackHeaderSubviewType::Center:
+    case Center:
       return RNSScreenStackHeaderSubviewTypeCenter;
-    case react::RNSScreenStackHeaderSubviewType::SearchBar:
+    case SearchBar:
       return RNSScreenStackHeaderSubviewTypeSearchBar;
-    case react::RNSScreenStackHeaderSubviewType::Back:
+    case Back:
       return RNSScreenStackHeaderSubviewTypeBackButton;
   }
 }
@@ -102,9 +111,10 @@
     (react::RNSScreenReplaceAnimation)replaceAnimation
 {
   switch (replaceAnimation) {
-    case react::RNSScreenReplaceAnimation::Pop:
+    using enum react::RNSScreenReplaceAnimation;
+    case Pop:
       return RNSScreenReplaceAnimationPop;
-    case react::RNSScreenReplaceAnimation::Push:
+    case Push:
       return RNSScreenReplaceAnimationPush;
   }
 }
@@ -112,9 +122,10 @@
 + (RNSScreenSwipeDirection)RNSScreenSwipeDirectionFromCppEquivalent:(react::RNSScreenSwipeDirection)swipeDirection
 {
   switch (swipeDirection) {
-    case react::RNSScreenSwipeDirection::Horizontal:
+    using enum react::RNSScreenSwipeDirection;
+    case Horizontal:
       return RNSScreenSwipeDirectionHorizontal;
-    case react::RNSScreenSwipeDirection::Vertical:
+    case Vertical:
       return RNSScreenSwipeDirectionVertical;
   }
 }
@@ -144,13 +155,14 @@
     (react::RNSSearchBarAutoCapitalize)autoCapitalize
 {
   switch (autoCapitalize) {
-    case react::RNSSearchBarAutoCapitalize::Words:
+    using enum react::RNSSearchBarAutoCapitalize;
+    case Words:
       return UITextAutocapitalizationTypeWords;
-    case react::RNSSearchBarAutoCapitalize::Sentences:
+    case Sentences:
       return UITextAutocapitalizationTypeSentences;
-    case react::RNSSearchBarAutoCapitalize::Characters:
+    case Characters:
       return UITextAutocapitalizationTypeAllCharacters;
-    case react::RNSSearchBarAutoCapitalize::None:
+    case None:
       return UITextAutocapitalizationTypeNone;
   }
 }
@@ -159,11 +171,12 @@
 + (RNSSearchBarPlacement)RNSScreenSearchBarPlacementFromCppEquivalent:(react::RNSSearchBarPlacement)placement
 {
   switch (placement) {
-    case react::RNSSearchBarPlacement::Stacked:
+    using enum react::RNSSearchBarPlacement;
+    case Stacked:
       return RNSSearchBarPlacementStacked;
-    case react::RNSSearchBarPlacement::Automatic:
+    case Automatic:
       return RNSSearchBarPlacementAutomatic;
-    case react::RNSSearchBarPlacement::Inline:
+    case Inline:
       return RNSSearchBarPlacementInline;
   }
 }
@@ -179,68 +192,69 @@
 
 + (RNSBlurEffectStyle)RNSBlurEffectStyleFromCppEquivalent:(react::RNSScreenStackHeaderConfigBlurEffect)blurEffect
 {
+  using enum react::RNSScreenStackHeaderConfigBlurEffect;
 #if !TARGET_OS_TV && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
     __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
   if (@available(iOS 13.0, *)) {
     switch (blurEffect) {
-      case react::RNSScreenStackHeaderConfigBlurEffect::None:
+      case None:
         return RNSBlurEffectStyleNone;
-      case react::RNSScreenStackHeaderConfigBlurEffect::ExtraLight:
+      case ExtraLight:
         return RNSBlurEffectStyleExtraLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Light:
+      case Light:
         return RNSBlurEffectStyleLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Dark:
+      case Dark:
         return RNSBlurEffectStyleDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Regular:
+      case Regular:
         return RNSBlurEffectStyleRegular;
-      case react::RNSScreenStackHeaderConfigBlurEffect::Prominent:
+      case Prominent:
         return RNSBlurEffectStyleProminent;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterial:
+      case SystemUltraThinMaterial:
         return RNSBlurEffectStyleSystemUltraThinMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterial:
+      case SystemThinMaterial:
         return RNSBlurEffectStyleSystemThinMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterial:
+      case SystemMaterial:
         return RNSBlurEffectStyleSystemMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterial:
+      case SystemThickMaterial:
         return RNSBlurEffectStyleSystemThickMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterial:
+      case SystemChromeMaterial:
         return RNSBlurEffectStyleSystemChromeMaterial;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterialLight:
+      case SystemUltraThinMaterialLight:
         return RNSBlurEffectStyleSystemUltraThinMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterialLight:
+      case SystemThinMaterialLight:
         return RNSBlurEffectStyleSystemThinMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterialLight:
+      case SystemMaterialLight:
         return RNSBlurEffectStyleSystemMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterialLight:
+      case SystemThickMaterialLight:
         return RNSBlurEffectStyleSystemThickMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterialLight:
+      case SystemChromeMaterialLight:
         return RNSBlurEffectStyleSystemChromeMaterialLight;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemUltraThinMaterialDark:
+      case SystemUltraThinMaterialDark:
         return RNSBlurEffectStyleSystemUltraThinMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThinMaterialDark:
+      case SystemThinMaterialDark:
         return RNSBlurEffectStyleSystemThinMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemMaterialDark:
+      case SystemMaterialDark:
         return RNSBlurEffectStyleSystemMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemThickMaterialDark:
+      case SystemThickMaterialDark:
         return RNSBlurEffectStyleSystemThickMaterialDark;
-      case react::RNSScreenStackHeaderConfigBlurEffect::SystemChromeMaterialDark:
+      case SystemChromeMaterialDark:
         return RNSBlurEffectStyleSystemChromeMaterialDark;
     }
   }
 #endif
 
   switch (blurEffect) {
-    case react::RNSScreenStackHeaderConfigBlurEffect::None:
+    case None:
       return RNSBlurEffectStyleNone;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Light:
+    case Light:
       return RNSBlurEffectStyleLight;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Dark:
+    case Dark:
       return RNSBlurEffectStyleDark;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Regular:
+    case Regular:
       return RNSBlurEffectStyleRegular;
-    case react::RNSScreenStackHeaderConfigBlurEffect::Prominent:
+    case Prominent:
       return RNSBlurEffectStyleProminent;
-    case react::RNSScreenStackHeaderConfigBlurEffect::ExtraLight:
+    case ExtraLight:
     default:
       return RNSBlurEffectStyleNone;
   }

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

@@ -31,6 +31,7 @@
 #import "RNSScreenStack.h"
 #import "RNSScreenStackHeaderConfig.h"
 
+#import "RNSDefines.h"
 #import "UIView+RNSUtility.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -136,10 +137,12 @@ constexpr NSInteger SHEET_LARGEST_UNDIMMED_DETENT_NONE = -1;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (NSArray<UIView *> *)reactSubviews
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 #endif
 
 - (void)updateBounds
@@ -374,10 +377,12 @@ constexpr NSInteger SHEET_LARGEST_UNDIMMED_DETENT_NONE = -1;
 }
 #endif
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (UIView *)reactSuperview
 {
   return _reactSuperview;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 /// This is RNSScreenContentWrapperDelegate method, where we do get notified when React did update frame of our child.
 - (void)reactDidSetFrame:(CGRect)reactFrame forContentWrapper:(RNSScreenContentWrapper *)contentWrapepr

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/RNSScreenFooter.mm

@@ -26,35 +26,34 @@
 - (void)willMoveToSuperview:(UIView *)newSuperview
 {
   [super willMoveToSuperview:newSuperview];
-  if ([newSuperview isKindOfClass:RNSScreenView.class]) {
-    RNSScreenView *screen = (RNSScreenView *)newSuperview;
-    _parent = (RNSScreenView *)newSuperview;
-
-    //    [NSLayoutConstraint activateConstraints:@[
-    //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeBottom
-    //      relatedBy:NSLayoutRelationEqual toItem:screen attribute:NSLayoutAttributeBottom multiplier:1.0
-    //      constant:0.0], [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeLeft
-    //      relatedBy:NSLayoutRelationEqual toItem:screen attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0],
-    //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual
-    //      toItem:screen attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0], [NSLayoutConstraint
-    //      constraintWithItem:self attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:screen
-    //      attribute:NSLayoutAttributeTop multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
-    //      attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self
-    //      attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0.0], [NSLayoutConstraint
-    //      constraintWithItem:screen attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self
-    //      attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
-    //      attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self
-    //      attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
-    //      attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop
-    //      multiplier:1.0 constant:0.0],
-    //    ]];
-    //    [self setNeedsLayout];
-  }
+  //  if ([newSuperview isKindOfClass:RNSScreenView.class]) {
+  //    RNSScreenView *screen = (RNSScreenView *)newSuperview;
+  //    _parent = (RNSScreenView *)newSuperview;
+
+  //    [NSLayoutConstraint activateConstraints:@[
+  //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeBottom
+  //      relatedBy:NSLayoutRelationEqual toItem:screen attribute:NSLayoutAttributeBottom multiplier:1.0
+  //      constant:0.0], [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeLeft
+  //      relatedBy:NSLayoutRelationEqual toItem:screen attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0],
+  //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual
+  //      toItem:screen attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0], [NSLayoutConstraint
+  //      constraintWithItem:self attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:screen
+  //      attribute:NSLayoutAttributeTop multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
+  //      attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self
+  //      attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0.0], [NSLayoutConstraint
+  //      constraintWithItem:screen attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self
+  //      attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
+  //      attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self
+  //      attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
+  //      attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop
+  //      multiplier:1.0 constant:0.0],
+  //    ]];
+  //    [self setNeedsLayout];
+  //  }
 }
 
 - (void)didMoveToSuperview
 {
-  NSLog(@"Adding constraints between %@ and %@", self, _parent);
   if (_parent != nil) {
     //    [NSLayoutConstraint activateConstraints:@[
     //      [NSLayoutConstraint constraintWithItem:self

package/ios/RNSScreenStack.mm

@@ -20,6 +20,7 @@
 #import "RCTTouchHandler+RNSUtility.h"
 #endif // RCT_NEW_ARCH_ENABLED
 
+#import "RNSDefines.h"
 #import "RNSPercentDrivenInteractiveTransition.h"
 #import "RNSScreen.h"
 #import "RNSScreenStack.h"
@@ -290,10 +291,12 @@ namespace react = facebook::react;
   }
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (NSArray<UIView *> *)reactSubviews
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)didMoveToWindow
 {
@@ -1086,6 +1089,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]]) {
@@ -1101,6 +1107,7 @@ namespace react = facebook::react;
   subview.reactSuperview = nil;
   [_reactSubviews removeObject:subview];
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)didUpdateReactSubviews
 {
@@ -1288,7 +1295,7 @@ namespace react = facebook::react;
 // with modal presentation or foreign modal presented from inside a Screen.
 - (void)dismissAllRelatedModals
 {
-  [_controller dismissViewControllerAnimated:NO completion:nil];
+  [_controller dismissViewControllerAnimated:YES completion:nil];
 
   // This loop seems to be excessive. Above message send to `_controller` should
   // be enough, because system dismisses the controllers recursively,

package/ios/RNSScreenStackHeaderConfig.h

@@ -12,7 +12,7 @@
 
 @interface NSString (RNSStringUtil)
 
-+ (BOOL)RNSisBlank:(NSString *)string;
++ (BOOL)RNSisBlank:(nullable NSString *)string;
 
 @end
 
@@ -31,6 +31,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;
@@ -58,9 +60,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;
 
 /**
  * Allows to send information with insets to the corresponding node in shadow tree.
@@ -132,8 +136,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

package/ios/RNSScreenStackHeaderConfig.mm

@@ -21,6 +21,7 @@
 #import <React/RCTImageLoader.h>
 #import <React/RCTImageSource.h>
 #import "RNSConvert.h"
+#import "RNSDefines.h"
 #import "RNSScreen.h"
 #import "RNSScreenStackHeaderConfig.h"
 #import "RNSSearchBar.h"
@@ -113,6 +114,7 @@ namespace react = facebook::react;
   _blurEffect = RNSBlurEffectStyleNone;
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (UIView *)reactSuperview
 {
   return _screenView;
@@ -122,6 +124,7 @@ namespace react = facebook::react;
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)removeFromSuperview
 {
@@ -785,6 +788,7 @@ namespace react = facebook::react;
   }
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
 {
   [_reactSubviews insertObject:subview atIndex:atIndex];
@@ -795,6 +799,7 @@ namespace react = facebook::react;
 {
   [_reactSubviews removeObject:subview];
 }
+RNS_IGNORE_SUPER_CALL_BEGIN
 
 - (void)didUpdateReactSubviews
 {
@@ -879,6 +884,9 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
       return RCTResizeModeCenter;
     case react::ImageResizeMode::Repeat:
       return RCTResizeModeRepeat;
+    default:
+      // Both RCTConvert and ImageProps use this as a default as of RN 0.76
+      return RCTResizeModeStretch;
   }
 }
 
@@ -956,7 +964,8 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
   _largeTitleFontWeight = RCTNSStringFromStringNilIfEmpty(newScreenProps.largeTitleFontWeight);
   _largeTitleFontSize = [self getFontSizePropValue:newScreenProps.largeTitleFontSize];
   _largeTitleHideShadow = newScreenProps.largeTitleHideShadow;
-
+  _largeTitleBackgroundColor = RCTUIColorFromSharedColor(newScreenProps.largeTitleBackgroundColor);
+  
   _backTitle = RCTNSStringFromStringNilIfEmpty(newScreenProps.backTitle);
   if (newScreenProps.backTitleFontFamily != oldScreenProps.backTitleFontFamily) {
     _backTitleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.backTitleFontFamily);

package/ios/RNSScreenStackHeaderSubview.mm

@@ -1,5 +1,6 @@
 #import "RNSScreenStackHeaderSubview.h"
 #import "RNSConvert.h"
+#import "RNSDefines.h"
 #import "RNSScreenStackHeaderConfig.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -86,6 +87,8 @@ namespace react = facebook::react;
   return react::concreteComponentDescriptorProvider<react::RNSScreenStackHeaderSubviewComponentDescriptor>();
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
+// System layouts the subviews.
 - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const react::LayoutMetrics &)oldLayoutMetrics
 {
@@ -105,6 +108,7 @@ namespace react = facebook::react;
     [self layoutNavigationBarIfNeeded];
   }
 }
+RNS_IGNORE_SUPER_CALL_BEGIN
 
 + (BOOL)shouldBeRecycled
 {

package/ios/utils/RNSDefines.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#define RNS_IGNORE_SUPER_CALL_BEGIN \
+  _Pragma("clang diagnostic push")  \
+      _Pragma("clang diagnostic ignored \"-Wobjc-missing-super-calls\"")
+
+#define RNS_IGNORE_SUPER_CALL_END _Pragma("clang diagnostic pop")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn)",