refact: merge Fabric & Paper impls: ScreenStackHeaderSubview (4)

ios/RNSConvert.h

@@ -10,6 +10,9 @@
 + (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:
     (facebook::react::RNSScreenStackAnimation)stackAnimation;
 
++ (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
+    (facebook::react::RNSScreenStackHeaderSubviewType)subviewType;
+
 @end
 
 #endif // RN_FABRIC_ENABLED

ios/RNSConvert.mm

@@ -48,6 +48,24 @@ + (RNSScreenStackAnimation)RNSScreenStackAnimationFromCppEquivalent:
   }
 }
 
++ (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewTypeFromCppEquivalent:
+    (facebook::react::RNSScreenStackHeaderSubviewType)subviewType
+{
+  switch (subviewType) {
+    case facebook::react::RNSScreenStackHeaderSubviewType::Left:
+      return RNSScreenStackHeaderSubviewTypeLeft;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Right:
+      return RNSScreenStackHeaderSubviewTypeRight;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Title:
+      return RNSScreenStackHeaderSubviewTypeTitle;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Center:
+      return RNSScreenStackHeaderSubviewTypeCenter;
+    case facebook::react::RNSScreenStackHeaderSubviewType::SearchBar:
+      return RNSScreenStackHeaderSubviewTypeSearchBar;
+    case facebook::react::RNSScreenStackHeaderSubviewType::Back:
+      return RNSScreenStackHeaderSubviewTypeBackButton;
+  }
+}
 @end
 
 #endif // RN_FABRIC_ENABLED

ios/RNSEnums.h

@@ -1,6 +1,3 @@
-#ifndef RNSEnums_h
-#define RNSEnums_h
-
 typedef NS_ENUM(NSInteger, RNSScreenStackPresentation) {
   RNSScreenStackPresentationPush,
   RNSScreenStackPresentationModal,
@@ -52,4 +49,11 @@ typedef NS_ENUM(NSInteger, RNSWindowTrait) {
   RNSWindowTraitHomeIndicatorHidden,
 };
 
-#endif /* RNSEnums_h */
+typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
+  RNSScreenStackHeaderSubviewTypeBackButton,
+  RNSScreenStackHeaderSubviewTypeLeft,
+  RNSScreenStackHeaderSubviewTypeRight,
+  RNSScreenStackHeaderSubviewTypeTitle,
+  RNSScreenStackHeaderSubviewTypeCenter,
+  RNSScreenStackHeaderSubviewTypeSearchBar,
+};

ios/RNSScreenStackHeaderConfig.h

@@ -1,6 +1,5 @@
 #ifdef RN_FABRIC_ENABLED
 #import <React/RCTViewComponentView.h>
-#import "RNSScreenStackHeaderSubviewComponentView.h"
 #else
 #import <React/RCTViewManager.h>
 // TODO: move this import when SearchBar is implemented on Fabric
@@ -9,6 +8,7 @@
 
 #import <React/RCTConvert.h>
 #import "RNSScreen.h"
+#import "RNSScreenStackHeaderSubview.h"
 
 @interface RNSScreenStackHeaderConfig :
 #ifdef RN_FABRIC_ENABLED
@@ -20,8 +20,6 @@
 @property (nonatomic, weak) RNSScreenView *screenView;
 
 #ifdef RN_FABRIC_ENABLED
-// TODO: change type when StackHeaderSubview is merged (??)
-@property (nonatomic) NSMutableArray<RNSScreenStackHeaderSubviewComponentView *> *reactSubviews;
 @property (nonatomic) BOOL show;
 #else
 @property (nonatomic) UIBlurEffectStyle blurEffect;
@@ -62,25 +60,9 @@
 
 @end
 
-typedef NS_ENUM(NSInteger, RNSScreenStackHeaderSubviewType) {
-  RNSScreenStackHeaderSubviewTypeBackButton,
-  RNSScreenStackHeaderSubviewTypeLeft,
-  RNSScreenStackHeaderSubviewTypeRight,
-  RNSScreenStackHeaderSubviewTypeTitle,
-  RNSScreenStackHeaderSubviewTypeCenter,
-  RNSScreenStackHeaderSubviewTypeSearchBar,
-};
-
 @interface RCTConvert (RNSScreenStackHeader)
 
-+ (RNSScreenStackHeaderSubviewType)RNSScreenStackHeaderSubviewType:(id)json;
 + (UIBlurEffectStyle)UIBlurEffectStyle:(id)json;
 + (UISemanticContentAttribute)UISemanticContentAttribute:(id)json;
 
 @end
-
-@interface RNSScreenStackHeaderSubviewManager : RCTViewManager
-
-@property (nonatomic) RNSScreenStackHeaderSubviewType type;
-
-@end

ios/RNSScreenStackHeaderConfig.mm

@@ -6,7 +6,6 @@
 #import <react/renderer/components/rnscreens/Props.h>
 #import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
 #import "RCTFabricComponentsPlugins.h"
-#import "RNSScreenStackHeaderSubviewComponentView.h"
 #else
 // TODO: move this import when SearchBar is implemented on Fabric
 #import <React/RCTBridge.h>
@@ -23,7 +22,8 @@
 #import "RNSScreen.h"
 #import "RNSScreenStackHeaderConfig.h"
 
-#ifndef RN_FABRIC_ENABLED
+#ifdef RN_FABRIC_ENABLED
+#else
 // Some RN private method hacking below. Couldn't figure out better way to access image data
 // of a given RCTImageView. See more comments in the code section processing SubviewTypeBackButton
 @interface RCTImageView (Private)
@@ -35,40 +35,11 @@ @interface RCTImageLoader (Private)
 @end
 #endif
 
-@interface RNSScreenStackHeaderSubview : UIView
-
-@property (nonatomic, weak) RCTBridge *bridge;
-@property (nonatomic, weak) UIView *reactSuperview;
-@property (nonatomic) RNSScreenStackHeaderSubviewType type;
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge;
-
-@end
-
-@implementation RNSScreenStackHeaderSubview
-
-- (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
-  // makes UINavigationBar the only one to control the position of header content.
-  [super reactSetFrame:CGRectMake(0, 0, frame.size.width, frame.size.height)];
-}
-
-@end
-
 @implementation RNSScreenStackHeaderConfig {
+  NSMutableArray<RNSScreenStackHeaderSubview *> *_reactSubviews;
 #ifdef RN_FABRIC_ENABLED
   BOOL _initialPropsSet;
 #else
-  NSMutableArray<RNSScreenStackHeaderSubview *> *_reactSubviews;
 #endif
 }
 
@@ -117,23 +88,6 @@ - (void)removeFromSuperview
 // is not added to native view hierarchy so we can apply our logic
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
-#ifdef RN_FABRIC_ENABLED
-  for (RNSScreenStackHeaderSubviewComponentView *subview in _reactSubviews) {
-    if (subview.type == facebook::react::RNSScreenStackHeaderSubviewType::Left ||
-        subview.type == facebook::react::RNSScreenStackHeaderSubviewType::Right) {
-      // we wrap the headerLeft/Right component in a UIBarButtonItem
-      // so we need to use the only subview of it to retrieve the correct view
-      UIView *headerComponent = subview.subviews.firstObject;
-      // we convert the point to RNSScreenStackView since it always contains the header inside it
-      CGPoint convertedPoint = [_screenView.reactSuperview convertPoint:point toView:headerComponent];
-
-      UIView *hitTestResult = [headerComponent hitTest:convertedPoint withEvent:event];
-      if (hitTestResult != nil) {
-        return hitTestResult;
-      }
-    }
-  }
-#else
   for (RNSScreenStackHeaderSubview *subview in _reactSubviews) {
     if (subview.type == RNSScreenStackHeaderSubviewTypeLeft || subview.type == RNSScreenStackHeaderSubviewTypeRight) {
       // we wrap the headerLeft/Right component in a UIBarButtonItem
@@ -148,7 +102,6 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
       }
     }
   }
-#endif
   return nil;
 }
 
@@ -391,7 +344,8 @@ + (UINavigationBarAppearance *)buildAppearance:(UIViewController *)vc
   }
 
   // TODO: implement blurEffect on Fabric
-#ifndef RN_FABRIC_ENABLED
+#ifdef RN_FABRIC_ENABLED
+#else
   if (config.blurEffect) {
     appearance.backgroundEffect = [UIBlurEffect effectWithStyle:config.blurEffect];
   }
@@ -451,15 +405,15 @@ + (UINavigationBarAppearance *)buildAppearance:(UIViewController *)vc
     appearance.largeTitleTextAttributes = largeAttrs;
   }
 
-#ifndef RN_FABRIC_ENABLED
+#ifdef RN_FABRIC_ENABLED
+  [appearance setBackIndicatorImage:nil transitionMaskImage:nil];
+#else
   UIImage *backButtonImage = [self loadBackButtonImageInViewController:vc withConfig:config];
   if (backButtonImage) {
     [appearance setBackIndicatorImage:backButtonImage transitionMaskImage:backButtonImage];
   } else if (appearance.backIndicatorImage) {
     [appearance setBackIndicatorImage:nil transitionMaskImage:nil];
   }
-#else
-  [appearance setBackIndicatorImage:nil transitionMaskImage:nil];
 #endif // RN_FABRIC_ENABLED
   return appearance;
 }
@@ -585,45 +539,16 @@ + (void)updateViewController:(UIViewController *)vc
   navitem.leftBarButtonItem = nil;
   navitem.rightBarButtonItem = nil;
   navitem.titleView = nil;
-#ifdef RN_FABRIC_ENABLED
-  for (RNSScreenStackHeaderSubviewComponentView *subview in config.reactSubviews) {
-    switch (subview.type) {
-      case facebook::react::RNSScreenStackHeaderSubviewType::Left: {
-        //#if !TARGET_OS_TV
-        //        navitem.leftItemsSupplementBackButton = config.backButtonInCustomView;
-        //#endif
-        UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithCustomView:subview];
-        navitem.leftBarButtonItem = buttonItem;
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::Right: {
-        UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithCustomView:subview];
-        navitem.rightBarButtonItem = buttonItem;
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::Center:
-      case facebook::react::RNSScreenStackHeaderSubviewType::Title: {
-        navitem.titleView = subview;
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::SearchBar: {
-        RCTLogWarn(@"SearchBar is not yet Fabric compatible in react-native-screens");
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::Back: {
-        RCTLogWarn(@"Back button subivew is not yet Fabric compatible in react-native-screens");
-        break;
-        ;
-      }
-    }
-  }
-#else
+
   for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
     switch (subview.type) {
       case RNSScreenStackHeaderSubviewTypeLeft: {
+#ifdef RN_FABRIC_ENABLED
+#else
 #if !TARGET_OS_TV
         navitem.leftItemsSupplementBackButton = config.backButtonInCustomView;
 #endif
+#endif // RN_FABRIC_ENABLED
         UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithCustomView:subview];
         navitem.leftBarButtonItem = buttonItem;
         break;
@@ -639,6 +564,9 @@ + (void)updateViewController:(UIViewController *)vc
         break;
       }
       case RNSScreenStackHeaderSubviewTypeSearchBar: {
+#ifdef RN_FABRIC_ENABLED
+        RCTLogWarn(@"SearchBar is not yet Fabric compatible in react-native-screens");
+#else
         if (subview.subviews == nil || [subview.subviews count] == 0) {
           RCTLogWarn(
               @"Failed to attach search bar to the header. We recommend using `useLayoutEffect` when managing "
@@ -655,13 +583,18 @@ + (void)updateViewController:(UIViewController *)vc
           }
 #endif
         }
+
+#endif // RN_FABRIC_ENABLED
+        break;
       }
       case RNSScreenStackHeaderSubviewTypeBackButton: {
+#ifdef RN_FABRIC_ENABLED
+        RCTLogWarn(@"Back button subivew is not yet Fabric compatible in react-native-screens");
+#endif
         break;
       }
     }
   }
-#endif // RN_FABRIC_ENABLED
 
   if (animated && vc.transitionCoordinator != nil &&
       vc.transitionCoordinator.presentationStyle == UIModalPresentationNone && !wasHidden) {
@@ -697,39 +630,9 @@ + (void)updateViewController:(UIViewController *)vc
 #ifdef RN_FABRIC_ENABLED
 #pragma mark - Fabric specific
 
-+ (void)addSubviewsToNavItem:(UINavigationItem *)navitem withConfig:(RNSScreenStackHeaderConfig *)config
-{
-  for (RNSScreenStackHeaderSubviewComponentView *subview in config.reactSubviews) {
-    switch (subview.type) {
-      case facebook::react::RNSScreenStackHeaderSubviewType::Left: {
-        UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithCustomView:subview];
-        navitem.leftBarButtonItem = buttonItem;
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::Right: {
-        UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithCustomView:subview];
-        navitem.rightBarButtonItem = buttonItem;
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::Center:
-      case facebook::react::RNSScreenStackHeaderSubviewType::Title: {
-        navitem.titleView = subview;
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::SearchBar: {
-        RCTLogWarn(@"SearchBar is not yet supported in react-native-screens with Fabric enabled");
-        break;
-      }
-      case facebook::react::RNSScreenStackHeaderSubviewType::Back: {
-        break;
-      }
-    }
-  }
-}
-
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  if (![childComponentView isKindOfClass:[RNSScreenStackHeaderSubviewComponentView class]]) {
+  if (![childComponentView isKindOfClass:[RNSScreenStackHeaderSubview class]]) {
     RCTLogError(@"ScreenStackHeader only accepts children of type ScreenStackHeaderSubview");
     return;
   }
@@ -742,13 +645,13 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
       @(index),
       @([childComponentView.superview tag]));
 
-  [_reactSubviews insertObject:(RNSScreenStackHeaderSubviewComponentView *)childComponentView atIndex:index];
+  [_reactSubviews insertObject:(RNSScreenStackHeaderSubview *)childComponentView atIndex:index];
   [self updateViewControllerIfNeeded];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  [_reactSubviews removeObject:(RNSScreenStackHeaderSubviewComponentView *)childComponentView];
+  [_reactSubviews removeObject:(RNSScreenStackHeaderSubview *)childComponentView];
   [childComponentView removeFromSuperview];
 }
 
@@ -971,19 +874,6 @@ + (NSMutableDictionary *)blurEffectsForIOSVersion
   return blurEffects;
 }
 
-RCT_ENUM_CONVERTER(
-    RNSScreenStackHeaderSubviewType,
-    (@{
-      @"back" : @(RNSScreenStackHeaderSubviewTypeBackButton),
-      @"left" : @(RNSScreenStackHeaderSubviewTypeLeft),
-      @"right" : @(RNSScreenStackHeaderSubviewTypeRight),
-      @"title" : @(RNSScreenStackHeaderSubviewTypeTitle),
-      @"center" : @(RNSScreenStackHeaderSubviewTypeCenter),
-      @"searchBar" : @(RNSScreenStackHeaderSubviewTypeSearchBar),
-    }),
-    RNSScreenStackHeaderSubviewTypeTitle,
-    integerValue)
-
 RCT_ENUM_CONVERTER(
     UISemanticContentAttribute,
     (@{
@@ -996,16 +886,3 @@ + (NSMutableDictionary *)blurEffectsForIOSVersion
 RCT_ENUM_CONVERTER(UIBlurEffectStyle, ([self blurEffectsForIOSVersion]), UIBlurEffectStyleExtraLight, integerValue)
 
 @end
-
-@implementation RNSScreenStackHeaderSubviewManager
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_VIEW_PROPERTY(type, RNSScreenStackHeaderSubviewType)
-
-- (UIView *)view
-{
-  return [[RNSScreenStackHeaderSubview alloc] initWithBridge:self.bridge];
-}
-
-@end