fix: upstream sync ifdefs

gokul1099 · Feb 2, 2024 · 56de923 · 56de923
1 parent 1b238f4
commit 56de923
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 41 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -110,48 +110,46 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
 }
 
 - (UIView *)viewWithModuleName:(NSString *)moduleName initialProperties:(NSDictionary*)initialProperties launchOptions:(NSDictionary*)launchOptions {
-    BOOL fabricEnabled = self.fabricEnabled;
-    BOOL enableBridgeless = self.bridgelessEnabled;
-
-    NSDictionary *initProps = updateInitialProps(initialProperties, fabricEnabled);
+  BOOL fabricEnabled = self.fabricEnabled;
+  BOOL enableBridgeless = self.bridgelessEnabled;
+
+  NSDictionary *initProps = updateInitialProps(initialProperties, fabricEnabled);
+
+  UIView *rootView;
+  if (enableBridgeless) {
+    // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
+    RCTSetUseNativeViewConfigsInBridgelessMode(self.fabricEnabled);
+
+    // Enable TurboModule interop by default in Bridgeless mode
+    RCTEnableTurboModuleInterop(YES);
+    RCTEnableTurboModuleInteropBridgeProxy(YES);
+
+    [self createReactHost];
+    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+    RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
+
+    RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
+                                                                   initWithSurface:surface
+                                                                   sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
 
-    UIView *rootView;
-    if (enableBridgeless) {
-      // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
-      RCTSetUseNativeViewConfigsInBridgelessMode(self.fabricEnabled);
-
-      // Enable TurboModule interop by default in Bridgeless mode
-      RCTEnableTurboModuleInterop(YES);
-      RCTEnableTurboModuleInteropBridgeProxy(YES);
-
-      [self createReactHost];
-      [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-      RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
-
-      RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
-          initWithSurface:surface
-          sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
-
     rootView = (RCTRootView *)surfaceHostingProxyRootView;
     rootView.backgroundColor = [UIColor systemBackgroundColor];
-  } else {
-    if (!self.bridge) {
-      self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
-    }
-    if ([self newArchEnabled]) {
-      self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
-                                                                   contextContainer:_contextContainer];
-      self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
-
-          [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-        }
-      }
-      rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initProps];
-    }
-
-    [self customizeRootView:(RCTRootView *)rootView];
+  }
+  if (!self.bridge) {
+    self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
+  }
+  if ([self newArchEnabled]) {
+    self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
+                                                                 contextContainer:_contextContainer];
+    self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
 
-    return rootView;
+    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+  }
+  rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initProps];
+
+  [self customizeRootView:(RCTRootView *)rootView];
+
+  return rootView;
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge

diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
@@ -533,9 +533,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
                   : (RCTPromiseResolveBlock)resolve reject
                   : (__unused RCTPromiseRejectBlock)reject)
 {
-#if TARGET_OS_VISION
-  return;
-#endif
+#if !TARGET_OS_VISION
   // The user actioned a local or remote notification to launch the app. Notification is represented by UNNotification.
   // Set this property in the implementation of
   // userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler.
@@ -574,6 +572,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }
 
   resolve((id)kCFNull);
+#endif
 }
 
 RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)