formatting

Author: Saadnajmi

packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm

@@ -25,21 +25,20 @@
 #import <React/RCTComponentViewProtocol.h>
 #import <React/RCTFabricSurface.h>
 #import <React/RCTSurfaceHostingProxyRootView.h>
-#import <React/RCTSurfaceHostingView+Private.h> // [macOS]
 #import <React/RCTSurfacePresenter.h>
 
-#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") // [macOS]
-#import "RCTDevMenu.h"
-#endif // [macOS]
 #import <ReactCommon/RCTHost+Internal.h>
 #import <ReactCommon/RCTHost.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #import <react/runtime/JSRuntimeFactory.h>
-#import <react/utils/ManagedObjectWrapper.h>
 
-using namespace facebook::react;
+#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") // [macOS
+#import <React/RCTSurfaceHostingView+Private.h>
+#import <react/utils/ManagedObjectWrapper.h>
+#import "RCTDevMenu.h"
+#endif // macOS]
 
 @implementation RCTRootViewFactoryConfiguration
 
@@ -160,15 +159,13 @@ - (RCTPlatformView *)viewWithModuleName:(NSString *)moduleName // [macOS]
     surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
 #endif // [macOS]
 
-    [surfaceHostingProxyRootView setContextContainer:_contextContainer]; // [macOS]
-
 #if TARGET_OS_OSX && __has_include("RCTDevMenu.h") && RCT_DEV
-    // Insert dev menu for macOS context menu access in bridgeless mode
     RCTDevMenu *devMenu = [self.reactHost.moduleRegistry moduleForClass:[RCTDevMenu class]];
     if (devMenu) {
       _contextContainer->erase("RCTDevMenu");
       _contextContainer->insert("RCTDevMenu", wrapManagedObject(devMenu));
     }
+    [surfaceHostingProxyRootView setContextContainer:_contextContainer]; // [macOS]
 #endif
 
     if (_configuration.customizeRootView != nil) {
@@ -207,11 +204,12 @@ - (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge
   rootView.backgroundColor = [UIColor systemBackgroundColor];
 #endif // [macOS]
 
-  // Set context container if this is a Fabric-enabled RCTSurfaceHostingView (or subclass)
+#if TARGET_OS_OSX // [macOS
   if (enableFabric && [rootView isKindOfClass:[RCTSurfaceHostingView class]]) {
     [(RCTSurfaceHostingView *)rootView setContextContainer:_contextContainer];
   }
-  
+#endif // macOS]
+
   return rootView;
 }
 
@@ -363,4 +361,4 @@ - (NSURL *)bundleURL
   return self->_configuration.bundleURLBlock();
 }
 
-@end
+@end

packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

@@ -11,7 +11,6 @@
 #import <React/RCTSurfaceProtocol.h>
 #import <React/RCTSurfaceSizeMeasureMode.h>
 #import <React/RCTSurfaceStage.h>
-// #import <react/utils/ContextContainer.h> // [macOS]
 
 @class RCTBridge;
 @class RCTSurface;

packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -14,13 +14,11 @@
 #import "RCTSurfaceView.h"
 #import "RCTUtils.h"
 
-#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") // [macOS]
+#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") // [macOS
 #import "RCTDevMenu.h"
 #import "RCTBridgeProxy.h"
 #import <react/utils/ManagedObjectWrapper.h>
-
-using namespace facebook::react;
-#endif // [macOS]
+#endif // macOS]
 
 @interface RCTSurfaceHostingView ()
 
@@ -145,7 +143,7 @@ - (void)setSizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
   [self _invalidateLayout];
 }
 
-// [macOS 
+#if TARGET_OS_OSX // [macOS 
 - (facebook::react::ContextContainer::Shared)contextContainer
 {
   return _contextContainer;
@@ -155,7 +153,7 @@ - (void)setContextContainer:(facebook::react::ContextContainer::Shared)contextCo
 {
   _contextContainer = contextContainer;
 }
-// macOS]
+#endif // macOS]
 
 - (void)disableActivityIndicatorAutoHide:(BOOL)disabled
 {
@@ -301,9 +299,10 @@ - (void)surface:(__unused RCTSurface *)surface didChangeIntrinsicSize:(__unused
   });
 }
 
+#if TARGET_OS_OSX // [macOS]
+
 #pragma mark - Context Menu
 
-#if TARGET_OS_OSX // [macOS]
 - (NSMenu *)menuForEvent:(NSEvent *)event
 {
   NSMenu *menu = nil;