add workaround for #412 - update to socket.io 2.3.0

ElectronNET · May 21, 2020 · b043688 · b043688
1 parent 3b3e38f
commit b043688
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 19 deletions.
diff --git a/ElectronNET.API/Extensions/MenuItemExtensions.cs b/ElectronNET.API/Extensions/MenuItemExtensions.cs
@@ -48,5 +48,24 @@ public static MenuItem GetMenuItem(this List<MenuItem> menuItems, string id)
 
             return result;
         }
+
+        public static MenuItem[] AddSubmenuTypes(this MenuItem[] menuItems)
+        {
+            for (int index = 0; index < menuItems.Length; index++)
+            {
+                var menuItem = menuItems[index];
+                if (menuItem?.Submenu?.Length > 0)
+                {
+                    if(menuItem.Type == MenuType.normal)
+                    {
+                        menuItem.Type = MenuType.submenu;
+                    }
+
+                    AddSubmenuTypes(menuItem.Submenu);
+                }
+            }
+
+            return menuItems;
+        }
     }
 }
diff --git a/ElectronNET.API/Menu.cs b/ElectronNET.API/Menu.cs
@@ -56,6 +56,8 @@ public void SetApplicationMenu(MenuItem[] menuItems)
             _menuItems.Clear();
 
             menuItems.AddMenuItemsId();
+            menuItems.AddSubmenuTypes();
+
             BridgeConnector.Socket.Emit("menu-setApplicationMenu", JArray.FromObject(menuItems, _jsonSerializer));
             _menuItems.AddRange(menuItems);
 
@@ -83,6 +85,8 @@ public void SetApplicationMenu(MenuItem[] menuItems)
         public void SetContextMenu(BrowserWindow browserWindow, MenuItem[] menuItems)
         {
             menuItems.AddMenuItemsId();
+            menuItems.AddSubmenuTypes();
+
             BridgeConnector.Socket.Emit("menu-setContextMenu", browserWindow.Id, JArray.FromObject(menuItems, _jsonSerializer));
 
             if (!_contextMenuItems.ContainsKey(browserWindow.Id))