External/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-08-18 06:50:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(desktop): keep settings shortcut from opening search (#1204)

Browse Source 
Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
This commit is contained in:
Wes
2026-06-23 14:15:44 -07:00
committed by GitHub
co-authored by Pinky
parent c0a872e898
commit 89ff950444
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/src/app/useSettingsShortcuts.ts
+3 -2
View File
@@ -26,6 +26,7 @@ export function useSettingsShortcuts({
}
event.preventDefault();
event.stopImmediatePropagation();
if (open) {
onClose();
return;
@@ -34,9 +35,9 @@ export function useSettingsShortcuts({
onOpenSettings();
}
window.addEventListener("keydown", handleKeyDown);
window.addEventListener("keydown", handleKeyDown, true);
return () => {
window.removeEventListener("keydown", handleKeyDown);
window.removeEventListener("keydown", handleKeyDown, true);
};
}, [onClose, onOpenSettings, open]);
}
desktop/tests/e2e/navigation.spec.ts
+20
View File
@@ -266,6 +266,26 @@ test("settings is a route: section survives reload, closing returns to the previ
await expect(threadPanel).toBeVisible();
});
test("settings shortcut returns without opening search dialog", async ({
page,
}) => {
await page.goto("/");
await page.getByTestId("channel-general").click();
await expect(page.getByTestId("chat-title")).toHaveText("general");
const channelUrl = page.url();
await page.keyboard.press(
process.platform === "darwin" ? "Meta+Comma" : "Control+Comma",
);
await expect(page).toHaveURL(/#\/settings/);
await page.getByTestId("settings-back-to-app").click();
await expect.poll(() => page.url()).toBe(channelUrl);
await expect(page.getByTestId("chat-title")).toHaveText("general");
await expect(page.getByTestId("search-results")).not.toBeVisible();
});
test("message links to visible root messages open the thread panel", async ({
page,
}) => {