Refactor menu and add 'New Session' options

Author: pimterry

src/index.ts

@@ -572,15 +572,17 @@ if (!amMainInstance) {
     });
 
     Promise.all([appReady.promise, portCheck]).then(() => {
-        Menu.setApplicationMenu(getMenu(windows));
+        Menu.setApplicationMenu(
+            getMenu(windows, openNewWindow)
+        );
         createWindow(logStream);
     });
 
+    const openNewWindow = () => appReady.promise.then(() => createWindow(logStream));
+
     // We use a single process instance to manage the server, but we
     // do allow multiple windows.
-    app.on('second-instance', () =>
-        appReady.promise.then(() => createWindow(logStream))
-    );
+    app.on('second-instance', openNewWindow);
 
     app.on('activate', () => {
         // On OS X it's common to re-create a window in the app when the

src/menu.ts

@@ -7,9 +7,20 @@ const AUTO_HIDE_SETTING_KEY = "autoHideMenuBar";
 
 export const shouldAutoHideMenu = () => !!store.get(AUTO_HIDE_SETTING_KEY);
 
-export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
-    const menuTemplate: MenuItemConstructorOptions[] = [
-        {
+type MenuKey =
+    | 'mac'
+    | 'file'
+    | 'edit'
+    | 'view'
+    | 'window'
+    | 'help';
+
+export const getMenu = (
+    browserWindows: Electron.BrowserWindow[],
+    openNewWindow: () => void
+) => {
+    const menuTemplate: { [key in MenuKey]?: MenuItemConstructorOptions } = {
+        edit: {
             label: '&Edit',
             submenu: [
                 { role: 'undo' },
@@ -22,7 +33,7 @@ export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
                 { role: 'delete' }
             ]
         },
-        {
+        view: {
             label: '&View',
             submenu: [
                 { role: 'resetZoom' },
@@ -38,7 +49,7 @@ export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
                 { role: 'toggleDevTools' }
             ]
         },
-        {
+        help: {
             label: '&Help',
             role: 'help',
             submenu: [
@@ -56,10 +67,10 @@ export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
                 }
             ]
         }
-    ];
+    };
 
     if (process.platform === 'darwin') {
-        const macMenu: MenuItemConstructorOptions = {
+        menuTemplate.mac = {
             label: app.getName(),
             submenu: [
                 { role: 'about' },
@@ -73,10 +84,25 @@ export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
                 { role: 'quit' }
             ]
         };
-        menuTemplate.unshift(macMenu);
+
+        menuTemplate.file = {
+            label: '&File',
+            submenu: [
+                {
+                    label: 'New Session',
+                    accelerator: 'CommandOrControl+Shift+N',
+                    click: openNewWindow
+                },
+                {
+                    role: 'close',
+                    accelerator: 'CommandOrControl+Shift+W',
+                    label: 'Close Session'
+                }
+            ]
+        };
 
         // Add to Edit menu
-        (menuTemplate[1].submenu as MenuItemConstructorOptions[]).push(
+        (menuTemplate.edit!.submenu as MenuItemConstructorOptions[]).push(
             { type: 'separator' },
             {
                 label: 'Speech',
@@ -87,31 +113,38 @@ export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
             }
         );
 
-        // Window menu
-        menuTemplate[3].submenu = [
-            { role: 'close' },
-            { role: 'minimize' },
-            { role: 'zoom' },
-            { type: 'separator' },
-            { role: 'front' }
-        ];
+        // Mac apps usually have a 'window' menu
+        menuTemplate.window = {
+            label: '&Window',
+            submenu: [
+                { role: 'minimize' },
+                { role: 'zoom' },
+                { type: 'separator' },
+                { role: 'front' }
+            ]
+        };
     } else {
-        menuTemplate.unshift({
+        menuTemplate.file = {
             label: '&File',
             submenu: [
+                {
+                    label: 'New Session',
+                    accelerator: 'CommandOrControl+Shift+N',
+                    click: openNewWindow
+                },
                 {
                     // This should close the Window, but look like Quit. End behaviour is that every
-                    // Window _acts_ like a separate process, but is really a separate window.
+                    // Window _acts_ like a separate process, but is really just a separate window.
                     // (This lets us easily share a single server instance)
                     role: 'close',
                     label: 'Quit',
                     accelerator: 'CommandOrControl+Q'
                 }
             ]
-        });
+        };
 
         // On Windows & Linux, it's possible to autohide the menu bar:
-        (menuTemplate[2].submenu as MenuItemConstructorOptions[]).push({
+        (menuTemplate.view!.submenu as MenuItemConstructorOptions[]).push({
             type: 'checkbox',
             label: 'Autohide Menu Bar',
             sublabel: 'Reveal with Alt',
@@ -127,5 +160,12 @@ export const getMenu = (browserWindows: Electron.BrowserWindow[]) => {
         })
     }
 
-    return Menu.buildFromTemplate(menuTemplate);
+    return Menu.buildFromTemplate([
+        menuTemplate.mac,
+        menuTemplate.file,
+        menuTemplate.edit,
+        menuTemplate.view,
+        menuTemplate.window,
+        menuTemplate.help
+    ].filter(Boolean) as MenuItemConstructorOptions[]);
 }