Merge branch 'master' of https://github.com/ElectronNET/Electron.NET

Author: gustavo-lara-molina

Changelog.md

@@ -1,12 +1,23 @@
 # Not released
 
+
+
+# Released
+
 # 8.31.2
 
+ElectronNET.CLI:
+* New Feature: Deactivate PublishReadyToRun for build or start [\#395](https://github.com/ElectronNET/Electron.NET/issues/395)
+  
+   `electronize build /target win /PublishReadyToRun false`  
+   `electronize start /PublishReadyToRun false`   
+* Fixed bug: Application window doesn't open after packaging  [\#387](https://github.com/ElectronNET/Electron.NET/issues/387)
+
 ElectronNET.API:
 
 * New Feature: NativeImage Support (thanks [ThrDev](https://github.com/ThrDev)) [\#394](https://github.com/ElectronNET/Electron.NET/pull/394)  
+* New Feature: Update menu items for context menu and system tray on-the-fly. [\#270](https://github.com/ElectronNET/Electron.NET/pull/270)  
 
-# Released
 
 # 8.31.1
 

ElectronNET.API/Entities/MenuItem.cs

@@ -69,13 +69,11 @@ public class MenuItem
         /// <summary>
         /// If false, the menu item will be greyed out and unclickable.
         /// </summary>
-        [DefaultValue(true)]
         public bool Enabled { get; set; } = true;
 
         /// <summary>
         /// If false, the menu item will be entirely hidden.
         /// </summary>
-        [DefaultValue(true)]
         public bool Visible { get; set; } = true;
 
         /// <summary>

ElectronNET.API/Menu.cs

@@ -82,25 +82,25 @@ public void SetApplicationMenu(MenuItem[] menuItems)
         /// <param name="menuItems">The menu items.</param>
         public void SetContextMenu(BrowserWindow browserWindow, MenuItem[] menuItems)
         {
+            menuItems.AddMenuItemsId();
+            BridgeConnector.Socket.Emit("menu-setContextMenu", browserWindow.Id, JArray.FromObject(menuItems, _jsonSerializer));
+
             if (!_contextMenuItems.ContainsKey(browserWindow.Id))
             {
-                menuItems.AddMenuItemsId();
-                BridgeConnector.Socket.Emit("menu-setContextMenu", browserWindow.Id, JArray.FromObject(menuItems, _jsonSerializer));
                 _contextMenuItems.Add(browserWindow.Id, menuItems.ToList());
-
                 var x = _contextMenuItems.ToDictionary(kv => kv.Key, kv => kv.Value.AsReadOnly());
                 ContextMenuItems = new ReadOnlyDictionary<int, ReadOnlyCollection<MenuItem>>(x);
+            }
 
-                BridgeConnector.Socket.Off("contextMenuItemClicked");
-                BridgeConnector.Socket.On("contextMenuItemClicked", (results) =>
-                {
-                    var id = ((JArray)results).First.ToString();
-                    var browserWindowId = (int)((JArray)results).Last;
+            BridgeConnector.Socket.Off("contextMenuItemClicked");
+            BridgeConnector.Socket.On("contextMenuItemClicked", (results) =>
+            {
+                var id = ((JArray)results).First.ToString();
+                var browserWindowId = (int)((JArray)results).Last;
 
-                    MenuItem menuItem = _contextMenuItems[browserWindowId].GetMenuItem(id);
-                    menuItem.Click?.Invoke();
-                });
-            }
+                MenuItem menuItem = _contextMenuItems[browserWindowId].GetMenuItem(id);
+                menuItem.Click?.Invoke();
+            });
         }
 
         /// <summary>
@@ -115,8 +115,7 @@ public void ContextMenuPopup(BrowserWindow browserWindow)
         private JsonSerializer _jsonSerializer = new JsonSerializer()
         {
             ContractResolver = new CamelCasePropertyNamesContractResolver(),
-            NullValueHandling = NullValueHandling.Ignore,
-            DefaultValueHandling = DefaultValueHandling.Ignore
+            NullValueHandling = NullValueHandling.Ignore
         };
     }
 }

ElectronNET.API/Tray.cs

@@ -252,6 +252,7 @@ public void Show(string image, MenuItem[] menuItems)
         {
             menuItems.AddMenuItemsId();
             BridgeConnector.Socket.Emit("create-tray", image, JArray.FromObject(menuItems, _jsonSerializer));
+            _items.Clear();
             _items.AddRange(menuItems);
 
             BridgeConnector.Socket.Off("trayMenuItemClicked");
@@ -339,8 +340,7 @@ public Task<bool> IsDestroyedAsync()
         private JsonSerializer _jsonSerializer = new JsonSerializer()
         {
             ContractResolver = new CamelCasePropertyNamesContractResolver(),
-            NullValueHandling = NullValueHandling.Ignore,
-            DefaultValueHandling = DefaultValueHandling.Ignore
+            NullValueHandling = NullValueHandling.Ignore
         };
     }
 }

ElectronNET.Host/api/menu.js

@@ -11,10 +11,18 @@ export = (socket: SocketIO.Socket) => {
             electronSocket.emit('contextMenuItemClicked', [id, browserWindowId]);
         });
 
-        contextMenuItems.push({
+        const index = contextMenuItems.findIndex(contextMenu => contextMenu.browserWindowId === browserWindowId);
+
+        const contextMenuItem = {
             menu: menu,
             browserWindowId: browserWindowId
-        });
+        };
+
+        if (index === -1) {
+            contextMenuItems.push(contextMenuItem);
+        } else {
+            contextMenuItems[index] = contextMenuItem;
+        }
     });
 
     function addContextMenuItemClickConnector(menuItems, browserWindowId, callback) {

ElectronNET.Host/api/menu.js.map

@@ -1,4 +1,4 @@
-set ENETVER=8.31.1
+set ENETVER=8.31.2
 echo "Start building Electron.NET dev stack..."
 echo "Restore & Build API"
 cd ElectronNet.API