update

zhongwuzw · Oct 25, 2023 · c1875dd · c1875dd
1 parent cd99631
commit c1875dd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -93,18 +93,21 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
   BOOL enableTM = NO;
   BOOL enableBridgeless = NO;
+  BOOL fabricEnabled = NO;
 #if RCT_NEW_ARCH_ENABLED
   enableTM = self.turboModuleEnabled;
   enableBridgeless = self.bridgelessEnabled;
+  fabricEnabled = [self fabricEnabled];
 #endif
+  NSDictionary *initProps = updateInitialProps([self prepareInitialProps], fabricEnabled);
 
   RCTAppSetupPrepareApp(application, enableTM);
 
   UIView *rootView;
   if (enableBridgeless) {
 #if RCT_NEW_ARCH_ENABLED
     // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
-    RCTSetUseNativeViewConfigsInBridgelessMode([self fabricEnabled]);
+    RCTSetUseNativeViewConfigsInBridgelessMode(fabricEnabled);
 
     // Enable TurboModule interop by default in Bridgeless mode
     RCTEnableTurboModuleInterop(YES);
@@ -113,7 +116,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [self createReactHost];
     [self unstable_registerLegacyComponents];
     [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-    NSDictionary *initProps = updateInitialProps([self prepareInitialProps], [self fabricEnabled]);
     RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
 
     RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
@@ -134,7 +136,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [self unstable_registerLegacyComponents];
     [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
 #endif
-    NSDictionary *initProps = updateInitialProps([self prepareInitialProps], [self fabricEnabled]);
 
     rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps];
   }