unregister reload command, fix isHotkeysRegistered

Author: coado

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

@@ -15,7 +15,7 @@ - (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *)devMenuC
   if (self = [super init]) {
     _devMenuConfiguration = devMenuConfiguration;
   }
-  
+
   return self;
 }
 
@@ -24,9 +24,16 @@ - (void)decorate:(id<RCTBridgeModule>)bridgeModule
   if ([bridgeModule isKindOfClass:[RCTDevMenu class]]) {
     RCTDevMenu *devMenu = (RCTDevMenu *)bridgeModule;
     devMenu.isDevMenuEnabled = _devMenuConfiguration.isDevMenuEnabled;
-    [devMenu setHotkeysEnabled:_devMenuConfiguration.areKeyboardShortcutsEnabled];
+
+    if (_devMenuConfiguration.areKeyboardShortcutsEnabled == false) {
+      if ([devMenu hotkeysEnabled]) {
+        [devMenu setHotkeysEnabled:_devMenuConfiguration.areKeyboardShortcutsEnabled];
+      }
+
+      [devMenu disableReloadCommand];
+    }
   }
-  
+
   if ([bridgeModule isKindOfClass:[RCTDevSettings class]]) {
     RCTDevSettings *devSettings = (RCTDevSettings *)bridgeModule;
     [devSettings setIsShakeToShowDevMenuEnabled:_devMenuConfiguration.isShakeGestureEnabled];

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

@@ -25,9 +25,9 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
 @property (nonatomic, readonly) BOOL isShakeGestureEnabled;
 @property (nonatomic, readonly) BOOL areKeyboardShortcutsEnabled;
 
-- (instancetype)initWithDevMenuEnabled:(BOOL) isDevMenuEnabled
-                shakeGestureEnabled:(BOOL) isShakeGestureEnabled
-              keyboardShortcutsEnabled:(BOOL) areKeyboardShortcutsEnabled;
+- (instancetype)initWithDevMenuEnabled:(BOOL)isDevMenuEnabled
+                   shakeGestureEnabled:(BOOL)isShakeGestureEnabled
+              keyboardShortcutsEnabled:(BOOL)areKeyboardShortcutsEnabled;
 @end
 
 /**
@@ -88,6 +88,11 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
  */
 - (void)addItem:(RCTDevMenuItem *)item;
 
+/**
+ * Disable the reload command (Cmd+R) in the simulator.
+ */
+- (void)disableReloadCommand;
+
 @end
 
 typedef NSString * (^RCTDevMenuItemTitleBlock)(void);

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

@@ -180,7 +180,6 @@ - (void)unregisterHotkeys
 
   [commands unregisterKeyCommandWithInput:@"d" modifierFlags:UIKeyModifierCommand];
   [commands unregisterKeyCommandWithInput:@"i" modifierFlags:UIKeyModifierCommand];
-  [commands unregisterKeyCommandWithInput:@"n" modifierFlags:UIKeyModifierCommand];
 #endif
 }
 
@@ -190,13 +189,30 @@ - (BOOL)isHotkeysRegistered
   RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
 
   return [commands isKeyCommandRegisteredForInput:@"d" modifierFlags:UIKeyModifierCommand] &&
-      [commands isKeyCommandRegisteredForInput:@"i" modifierFlags:UIKeyModifierCommand] &&
-      [commands isKeyCommandRegisteredForInput:@"n" modifierFlags:UIKeyModifierCommand];
+      [commands isKeyCommandRegisteredForInput:@"i" modifierFlags:UIKeyModifierCommand];
 #else
   return NO;
 #endif
 }
 
+- (BOOL)isReloadCommandRegistered
+{
+#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
+  return [commands isKeyCommandRegisteredForInput:@"r" modifierFlags:UIKeyModifierCommand];
+#else
+  return NO;
+#endif
+}
+
+- (void)unregisterReloadCommand
+{
+#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
+  [commands unregisterKeyCommandWithInput:@"r" modifierFlags:UIKeyModifierCommand];
+#endif
+}
+
 - (dispatch_queue_t)methodQueue
 {
   return dispatch_get_main_queue();
@@ -496,6 +512,13 @@ - (BOOL)hotkeysEnabled
   return [self isHotkeysRegistered];
 }
 
+- (void)disableReloadCommand
+{
+  if ([self isReloadCommandRegistered]) {
+    [self unregisterReloadCommand];
+  }
+}
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {