[menu-bar] Add context menu (#36)

* [menu-bar] Add context menu * Add changelog entry
expo · Aug 11, 2023 · 66e548f · 66e548f
1 parent 63f248a
commit 66e548f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### 🎉 New features
 
+- Added a context menu when right clicking on the menu bar icon. ([#36](https://github.com/expo/orbit/pull/36) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ### 🐛 Bug fixes
 
 ### 💡 Others

diff --git a/apps/menu-bar/macos/ExpoMenuBar-macOS/AppDelegate.m b/apps/menu-bar/macos/ExpoMenuBar-macOS/AppDelegate.m
@@ -6,6 +6,7 @@
 #import <React/RCTLinkingManager.h>
 
 #import "DevViewController.h"
+#import "WindowNavigator.h"
 
 @interface AppDelegate () <RCTBridgeDelegate>
 #if RCT_DEV
@@ -28,6 +29,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
   [image setTemplate:YES];
   statusItem.button.image = image;
   [statusItem.button setTarget:self];
+  [statusItem.button sendActionOn:NSEventMaskRightMouseUp | NSEventMaskLeftMouseUp];
   [statusItem.button setAction:@selector(onPressStatusItem:)];
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:_bridge
@@ -58,6 +60,26 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
   [NSApp activateIgnoringOtherApps:YES];
 }
 
+- (NSMenu *)createContextMenu {
+    NSMenu *menu = [[NSMenu alloc] initWithTitle:@"My Menu"];
+
+    [menu addItemWithTitle:@"Settings..." action:@selector(settingsAction:) keyEquivalent:@""];
+    [menu addItemWithTitle:@"Quit" action:@selector(quitAction:) keyEquivalent:@"q"];
+
+    return menu;
+}
+
+
+- (void)quitAction:(id)sender {
+  exit(0);
+}
+
+
+- (void)settingsAction:(id)sender {
+  WindowNavigator *windowNavigator = [WindowNavigator shared];
+  [windowNavigator openWindow:@"Settings" options:@{}];
+}
+
 - (void)openPopover {
     [popover showRelativeToRect:statusItem.button.bounds
                          ofView:statusItem.button
@@ -68,6 +90,13 @@ - (void)openPopover {
 }
 
 - (void)onPressStatusItem:(id)sender {
+  NSEvent *event = [NSApp currentEvent];
+  if (event.type == NSEventTypeRightMouseUp) {
+    NSMenu *contextMenu = [self createContextMenu];
+    [statusItem popUpStatusItemMenu:contextMenu];
+    return;
+  }
+
   if (popover.isShown) {
     [popover close];
   } else {