Skip to content

Commit 0f87830

Browse files
fix(web): preserve cleared shortcut conditions
1 parent 335ecdf commit 0f87830

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,23 @@ it("clears only the automatic terminal guard when changing commands", async () =
161161
await page.getByRole("option", { name: "Terminal: Toggle" }).click();
162162
await vi.waitFor(() => expect(newWhenText()).toContain("editorFocus"));
163163
});
164+
165+
it("preserves an explicitly cleared condition when changing commands", async () => {
166+
await using screen = await render(
167+
<RegistryProvider>
168+
<KeybindingsSettingsPanel />
169+
</RegistryProvider>,
170+
);
171+
await screen.getByRole("button", { name: "Add keybinding" }).click();
172+
const select = screen.getByRole("combobox");
173+
await select.click();
174+
await page.getByRole("option", { name: "Thread: Archive" }).click();
175+
await screen.getByRole("button", { name: "Edit when clause for Thread: Archive" }).click();
176+
await userEvent.clear(screen.getByRole("textbox", { name: "When expression" }));
177+
await userEvent.keyboard("{Escape}");
178+
await select.click();
179+
await page.getByRole("option", { name: "Thread: Delete" }).click();
180+
await expect
181+
.element(screen.getByRole("button", { name: "Edit when clause for Thread: Delete" }))
182+
.toHaveTextContent("Always");
183+
});

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ function useNewKeybindingDraft({
10461046
}) {
10471047
const [commandDraft, setCommandDraft] = useState<KeybindingCommand | "">("");
10481048
const [hasAutomaticWhen, setHasAutomaticWhen] = useState(false);
1049+
const [hasEditedWhen, setHasEditedWhen] = useState(false);
10491050
const [draft, setDraft] = useReducer(keybindingRowDraftReducer, {
10501051
keyDraft: "",
10511052
whenDraft: undefined,
@@ -1093,7 +1094,7 @@ function useNewKeybindingDraft({
10931094
setCommandDraft: (command: KeybindingCommand) => {
10941095
setCommandDraft(command);
10951096
const needsTerminalGuard = command === "thread.archive" || command === "thread.delete";
1096-
if (needsTerminalGuard && !whenDraft) {
1097+
if (needsTerminalGuard && !whenDraft && !hasEditedWhen) {
10971098
setDraft({
10981099
whenDraft: { type: "not", node: { type: "identifier", name: "terminalFocus" } },
10991100
});
@@ -1113,6 +1114,7 @@ function useNewKeybindingDraft({
11131114
setDraft,
11141115
setWhenDraft: (whenDraft: KeybindingWhenNode | undefined) => {
11151116
setHasAutomaticWhen(false);
1117+
setHasEditedWhen(true);
11161118
setDraft({ whenDraft });
11171119
},
11181120
save,

0 commit comments

Comments
 (0)