Local Environment: Add application menu on non MacOS on development (A…

…utomattic#140) * Local Environment: Add application menu on non MacOS * Update: Make the menu available on development
syaifulnizamiphone7 · Mar 14, 2024 · 5a8e2cd · 5a8e2cd
1 parent 585467b
commit 5a8e2cd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -220,9 +220,9 @@ async function appBoot() {
 
 		setupIpc();
 		setupCustomProtocolHandler();
-		setupMenu();
 
 		mainWindow = createMainWindow();
+		setupMenu( mainWindow );
 		setupAuthCallbackHandler( mainWindow );
 		handleAuthOnStartup();
 		mainWindow.on( 'closed', () => ( mainWindow = null ) );

diff --git a/src/menu.ts b/src/menu.ts
@@ -1,15 +1,12 @@
-import { Menu, type MenuItemConstructorOptions, app } from 'electron';
+import { Menu, type MenuItemConstructorOptions, app, BrowserWindow } from 'electron';
 import { __ } from '@wordpress/i18n';
 import { manualCheckForUpdates } from './updates';
 
-export function setupMenu() {
-	// We only show a menu on macOS.
-	// Setting the application menu to null will remove it from all windows we create.
-	if ( process.platform !== 'darwin' ) {
+export function setupMenu( window: BrowserWindow | null ) {
+	if ( ! window && process.platform !== 'darwin' ) {
 		Menu.setApplicationMenu( null );
 		return;
 	}
-
 	const crashTestMenuItems: MenuItemConstructorOptions[] = [
 		{
 			label: __( 'Test Hard Crash (dev only)' ),
@@ -96,5 +93,14 @@ export function setupMenu() {
 		},
 	] );
 
-	Menu.setApplicationMenu( menu );
+	if ( process.platform === 'darwin' ) {
+		Menu.setApplicationMenu( menu );
+		return;
+	}
+	// Make menu accessible in development for non-macOS platforms
+	if ( process.env.NODE_ENV === 'development' ) {
+		window?.setMenu( menu );
+		return;
+	}
+	Menu.setApplicationMenu( null );
 }