Why do we need context container at all?

Author: Saadnajmi

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

@@ -34,9 +34,7 @@
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #import <react/runtime/JSRuntimeFactory.h>
 
-#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") // [macOS
-#import <React/RCTSurfaceHostingView+Private.h>
-#import <react/utils/ManagedObjectWrapper.h>
+#if RCT_DEV_MENU // [macOS
 #import "RCTDevMenu.h"
 #endif // macOS]
 
@@ -159,14 +157,12 @@ - (RCTPlatformView *)viewWithModuleName:(NSString *)moduleName // [macOS]
     surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
 #endif // [macOS]
 
-#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") && RCT_DEV
+#if RCT_DEV_MENU // [macOS
     RCTDevMenu *devMenu = [self.reactHost.moduleRegistry moduleForClass:[RCTDevMenu class]];
     if (devMenu) {
-      _contextContainer->erase("RCTDevMenu");
-      _contextContainer->insert("RCTDevMenu", facebook::react::wrapManagedObject(devMenu));
+      surfaceHostingProxyRootView.devMenu = devMenu;
     }
-    [surfaceHostingProxyRootView setContextContainer:_contextContainer]; // [macOS]
-#endif
+#endif // macOS]
 
     if (_configuration.customizeRootView != nil) {
       _configuration.customizeRootView(surfaceHostingProxyRootView);
@@ -200,15 +196,19 @@ - (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge
 {
   BOOL enableFabric = _configuration.fabricEnabled;
   RCTPlatformView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric); // [macOS]
-#if !TARGET_OS_OSX // [macOS]
-  rootView.backgroundColor = [UIColor systemBackgroundColor];
-#endif // [macOS]
 
-#if TARGET_OS_OSX // [macOS
+#if RCT_DEV_MENU // [macOS
   if (enableFabric && [rootView isKindOfClass:[RCTSurfaceHostingView class]]) {
-    [(RCTSurfaceHostingView *)rootView setContextContainer:_contextContainer];
+    RCTDevMenu *devMenu = [bridge moduleForClass:[RCTDevMenu class]];
+    if (devMenu) {
+      [(RCTSurfaceHostingView *)rootView setDevMenu:devMenu];
+    }
   }
 #endif // macOS]
+  
+#if !TARGET_OS_OSX // [macOS]
+  rootView.backgroundColor = [UIColor systemBackgroundColor];
+#endif // [macOS]
 
   return rootView;
 }
@@ -227,15 +227,6 @@ - (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge
     _contextContainer->erase("RuntimeScheduler");
     _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
 
-#if TARGET_OS_OSX && __has_include("RCTDevMenu.h") && RCT_DEV
-    // Insert dev menu for macOS context menu access using proper moduleForClass pattern
-    RCTDevMenu *devMenu = [bridge moduleForClass:[RCTDevMenu class]];
-    if (devMenu) {
-      _contextContainer->erase("RCTDevMenu");
-      _contextContainer->insert("RCTDevMenu", facebook::react::wrapManagedObject(devMenu));
-    }
-#endif
-    
     return RCTAppSetupDefaultJsExecutorFactory(bridge, turboModuleManager, _runtimeScheduler);
   } else {
     return RCTAppSetupJsExecutorFactoryForOldArch(bridge, _runtimeScheduler);

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

@@ -15,6 +15,10 @@
 @class RCTBridge;
 @class RCTSurface;
 
+#if RCT_DEV_MENU// [macOS]
+@class RCTDevMenu;
+#endif // [macOS]
+
 typedef RCTPlatformView *_Nullable (^RCTSurfaceHostingViewActivityIndicatorViewFactory)(void); // [macOS]
 
 NS_ASSUME_NONNULL_BEGIN
@@ -63,6 +67,14 @@ NS_ASSUME_NONNULL_BEGIN
  * @param disabled if `YES`, the auto-hide is disabled. Otherwise the loading view will be hidden automatically
  */
 - (void)disableActivityIndicatorAutoHide:(BOOL)disabled;
+
+#if RCT_DEV_MENU // [macOS
+/**
+ * Dev menu for macOS context menu access.
+ */
+@property (nonatomic, strong, nullable) RCTDevMenu *devMenu;
+#endif // macOS]
+
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -6,7 +6,6 @@
  */
 
 #import "RCTSurfaceHostingView.h"
-#import "RCTSurfaceHostingView+Private.h" // [macOS]
 #import "RCTConstants.h"
 #import "RCTDefines.h"
 #import "RCTSurface.h"
@@ -31,7 +30,6 @@ @implementation RCTSurfaceHostingView {
   RCTPlatformView *_Nullable _surfaceView; // [macOS]
   RCTSurfaceStage _stage;
   BOOL _autoHideDisabled;
-  facebook::react::ContextContainer::Shared _contextContainer; // [macOS]
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)init)
@@ -142,18 +140,6 @@ - (void)setSizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
   [self _invalidateLayout];
 }
 
-#if TARGET_OS_OSX // [macOS 
-- (facebook::react::ContextContainer::Shared)contextContainer
-{
-  return _contextContainer;
-}
-
-- (void)setContextContainer:(facebook::react::ContextContainer::Shared)contextContainer
-{
-  _contextContainer = contextContainer;
-}
-#endif // macOS]
-
 - (void)disableActivityIndicatorAutoHide:(BOOL)disabled
 {
   _autoHideDisabled = disabled;
@@ -304,16 +290,13 @@ - (void)surface:(__unused RCTSurface *)surface didChangeIntrinsicSize:(__unused
 
 - (NSMenu *)menuForEvent:(NSEvent *)event
 {
-#if RCT_DEV_MENU && __has_include("RCTDevMenu.h")
-  if (_contextContainer) {
-    auto devMenuOptional = _contextContainer->find<std::shared_ptr<void>>("RCTDevMenu");
-    if (devMenuOptional.has_value()) {
-      RCTDevMenu *devMenu = facebook::react::unwrapManagedObject(*devMenuOptional);
-      if (devMenu) {
-        return [devMenu menu];
-      }
-    }
+#if __has_include("RCTDevMenu.h") && RCT_DEV
+  // Try direct dev menu property first (simplest approach)
+  if (_devMenu) {
+    return [_devMenu menu];
   }
+  
+
 #endif
 
   return [super menuForEvent:event];