Skip to content

Commit 7816a0f

Browse files
atatterclaudemaria-rcks
authored
fix(web): Enter selects the first branch search result (#27434)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent a2a1f2b commit 7816a0f

3 files changed

Lines changed: 84 additions & 11 deletions

File tree

‎apps/web/src/components/BranchToolbarBranchSelector.tsx‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
} from "@t3tools/contracts";
1919
import { GitBranchIcon } from "lucide-react";
2020
import {
21-
useDeferredValue,
2221
useEffect,
2322
useImperativeHandle,
2423
useOptimistic,
@@ -216,7 +215,6 @@ export function BranchToolbarBranchSelector({
216215

217216
const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
218217
const [branchQuery, setBranchQuery] = useState("");
219-
const deferredBranchQuery = useDeferredValue(branchQuery);
220218

221219
const branchStatusQuery = useEnvironmentQuery(
222220
branchCwd === null
@@ -226,18 +224,17 @@ export function BranchToolbarBranchSelector({
226224
input: { cwd: branchCwd },
227225
}),
228226
);
227+
const trimmedBranchQuery = branchQuery.trim();
229228
const branchRefState = usePaginatedBranches({
230229
environmentId,
231230
cwd: branchCwd,
232231
// Substring search needs sanitized names to detect new-branch collisions; refs cannot contain ASCII
233232
// spaces.
234-
query: sanitizeNewRefName(deferredBranchQuery.trim()),
233+
query: sanitizeNewRefName(trimmedBranchQuery),
235234
});
236-
const trimmedBranchQuery = branchQuery.trim();
237-
const deferredTrimmedBranchQuery = deferredBranchQuery.trim();
238235
const refs = branchRefState.refs;
239236
const branchByName = new Map(refs.map((refName) => [refName.name, refName] as const));
240-
const normalizedDeferredBranchQuery = deferredTrimmedBranchQuery.toLowerCase();
237+
const normalizedBranchQuery = trimmedBranchQuery.toLowerCase();
241238
const prReference = parsePullRequestReference(trimmedBranchQuery);
242239
const isSelectingWorktreeBase =
243240
effectiveEnvMode === "worktree" && !envLocked && !activeWorktreePath;
@@ -260,12 +257,12 @@ export function BranchToolbarBranchSelector({
260257
...(pickerCreateBranchItemValue ? [pickerCreateBranchItemValue] : []),
261258
];
262259
const filteredBranchPickerItems =
263-
normalizedDeferredBranchQuery.length === 0
260+
normalizedBranchQuery.length === 0
264261
? branchPickerItems
265262
: branchPickerItems.filter((itemValue) =>
266263
shouldIncludeBranchPickerItem({
267264
itemValue,
268-
normalizedQuery: normalizedDeferredBranchQuery,
265+
normalizedQuery: normalizedBranchQuery,
269266
createBranchItemValue: pickerCreateBranchItemValue,
270267
checkoutPullRequestItemValue,
271268
}),
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import { EnvironmentId, type VcsRef } from "@t3tools/contracts";
2+
import { describe, expect, it, vi } from "vite-plus/test";
3+
import { page, userEvent } from "vite-plus/test/browser";
4+
5+
const mocks = vi.hoisted(() => ({ resolvedQueries: new Set<string>() }));
6+
7+
const REFS: VcsRef[] = ["develop", "main", "origin/main", "origin/feature/main-nav"].map(
8+
(name) => ({ name, current: false, isDefault: false, worktreePath: null }),
9+
);
10+
11+
// Like the real hook, a query has no refs until the server answers it.
12+
vi.mock(import("../state/queries"), async (original) => ({
13+
...(await original()),
14+
usePaginatedBranches: (target) => {
15+
const query = target.query ?? "";
16+
const resolved = mocks.resolvedQueries.has(query);
17+
const refs = resolved ? REFS.filter((ref) => ref.name.includes(query)) : [];
18+
return {
19+
data: resolved
20+
? { refs, isRepo: true, hasPrimaryRemote: true, nextCursor: null, totalCount: refs.length }
21+
: null,
22+
refs,
23+
error: null,
24+
isPending: !resolved,
25+
isFetchingNextPage: false,
26+
refresh: () => {},
27+
loadNext: () => {},
28+
};
29+
},
30+
}));
31+
32+
import "~/index.css";
33+
import { render } from "../../test/render";
34+
import { WorktreeBaseBranchPicker } from "./WorktreeBaseBranchPicker";
35+
36+
function setup() {
37+
mocks.resolvedQueries = new Set([""]);
38+
}
39+
40+
describe("WorktreeBaseBranchPicker", () => {
41+
it.each([
42+
{ keys: "{Enter}", selected: "main" },
43+
{ keys: "{ArrowDown}{Enter}", selected: "origin/main" },
44+
])(
45+
"$keys selects $selected when each keystroke's results arrive before the next",
46+
async ({ keys, selected }) => {
47+
setup();
48+
const onValueChange = vi.fn();
49+
const picker = () => (
50+
<WorktreeBaseBranchPicker
51+
environmentId={EnvironmentId.make("primary")}
52+
cwd="/repo"
53+
value=""
54+
onValueChange={onValueChange}
55+
startFromOrigin={false}
56+
onStartFromOriginChange={() => {}}
57+
/>
58+
);
59+
await using screen = await render(picker());
60+
61+
await userEvent.click(screen.getByRole("combobox"));
62+
let query = "";
63+
for (const char of "main") {
64+
await userEvent.type(page.getByPlaceholder("Search refs..."), char);
65+
query += char;
66+
mocks.resolvedQueries.add(query);
67+
await screen.rerender(picker());
68+
}
69+
70+
await expect
71+
.element(page.getByRole("option", { name: "main", exact: true }))
72+
.toHaveAttribute("data-highlighted");
73+
await userEvent.keyboard(keys);
74+
expect(onValueChange).toHaveBeenCalledExactlyOnceWith(selected);
75+
},
76+
);
77+
});

‎apps/web/src/components/WorktreeBaseBranchPicker.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { EnvironmentId } from "@t3tools/contracts";
22
import { ChevronDownIcon, GitBranchIcon } from "lucide-react";
3-
import { useDeferredValue, useState } from "react";
3+
import { useState } from "react";
44

55
import { usePaginatedBranches } from "../state/queries";
66
import { useEnvironmentQuery } from "../state/query";
@@ -32,11 +32,10 @@ export function WorktreeBaseBranchPicker({
3232
}) {
3333
const [open, setOpen] = useState(false);
3434
const [query, setQuery] = useState("");
35-
const deferredQuery = useDeferredValue(query.trim());
3635
const branches = usePaginatedBranches({
3736
environmentId,
3837
cwd,
39-
query: sanitizeNewRefName(deferredQuery),
38+
query: sanitizeNewRefName(query.trim()),
4039
});
4140
const selectedRefQuery = useEnvironmentQuery(
4241
cwd && value

0 commit comments

Comments
 (0)