react-native-screens 4.0.0 → 4.2.0

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
 {
@@ -1176,16 +1183,7 @@ namespace react = facebook::react;
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   RNSScreenView *screenChildComponent = (RNSScreenView *)childComponentView;
-
-  // We should only do a snapshot of a screen that is on the top.
-  // We also check `_presentedModals` since if you push 2 modals, second one is not a "child" of _controller.
-  // Also, when dissmised with a gesture, the screen already is not under the window, so we don't need to apply
-  // snapshot.
-  if (screenChildComponent.window != nil &&
-      ((screenChildComponent == _controller.visibleViewController.view && _presentedModals.count < 2) ||
-       screenChildComponent == [_presentedModals.lastObject view])) {
-    [screenChildComponent.controller setViewToSnapshot];
-  }
+  [screenChildComponent.controller setViewToSnapshot];
 
   RCTAssert(
       screenChildComponent.reactSuperview == self,
@@ -1288,7 +1286,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

@@ -10,6 +10,9 @@
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import <rnscreens/RNSScreenStackHeaderConfigComponentDescriptor.h>
 #import "RCTImageComponentView+RNSScreenStackHeaderConfig.h"
+#ifndef NDEBUG
+#import <react/utils/ManagedObjectWrapper.h>
+#endif // !NDEBUG
 #else
 #import <React/RCTImageView.h>
 #import <React/RCTShadowView.h>
@@ -21,6 +24,7 @@
 #import <React/RCTImageLoader.h>
 #import <React/RCTImageSource.h>
 #import "RNSConvert.h"
+#import "RNSDefines.h"
 #import "RNSScreen.h"
 #import "RNSScreenStackHeaderConfig.h"
 #import "RNSSearchBar.h"
@@ -60,6 +64,9 @@ namespace react = facebook::react;
 #ifdef RCT_NEW_ARCH_ENABLED
   BOOL _initialPropsSet;
   react::RNSScreenStackHeaderConfigShadowNode::ConcreteState::Shared _state;
+#ifndef NDEBUG
+  RCTImageLoader *imageLoader;
+#endif // !NDEBUG
 #else
   __weak RCTBridge *_bridge;
 #endif
@@ -113,6 +120,7 @@ namespace react = facebook::react;
   _blurEffect = RNSBlurEffectStyleNone;
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (UIView *)reactSuperview
 {
   return _screenView;
@@ -122,6 +130,7 @@ namespace react = facebook::react;
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (void)removeFromSuperview
 {
@@ -335,10 +344,10 @@ namespace react = facebook::react;
   [button setTitleTextAttributes:attrs forState:UIControlStateFocused];
 }
 
-+ (UIImage *)loadBackButtonImageInViewController:(UIViewController *)vc withConfig:(RNSScreenStackHeaderConfig *)config
+- (UIImage *)loadBackButtonImageInViewController:(UIViewController *)vc
 {
   BOOL hasBackButtonImage = NO;
-  for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
+  for (RNSScreenStackHeaderSubview *subview in self.reactSubviews) {
     if (subview.type == RNSScreenStackHeaderSubviewTypeBackButton && subview.subviews.count > 0) {
       hasBackButtonImage = YES;
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -364,6 +373,7 @@ namespace react = facebook::react;
 
       UIImage *image = imageView.image;
 
+#ifndef NDEBUG
       // IMPORTANT!!!
       // image can be nil in DEV MODE ONLY
       //
@@ -378,8 +388,9 @@ namespace react = facebook::react;
         // in DEV MODE we try to load from cache (we use private API for that as it is not exposed
         // publically in headers).
         RCTImageSource *imageSource = [RNSScreenStackHeaderConfig imageSourceFromImageView:imageView];
-        RCTImageLoader *imageLoader = [subview.bridge moduleForClass:[RCTImageLoader class]];
-
+#ifndef RCT_NEW_ARCH_ENABLED
+        RCTImageLoader *imageLoader = [_bridge moduleForClass:[RCTImageLoader class]];
+#endif // !RCT_NEW_ARCH_ENABLED
         image = [imageLoader.imageCache
             imageForUrl:imageSource.request.URL.absoluteString
                    size:imageSource.size
@@ -391,6 +402,7 @@ namespace react = facebook::react;
              resizeMode:imageView.resizeMode];
 #endif // RCT_NEW_ARCH_ENABLED
       }
+#endif // !NDEBUG
       if (image == nil) {
         // This will be triggered if the image is not in the cache yet. What we do is we wait until
         // the end of transition and run header config updates again. We could potentially wait for
@@ -407,7 +419,7 @@ namespace react = facebook::react;
 #if !TARGET_OS_TV
                 vc.navigationItem.hidesBackButton = YES;
 #endif
-                [config updateViewControllerIfNeeded];
+                [self updateViewControllerIfNeeded];
               }];
         }
         return [UIImage new];
@@ -439,8 +451,16 @@ namespace react = facebook::react;
   UINavigationBarAppearance *appearance = [UINavigationBarAppearance new];
 
   if (config.backgroundColor && CGColorGetAlpha(config.backgroundColor.CGColor) == 0.) {
+    // Preserve the shadow properties in case the user wants to show the shadow on scroll.
+    UIColor *shadowColor = appearance.shadowColor;
+    UIImage *shadowImage = appearance.shadowImage;
     // transparent background color
     [appearance configureWithTransparentBackground];
+      
+    if (!config.hideShadow) {
+      appearance.shadowColor = shadowColor;
+      appearance.shadowImage = shadowImage;
+    }
   } else {
     [appearance configureWithOpaqueBackground];
   }
@@ -517,7 +537,7 @@ namespace react = facebook::react;
     appearance.largeTitleTextAttributes = largeAttrs;
   }
 
-  UIImage *backButtonImage = [self loadBackButtonImageInViewController:vc withConfig:config];
+  UIImage *backButtonImage = [config loadBackButtonImageInViewController:vc];
   if (backButtonImage) {
     [appearance setBackIndicatorImage:backButtonImage transitionMaskImage:backButtonImage];
   } else if (appearance.backIndicatorImage) {
@@ -668,7 +688,15 @@ namespace react = facebook::react;
     UINavigationBarAppearance *scrollEdgeAppearance =
         [[UINavigationBarAppearance alloc] initWithBarAppearance:appearance];
     if (config.largeTitleBackgroundColor != nil) {
-      scrollEdgeAppearance.backgroundColor = config.largeTitleBackgroundColor;
+      // Add support for using a fully transparent bar when the backgroundColor is set to transparent. 
+      if (CGColorGetAlpha(config.largeTitleBackgroundColor.CGColor) == 0.) {
+      // This will also remove the background blur effect in the large title which is otherwise inherited from the standard appearance.
+        [scrollEdgeAppearance configureWithTransparentBackground];
+        // This must be set to nil otherwise a default view will be added to the navigation bar background with an opaque background.
+        scrollEdgeAppearance.backgroundColor = nil;
+      } else {
+        scrollEdgeAppearance.backgroundColor = config.largeTitleBackgroundColor;
+      }
     }
     if (config.largeTitleHideShadow) {
       scrollEdgeAppearance.shadowColor = nil;
@@ -680,7 +708,7 @@ namespace react = facebook::react;
 #if !TARGET_OS_TV
     // updating backIndicatotImage does not work when called during transition. On iOS pre 13 we need
     // to update it before the navigation starts.
-    UIImage *backButtonImage = [self loadBackButtonImageInViewController:vc withConfig:config];
+    UIImage *backButtonImage = [config loadBackButtonImageInViewController:vc];
     if (backButtonImage) {
       navctr.navigationBar.backIndicatorImage = backButtonImage;
       navctr.navigationBar.backIndicatorTransitionMaskImage = backButtonImage;
@@ -785,6 +813,7 @@ namespace react = facebook::react;
   }
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
 - (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
 {
   [_reactSubviews insertObject:subview atIndex:atIndex];
@@ -795,6 +824,7 @@ namespace react = facebook::react;
 {
   [_reactSubviews removeObject:subview];
 }
+RNS_IGNORE_SUPER_CALL_BEGIN
 
 - (void)didUpdateReactSubviews
 {
@@ -842,27 +872,29 @@ namespace react = facebook::react;
 
 - (void)replaceNavigationBarViewsWithSnapshotOfSubview:(RNSScreenStackHeaderSubview *)childComponentView
 {
-  UINavigationItem *navitem = _screenView.controller.navigationItem;
-  UIView *snapshot = [childComponentView snapshotViewAfterScreenUpdates:NO];
-
-  // This code should be kept in sync with analogous switch statement in
-  // `+ [RNSScreenStackHeaderConfig updateViewController: withConfig: animated:]` method.
-  switch (childComponentView.type) {
-    case RNSScreenStackHeaderSubviewTypeLeft:
-      navitem.leftBarButtonItem.customView = snapshot;
-      break;
-    case RNSScreenStackHeaderSubviewTypeCenter:
-    case RNSScreenStackHeaderSubviewTypeTitle:
-      navitem.titleView = snapshot;
-      break;
-    case RNSScreenStackHeaderSubviewTypeRight:
-      navitem.rightBarButtonItem.customView = snapshot;
-      break;
-    case RNSScreenStackHeaderSubviewTypeSearchBar:
-    case RNSScreenStackHeaderSubviewTypeBackButton:
-      break;
-    default:
-      RCTLogError(@"[RNScreens] Unhandled subview type: %ld", childComponentView.type);
+  if (childComponentView.window != nil) {
+    UINavigationItem *navitem = _screenView.controller.navigationItem;
+    UIView *snapshot = [childComponentView snapshotViewAfterScreenUpdates:NO];
+
+    // This code should be kept in sync with analogous switch statement in
+    // `+ [RNSScreenStackHeaderConfig updateViewController: withConfig: animated:]` method.
+    switch (childComponentView.type) {
+      case RNSScreenStackHeaderSubviewTypeLeft:
+        navitem.leftBarButtonItem.customView = snapshot;
+        break;
+      case RNSScreenStackHeaderSubviewTypeCenter:
+      case RNSScreenStackHeaderSubviewTypeTitle:
+        navitem.titleView = snapshot;
+        break;
+      case RNSScreenStackHeaderSubviewTypeRight:
+        navitem.rightBarButtonItem.customView = snapshot;
+        break;
+      case RNSScreenStackHeaderSubviewTypeSearchBar:
+      case RNSScreenStackHeaderSubviewTypeBackButton:
+        break;
+      default:
+        RCTLogError(@"[RNScreens] Unhandled subview type: %ld", childComponentView.type);
+    }
   }
 }
 
@@ -879,6 +911,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,6 +991,7 @@ 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) {
@@ -1000,6 +1036,11 @@ static RCTResizeMode resizeModeFromCppEquiv(react::ImageResizeMode resizeMode)
            oldState:(const facebook::react::State::Shared &)oldState
 {
   _state = std::static_pointer_cast<const react::RNSScreenStackHeaderConfigShadowNode::ConcreteState>(state);
+#ifndef NDEBUG
+  if (auto imgLoaderPtr = _state.get()->getData().getImageLoader().lock()) {
+    imageLoader = react::unwrapManagedObject(imgLoaderPtr);
+  }
+#endif // !NDEBUG
 }
 
 #else

package/ios/RNSScreenStackHeaderSubview.h

@@ -20,13 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) UIView *reactSuperview;
 
-@property (nonatomic, weak) RCTBridge *bridge;
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#else
-- (instancetype)initWithBridge:(RCTBridge *)bridge;
-#endif // RCT_NEW_ARCH_ENABLED
-
 @end
 
 @interface RNSScreenStackHeaderSubviewManager : RCTViewManager

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
@@ -17,10 +18,6 @@
 namespace react = facebook::react;
 #endif // RCT_NEW_ARCH_ENABLED
 
-@interface RCTBridge (Private)
-+ (RCTBridge *)currentBridge;
-@end
-
 @implementation RNSScreenStackHeaderSubview
 
 #pragma mark - Common
@@ -86,6 +83,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,23 +104,16 @@ namespace react = facebook::react;
     [self layoutNavigationBarIfNeeded];
   }
 }
+RNS_IGNORE_SUPER_CALL_BEGIN
 
 + (BOOL)shouldBeRecycled
 {
   return NO;
 }
 
-#else
+#else // RCT_NEW_ARCH_ENABLED
 #pragma mark - Paper specific
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-{
-  if (self = [super init]) {
-    _bridge = bridge;
-  }
-  return self;
-}
-
 - (void)reactSetFrame:(CGRect)frame
 {
   // Block any attempt to set coordinates on RNSScreenStackHeaderSubview. This
@@ -129,18 +121,8 @@ namespace react = facebook::react;
   [super reactSetFrame:CGRectMake(0, 0, frame.size.width, frame.size.height)];
   [self layoutNavigationBarIfNeeded];
 }
-
 #endif // RCT_NEW_ARCH_ENABLED
 
-- (RCTBridge *)bridge
-{
-#ifdef RCT_NEW_ARCH_ENABLED
-  return [RCTBridge currentBridge];
-#else
-  return _bridge;
-#endif // RCT_NEW_ARCH_ENABLED
-}
-
 @end
 
 @implementation RNSScreenStackHeaderSubviewManager
@@ -153,7 +135,7 @@ RCT_EXPORT_VIEW_PROPERTY(type, RNSScreenStackHeaderSubviewType)
 #else
 - (UIView *)view
 {
-  return [[RNSScreenStackHeaderSubview alloc] initWithBridge:self.bridge];
+  return [RNSScreenStackHeaderSubview new];
 }
 #endif
 

package/ios/events/RNSHeaderHeightChangeEvent.h

@@ -1,4 +1,3 @@
-#import <React/RCTBridge+Private.h>
 #import <React/RCTEventDispatcherProtocol.h>
 
 @interface RNSHeaderHeightChangeEvent : NSObject <RCTEvent>

package/ios/events/RNSScreenViewEvent.h

@@ -1,4 +1,3 @@
-#import <React/RCTBridge+Private.h>
 #import <React/RCTEventDispatcherProtocol.h>
 
 @interface RNSScreenViewEvent : NSObject <RCTEvent>

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/lib/commonjs/components/ScreenFooter.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.FooterComponent = FooterComponent;
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ScreenFooterNativeComponent = _interopRequireDefault(require("../fabric/ScreenFooterNativeComponent"));
@@ -13,5 +14,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function ScreenFooter(props) {
   return /*#__PURE__*/_react.default.createElement(_ScreenFooterNativeComponent.default, props);
 }
+function FooterComponent(_ref) {
+  let {
+    children
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(ScreenFooter, {
+    collapsable: false
+  }, children);
+}
 var _default = exports.default = ScreenFooter;
 //# sourceMappingURL=ScreenFooter.js.map

package/lib/commonjs/components/ScreenFooter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_ScreenFooterNativeComponent","obj","__esModule","default","ScreenFooter","props","createElement","_default","exports"],"sourceRoot":"../../../src","sources":["components/ScreenFooter.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,4BAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAgF,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEhF;AACA;AACA;AACA,SAASG,YAAYA,CAACC,KAAgB,EAAE;EACtC,oBAAOR,MAAA,CAAAM,OAAA,CAAAG,aAAA,CAACN,4BAAA,CAAAG,OAA2B,EAAKE,KAAQ,CAAC;AACnD;AAAC,IAAAE,QAAA,GAAAC,OAAA,CAAAL,OAAA,GAEcC,YAAY"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_ScreenFooterNativeComponent","obj","__esModule","default","ScreenFooter","props","createElement","FooterComponent","_ref","children","collapsable","_default","exports"],"sourceRoot":"../../../src","sources":["components/ScreenFooter.tsx"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,4BAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAgF,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEhF;AACA;AACA;AACA,SAASG,YAAYA,CAACC,KAAgB,EAAE;EACtC,oBAAOR,MAAA,CAAAM,OAAA,CAAAG,aAAA,CAACN,4BAAA,CAAAG,OAA2B,EAAKE,KAAQ,CAAC;AACnD;AAMO,SAASE,eAAeA,CAAAC,IAAA,EAA4B;EAAA,IAA3B;IAAEC;EAAsB,CAAC,GAAAD,IAAA;EACvD,oBAAOX,MAAA,CAAAM,OAAA,CAAAG,aAAA,CAACF,YAAY;IAACM,WAAW,EAAE;EAAM,GAAED,QAAuB,CAAC;AACpE;AAAC,IAAAE,QAAA,GAAAC,OAAA,CAAAT,OAAA,GAEcC,YAAY"}

package/lib/commonjs/components/ScreenStackItem.js

@@ -12,6 +12,7 @@ var _ScreenStackHeaderConfig = require("./ScreenStackHeaderConfig");
 var _Screen = _interopRequireDefault(require("./Screen"));
 var _ScreenStack = _interopRequireDefault(require("./ScreenStack"));
 var _contexts = require("../contexts");
+var _ScreenFooter = require("./ScreenFooter");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -25,6 +26,8 @@ function ScreenStackItem(_ref, ref) {
     contentStyle,
     style,
     screenId,
+    // eslint-disable-next-line camelcase
+    unstable_sheetFooter,
     ...rest
   } = _ref;
   const currentScreenRef = React.useRef(null);
@@ -39,7 +42,7 @@ function ScreenStackItem(_ref, ref) {
   const content = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_DebugContainer.default, {
     style: [stackPresentation === 'formSheet' ? _reactNative.Platform.OS === 'ios' ? styles.absolute : null : styles.container, contentStyle],
     stackPresentation: stackPresentation ?? 'push'
-  }, children), /*#__PURE__*/React.createElement(_ScreenStackHeaderConfig.ScreenStackHeaderConfig, headerConfig));
+  }, children), /*#__PURE__*/React.createElement(_ScreenStackHeaderConfig.ScreenStackHeaderConfig, headerConfig), stackPresentation === 'formSheet' && unstable_sheetFooter && /*#__PURE__*/React.createElement(_ScreenFooter.FooterComponent, null, unstable_sheetFooter()));
 
   // We take backgroundColor from contentStyle and apply it on Screen.
   // This allows to workaround one issue with truncated