Bump deps for RN 0.84 and guard remaining legacy iOS imports

yedidyak · claude · yedidyak · commit ef00b947d538 · 2026-03-05T13:05:41.000+02:00
- Bump reanimated 4.2.0→4.2.2, worklets 0.7.1→0.7.4 for RN 0.84 compat
- Bump gesture-handler to ^2.30.0
- Replace abandoned react-native-fast-image with @d11/react-native-fast-image
  (Fabric/new arch support)
- Guard remaining legacy-only headers (RCTModalHostView, RCTScrollView,
  RCTRootView, RCTRootContentView) behind #ifndef RCT_NEW_ARCH_ENABLED
- Wrap bridge-only files (RNNBridgeManager, bridge APIs in
  ReactNativeNavigation) in #ifndef RCT_NEW_ARCH_ENABLED
- Remove dead bridge fallback in RNNCommandsHandler new-arch path
- Clean stale hardcoded OTHER_CFLAGS from playground xcodeproj

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/ios/RCTHelpers.h b/ios/RCTHelpers.h
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <React/RCTRootView.h>
+#endif
 
 @interface RCTHelpers : NSObject
 + (NSMutableDictionary *)textAttributesFromDictionary:(NSDictionary *)dictionary
@@ -8,5 +10,7 @@
                                            withPrefix:(NSString *)prefix
                                              baseFont:(UIFont *)font;
 + (NSString *)getTimestampString;
+#ifndef RCT_NEW_ARCH_ENABLED
 + (BOOL)removeYellowBox:(RCTRootView *)reactRootView;
+#endif
 @end
diff --git a/ios/RCTHelpers.mm b/ios/RCTHelpers.mm
@@ -1,6 +1,8 @@
 #import "RCTHelpers.h"
 #import <React/RCTFont.h>
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <React/RCTScrollView.h>
+#endif
 #import <React/RCTView.h>
 
 @implementation RCTHelpers
@@ -182,6 +184,7 @@ noticeable in RCCLightBox and RCCNotification where button (for example) are
  not clickable if placed at the bottom part of the view
  */
 
+#ifndef RCT_NEW_ARCH_ENABLED
 + (BOOL)removeYellowBox:(RCTRootView *)reactRootView {
 #ifndef DEBUG
     return YES;
@@ -220,5 +223,6 @@ + (BOOL)removeYellowBox:(RCTRootView *)reactRootView {
 
     return removed;
 }
+#endif
 
 @end
diff --git a/ios/RNNBridgeManager.h b/ios/RNNBridgeManager.h
@@ -1,3 +1,4 @@
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <Foundation/Foundation.h>
 #import <React/RCTBridge.h>
 
@@ -16,3 +17,4 @@ typedef UIViewController * (^RNNExternalViewCreator)(NSDictionary *props, RCTBri
 - (UIViewController *)findComponentForId:(NSString *)componentId;
 
 @end
+#endif
diff --git a/ios/RNNBridgeManager.mm b/ios/RNNBridgeManager.mm
@@ -1,3 +1,4 @@
+#ifndef RCT_NEW_ARCH_ENABLED
 #import "RNNBridgeManager.h"
 
 #import "RNNBridgeModule.h"
@@ -121,3 +122,4 @@ - (void)onBridgeWillReload {
 }
 
 @end
+#endif
diff --git a/ios/RNNCommandsHandler.mm b/ios/RNNCommandsHandler.mm
@@ -200,20 +200,20 @@ - (void)push:(NSString *)componentId
             RCTExecuteOnMainQueue(^{
 				UIView *view = nil;
 #ifdef RCT_NEW_ARCH_ENABLED
-				RCTHost *host = [ReactNativeNavigation getHost];
-
-				if (host != nil) {
-					view = [host.surfacePresenter.mountingManager.componentViewRegistry
-						findComponentViewWithTag: [optionsWithDefault.preview.reactTag.get integerValue]];
-				} else {
-					view = [[ReactNativeNavigation getBridge].uiManager
-						viewForReactTag:optionsWithDefault.preview.reactTag.get];
-				}
+                                RCTHost *host = [ReactNativeNavigation getHost];
+                                if (host != nil) {
+                                    view =
+                                        [host.surfacePresenter.mountingManager.componentViewRegistry
+                                            findComponentViewWithTag:[optionsWithDefault.preview
+                                                                             .reactTag
+                                                                             .get integerValue]];
+                                }
 #else
 				view = [[ReactNativeNavigation getBridge].uiManager
 					viewForReactTag:optionsWithDefault.preview.reactTag.get];
 #endif
-				[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:view];
+                                [rootVc registerForPreviewingWithDelegate:(id)rootVc
+                                                               sourceView:view];
             });
         }
     } else {
diff --git a/ios/RNNElementFinder.mm b/ios/RNNElementFinder.mm
@@ -2,8 +2,9 @@
 #import "RNNReactView.h"
 #import <React/RCTSurfaceView.h>
 #import <React/RCTUIManager.h>
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <React/RCTRootView.h>
-#import <React/RCTUIManager.h>
+#endif
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
diff --git a/ios/RNNExternalComponentStore.h b/ios/RNNExternalComponentStore.h
@@ -6,12 +6,12 @@
 
 @interface RNNExternalComponentStore : NSObject
 
-- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
-- (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge;
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHostViewCreator)callback;
 - (UIViewController *)getExternalHostComponent:(RNNLayoutInfo *)layoutInfo host:(RCTHost *)host;
+#else
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
+- (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge;
 #endif
 
 @end
diff --git a/ios/RNNExternalComponentStore.mm b/ios/RNNExternalComponentStore.mm
@@ -14,16 +14,6 @@ - (instancetype)init {
     return self;
 }
 
-- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
-    [_externalComponentCreators setObject:[callback copy] forKey:name];
-}
-
-- (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge {
-    RNNExternalViewCreator creator = [_externalComponentCreators objectForKey:layoutInfo.name];
-    return creator(layoutInfo.props, bridge);
-}
-
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHostViewCreator)callback {
 	[_externalComponentCreators setObject:[callback copy] forKey:name];
@@ -33,6 +23,15 @@ - (UIViewController *)getExternalHostComponent:(RNNLayoutInfo *)layoutInfo host:
 	RNNExternalHostViewCreator creator = [_externalComponentCreators objectForKey:layoutInfo.name];
 	return creator(layoutInfo.props, host);
 }
+#else
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
+    [_externalComponentCreators setObject:[callback copy] forKey:name];
+}
+
+- (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge {
+    RNNExternalViewCreator creator = [_externalComponentCreators objectForKey:layoutInfo.name];
+    return creator(layoutInfo.props, bridge);
+}
 #endif
 
 @end
diff --git a/ios/RNNModalHostViewManagerHandler.h b/ios/RNNModalHostViewManagerHandler.h
@@ -1,11 +1,15 @@
 #import "RNNModalManager.h"
 #import <Foundation/Foundation.h>
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <React/RCTModalHostViewManager.h>
+#endif
 
 @interface RNNModalHostViewManagerHandler : NSObject
 
 - (instancetype)initWithModalManager:(RNNModalManager *)modalManager;
 
+#ifndef RCT_NEW_ARCH_ENABLED
 - (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager;
+#endif
 
 @end
diff --git a/ios/RNNModalHostViewManagerHandler.mm b/ios/RNNModalHostViewManagerHandler.mm
@@ -10,6 +10,7 @@ - (instancetype)initWithModalManager:(RNNModalManager *)modalManager {
     return self;
 }
 
+#ifndef RCT_NEW_ARCH_ENABLED
 - (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {
     modalHostViewManager.presentationBlock =
         ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
@@ -36,5 +37,6 @@ - (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewMana
                                  }];
         };
 }
+#endif
 
 @end
diff --git a/ios/RNNOverlayOptions.mm b/ios/RNNOverlayOptions.mm
@@ -1,5 +1,4 @@
 #import "RNNOverlayOptions.h"
-#import <React/RCTRootView.h>
 
 @implementation RNNOverlayOptions
 
diff --git a/ios/RNNOverlayWindow.mm b/ios/RNNOverlayWindow.mm
@@ -1,6 +1,8 @@
 #import "RNNOverlayWindow.h"
 #import "RNNReactView.h"
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <React/RCTModalHostView.h>
+#endif
 
 @implementation RNNOverlayWindow
 
@@ -9,7 +11,7 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
 
     if ([hitTestResult isKindOfClass:[UIWindow class]] ||
         [hitTestResult.subviews.firstObject isKindOfClass:RNNReactView.class] ||
-        [hitTestResult isKindOfClass:[RCTModalHostView class]] ||
+        [hitTestResult isKindOfClass:NSClassFromString(@"RCTModalHostView")] ||
         [hitTestResult isKindOfClass:NSClassFromString(@"RCTRootComponentView")]) {
         return nil;
     }
diff --git a/ios/RNNReactView.mm b/ios/RNNReactView.mm
@@ -1,6 +1,5 @@
 #import "RNNReactView.h"
 #import "RNNAppDelegate.h"
-#import <React/RCTRootContentView.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React-RuntimeApple/ReactCommon/RCTHost.h>
diff --git a/ios/ReactNativeNavigation.h b/ios/ReactNativeNavigation.h
@@ -1,30 +1,30 @@
 #import <Foundation/Foundation.h>
-#import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 #import <UIKit/UIKit.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React-RuntimeApple/ReactCommon/RCTHost.h>
 #import "RNNTurboManager.h"
-#endif
-
+#else
+#import <React/RCTBridge.h>
 typedef UIViewController * (^RNNExternalViewCreator)(NSDictionary *props, RCTBridge *bridge);
+#endif
 
 @interface ReactNativeNavigation : NSObject
 
 #ifdef RCT_NEW_ARCH_ENABLED
 + (void)bootstrapWithHost:(RCTHost *)host;
 + (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHostViewCreator)callback;
 + (RCTHost *)getHost;
-#endif
-
+#else
 + (void)bootstrapWithBridge:(RCTBridge *)bridge;
 
 + (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge;
 
 + (RCTBridge *)getBridge;
 
 + (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
+#endif
 
 + (UIViewController *)findViewController:(NSString *)componentId;
 
diff --git a/ios/ReactNativeNavigation.mm b/ios/ReactNativeNavigation.mm
@@ -2,36 +2,36 @@
 
 #import <React/RCTUIManager.h>
 
+#ifndef RCT_NEW_ARCH_ENABLED
 #import "RNNBridgeManager.h"
+#endif
 #import "RNNLayoutManager.h"
 #import "RNNSplashScreenViewController.h"
 
 @interface ReactNativeNavigation ()
 
 #ifdef RCT_NEW_ARCH_ENABLED
 @property(nonatomic, strong) RNNTurboManager *turboManager;
-#endif
-
+#else
 @property(nonatomic, strong) RNNBridgeManager *bridgeManager;
+#endif
 
 @end
 
 @implementation ReactNativeNavigation
 
 #pragma mark - public API
 
+#ifndef RCT_NEW_ARCH_ENABLED
 + (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
 	[[ReactNativeNavigation sharedInstance].bridgeManager registerExternalComponent:name
 																		   callback:callback];
 }
+#endif
 
 + (UIViewController *)findViewController:(NSString *)componentId {
 #ifdef RCT_NEW_ARCH_ENABLED
-	if ([ReactNativeNavigation sharedInstance].turboManager == nil) {
-		return [[ReactNativeNavigation sharedInstance].bridgeManager findComponentForId:componentId];
-	} else {
-		return [[ReactNativeNavigation sharedInstance].turboManager findComponentForId:componentId];
-	}
+    return [[ReactNativeNavigation sharedInstance].turboManager findComponentForId:componentId];
 #else
 	return [[ReactNativeNavigation sharedInstance].bridgeManager findComponentForId:componentId];
 #endif
@@ -63,6 +63,7 @@ + (RCTHost *)getHost {
 }
 #endif
 
+#ifndef RCT_NEW_ARCH_ENABLED
 #pragma mark - bridge
 
 + (void)bootstrapWithBridge:(RCTBridge *)bridge {
@@ -90,6 +91,7 @@ - (RNNBridgeManager *)getBridgeManagerForBridge:(RCTBridge *)bridge {
 - (void)bootstrapWithBridge:(RCTBridge *)bridge {
 	[RNNSplashScreenViewController showOnWindow:[self mainWindow]];
 }
+#endif
 
 #pragma mark - instance
 
diff --git a/ios/UIViewController+RNNOptions.mm b/ios/UIViewController+RNNOptions.mm
@@ -2,7 +2,6 @@
 #import "RNNBottomTabOptions.h"
 #import "RNNNavigationOptions.h"
 #import "UIViewController+RNNOptions.h"
-#import <React/RCTRootView.h>
 
 #define kStatusBarAnimationDuration 0.35
 const NSInteger BLUR_STATUS_TAG = 78264801;
diff --git a/playground/ios/playground.xcodeproj/project.pbxproj b/playground/ios/playground.xcodeproj/project.pbxproj
diff --git a/playground/package.json b/playground/package.json
diff --git a/playground/src/screens/sharedElementCarDealer/CarCard.tsx b/playground/src/screens/sharedElementCarDealer/CarCard.tsx
diff --git a/playground/src/screens/sharedElementCarDealer/CarDetailsScreen.tsx b/playground/src/screens/sharedElementCarDealer/CarDetailsScreen.tsx
diff --git a/playground/src/screens/sharedElementCarDealer/ImageFullScreenViewer.tsx b/playground/src/screens/sharedElementCarDealer/ImageFullScreenViewer.tsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#ifndef RCT_NEW_ARCH_ENABLED`
`1`	`2`	`#import "RNNBridgeManager.h"`
`2`	`3`
`3`	`4`	`#import "RNNBridgeModule.h"`
`@@ -121,3 +122,4 @@ - (void)onBridgeWillReload {`
`121`	`122`	`}`
`122`	`123`
`123`	`124`	`@end`
	`125`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ - (instancetype)initWithModalManager:(RNNModalManager *)modalManager {`
`10`	`10`	`return self;`
`11`	`11`	`}`
`12`	`12`
	`13`	`+#ifndef RCT_NEW_ARCH_ENABLED`
`13`	`14`	`- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {`
`14`	`15`	`modalHostViewManager.presentationBlock =`
`15`	`16`	`^(UIViewController reactViewController, UIViewController viewController, BOOL animated,`
`@@ -36,5 +37,6 @@ - (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewMana`
`36`	`37`	`}];`
`37`	`38`	`};`
`38`	`39`	`}`
	`40`	`+#endif`
`39`	`41`
`40`	`42`	`@end`