From f504984c37340350a37ea8a078ad3362498fb7e0 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 3 Jun 2026 21:18:06 -0700 Subject: [PATCH 1/3] RCTReactNativeFactory remove RCTBridge methods and bridge property (#57067) Summary: Removes `RCTBridge`-related functions from `RCTReactNativeFactory` protocol and default delegate implementation as part of cleaning up legacy architecture APIs. Removes `createBridgeWithDelegate:launchOptions:`, `createRootViewWithBridge:moduleName:initProps:`, and the `bridge` property. The `bridgeAdapter` property is preserved as it returns `RCTSurfacePresenterBridgeAdapter`, not `RCTBridge`. Updates documentation in `RCTAppDelegate.h` to reflect the removed overridable methods. ## Changelog: [iOS][Breaking] Remove RCTBridge Functions from RCTReactNativeFactory Header Differential Revision: D107417684 --- .../Libraries/AppDelegate/RCTAppDelegate.h | 5 --- .../RCTDefaultReactNativeFactoryDelegate.mm | 20 ----------- .../AppDelegate/RCTReactNativeFactory.h | 35 ------------------- .../AppDelegate/RCTReactNativeFactory.mm | 8 ----- .../api-snapshots/ReactAppleDebugCxx.api | 3 -- .../api-snapshots/ReactAppleNewarchCxx.api | 2 -- .../api-snapshots/ReactAppleReleaseCxx.api | 3 -- 7 files changed, 76 deletions(-) diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h index 00f5e97ccdad..4c2423772ba3 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h +++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h @@ -10,7 +10,6 @@ #import "RCTReactNativeFactory.h" #import "RCTRootViewFactory.h" -@class RCTBridge; @protocol RCTBridgeDelegate; @protocol RCTComponentViewProtocol; @class RCTRootView; @@ -41,10 +40,6 @@ NS_ASSUME_NONNULL_BEGIN * * Overridable methods * Shared: - * - (RCTBridge *)createBridgeWithDelegate:(id)delegate launchOptions:(NSDictionary - *)launchOptions; - * - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge moduleName:(NSString*)moduleName initProps:(NSDictionary - *)initProps; * - (UIViewController *)createRootViewController; * - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController; * New Architecture: diff --git a/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm index 725c37baf52b..c7d2ef7dd10f 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm @@ -31,11 +31,6 @@ - (UIViewController *)createRootViewController return [UIViewController new]; } -- (RCTBridge *)createBridgeWithDelegate:(id)delegate launchOptions:(NSDictionary *)launchOptions -{ - return [[RCTBridge alloc] initWithDelegate:delegate launchOptions:launchOptions]; -} - - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController { rootViewController.view = rootView; @@ -57,21 +52,6 @@ - (void)customizeRootView:(RCTRootView *)rootView // Override point for customization after application launch. } -- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge - moduleName:(NSString *)moduleName - initProps:(NSDictionary *)initProps -{ - UIView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, YES); - -#if TARGET_OS_TV - rootView.backgroundColor = [UIColor clearColor]; -#else - rootView.backgroundColor = [UIColor systemBackgroundColor]; -#endif - - return rootView; -} - - (RCTColorSpace)defaultColorSpace { return RCTColorSpaceSRGB; diff --git a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h index be7bbe5efdae..9665e6975eaf 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h +++ b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h @@ -46,39 +46,6 @@ typedef NS_ENUM(NSInteger, RCTReleaseLevel) { Canary, Experimental, Stable }; @property (nonatomic, strong) id dependencyProvider; @optional -/** - * It creates a `RCTBridge` using a delegate and some launch options. - * By default, it is invoked passing `self` as a delegate. - * You can override this function to customize the logic that creates the RCTBridge - * - * @parameter: delegate - an object that implements the `RCTBridgeDelegate` protocol. - * @parameter: launchOptions - a dictionary with a set of options. - * - * @returns: a newly created instance of RCTBridge. - */ -- (RCTBridge *)createBridgeWithDelegate:(id)delegate - launchOptions:(NSDictionary *)launchOptions - __attribute__((deprecated( - "createBridgeWithDelegate:launchOptions: is deprecated and will be removed when removing the legacy architecture."))); - -/** - * It creates a `UIView` starting from a bridge, a module name and a set of initial properties. - * By default, it is invoked using the bridge created by `createBridgeWithDelegate:launchOptions` and - * the name in the `self.moduleName` variable. - * You can override this function to customize the logic that creates the Root View. - * - * @parameter: bridge - an instance of the `RCTBridge` object. - * @parameter: moduleName - the name of the app, used by Metro to resolve the module. - * @parameter: initProps - a set of initial properties. - * - * @returns: a UIView properly configured with a bridge for React Native. - */ -- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge - moduleName:(NSString *)moduleName - initProps:(NSDictionary *)initProps - __attribute__((deprecated( - "createRootViewWithBridge:moduleName:initProps is deprecated and will be removed when removing the legacy architecture."))); - /// This method returns a map of Component Descriptors and Components classes that needs to be registered in the /// new renderer. The Component Descriptor is a string which represent the name used in JS to refer to the native /// component. The default implementation returns an empty dictionary. Subclasses can override this method to register @@ -107,8 +74,6 @@ typedef NS_ENUM(NSInteger, RCTReleaseLevel) { Canary, Experimental, Stable }; launchOptions:(NSDictionary *_Nullable)launchOptions; #if !defined(RCT_REMOVE_LEGACY_ARCH) -@property (nonatomic, nullable) RCTBridge *bridge - __attribute__((deprecated("The bridge is deprecated and will be removed when removing the legacy architecture."))); @property (nonatomic, nullable) RCTSurfacePresenterBridgeAdapter *bridgeAdapter __attribute__(( deprecated("The bridgeAdapter is deprecated and will be removed when removing the legacy architecture."))); #endif diff --git a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm index 5ceb3a72fadb..6cf2848a5512 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm @@ -238,14 +238,6 @@ - (RCTRootViewFactory *)createRCTRootViewFactory turboModuleEnabled:YES bridgelessEnabled:YES]; - configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps) { - return [weakSelf.delegate createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps]; - }; - - configuration.createBridgeWithDelegate = ^RCTBridge *(id delegate, NSDictionary *launchOptions) { - return [weakSelf.delegate createBridgeWithDelegate:delegate launchOptions:launchOptions]; - }; - configuration.customizeRootView = ^(UIView *_Nonnull rootView) { [weakSelf.delegate customizeRootView:(RCTRootView *)rootView]; }; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 9ff8dcb229e6..07cddd22f9a5 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -1583,7 +1583,6 @@ interface RCTRadialGradient : public NSObject { } interface RCTReactNativeFactory : public NSObject { - public @property (assign) RCTBridge* bridge; public @property (assign) RCTDevMenuConfiguration* devMenuConfiguration; public @property (assign) RCTSurfacePresenterBridgeAdapter* bridgeAdapter; public @property (strong) RCTBundleConfiguration* bundleConfiguration; @@ -2980,8 +2979,6 @@ protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIC public @property (strong) id dependencyProvider; public virtual NSDictionary>* thirdPartyFabricComponents(); public virtual NSURL* _Nullable bundleURL(); - public virtual RCTBridge* createBridgeWithDelegate:launchOptions:(id delegate, NSDictionary* launchOptions); - public virtual UIView* createRootViewWithBridge:moduleName:initProps:(RCTBridge* bridge, NSString* moduleName, NSDictionary* initProps); } protocol RCTRedBoxExtraDataActionDelegate : public NSObject { diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 7de39e2e86d2..9b793532a7e3 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -2967,8 +2967,6 @@ protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIC public @property (strong) id dependencyProvider; public virtual NSDictionary>* thirdPartyFabricComponents(); public virtual NSURL* _Nullable bundleURL(); - public virtual RCTBridge* createBridgeWithDelegate:launchOptions:(id delegate, NSDictionary* launchOptions); - public virtual UIView* createRootViewWithBridge:moduleName:initProps:(RCTBridge* bridge, NSString* moduleName, NSDictionary* initProps); } protocol RCTRedBoxExtraDataActionDelegate : public NSObject { diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index f1e8fb0dd9b0..6d60efb3feb4 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -1583,7 +1583,6 @@ interface RCTRadialGradient : public NSObject { } interface RCTReactNativeFactory : public NSObject { - public @property (assign) RCTBridge* bridge; public @property (assign) RCTDevMenuConfiguration* devMenuConfiguration; public @property (assign) RCTSurfacePresenterBridgeAdapter* bridgeAdapter; public @property (strong) RCTBundleConfiguration* bundleConfiguration; @@ -2980,8 +2979,6 @@ protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIC public @property (strong) id dependencyProvider; public virtual NSDictionary>* thirdPartyFabricComponents(); public virtual NSURL* _Nullable bundleURL(); - public virtual RCTBridge* createBridgeWithDelegate:launchOptions:(id delegate, NSDictionary* launchOptions); - public virtual UIView* createRootViewWithBridge:moduleName:initProps:(RCTBridge* bridge, NSString* moduleName, NSDictionary* initProps); } protocol RCTRedBoxExtraDataActionDelegate : public NSObject { From 8c012cd8126a5a065124c23132eef9e2919d8aba Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 3 Jun 2026 21:18:06 -0700 Subject: [PATCH 2/3] Remove unused legacy architecture RCTAppSetupUtils methods (#57068) Summary: ## Changelog: [iOS][Breaking] Remove unused legacy architecture RCTAppSetupUtils methods Differential Revision: D107420863 --- .../Libraries/AppDelegate/RCTAppSetupUtils.h | 11 ---------- .../Libraries/AppDelegate/RCTAppSetupUtils.mm | 22 ------------------- 2 files changed, 33 deletions(-) diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h index c0256a5bbe7f..4b31a54049df 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h +++ b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h @@ -46,14 +46,3 @@ std::unique_ptr RCTAppSetupJsExecutorFactory ; #endif // __cplusplus - -RCT_EXTERN_C_BEGIN - -void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled) __attribute__((deprecated( - "RCTAppSetupPrepareApp(UIApplication, BOOL) is deprecated and it's signature will change when we remove the legacy arch"))); -UIView * -RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties, BOOL fabricEnabled) - __attribute__((deprecated( - "RCTAppSetupDefaultRootView(RCTBridge *, NSString *, NSDictionary *, BOOL) is deprecated and it's signature will change when we remove the legacy arch"))); - -RCT_EXTERN_C_END diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm index afa9d5dcd1ef..b77556d41891 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm @@ -28,28 +28,6 @@ #import "RCTDependencyProvider.h" -void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled) -{ - RCTEnableTurboModule(YES); - -#if DEBUG - // Disable idle timer in dev builds to avoid putting application in background and complicating - // Metro reconnection logic. Users only need this when running the application using our CLI tooling. - application.idleTimerDisabled = YES; -#endif -} - -UIView * -RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties, BOOL fabricEnabled) -{ - id surface = [[RCTFabricSurface alloc] initWithBridge:bridge - moduleName:moduleName - initialProperties:initialProperties]; - UIView *rootView = [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface]; - [surface start]; - return rootView; -} - NSArray *RCTAppSetupUnstableModulesRequiringMainQueueSetup(id dependencyProvider) { // For oss, insert core main queue setup modules here From 8538b5e130f95bc2a4537be9ef1a58696c90687a Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Wed, 3 Jun 2026 21:18:06 -0700 Subject: [PATCH 3/3] Remove depracted legacy architecture @protocol APIs (#57069) Summary: ## Changelog: [IOS][Breaking] Remove depracted legacy architecture protocol APIs Differential Revision: D107422407 --- .../react-native/React/Base/RCTRootView.m | 1 - packages/react-native/React/Base/RCTUtils.h | 3 -- packages/react-native/React/Base/RCTUtils.mm | 6 ---- .../React/Modules/RCTUIManager.mm | 2 -- .../React/Views/RCTRootShadowView.h | 35 ------------------- .../React/Views/RCTRootShadowView.m | 14 -------- .../React/Views/RCTShadowView+Internal.h | 18 ---------- .../React/Views/RCTShadowView+Internal.m | 23 ------------ .../react-native/React/Views/RCTShadowView.h | 2 -- .../Views/ScrollView/RCTScrollableProtocol.h | 4 --- .../ios/ReactCommon/RCTTurboModuleManager.mm | 3 -- .../RCTTurboModuleWithJSIBindings.h | 3 -- .../ios-prebuild/templates/React-umbrella.h | 2 -- .../RCTComponentPropsTests.m | 3 +- .../api-snapshots/ReactAppleDebugCxx.api | 12 ------- .../api-snapshots/ReactAppleNewarchCxx.api | 12 ------- .../api-snapshots/ReactAppleReleaseCxx.api | 12 ------- 17 files changed, 1 insertion(+), 154 deletions(-) delete mode 100644 packages/react-native/React/Views/RCTRootShadowView.h delete mode 100644 packages/react-native/React/Views/RCTRootShadowView.m delete mode 100644 packages/react-native/React/Views/RCTShadowView+Internal.h delete mode 100644 packages/react-native/React/Views/RCTShadowView+Internal.m diff --git a/packages/react-native/React/Base/RCTRootView.m b/packages/react-native/React/Base/RCTRootView.m index 8d6b89701437..a0af31898155 100644 --- a/packages/react-native/React/Base/RCTRootView.m +++ b/packages/react-native/React/Base/RCTRootView.m @@ -18,7 +18,6 @@ #import "RCTLog.h" #import "RCTPerformanceLogger.h" #import "RCTProfile.h" -#import "RCTRootShadowView.h" #import "RCTTouchHandler.h" #import "RCTUIManager.h" #import "RCTUIManagerUtils.h" diff --git a/packages/react-native/React/Base/RCTUtils.h b/packages/react-native/React/Base/RCTUtils.h index aaa0bd237d90..95b49b79a417 100644 --- a/packages/react-native/React/Base/RCTUtils.h +++ b/packages/react-native/React/Base/RCTUtils.h @@ -16,9 +16,6 @@ NS_ASSUME_NONNULL_BEGIN // Whether the New Architecture is enabled or not RCT_EXTERN BOOL RCTIsNewArchEnabled(void); -RCT_EXTERN void RCTSetNewArchEnabled(BOOL enabled) __attribute__((deprecated( - "This function is now no-op. You need to modify the Info.plist adding a RCTNewArchEnabled bool property to control whether the New Arch is enabled or not"))); -; // Whether React native should output logs for modules and components used // through the interop layers diff --git a/packages/react-native/React/Base/RCTUtils.mm b/packages/react-native/React/Base/RCTUtils.mm index 44ebe7d3260a..4a0e1ca40b6b 100644 --- a/packages/react-native/React/Base/RCTUtils.mm +++ b/packages/react-native/React/Base/RCTUtils.mm @@ -46,12 +46,6 @@ BOOL RCTIsNewArchEnabled(void) { return YES; } -void RCTSetNewArchEnabled(BOOL enabled) -{ - // This function is now deprecated and will be removed in the future. - // This function is now no-op. You need to modify the Info.plist adding a `RCTNewArchEnabled` bool property to control - // whether the New Arch is enabled or not. -} BOOL RCTAreLegacyLogsEnabled(void) { diff --git a/packages/react-native/React/Modules/RCTUIManager.mm b/packages/react-native/React/Modules/RCTUIManager.mm index 983a881afb8f..af16e8b0c06d 100644 --- a/packages/react-native/React/Modules/RCTUIManager.mm +++ b/packages/react-native/React/Modules/RCTUIManager.mm @@ -25,9 +25,7 @@ #import "RCTModuleData.h" #import "RCTModuleMethod.h" #import "RCTProfile.h" -#import "RCTRootShadowView.h" #import "RCTScrollableProtocol.h" -#import "RCTShadowView+Internal.h" #import "RCTShadowView.h" #import "RCTSurfaceRootShadowView.h" #import "RCTSurfaceRootView.h" diff --git a/packages/react-native/React/Views/RCTRootShadowView.h b/packages/react-native/React/Views/RCTRootShadowView.h deleted file mode 100644 index 4755a5a9de54..000000000000 --- a/packages/react-native/React/Views/RCTRootShadowView.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import -#import - -__attribute__((deprecated("This API will be removed along with the legacy architecture."))) -@interface RCTRootShadowView : RCTShadowView - -/** - * Minimum size to layout all views. - * Defaults to CGSizeZero - */ -@property (nonatomic, assign) CGSize minimumSize; - -/** - * Available size to layout all views. - * Defaults to {INFINITY, INFINITY} - */ -@property (nonatomic, assign) CGSize availableSize; - -/** - * Layout direction (LTR or RTL) inherited from native environment and - * is using as a base direction value in layout engine. - * Defaults to value inferred from current locale. - */ -@property (nonatomic, assign) YGDirection baseDirection; - -- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews; - -@end diff --git a/packages/react-native/React/Views/RCTRootShadowView.m b/packages/react-native/React/Views/RCTRootShadowView.m deleted file mode 100644 index 8131d8276108..000000000000 --- a/packages/react-native/React/Views/RCTRootShadowView.m +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import "RCTRootShadowView.h" - -@implementation RCTRootShadowView -- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews -{ -} -@end diff --git a/packages/react-native/React/Views/RCTShadowView+Internal.h b/packages/react-native/React/Views/RCTShadowView+Internal.h deleted file mode 100644 index 0455863f726d..000000000000 --- a/packages/react-native/React/Views/RCTShadowView+Internal.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import - -#import - -@class RCTRootShadowView; - -@interface RCTShadowView (Internal) - -@property (nonatomic, weak, readwrite) RCTRootShadowView *rootView; - -@end diff --git a/packages/react-native/React/Views/RCTShadowView+Internal.m b/packages/react-native/React/Views/RCTShadowView+Internal.m deleted file mode 100644 index f87cd084abff..000000000000 --- a/packages/react-native/React/Views/RCTShadowView+Internal.m +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import "RCTShadowView+Layout.h" - -@interface RCTShadowView () { - __weak RCTRootShadowView *_rootView; -} - -@end - -@implementation RCTShadowView (Internal) - -- (void)setRootView:(RCTRootShadowView *)rootView -{ - _rootView = rootView; -} - -@end diff --git a/packages/react-native/React/Views/RCTShadowView.h b/packages/react-native/React/Views/RCTShadowView.h index d647796e09dd..526d1c12b6eb 100644 --- a/packages/react-native/React/Views/RCTShadowView.h +++ b/packages/react-native/React/Views/RCTShadowView.h @@ -14,7 +14,6 @@ #import #import -@class RCTRootShadowView; @class RCTSparseArray; typedef void (^RCTApplierBlock)(NSDictionary *viewRegistry); @@ -46,7 +45,6 @@ typedef void (^RCTApplierBlock)(NSDictionary *viewRegistry - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex NS_REQUIRES_SUPER; - (void)removeReactSubview:(RCTShadowView *)subview NS_REQUIRES_SUPER; -@property (nonatomic, weak, readonly) RCTRootShadowView *rootView; @property (nonatomic, weak, readonly) RCTShadowView *superview; @property (nonatomic, assign, readonly) YGNodeRef yogaNode; @property (nonatomic, copy) NSString *viewName; diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollableProtocol.h b/packages/react-native/React/Views/ScrollView/RCTScrollableProtocol.h index d85f135c38e3..f54a366b97a0 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollableProtocol.h +++ b/packages/react-native/React/Views/ScrollView/RCTScrollableProtocol.h @@ -42,7 +42,3 @@ @property (nonatomic, weak) UIScrollView *scrollView; @end - -__attribute__((deprecated("Use RCTCustomRefreshControlProtocol instead"))) -@protocol RCTCustomRefreshContolProtocol -@end diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm index 41baf828d4ac..384957a3e9c7 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm @@ -351,9 +351,6 @@ - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy if ([module respondsToSelector:@selector(installJSIBindingsWithRuntime:callInvoker:)]) { [(id)module installJSIBindingsWithRuntime:*runtime callInvoker:_jsInvoker]; - } else if ([module respondsToSelector:@selector(installJSIBindingsWithRuntime:)]) { - // Old API without CallInvoker (deprecated) - [(id)module installJSIBindingsWithRuntime:*runtime]; } return turboModule; } diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h index 60e29bd164a6..6e23cdb2f1bc 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleWithJSIBindings.h @@ -20,9 +20,6 @@ - (void)installJSIBindingsWithRuntime:(facebook::jsi::Runtime &)runtime callInvoker:(const std::shared_ptr &)callinvoker; -- (void)installJSIBindingsWithRuntime:(facebook::jsi::Runtime &)runtime - __attribute__((deprecated("Use 'installJSIBindingsWithRuntime:callInvoker:' instead"))); - #endif @end diff --git a/packages/react-native/scripts/ios-prebuild/templates/React-umbrella.h b/packages/react-native/scripts/ios-prebuild/templates/React-umbrella.h index 1918f29c436a..53d69b27c1b8 100644 --- a/packages/react-native/scripts/ios-prebuild/templates/React-umbrella.h +++ b/packages/react-native/scripts/ios-prebuild/templates/React-umbrella.h @@ -184,7 +184,6 @@ #import #import #import -#import #import #import #import @@ -192,7 +191,6 @@ #import #import #import -#import #import #import #import diff --git a/packages/rn-tester/RNTesterUnitTests/RCTComponentPropsTests.m b/packages/rn-tester/RNTesterUnitTests/RCTComponentPropsTests.m index cdce76af549b..bbe70ee8d966 100644 --- a/packages/rn-tester/RNTesterUnitTests/RCTComponentPropsTests.m +++ b/packages/rn-tester/RNTesterUnitTests/RCTComponentPropsTests.m @@ -8,7 +8,6 @@ #import #import -#import #import #import #import @@ -90,7 +89,7 @@ - (void)setUp RCTUIManager *uiManager = _bridge.uiManager; dispatch_async(uiManager.methodQueue, ^{ - RCTRootShadowView *rootShadowView = [RCTRootShadowView new]; + RCTShadowView *rootShadowView = [RCTShadowView new]; rootShadowView.reactTag = self->_rootViewReactTag; uiManager.shadowViewRegistry[rootShadowView.reactTag] = rootShadowView; }); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 07cddd22f9a5..ef3f2079032f 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -1635,13 +1635,6 @@ interface RCTRedBoxExtraDataViewController : public UIViewController { public @property (assign, readonly) YGNodeRef yogaNode; public @property (copy) NSString* viewName; public @property (copy) RCTDirectEventBlock onLayout; - public @property (weak, readonly) RCTRootShadowView* rootView; public @property (weak, readonly) RCTShadowView* superview; public virtual BOOL canHaveSubviews(); public virtual BOOL isYogaLeafNode(); @@ -2725,9 +2717,6 @@ protocol RCTContextContainerHandling : public NSObject { protocol RCTCustomPullToRefreshViewProtocol { } -protocol RCTCustomRefreshContolProtocol : public RCTCustomRefreshControlProtocol { -} - protocol RCTCustomRefreshControlProtocol { public @property (assign, readonly) BOOL refreshing; public @property (copy) RCTDirectEventBlock onRefresh; @@ -3109,7 +3098,6 @@ protocol RCTTurboModuleRegistry : public NSObject { } protocol RCTTurboModuleWithJSIBindings : public NSObject { - public virtual void installJSIBindingsWithRuntime:(facebook::jsi::Runtime& runtime); public virtual void installJSIBindingsWithRuntime:callInvoker:(facebook::jsi::Runtime& runtime, const std::shared_ptr& callinvoker); } diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 9b793532a7e3..951775f5a1bf 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -1632,13 +1632,6 @@ interface RCTRedBoxExtraDataViewController : public UIViewController { public @property (assign, readonly) YGNodeRef yogaNode; public @property (copy) NSString* viewName; public @property (copy) RCTDirectEventBlock onLayout; - public @property (weak, readonly) RCTRootShadowView* rootView; public @property (weak, readonly) RCTShadowView* superview; public virtual BOOL canHaveSubviews(); public virtual BOOL isYogaLeafNode(); @@ -2713,9 +2705,6 @@ protocol RCTContextContainerHandling : public NSObject { protocol RCTCustomPullToRefreshViewProtocol { } -protocol RCTCustomRefreshContolProtocol : public RCTCustomRefreshControlProtocol { -} - protocol RCTCustomRefreshControlProtocol { public @property (assign, readonly) BOOL refreshing; public @property (copy) RCTDirectEventBlock onRefresh; @@ -3097,7 +3086,6 @@ protocol RCTTurboModuleRegistry : public NSObject { } protocol RCTTurboModuleWithJSIBindings : public NSObject { - public virtual void installJSIBindingsWithRuntime:(facebook::jsi::Runtime& runtime); public virtual void installJSIBindingsWithRuntime:callInvoker:(facebook::jsi::Runtime& runtime, const std::shared_ptr& callinvoker); } diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 6d60efb3feb4..5226973262d9 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -1635,13 +1635,6 @@ interface RCTRedBoxExtraDataViewController : public UIViewController { public @property (assign, readonly) YGNodeRef yogaNode; public @property (copy) NSString* viewName; public @property (copy) RCTDirectEventBlock onLayout; - public @property (weak, readonly) RCTRootShadowView* rootView; public @property (weak, readonly) RCTShadowView* superview; public virtual BOOL canHaveSubviews(); public virtual BOOL isYogaLeafNode(); @@ -2725,9 +2717,6 @@ protocol RCTContextContainerHandling : public NSObject { protocol RCTCustomPullToRefreshViewProtocol { } -protocol RCTCustomRefreshContolProtocol : public RCTCustomRefreshControlProtocol { -} - protocol RCTCustomRefreshControlProtocol { public @property (assign, readonly) BOOL refreshing; public @property (copy) RCTDirectEventBlock onRefresh; @@ -3109,7 +3098,6 @@ protocol RCTTurboModuleRegistry : public NSObject { } protocol RCTTurboModuleWithJSIBindings : public NSObject { - public virtual void installJSIBindingsWithRuntime:(facebook::jsi::Runtime& runtime); public virtual void installJSIBindingsWithRuntime:callInvoker:(facebook::jsi::Runtime& runtime, const std::shared_ptr& callinvoker); }