Skip to content

Commit c65e488

Browse files
only21milcodex
andauthored
fix(web): save settings fields only after an edit (#23427)
Co-authored-by: GPT-6.1 Sol <[email protected]>
1 parent 14d56e1 commit c65e488

2 files changed

Lines changed: 45 additions & 2 deletions

File tree

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
import { userEvent } from "vite-plus/test/browser";
3+
4+
import { render } from "../../test/render";
5+
import { DraftInput } from "../components/ui/draft-input";
6+
7+
describe("settings draft commits", () => {
8+
it("preserves an external update when an untouched field loses focus", async () => {
9+
let saved = "~/";
10+
const commit = (next: string) => {
11+
saved = next;
12+
};
13+
await using screen = await render(<DraftInput value={saved} onCommit={commit} />);
14+
const input = screen.getByRole("textbox");
15+
await input.click();
16+
17+
saved = "/projects";
18+
await screen.rerender(<DraftInput value={saved} onCommit={commit} />);
19+
await userEvent.tab();
20+
21+
expect(saved).toBe("/projects");
22+
});
23+
24+
it("preserves a saved edit when refocused before its server snapshot arrives", async () => {
25+
let saved = "~/";
26+
const commit = (next: string) => {
27+
saved = next;
28+
};
29+
await using screen = await render(<DraftInput value="~/" onCommit={commit} />);
30+
const input = screen.getByRole("textbox");
31+
await input.fill("/projects");
32+
await userEvent.tab();
33+
expect(saved).toBe("/projects");
34+
35+
await input.click();
36+
await screen.rerender(<DraftInput value={saved} onCommit={commit} />);
37+
await userEvent.tab();
38+
39+
expect(saved).toBe("/projects");
40+
});
41+
});

‎apps/web/src/hooks/useCommitOnBlur.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
import { type ChangeEvent, type KeyboardEvent, useState } from "react";
1+
import { type ChangeEvent, type KeyboardEvent, useRef, useState } from "react";
22

33
export function useCommitOnBlur(value: string, onCommit: (next: string) => void) {
44
const [draft, setDraft] = useState<string | null>(null);
5+
const valueOnFocus = useRef(value);
56

67
return {
78
value: draft ?? value,
89
onChange: (event: ChangeEvent<HTMLInputElement>) => {
910
setDraft(event.target.value);
1011
},
1112
onFocus: () => {
13+
valueOnFocus.current = value;
1214
setDraft(value);
1315
},
1416
onBlur: () => {
1517
const next = draft ?? value;
1618
setDraft(null);
17-
if (next !== value) {
19+
if (next !== valueOnFocus.current && next !== value) {
1820
onCommit(next);
1921
}
2022
},

0 commit comments

Comments
 (0)