Skip to content

test(desktop): decide the WorkHub popup close in the main process #5918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liugddx merged 1 commit into from
Oct 2, 2026
Merged

test(desktop): decide the WorkHub popup close in the main process #5918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions apps/desktop/e2e/workhub-layout.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,14 @@ test('WorkHub uses its coordination model and shared attachment composer', async
await app.evaluate(({ Menu }) => {
const original = Menu.prototype.popup;
Menu.prototype.popup = function (options) {
(globalThis as unknown as { workbarMenu: Electron.Menu }).workbarMenu = this;
const probe = globalThis as unknown as { workbarMenu: Electron.Menu; workbarMenuOpen: boolean };
probe.workbarMenu = this;
probe.workbarMenuOpen = true;
// Track the popup's own lifetime in the main process: Linux may
// auto-dismiss it (e.g. after a resize) at any moment.
this.once('menu-will-close', () => {
probe.workbarMenuOpen = false;
});
Menu.prototype.popup = original;
return original.call(this, options);
};
Expand All @@ -128,15 +135,17 @@ test('WorkHub uses its coordination model and shared attachment composer', async
'webContents' in child && (child as Electron.WebContentsView).webContents.getURL().includes('surface=workhub')));
return container?.getVisible();
})).toBe(true);
// aria-expanded tracks the popup IPC resolution, so a menu that already
// auto-dismissed (Linux closes popups after window resizes) must not be
// closed again — closePopup on a dead popup crashes the main process.
if ((await addPanel.getAttribute('aria-expanded')) === 'true') {
// A menu that already auto-dismissed (Linux closes popups after window
// resizes) must not be closed again: closePopup on a dead popup crashes the
// main process. Decide inside the main process, in the same task as the
// close, so the dismissal cannot land between the check and the call;
// checking the renderer's aria-expanded first left exactly that window.
await mainWindow.evaluate((window) => {
const probe = globalThis as unknown as { workbarMenu: Electron.Menu; workbarMenuOpen: boolean };
// Close on the same owner passed to popup(). The no-window overload takes
// Electron's close-all MenuRunner path on Linux, even for this single menu.
await mainWindow.evaluate((window) =>
(globalThis as unknown as { workbarMenu: Electron.Menu }).workbarMenu.closePopup(window));
}
if (probe.workbarMenuOpen) probe.workbarMenu.closePopup(window);
});
await expect(addPanel).not.toHaveAttribute('aria-expanded', 'true');
await workhub.getByRole('button', { name: '收起任务工作栏', exact: true }).click();
await expect(page.locator('.maka-session-workbar[data-placement="right"]')).toBeHidden();
Expand Down