The open source coding agent.
TypeScript
fix(app): prefer cmd+k for command palette (#18731)
Shoubhit Dash0f5626d2e46f
diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.tsindex aced0756c00..90af177ed15 100644--- a/packages/app/e2e/actions.ts+++ b/packages/app/e2e/actions.ts@@ -175,9 +175,9 @@ export async function runTerminal(page: Page, input: { cmd: string; token: strinawait expect.poll(() => terminalHas(page, { term, token: input.token }), { timeout }).toBe(true)}-export async function openPalette(page: Page) {+export async function openPalette(page: Page, key = "K") {await defocus(page)- await page.keyboard.press(`${modKey}+P`)+ await page.keyboard.press(`${modKey}+${key}`)const dialog = page.getByRole("dialog")await expect(dialog).toBeVisible()diff --git a/packages/app/e2e/app/palette.spec.ts b/packages/app/e2e/app/palette.spec.tsindex 3ccfd7a9250..4c701fab274 100644--- a/packages/app/e2e/app/palette.spec.ts+++ b/packages/app/e2e/app/palette.spec.ts@@ -1,5 +1,5 @@import { test, expect } from "../fixtures"-import { openPalette } from "../actions"+import { closeDialog, openPalette } from "../actions"test("search palette opens and closes", async ({ page, gotoSession }) => {await gotoSession()@@ -9,3 +9,12 @@ test("search palette opens and closes", async ({ page, gotoSession }) => {await page.keyboard.press("Escape")await expect(dialog).toHaveCount(0)})++test("search palette also opens with cmd+p", async ({ page, gotoSession }) => {+ await gotoSession()++ const dialog = await openPalette(page, "P")++ await closeDialog(page, dialog)+ await expect(dialog).toHaveCount(0)+})diff --git a/packages/app/e2e/settings/settings-keybinds.spec.ts b/packages/app/e2e/settings/settings-keybinds.spec.tsindex 5789dc0eb02..4fc50b68d7e 100644--- a/packages/app/e2e/settings/settings-keybinds.spec.ts+++ b/packages/app/e2e/settings/settings-keybinds.spec.ts@@ -241,7 +241,7 @@ test("changing file open keybind works", async ({ page, gotoSession }) => {await expect(keybindButton).toBeVisible()const initialKeybind = await keybindButton.textContent()- expect(initialKeybind).toContain("P")+ expect(initialKeybind).toContain("K")await keybindButton.click()await expect(keybindButton).toHaveText(/press/i)diff --git a/packages/app/src/context/command-keybind.test.ts b/packages/app/src/context/command-keybind.test.tsindex 4e38efd8da8..d804195c401 100644--- a/packages/app/src/context/command-keybind.test.ts+++ b/packages/app/src/context/command-keybind.test.ts@@ -40,4 +40,11 @@ describe("command keybind helpers", () => {expect(display.includes("Alt") || display.includes("⌥")).toBe(true)expect(formatKeybind("none")).toBe("")})++ test("formatKeybind prefers the first combo", () => {+ const display = formatKeybind("mod+k,mod+p")++ expect(display.includes("K") || display.includes("k")).toBe(true)+ expect(display.includes("P") || display.includes("p")).toBe(false)+ })})diff --git a/packages/app/src/pages/session/use-session-commands.tsx b/packages/app/src/pages/session/use-session-commands.tsxindex 1a2e777f522..f17e3f7a1f6 100644--- a/packages/app/src/pages/session/use-session-commands.tsx+++ b/packages/app/src/pages/session/use-session-commands.tsx@@ -255,7 +255,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {id: "file.open",title: language.t("command.file.open"),description: language.t("palette.search.placeholder"),- keybind: "mod+p",+ keybind: "mod+k,mod+p",slash: "open",onSelect: () => dialog.show(() => <DialogSelectFile onOpenFile={showAllFiles} />),}),