Dock Menu support

fix #527

Author: Dan

ElectronNET.API/Dock.cs

@@ -1,8 +1,11 @@
-using System.Threading;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using ElectronNET.API.Entities;
 using ElectronNET.API.Extensions;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
 
 namespace ElectronNET.API
 {
@@ -162,12 +165,29 @@ public async Task<bool> IsVisibleAsync(CancellationToken cancellationToken = def
         }
 
         /// <summary>
-        /// TODO: Menu (macOS) still to be implemented
+        /// Gets the dock menu items.
+        /// </summary>
+        /// <value>
+        /// The menu items.
+        /// </value>
+        public IReadOnlyCollection<MenuItem> MenuItems { get { return _items.AsReadOnly(); } }
+        private List<MenuItem> _items = new List<MenuItem>();
+
+        /// <summary>
         /// Sets the application's dock menu.
         /// </summary>
-        public void SetMenu()
+        public void SetMenu(MenuItem[] menuItems)
         {
-            BridgeConnector.Socket.Emit("dock-setMenu");
+            menuItems.AddMenuItemsId();
+            BridgeConnector.Socket.Emit("dock-setMenu", JArray.FromObject(menuItems, _jsonSerializer));
+            _items.AddRange(menuItems);
+
+            BridgeConnector.Socket.Off("dockMenuItemClicked");
+            BridgeConnector.Socket.On("dockMenuItemClicked", (id) => {
+                MenuItem menuItem = _items.GetMenuItem(id.ToString());
+                menuItem?.Click();
+            });
+           
         }
 
         /// <summary>
@@ -202,5 +222,11 @@ public void SetIcon(string image)
         {
             BridgeConnector.Socket.Emit("dock-setIcon", image);
         }
+
+        private JsonSerializer _jsonSerializer = new JsonSerializer()
+        {
+            ContractResolver = new CamelCasePropertyNamesContractResolver(),
+            NullValueHandling = NullValueHandling.Ignore
+        };
     }
 }

ElectronNET.Host/api/dock.js

@@ -1,4 +1,4 @@
-import { app } from 'electron';
+import { app, Menu } from 'electron';
 let electronSocket;
 
 export = (socket: SocketIO.Socket) => {
@@ -39,8 +39,17 @@ export = (socket: SocketIO.Socket) => {
         electronSocket.emit('dock-isVisible-completed', isVisible);
     });
 
-    // TODO: Menu (macOS) still to be implemented
-    socket.on('dock-setMenu', (menu) => {
+    socket.on('dock-setMenu', (menuItems) => {
+        let menu = null;
+
+        if (menuItems) {
+            menu = Menu.buildFromTemplate(menuItems);
+
+            addMenuItemClickConnector(menu.items, (id) => {
+                electronSocket.emit('dockMenuItemClicked', id);
+            });
+        }
+
         app.dock.setMenu(menu);
     });
 
@@ -53,4 +62,16 @@ export = (socket: SocketIO.Socket) => {
     socket.on('dock-setIcon', (image) => {
         app.dock.setIcon(image);
     });
+
+    function addMenuItemClickConnector(menuItems, callback) {
+        menuItems.forEach((item) => {
+            if (item.submenu && item.submenu.items.length > 0) {
+                addMenuItemClickConnector(item.submenu.items, callback);
+            }
+
+            if ('id' in item && item.id) {
+                item.click = () => { callback(item.id); };
+            }
+        });
+    }
 };