[macOS] Add back the right click dev menu (facebook#1822)

acoates-ms · May 10, 2023 · 97ad878 · 97ad878
1 parent cf399b4
commit 97ad878
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/Libraries/NativeModules/specs/NativeDevSettings.js b/Libraries/NativeModules/specs/NativeDevSettings.js
@@ -28,6 +28,9 @@ export interface Spec extends TurboModule {
 
   // iOS only.
   +setIsShakeToShowDevMenuEnabled: (enabled: boolean) => void;
+
+  // macOS only.
+  +setIsSecondaryClickToShowDevMenuEnabled: (enabled: boolean) => void; // [macOS]
 }
 
 export default (TurboModuleRegistry.getEnforcing<Spec>('DevSettings'): Spec);
diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm
@@ -31,6 +31,7 @@
 static NSString *const kRCTDevSettingExecutorOverrideClass = @"executor-override";
 static NSString *const kRCTDevSettingShakeToShowDevMenu = @"shakeToShow";
 static NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
+static NSString *const kRCTDevSettingSecondClickToShowDevMenu = @"secondClickToShow"; // [macOS]
 
 static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 
@@ -157,6 +158,7 @@ - (instancetype)init
   NSDictionary *defaultValues = @{
     kRCTDevSettingShakeToShowDevMenu : @YES,
     kRCTDevSettingHotLoadingEnabled : @YES,
+    kRCTDevSettingSecondClickToShowDevMenu: @YES, // [macOS]
   };
   RCTDevSettingsUserDefaultsDataSource *dataSource =
       [[RCTDevSettingsUserDefaultsDataSource alloc] initWithDefaultValues:defaultValues];
@@ -332,6 +334,18 @@ - (BOOL)isShakeToShowDevMenuEnabled
   return [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];
 }
 
+// [macOS
+RCT_EXPORT_METHOD(setIsSecondaryClickToShowDevMenuEnabled:(BOOL)enabled)
+{
+  [self _updateSettingWithValue:@(enabled) forKey:kRCTDevSettingSecondClickToShowDevMenu];
+}
+
+- (BOOL)isSecondaryClickToShowDevMenuEnabled
+{
+  return [[self settingForKey:kRCTDevSettingSecondClickToShowDevMenu] boolValue];
+}
+// macOS]
+
 RCT_EXPORT_METHOD(setIsDebuggingRemotely:(BOOL)enabled)
 {
   [self _updateSettingWithValue:@(enabled) forKey:kRCTDevSettingIsDebuggingRemotely];

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java
@@ -102,6 +102,13 @@ public void setIsShakeToShowDevMenuEnabled(boolean enabled) {
     // iOS only
   }
 
+  // [macOS
+  @Override
+  public void setIsShakeToShowDevMenuEnabled(boolean enabled) {
+    // macOS only
+  }
+  // macOS]
+
   @Override
   public void addListener(String eventName) {
     // iOS only