decorate RCTDevMenu

Author: coado

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

@@ -253,7 +253,8 @@ - (RCTHost *)createReactHost:(NSDictionary *)launchOptions
                                 jsEngineProvider:^std::shared_ptr<facebook::react::JSRuntimeFactory>() {
                                   return [weakSelf createJSRuntimeFactory];
                                 }
-                                   launchOptions:launchOptions];
+                                   launchOptions:launchOptions
+                            devMenuConfiguration:devMenuConfiguration];
   [reactHost setBundleURLProvider:^NSURL *() {
     return [weakSelf bundleURL];
   }];

packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTDevMenu.h>
+
+@interface RCTDevMenuConfigurationDecorator : NSObject
+@property (nonatomic, strong, readonly) RCTDevMenuConfiguration *devMenuConfiguration;
+
+- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *)devMenuConfiguration;
+- (void)decorate:(RCTDevMenu *)devMenuModule;
+@end

packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.mm

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <RCTDevMenuConfigurationDecorator.h>
+
+@implementation RCTDevMenuConfigurationDecorator
+
+- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *)devMenuConfiguration
+{
+  if (self = [super init]) {
+    _devMenuConfiguration = devMenuConfiguration;
+  }
+  
+  return self;
+}
+
+- (void)decorate:(RCTDevMenu *)devMenuModule
+{
+  if (_devMenuConfiguration != nil) {
+    devMenuModule.isDevMenuEnabled = _devMenuConfiguration.isDevMenuEnabled;
+    [devMenuModule setShakeToShow:_devMenuConfiguration.isShakeGestureEnabled];
+  }
+}
+
+@end

packages/react-native/React/CoreModules/RCTDevMenu.h

@@ -20,8 +20,14 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
 
 @class RCTDevMenuItem;
 
-@interface RCTDevMenuConfiguration
+@interface RCTDevMenuConfiguration : NSObject
 @property (nonatomic, readonly) BOOL isDevMenuEnabled;
+@property (nonatomic, readonly) BOOL isShakeGestureEnabled;
+@property (nonatomic, readonly) BOOL areKeyboardShortcutsEnabled;
+
+- (instancetype)initWithDevMenuEnabled:(BOOL) isDevMenuEnabled
+                shakeGestureEnabled:(BOOL) isShakeGestureEnabled
+              keyboardShortcutsEnabled:(BOOL) areKeyboardShortcutsEnabled;
 @end
 
 /**
@@ -54,6 +60,8 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
  */
 @property (nonatomic, copy, readonly) NSArray<RCTDevMenuItem *> *presentedItems;
 
+@property (nonatomic, assign) BOOL isDevMenuEnabled;
+
 /**
  * Detect if actions sheet (development menu) is shown
  */

packages/react-native/React/CoreModules/RCTDevMenu.mm

@@ -29,6 +29,23 @@ - (RCTDevMenuItem *)devMenuItem;
 
 NSString *const RCTShowDevMenuNotification = @"RCTShowDevMenuNotification";
 
+@interface RCTDevMenuConfiguration ()
+@end
+
+@implementation RCTDevMenuConfiguration
+  - (instancetype)initWithDevMenuEnabled:(BOOL) isDevMenuEnabled
+                     shakeGestureEnabled:(BOOL) isShakeGestureEnabled
+                   keyboardShortcutsEnabled:(BOOL) areKeyboardShortcutsEnabled
+  {
+    if (self = [super init]) {
+      _isDevMenuEnabled = isDevMenuEnabled;
+      _isShakeGestureEnabled = isShakeGestureEnabled;
+      _areKeyboardShortcutsEnabled = areKeyboardShortcutsEnabled;
+    }
+    return self;
+  }
+@end
+
 @implementation UIWindow (RCTDevMenu)
 
 - (void)RCT_motionEnded:(__unused UIEventSubtype)motion withEvent:(UIEvent *)event
@@ -102,6 +119,7 @@ @implementation RCTDevMenu {
 @synthesize moduleRegistry = _moduleRegistry;
 @synthesize callableJSModules = _callableJSModules;
 @synthesize bundleManager = _bundleManager;
+@synthesize isDevMenuEnabled = _isDevMenuEnabled;
 
 RCT_EXPORT_MODULE()
 
@@ -379,7 +397,7 @@ - (void)setDefaultJSBundle
 
 RCT_EXPORT_METHOD(show)
 {
-  if (_actionSheet || RCTRunningInAppExtension()) {
+  if (_actionSheet || RCTRunningInAppExtension() || !_isDevMenuEnabled) {
     return;
   }
 

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h

@@ -10,6 +10,7 @@
 #import <memory>
 
 #import <React/RCTBridgeModuleDecorator.h>
+#import <React/RCTDevMenuConfigurationDecorator.h>
 #import <React/RCTDefines.h>
 #import <React/RCTTurboModuleRegistry.h>
 #import <ReactCommon/RuntimeExecutor.h>
@@ -71,7 +72,8 @@
 - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
               bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
                            delegate:(id<RCTTurboModuleManagerDelegate>)delegate
-                          jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
+                          jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+      devMenuConfigurationDecorator:(RCTDevMenuConfigurationDecorator *)devMenuConfigurationDecorator;
 
 - (void)installJSBindings:(facebook::jsi::Runtime &)runtime;
 

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

@@ -215,15 +215,17 @@ @implementation RCTTurboModuleManager {
 
   RCTBridgeProxy *_bridgeProxy;
   RCTBridgeModuleDecorator *_bridgeModuleDecorator;
+  RCTDevMenuConfigurationDecorator *_devMenuConfigurationDecorator;
 
   dispatch_queue_t _sharedModuleQueue;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
-                   bridgeProxy:(RCTBridgeProxy *)bridgeProxy
-         bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
-                      delegate:(id<RCTTurboModuleManagerDelegate>)delegate
-                     jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+                      bridgeProxy:(RCTBridgeProxy *)bridgeProxy
+            bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                         delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                        jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+    devMenuConfigurationDecorator:(RCTDevMenuConfigurationDecorator *)devMenuConfigurationDecorator
 {
   if (self = [super init]) {
     _jsInvoker = std::move(jsInvoker);
@@ -233,6 +235,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _bridgeModuleDecorator = bridgeModuleDecorator;
     _invalidating = false;
     _sharedModuleQueue = dispatch_queue_create("com.meta.react.turbomodulemanager.queue", DISPATCH_QUEUE_SERIAL);
+    _devMenuConfigurationDecorator = devMenuConfigurationDecorator;
 
     if (RCTTurboModuleInteropEnabled()) {
       // TODO(T174674274): Implement lazy loading of legacy modules in the new architecture.
@@ -273,22 +276,25 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
                      jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
 {
   return [self initWithBridge:bridge
-                  bridgeProxy:nil
-        bridgeModuleDecorator:[bridge bridgeModuleDecorator]
-                     delegate:delegate
-                    jsInvoker:jsInvoker];
+                        bridgeProxy:nil
+              bridgeModuleDecorator:[bridge bridgeModuleDecorator]
+                           delegate:delegate
+                          jsInvoker:jsInvoker
+      devMenuConfigurationDecorator:nil];
 }
 
 - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
               bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
                            delegate:(id<RCTTurboModuleManagerDelegate>)delegate
                           jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+      devMenuConfigurationDecorator:(RCTDevMenuConfigurationDecorator *)devMenuConfigurationDecorator
 {
   return [self initWithBridge:nil
-                  bridgeProxy:bridgeProxy
-        bridgeModuleDecorator:bridgeModuleDecorator
-                     delegate:delegate
-                    jsInvoker:jsInvoker];
+                        bridgeProxy:bridgeProxy
+              bridgeModuleDecorator:bridgeModuleDecorator
+                           delegate:delegate
+                          jsInvoker:jsInvoker
+      devMenuConfigurationDecorator:devMenuConfigurationDecorator];
 }
 
 /**
@@ -770,6 +776,11 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
     [(id<RCTInitializing>)module initialize];
   }
 
+  if ([module isKindOfClass:[RCTDevMenu class]]) {
+    RCTDevMenu *devMenu = (RCTDevMenu *)module;
+    [_devMenuConfigurationDecorator decorate:devMenu];
+  }
+
   /**
    * Attach method queue to id<RCTBridgeModule> object.
    * This is necessary because the id<RCTBridgeModule> object can be eagerly created/initialized before the method

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm

@@ -123,6 +123,7 @@ @implementation RCTHost {
   std::vector<__weak RCTFabricSurface *> _attachedSurfaces;
 
   RCTModuleRegistry *_moduleRegistry;
+  RCTDevMenuConfiguration *_devMenuConfiguration;
 
   std::unique_ptr<RCTHostHostTargetDelegate> _inspectorHostDelegate;
   std::shared_ptr<jsinspector_modern::HostTarget> _inspectorTarget;
@@ -203,6 +204,7 @@ - (instancetype)initWithBundleURLProvider:(RCTHostBundleURLProvider)provider
     });
 
     _inspectorHostDelegate = std::make_unique<RCTHostHostTargetDelegate>(self);
+    _devMenuConfiguration = devMenuConfiguration;
   }
   return self;
 }
@@ -248,7 +250,8 @@ - (void)start
                          turboModuleManagerDelegate:_turboModuleManagerDelegate
                                      moduleRegistry:_moduleRegistry
                               parentInspectorTarget:_inspectorTarget.get()
-                                      launchOptions:_launchOptions];
+                                      launchOptions:_launchOptions
+                        devMenuConfiguration:_devMenuConfiguration];
   [_hostDelegate hostDidStart:self];
 }
 
@@ -451,7 +454,8 @@ - (void)_reloadWithShouldRestartSurfaces:(BOOL)shouldRestartSurfaces
                          turboModuleManagerDelegate:_turboModuleManagerDelegate
                                      moduleRegistry:_moduleRegistry
                               parentInspectorTarget:_inspectorTarget.get()
-                                      launchOptions:_launchOptions];
+                                      launchOptions:_launchOptions
+                        devMenuConfiguration:_devMenuConfiguration];
   [_hostDelegate hostDidStart:self];
 
   for (RCTFabricSurface *surface in [self _getAttachedSurfaces]) {

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h

@@ -8,6 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
+#import <React/RCTDevMenu.h>
 #import <React/RCTJavaScriptLoader.h>
 #import <jsinspector-modern/ReactCdp.h>
 #import <react/runtime/JSRuntimeFactory.h>
@@ -71,7 +72,8 @@ RCT_EXTERN void RCTInstanceSetRuntimeDiagnosticFlags(NSString *_Nullable flags);
       turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(facebook::react::jsinspector_modern::HostTarget *)parentInspectorTarget
-                   launchOptions:(nullable NSDictionary *)launchOptions;
+                   launchOptions:(nullable NSDictionary *)launchOptions
+            devMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
 
 - (void)callFunctionOnJSModule:(NSString *)moduleName method:(NSString *)method args:(NSArray *)args;
 - (void)callFunctionOnBufferedRuntimeExecutor:(std::function<void(facebook::jsi::Runtime &runtime)> &&)executor;

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -119,6 +119,7 @@ @implementation RCTInstance {
 
   // APIs supporting interop with native modules and view managers
   RCTBridgeModuleDecorator *_bridgeModuleDecorator;
+  RCTDevMenuConfigurationDecorator *_devMenuConfigurationDecorator;
 
   jsinspector_modern::HostTarget *_parentInspectorTarget;
 }
@@ -132,6 +133,7 @@ - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(jsinspector_modern::HostTarget *)parentInspectorTarget
                    launchOptions:(nullable NSDictionary *)launchOptions
+            devMenuConfiguration:(RCTDevMenuConfiguration *)devMenuConfiguration
 {
   if (self = [super init]) {
     _performanceLogger = [RCTPerformanceLogger new];
@@ -142,10 +144,14 @@ - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
     _jsRuntimeFactory = jsRuntimeFactory;
     _appTMMDelegate = tmmDelegate;
     _jsThreadManager = [RCTJSThreadManager new];
+
     _bridgeModuleDecorator = [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:[RCTViewRegistry new]
                                                                      moduleRegistry:moduleRegistry
                                                                       bundleManager:bundleManager
                                                                   callableJSModules:[RCTCallableJSModules new]];
+    _devMenuConfigurationDecorator =
+        [[RCTDevMenuConfigurationDecorator alloc] initWithDevMenuConfiguration:devMenuConfiguration];
+
     _parentInspectorTarget = parentInspectorTarget;
     {
       __weak __typeof(self) weakSelf = self;
@@ -326,7 +332,8 @@ - (void)_start
   _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridgeProxy:bridgeProxy
                                                      bridgeModuleDecorator:_bridgeModuleDecorator
                                                                   delegate:self
-                                                                 jsInvoker:jsCallInvoker];
+                                                                 jsInvoker:jsCallInvoker
+                                                      devMenuConfigurationDecorator:_devMenuConfigurationDecorator];
 
 #if RCT_DEV
   /**