Change TrayMenuRegistration not to leak or depend on Electron Menu API

Signed-off-by: Juho Heikka <juho.heikka@gmail.com>

src/main/tray/tray-menu-registration.d.ts

@@ -19,8 +19,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import type { MenuItemConstructorOptions } from "electron";
-
-export type TrayMenuRegistration = Pick<MenuItemConstructorOptions,
-  "label" | "type" | "submenu" | "click" |
-  "toolTip" | "visible" | "enabled" | "id">;
+export interface TrayMenuRegistration {
+  label?: string;
+  click?: (menuItem: TrayMenuRegistration) => void;
+  id?: string;
+  type?: "normal" | "separator" | "submenu"
+  toolTip?: string;
+  enabled?: boolean;
+  submenu?: TrayMenuRegistration[]
+}

src/main/tray/tray.ts

@@ -83,6 +83,16 @@ export function initTray(
   };
 }
 
+function getMenuItemConstructorOptions(trayItem: TrayMenuRegistration): Electron.MenuItemConstructorOptions {
+  return {
+    ...trayItem,
+    submenu: trayItem.submenu ? trayItem.submenu.map(getMenuItemConstructorOptions) : undefined,
+    click: trayItem.click ? () => {
+      trayItem.click(trayItem);
+    } : undefined,
+  };
+}
+
 function createTrayMenu(
   windowManager: WindowManager,
   extensionTrayItems: TrayMenuRegistration[],
@@ -116,7 +126,7 @@ function createTrayMenu(
     });
   }
 
-  template = template.concat(extensionTrayItems);
+  template = template.concat(extensionTrayItems.map(getMenuItemConstructorOptions));
 
   return Menu.buildFromTemplate(template.concat([
     {