diff --git a/React/AppSetup/RCTAppSetupUtils.h b/React/AppSetup/RCTAppSetupUtils.h index 5403c8cde47e2e..3056dd1595351e 100644 --- a/React/AppSetup/RCTAppSetupUtils.h +++ b/React/AppSetup/RCTAppSetupUtils.h @@ -9,7 +9,7 @@ #import #import -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED #ifndef RCT_USE_HERMES #if __has_include() @@ -34,7 +34,7 @@ moduleName:(NSString *_Nonnull)moduleName initialProperties:(nullable NSDictionary *)initialProperties; -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED + (id _Nonnull)defaultModuleInstanceFromClass:(Class _Nonnull)moduleClass; + (std::unique_ptr) defaultJsExecutorFactoryForBridge:(RCTBridge *_Nonnull)bridge diff --git a/React/AppSetup/RCTAppSetupUtils.mm b/React/AppSetup/RCTAppSetupUtils.mm index a15f5cb9014a1c..c051c7c64447ea 100644 --- a/React/AppSetup/RCTAppSetupUtils.mm +++ b/React/AppSetup/RCTAppSetupUtils.mm @@ -7,7 +7,7 @@ #import "RCTAppSetupUtils.h" -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED // Turbo Module #import #import @@ -52,7 +52,7 @@ + (void)prepareApp:(UIApplication *)application InitializeFlipper(application); #endif -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED RCTEnableTurboModule(YES); #endif } @@ -61,7 +61,7 @@ + (UIView *)defaultRootViewWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties { -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties]; @@ -70,7 +70,7 @@ + (UIView *)defaultRootViewWithBridge:(RCTBridge *)bridge #endif } -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED + (id)defaultModuleInstanceFromClass:(Class)moduleClass { // Set up the default RCTImageLoader and RCTNetworking modules. diff --git a/template/ios/HelloWorld/AppDelegate.mm b/template/ios/HelloWorld/AppDelegate.mm index 1f19f964d04936..76dd1b445b93d4 100644 --- a/template/ios/HelloWorld/AppDelegate.mm +++ b/template/ios/HelloWorld/AppDelegate.mm @@ -6,7 +6,7 @@ #import -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED #import #import #import @@ -33,7 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED _contextContainer = std::make_shared(); _reactNativeConfig = std::make_shared(); _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); @@ -68,7 +68,7 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge #endif } -#if RCT_TM_FABRIC_ENABLED +#if RCT_NEW_ARCH_ENABLED #pragma mark - RCTCxxBridgeDelegate