fix(iOS): fix build issues when building with -Werror -Wreturn-path (#2497)

kkafar · web-flow · commit 46147026c708 · 2024-11-13T13:57:38.000+01:00
## Description

Possible build issues.

## Changes

- **Add default for resizemode conversion**
- **Remove unimplemented and unused method**

## Test code and steps to reproduce

CI

## Checklist

- [ ] Ensured that CI passes
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenShadowNode.cpp b/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) {
diff --git a/ios/RNSConvert.h b/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;
diff --git a/ios/RNSFullWindowOverlay.mm b/ios/RNSFullWindowOverlay.mm
@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
 
+#import "RNSDefines.h"
 #import "RNSFullWindowOverlay.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -198,13 +199,16 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [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
 {
   CGRect frame = RCTCGRectFromRect(layoutMetrics.frame);
   _reactFrame = frame;
   [_container setFrame:frame];
 }
+RNS_IGNORE_SUPER_CALL_END
 
 #else
 #pragma mark - Paper specific
diff --git a/ios/RNSScreen.mm b/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 @@ - (UIViewController *)reactViewController
 }
 
 #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 @@ - (void)setHomeIndicatorHidden:(BOOL)homeIndicatorHidden
 }
 #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
diff --git a/ios/RNSScreenContainer.mm b/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 @@ - (void)markChildUpdated
   [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 @@ - (void)removeReactSubview:(RNSScreenView *)subview
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (UIViewController *)reactViewController
 {
diff --git a/ios/RNSScreenFooter.mm b/ios/RNSScreenFooter.mm
@@ -26,35 +26,34 @@ - (instancetype)init
 - (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
diff --git a/ios/RNSScreenStack.mm b/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 @@ - (void)presentationControllerDidDismiss:(UIPresentationController *)presentatio
   }
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (NSArray<UIView *> *)reactSubviews
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)didMoveToWindow
 {
@@ -1086,6 +1089,9 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
 
 #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 @@ - (void)removeReactSubview:(RNSScreenView *)subview
   subview.reactSuperview = nil;
   [_reactSubviews removeObject:subview];
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)didUpdateReactSubviews
 {
diff --git a/ios/RNSScreenStackHeaderConfig.h b/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
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/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 @@ - (void)initProps
   _blurEffect = RNSBlurEffectStyleNone;
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (UIView *)reactSuperview
 {
   return _screenView;
@@ -122,6 +124,7 @@ - (UIView *)reactSuperview
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)removeFromSuperview
 {
@@ -785,6 +788,7 @@ + (void)updateViewController:(UIViewController *)vc
   }
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
 {
   [_reactSubviews insertObject:subview atIndex:atIndex];
@@ -795,6 +799,7 @@ - (void)removeReactSubview:(RNSScreenStackHeaderSubview *)subview
 {
   [_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;
   }
 }
 
diff --git a/ios/RNSScreenStackHeaderSubview.mm b/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 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
   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 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
     [self layoutNavigationBarIfNeeded];
   }
 }
+RNS_IGNORE_SUPER_CALL_BEGIN
 
 + (BOOL)shouldBeRecycled
 {
diff --git a/ios/utils/RNSDefines.h b/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")

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#import <UIKit/UIKit.h>`
`2`	`2`
	`3`	`+#import "RNSDefines.h"`
`3`	`4`	`#import "RNSFullWindowOverlay.h"`
`4`	`5`
`5`	`6`	`#ifdef RCT_NEW_ARCH_ENABLED`
`@@ -198,13 +199,16 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo`
`198`	`199`	`[childComponentView removeFromSuperview];`
`199`	`200`	`}`
`200`	`201`
	`202`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
	`203`	`+// We do not set frame for ouselves, but rather for the container.`
`201`	`204`	`- (void)updateLayoutMetrics:(react::LayoutMetrics const &)layoutMetrics`
`202`	`205`	`oldLayoutMetrics:(react::LayoutMetrics const &)oldLayoutMetrics`
`203`	`206`	`{`
`204`	`207`	`CGRect frame = RCTCGRectFromRect(layoutMetrics.frame);`
`205`	`208`	`_reactFrame = frame;`
`206`	`209`	`[_container setFrame:frame];`
`207`	`210`	`}`
	`211`	`+RNS_IGNORE_SUPER_CALL_END`
`208`	`212`
`209`	`213`	`#else`
`210`	`214`	`#pragma mark - Paper specific`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#import "RNSScreenStack.h"`
`32`	`32`	`#import "RNSScreenStackHeaderConfig.h"`
`33`	`33`
	`34`	`+#import "RNSDefines.h"`
`34`	`35`	`#import "UIView+RNSUtility.h"`
`35`	`36`
`36`	`37`	`#ifdef RCT_NEW_ARCH_ENABLED`
`@@ -136,10 +137,12 @@ - (UIViewController *)reactViewController`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`#ifdef RCT_NEW_ARCH_ENABLED`
	`140`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`139`	`141`	`- (NSArray<UIView > )reactSubviews`
`140`	`142`	`{`
`141`	`143`	`return _reactSubviews;`
`142`	`144`	`}`
	`145`	`+RNS_IGNORE_SUPER_CALL_END`
`143`	`146`	`#endif`
`144`	`147`
`145`	`148`	`- (void)updateBounds`
`@@ -374,10 +377,12 @@ - (void)setHomeIndicatorHidden:(BOOL)homeIndicatorHidden`
`374`	`377`	`}`
`375`	`378`	`#endif`
`376`	`379`
	`380`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`377`	`381`	`- (UIView *)reactSuperview`
`378`	`382`	`{`
`379`	`383`	`return _reactSuperview;`
`380`	`384`	`}`
	`385`	`+RNS_IGNORE_SUPER_CALL_END`
`381`	`386`
`382`	`387`	`/// This is RNSScreenContentWrapperDelegate method, where we do get notified when React did update frame of our child.`
`383`	`388`	`- (void)reactDidSetFrame:(CGRect)reactFrame forContentWrapper:(RNSScreenContentWrapper *)contentWrapepr`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#import "RNSScreenContainer.h"`
	`2`	`+#import "RNSDefines.h"`
`2`	`3`	`#import "RNSScreen.h"`
`3`	`4`
`4`	`5`	`#ifdef RCT_NEW_ARCH_ENABLED`
`@@ -89,6 +90,9 @@ - (void)markChildUpdated`
`89`	`90`	`[self updateContainer];`
`90`	`91`	`}`
`91`	`92`
	`93`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
	`94`	`+// We do not call super as we do not want to update UIKit model. It will`
	`95`	`+// be updated after we receive all mutations.`
`92`	`96`	`- (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex`
`93`	`97`	`{`
`94`	`98`	`subview.reactSuperview = self;`
`@@ -106,6 +110,7 @@ - (void)removeReactSubview:(RNSScreenView *)subview`
`106`	`110`	`{`
`107`	`111`	`return _reactSubviews;`
`108`	`112`	`}`
	`113`	`+RNS_IGNORE_SUPER_CALL_END`
`109`	`114`
`110`	`115`	`- (UIViewController *)reactViewController`
`111`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#import "RCTTouchHandler+RNSUtility.h"`
`21`	`21`	`#endif // RCT_NEW_ARCH_ENABLED`
`22`	`22`
	`23`	`+#import "RNSDefines.h"`
`23`	`24`	`#import "RNSPercentDrivenInteractiveTransition.h"`
`24`	`25`	`#import "RNSScreen.h"`
`25`	`26`	`#import "RNSScreenStack.h"`
`@@ -290,10 +291,12 @@ - (void)presentationControllerDidDismiss:(UIPresentationController *)presentatio`
`290`	`291`	`}`
`291`	`292`	`}`
`292`	`293`
	`294`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`293`	`295`	`- (NSArray<UIView > )reactSubviews`
`294`	`296`	`{`
`295`	`297`	`return _reactSubviews;`
`296`	`298`	`}`
	`299`	`+RNS_IGNORE_SUPER_CALL_END`
`297`	`300`
`298`	`301`	`- (void)didMoveToWindow`
`299`	`302`	`{`
`@@ -1086,6 +1089,9 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer`
`1086`	`1089`
`1087`	`1090`	`#endif // !TARGET_OS_TV`
`1088`	`1091`
	`1092`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
	`1093`	`+// We hijack the udpates as we don't want to update UIKit model yet.`
	`1094`	`+// This is done after all mutations are processed.`
`1089`	`1095`	`- (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex`
`1090`	`1096`	`{`
`1091`	`1097`	`if (![subview isKindOfClass:[RNSScreenView class]]) {`
`@@ -1101,6 +1107,7 @@ - (void)removeReactSubview:(RNSScreenView *)subview`
`1101`	`1107`	`subview.reactSuperview = nil;`
`1102`	`1108`	`[_reactSubviews removeObject:subview];`
`1103`	`1109`	`}`
	`1110`	`+RNS_IGNORE_SUPER_CALL_END`
`1104`	`1111`
`1105`	`1112`	`- (void)didUpdateReactSubviews`
`1106`	`1113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`#import <React/RCTImageLoader.h>`
`22`	`22`	`#import <React/RCTImageSource.h>`
`23`	`23`	`#import "RNSConvert.h"`
	`24`	`+#import "RNSDefines.h"`
`24`	`25`	`#import "RNSScreen.h"`
`25`	`26`	`#import "RNSScreenStackHeaderConfig.h"`
`26`	`27`	`#import "RNSSearchBar.h"`
`@@ -113,6 +114,7 @@ - (void)initProps`
`113`	`114`	`_blurEffect = RNSBlurEffectStyleNone;`
`114`	`115`	`}`
`115`	`116`
	`117`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`116`	`118`	`- (UIView *)reactSuperview`
`117`	`119`	`{`
`118`	`120`	`return _screenView;`
`@@ -122,6 +124,7 @@ - (UIView *)reactSuperview`
`122`	`124`	`{`
`123`	`125`	`return _reactSubviews;`
`124`	`126`	`}`
	`127`	`+RNS_IGNORE_SUPER_CALL_END`
`125`	`128`
`126`	`129`	`- (void)removeFromSuperview`
`127`	`130`	`{`
`@@ -785,6 +788,7 @@ + (void)updateViewController:(UIViewController *)vc`
`785`	`788`	`}`
`786`	`789`	`}`
`787`	`790`
	`791`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`788`	`792`	`- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex`
`789`	`793`	`{`
`790`	`794`	`[_reactSubviews insertObject:subview atIndex:atIndex];`
`@@ -795,6 +799,7 @@ - (void)removeReactSubview:(RNSScreenStackHeaderSubview *)subview`
`795`	`799`	`{`
`796`	`800`	`[_reactSubviews removeObject:subview];`
`797`	`801`	`}`
	`802`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`798`	`803`
`799`	`804`	`- (void)didUpdateReactSubviews`
`800`	`805`	`{`
`@@ -879,6 +884,9 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)`
`879`	`884`	`return RCTResizeModeCenter;`
`880`	`885`	`case react::ImageResizeMode::Repeat:`
`881`	`886`	`return RCTResizeModeRepeat;`
	`887`	`+ default:`
	`888`	`+ // Both RCTConvert and ImageProps use this as a default as of RN 0.76`
	`889`	`+ return RCTResizeModeStretch;`
`882`	`890`	`}`
`883`	`891`	`}`
`884`	`892`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#import "RNSScreenStackHeaderSubview.h"`
`2`	`2`	`#import "RNSConvert.h"`
	`3`	`+#import "RNSDefines.h"`
`3`	`4`	`#import "RNSScreenStackHeaderConfig.h"`
`4`	`5`
`5`	`6`	`#ifdef RCT_NEW_ARCH_ENABLED`
`@@ -86,6 +87,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::`
`86`	`87`	`return react::concreteComponentDescriptorProvider<react::RNSScreenStackHeaderSubviewComponentDescriptor>();`
`87`	`88`	`}`
`88`	`89`
	`90`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
	`91`	`+// System layouts the subviews.`
`89`	`92`	`- (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics`
`90`	`93`	`oldLayoutMetrics:(const react::LayoutMetrics &)oldLayoutMetrics`
`91`	`94`	`{`
`@@ -105,6 +108,7 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics`
`105`	`108`	`[self layoutNavigationBarIfNeeded];`
`106`	`109`	`}`
`107`	`110`	`}`
	`111`	`+RNS_IGNORE_SUPER_CALL_BEGIN`
`108`	`112`
`109`	`113`	`+ (BOOL)shouldBeRecycled`
`110`	`114`	`{`