decorate

Author: coado

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

@@ -6,6 +6,7 @@
  */
 
 #import <RCTDevMenuConfigurationDecorator.h>
+#import <React/RCTDevSettings.h>
 
 @implementation RCTDevMenuConfigurationDecorator
 
@@ -18,11 +19,17 @@ - (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *)devMenuC
   return self;
 }
 
-- (void)decorate:(RCTDevMenu *)devMenuModule
+- (void)decorate:(id<RCTBridgeModule>)bridgeModule
 {
-  if (_devMenuConfiguration != nil) {
-    devMenuModule.isDevMenuEnabled = _devMenuConfiguration.isDevMenuEnabled;
-    [devMenuModule setShakeToShow:_devMenuConfiguration.isShakeGestureEnabled];
+  if ([bridgeModule isKindOfClass:[RCTDevMenu class]]) {
+    RCTDevMenu *devMenu = (RCTDevMenu *)bridgeModule;
+    devMenu.isDevMenuEnabled = _devMenuConfiguration.isDevMenuEnabled;
+    [devMenu setHotkeysEnabled:_devMenuConfiguration.areKeyboardShortcutsEnabled];
+  }
+  
+  if ([bridgeModule isKindOfClass:[RCTDevSettings class]]) {
+    RCTDevSettings *devSettings = (RCTDevSettings *)bridgeModule;
+    [devSettings setIsShakeToShowDevMenuEnabled:_devMenuConfiguration.isShakeGestureEnabled];
   }
 }
 

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

@@ -33,17 +33,17 @@ @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;
+- (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)
@@ -445,7 +445,8 @@ - (RCTDevMenuAlertActionHandler)alertActionHandlerForDevItem:(RCTDevMenuItem *__
 
 - (void)setShakeToShow:(BOOL)shakeToShow
 {
-  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isShakeToShowDevMenuEnabled = shakeToShow;
+  RCTDevSettings *devSettings = [_moduleRegistry moduleForName:"DevSettings"];
+  [devSettings setIsShakeToShowDevMenuEnabled:shakeToShow];
 }
 
 - (BOOL)shakeToShow

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

@@ -776,10 +776,7 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
     [(id<RCTInitializing>)module initialize];
   }
 
-  if ([module isKindOfClass:[RCTDevMenu class]]) {
-    RCTDevMenu *devMenu = (RCTDevMenu *)module;
-    [_devMenuConfigurationDecorator decorate:devMenu];
-  }
+  [_devMenuConfigurationDecorator decorate:module];
 
   /**
    * Attach method queue to id<RCTBridgeModule> object.