Skip to content

Commit 89ff950

Browse files
wesbillmanPinky
andauthored
fix(desktop): keep settings shortcut from opening search (#1204)
Signed-off-by: Wes <[email protected]> Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
1 parent c0a872e commit 89ff950

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

‎desktop/src/app/useSettingsShortcuts.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export function useSettingsShortcuts({
2626
}
2727

2828
event.preventDefault();
29+
event.stopImmediatePropagation();
2930
if (open) {
3031
onClose();
3132
return;
@@ -34,9 +35,9 @@ export function useSettingsShortcuts({
3435
onOpenSettings();
3536
}
3637

37-
window.addEventListener("keydown", handleKeyDown);
38+
window.addEventListener("keydown", handleKeyDown, true);
3839
return () => {
39-
window.removeEventListener("keydown", handleKeyDown);
40+
window.removeEventListener("keydown", handleKeyDown, true);
4041
};
4142
}, [onClose, onOpenSettings, open]);
4243
}

‎desktop/tests/e2e/navigation.spec.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,26 @@ test("settings is a route: section survives reload, closing returns to the previ
266266
await expect(threadPanel).toBeVisible();
267267
});
268268

269+
test("settings shortcut returns without opening search dialog", async ({
270+
page,
271+
}) => {
272+
await page.goto("/");
273+
await page.getByTestId("channel-general").click();
274+
await expect(page.getByTestId("chat-title")).toHaveText("general");
275+
const channelUrl = page.url();
276+
277+
await page.keyboard.press(
278+
process.platform === "darwin" ? "Meta+Comma" : "Control+Comma",
279+
);
280+
281+
await expect(page).toHaveURL(/#\/settings/);
282+
await page.getByTestId("settings-back-to-app").click();
283+
284+
await expect.poll(() => page.url()).toBe(channelUrl);
285+
await expect(page.getByTestId("chat-title")).toHaveText("general");
286+
await expect(page.getByTestId("search-results")).not.toBeVisible();
287+
});
288+
269289
test("message links to visible root messages open the thread panel", async ({
270290
page,
271291
}) => {

0 commit comments

Comments
 (0)