Menu improvements

resources/js/electron-plugin/src/server/api/contextMenu.ts

@@ -1,35 +1,37 @@
-import express from 'express'
-import {app, Menu} from 'electron'
-import {mapMenu} from "./helper";
+import express from 'express';
+import { app, Menu } from 'electron';
+import { compileMenu } from "./helper";
 import contextMenu from "electron-context-menu";
+
 const router = express.Router();
 
 let contextMenuDisposable = null
 
 router.delete('/', (req, res) => {
-    res.sendStatus(200)
+    res.sendStatus(200);
 
     if (contextMenuDisposable) {
-        contextMenuDisposable()
-        contextMenuDisposable = null
+        contextMenuDisposable();
+        contextMenuDisposable = null;
     }
 });
 
 router.post('/', (req, res) => {
-    res.sendStatus(200)
+    res.sendStatus(200);
 
     if (contextMenuDisposable) {
-        contextMenuDisposable()
-        contextMenuDisposable = null
+        contextMenuDisposable();
+        contextMenuDisposable = null;
     }
+
     contextMenuDisposable = contextMenu({
         showLookUpSelection: false,
         showSearchWithGoogle: false,
         showInspectElement: false,
         prepend: (defaultActions, parameters, browserWindow) => {
-            return req.body.entries.map(mapMenu)
-        }
-    })
-})
+            return req.body.entries.map(compileMenu);
+        },
+    });
+});
 
 export default router;

resources/js/electron-plugin/src/server/api/dock.ts

@@ -1,10 +1,10 @@
-import express from 'express'
-import {app, Menu} from 'electron'
-import {mapMenu} from "./helper";
+import express from 'express';
+import { app, Menu } from 'electron';
+import { compileMenu } from './helper';
 const router = express.Router();
 
 router.post('/', (req, res) => {
-    const menuEntries = req.body.items.map(mapMenu)
+    const menuEntries = req.body.items.map(compileMenu)
 
     const menu = Menu.buildFromTemplate(menuEntries)
     app.dock.setMenu(menu)

resources/js/electron-plugin/src/server/api/helper/index.ts

@@ -1,73 +1,82 @@
-import {shell} from "electron";
-import {notifyLaravel} from "../../utils";
+import { shell } from 'electron';
+import { notifyLaravel, goToUrl } from '../../utils';
+import state from '../../state';
 
-function triggerMenuItemEvent(menuItem) {
+function triggerMenuItemEvent(menuItem, combo) {
     notifyLaravel('events', {
-        event: '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
-        payload: [
-            {
+        event: menuItem.event || '\\Native\\Laravel\\Events\\Menu\\MenuItemClicked',
+        payload: {
+            item: {
                 id: menuItem.id,
                 label: menuItem.label,
-                checked: menuItem.checked
-            }
-        ]
-    })
+                checked: menuItem.checked,
+            },
+            combo,
+        },
+    });
 }
 
-const mapMenu = (menu) => {
-    if (menu.submenu) {
-        menu.submenu = menu.submenu.map(mapMenu)
-    }
-
-    if (menu.type === 'link') {
-        menu.type = 'normal'
-        menu.click = () => {
-            triggerMenuItemEvent(menu)
-            shell.openExternal(menu.url)
+export function compileMenu (item) {
+    if (item.submenu) {
+        if (Array.isArray(item.submenu)) {
+            item.submenu = item.submenu?.map(compileMenu);
+        } else {
+            item.submenu = item.submenu.submenu?.map(compileMenu);
         }
-        return menu
     }
 
-    if (menu.type === 'checkbox') {
-        menu.click = () => {
-            menu.checked = !menu.checked
-            triggerMenuItemEvent(menu)
-        }
-    }
+    if (item.type === 'link') {
+        item.type = 'normal';
 
-    if (menu.type === 'event') {
-        return {
-            label: menu.label,
-            accelerator: menu.accelerator,
-            click() {
-                notifyLaravel('events', {
-                    event: menu.event
-                })
+        item.click = (menuItem, focusedWindow, combo) => {
+            triggerMenuItemEvent(item, combo);
+
+            if (item.openInBrowser) {
+                shell.openExternal(item.url);
+                return;
+            }
+
+            if (! focusedWindow) {
+                // TODO: Bring a window to the front?
+                return;
             }
+
+            const id = Object.keys(state.windows)
+                .find(key => state.windows[key] === focusedWindow);
+
+            goToUrl(item.url, id);
         }
+
+        return item;
+    }
+
+    if (item.type === 'checkbox' || item.type === 'radio') {
+        item.click = (menuItem, focusedWindow, combo) => {
+            item.checked = !item.checked;
+            triggerMenuItemEvent(item, combo);
+        };
+
+        return item;
     }
 
-    if (menu.type === 'role') {
+    if (item.type === 'role') {
         let menuItem = {
-          role: menu.role
+            role: item.role
         };
 
-        if (menu.label) {
-          menuItem['label'] = menu.label;
+        if (item.label) {
+            menuItem['label'] = item.label;
         }
 
         return menuItem;
     }
 
-    if (! menu.click) {
-        menu.click = () => {
-            triggerMenuItemEvent(menu)
+    // Default click event
+    if (! item.click) {
+        item.click = (menuItem, focusedWindow, combo) => {
+            triggerMenuItemEvent(item, combo);
         }
     }
 
-    return menu
-}
-
-export {
-    mapMenu,
+    return item;
 }

resources/js/electron-plugin/src/server/api/menu.ts

@@ -1,14 +1,19 @@
-import express from 'express'
-import {Menu} from 'electron'
-import {mapMenu} from "./helper";
+import express from 'express';
+import { Menu } from 'electron';
+import { compileMenu } from './helper';
+
 const router = express.Router();
 
 router.post('/', (req, res) => {
-    const menuEntries = req.body.items.map(mapMenu)
+    Menu.setApplicationMenu(null);
+
+    const menuEntries = req.body.items.map(compileMenu);
+
+    const menu = Menu.buildFromTemplate(menuEntries);
+
+    Menu.setApplicationMenu(menu);
 
-    const menu = Menu.buildFromTemplate(menuEntries)
-    Menu.setApplicationMenu(menu)
-    res.sendStatus(200)
-})
+    res.sendStatus(200);
+});
 
 export default router;

resources/js/electron-plugin/src/server/api/menuBar.ts

@@ -1,6 +1,6 @@
 import express from "express";
 import { Menu, Tray } from "electron";
-import { mapMenu } from "./helper";
+import { compileMenu } from "./helper";
 import state from "../state";
 import { menubar } from "menubar";
 import { notifyLaravel } from "../utils";
@@ -180,7 +180,7 @@ function buildMenu(contextMenu) {
     let menu = Menu.buildFromTemplate([{ role: "quit" }]);
 
     if (contextMenu) {
-        const menuEntries = contextMenu.map(mapMenu);
+        const menuEntries = contextMenu.map(compileMenu);
         menu = Menu.buildFromTemplate(menuEntries);
     }
 

resources/js/electron-plugin/src/server/api/progressBar.ts

@@ -1,7 +1,6 @@
 import express from 'express'
 import {app, Menu} from 'electron'
 import state from "../state";
-import {mapMenu} from "./helper";
 const router = express.Router();
 
 router.post('/update', (req, res) => {

resources/js/electron-plugin/src/server/api/settings.ts

@@ -1,7 +1,7 @@
-import express from 'express'
-import {app, Menu} from 'electron'
-import {mapMenu} from "./helper";
-import state from "../state";
+import express from 'express';
+import { app, Menu } from 'electron';
+import state from '../state';
+
 const router = express.Router();
 
 router.get('/:key', (req, res) => {

resources/js/electron-plugin/src/server/api/system.ts

@@ -1,5 +1,5 @@
 import express from 'express';
-import {BrowserWindow, systemPreferences, safeStorage} from 'electron';
+import { BrowserWindow, systemPreferences, safeStorage } from 'electron';
 
 const router = express.Router();
 

resources/js/electron-plugin/src/server/api/window.ts

@@ -1,10 +1,11 @@
 import express from 'express';
-import {BrowserWindow, clipboard, NativeImage} from 'electron';
+import { BrowserWindow, clipboard, NativeImage } from 'electron';
 import state from '../state';
-import {join} from "path";
-import {notifyLaravel} from "../utils";
+import { join } from 'path';
+import { notifyLaravel, goToUrl, appendWindowIdToUrl } from '../utils';
+import windowStateKeeper from 'electron-window-state';
+
 const router = express.Router();
-import windowStateKeeper from "electron-window-state";
 
 router.post('/maximize', (req, res) => {
     const {id} = req.body;
@@ -41,7 +42,7 @@ router.post('/title', (req, res) => {
 router.post('/url', (req, res) => {
     const {id, url} = req.body;
 
-    state.windows[id]?.loadURL(appendWindowIdToUrl(url, id));
+    goToUrl(url, id);
 
     res.sendStatus(200);
 });
@@ -142,10 +143,6 @@ router.get('/get/:id', (req, res) => {
     res.json(getWindowData(id));
 });
 
-function appendWindowIdToUrl(url, id) {
-    return url + (url.indexOf('?') === -1 ? '?' : '&') + '_windowId=' + id;
-}
-
 function getWindowData(id) {
     const currentWindow = state.windows[id];
 
@@ -360,7 +357,7 @@ router.post('/open', (req, res) => {
 
     window.webContents.on('did-finish-load', () => {
         window.show();
-    })
+    });
 
     window.webContents.on('did-fail-load', (event) => {
         console.error('failed to open window...', event);