Skip to content

Commit 2724127

Browse files
committed
fix(web): allow additional shortcuts for assigned actions
1 parent aa30a7c commit 2724127

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎apps/web/src/components/settings/KeybindingsSettings.browser.test.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,20 @@ it("re-enables Save when a When editor closes on an expression it could not pars
126126
await expect.element(screen.getByRole("button", { name: "Save" })).toBeEnabled();
127127
});
128128

129-
it("filters actions and keeps assigned commands disabled with their shortcuts", async () => {
129+
it("filters actions and allows additional shortcuts for assigned commands", async () => {
130130
await using screen = await render(<KeybindingsSettingsPanel />);
131131
await screen.getByRole("button", { name: "Add keybinding" }).click();
132132
const search = screen.getByRole("combobox", { name: "Search actions" });
133133
await expect.element(search).toHaveFocus();
134134
await userEvent.keyboard("sidebar.toggle");
135135
const assigned = screen.getByRole("option", { name: /Sidebar: Toggle/ });
136-
await expect.element(assigned).toHaveAttribute("aria-disabled", "true");
136+
await expect.element(assigned).not.toHaveAttribute("aria-disabled", "true");
137137
await expect.element(assigned.element().querySelector("kbd")!).toBeVisible();
138138
expect(screen.getByRole("option").elements()).toHaveLength(1);
139+
await assigned.click();
140+
const command = screen.getByRole("combobox", { name: "Command", exact: true });
141+
await expect.element(command).toHaveTextContent("Sidebar: Toggle");
142+
await command.click();
139143
await search.fill("no-such-action");
140144
await expect.element(screen.getByText("No actions found.")).toBeVisible();
141145
await search.fill("composer.cycleHost");

‎apps/web/src/components/settings/KeybindingsSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ function NewKeybindingCommandSelect({
11671167
{(command: KeybindingCommandOption) => {
11681168
const bindings = allRows.filter((row) => row.command === command);
11691169
return (
1170-
<ComboboxItem key={command} value={command} disabled={bindings.length > 0}>
1170+
<ComboboxItem key={command} value={command}>
11711171
<div className="flex min-w-0 flex-1 items-center justify-between gap-3">
11721172
<span>{commandLabel(command)}</span>
11731173
{bindings.length > 0 && (

0 commit comments

Comments
 (0)