Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 2 additions & 31 deletions frontend/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import { connectSupervisor, type SupervisorLinkHandle } from "./main/supervisor-
import { shouldLinkOnAttach } from "./main/daemon-owner";
import { readMigrationState, updateMigration, writeAppStateMarker, type MigrationState } from "./main/app-state";
import { isAllowedAppExternalURL, openAllowedAppExternalURL } from "./main/external-open";
import { buildWindowsAppMenuTemplate } from "./main/menu";

// Globals injected at compile time by @electron-forge/plugin-vite.
declare const MAIN_WINDOW_VITE_DEV_SERVER_URL: string | undefined;
Expand Down Expand Up @@ -242,37 +243,7 @@ function setDaemonStatus(nextStatus: DaemonStatus): void {
// DevTools, zoom, full screen, edit commands) and each acts on the *focused*
// webContents — including a BrowserView panel — matching native menu behaviour.
function buildWindowsAppMenu(): Menu {
return Menu.buildFromTemplate([
{
label: "Edit",
submenu: [
{ role: "undo" },
{ role: "redo" },
{ type: "separator" },
{ role: "cut" },
{ role: "copy" },
{ role: "paste" },
{ role: "selectAll" },
],
},
{
label: "View",
submenu: [
{ role: "reload" },
{ role: "toggleDevTools" },
{ type: "separator" },
{ role: "resetZoom" },
{ role: "zoomIn" },
{ role: "zoomOut" },
{ type: "separator" },
{ role: "togglefullscreen" },
],
},
{
label: "Window",
submenu: [{ role: "minimize" }, { role: "close" }],
},
]);
return Menu.buildFromTemplate(buildWindowsAppMenuTemplate());
}

function createWindow(): void {
Expand Down
30 changes: 30 additions & 0 deletions frontend/src/main/menu.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { describe, expect, it } from "vitest";
import { buildWindowsAppMenuTemplate } from "./menu";

type MenuItem = ReturnType<typeof buildWindowsAppMenuTemplate>[number];
type SubmenuItem = NonNullable<Extract<MenuItem["submenu"], readonly unknown[]>>[number];

function viewSubmenu(): readonly SubmenuItem[] {
const viewMenu = buildWindowsAppMenuTemplate().find((item) => item.label === "View");
if (!viewMenu || !Array.isArray(viewMenu.submenu)) {
throw new Error("View menu not found");
}
return viewMenu.submenu;
}

describe("buildWindowsAppMenuTemplate", () => {
it("registers both plus key forms for zoom in", () => {
const zoomInItems = viewSubmenu().filter((item) => item.role === "zoomIn");

expect(zoomInItems).toEqual(
expect.arrayContaining([
expect.objectContaining({ accelerator: "Ctrl+=", role: "zoomIn" }),
expect.objectContaining({ accelerator: "Ctrl+Plus", role: "zoomIn", visible: false }),
]),
);
});

it("keeps the direct minus accelerator for zoom out", () => {
expect(viewSubmenu()).toContainEqual(expect.objectContaining({ accelerator: "Ctrl+-", role: "zoomOut" }));
});
});
36 changes: 36 additions & 0 deletions frontend/src/main/menu.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import type { MenuItemConstructorOptions } from "electron";

export function buildWindowsAppMenuTemplate(): MenuItemConstructorOptions[] {
return [
{
label: "Edit",
submenu: [
{ role: "undo" },
{ role: "redo" },
{ type: "separator" },
{ role: "cut" },
{ role: "copy" },
{ role: "paste" },
{ role: "selectAll" },
],
},
{
label: "View",
submenu: [
{ role: "reload" },
{ role: "toggleDevTools" },
{ type: "separator" },
{ role: "resetZoom" },
{ accelerator: "Ctrl+=", role: "zoomIn" },
{ accelerator: "Ctrl+Plus", acceleratorWorksWhenHidden: true, role: "zoomIn", visible: false },
{ accelerator: "Ctrl+-", role: "zoomOut" },
{ type: "separator" },
{ role: "togglefullscreen" },
],
},
{
label: "Window",
submenu: [{ role: "minimize" }, { role: "close" }],
},
];
}
Loading