@devries-cameron20 / t3code-1 / commits / 7816a0fa81
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web): Enter selects the first branch search result (#27434)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>

Aleks Tatter committed Nov 1, 2026 at 23:44 UTC 7816a0fa815e50d6b6466cc903f40468ef7f635a
3 files changed +84 -11
apps/web/src/components/BranchToolbarBranchSelector.tsx
+5 -8
@@ -18,7 +18,6 @@ import {
18 } from "@t3tools/contracts";
19 import { GitBranchIcon } from "lucide-react";
20 import {
21 - useDeferredValue,
21 useEffect,
22 useImperativeHandle,
23 useOptimistic,
@@ -216,7 +215,6 @@ export function BranchToolbarBranchSelector({
215
216 const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
217 const [branchQuery, setBranchQuery] = useState("");
219 - const deferredBranchQuery = useDeferredValue(branchQuery);
218
219 const branchStatusQuery = useEnvironmentQuery(
220 branchCwd === null
@@ -226,18 +224,17 @@ export function BranchToolbarBranchSelector({
224 input: { cwd: branchCwd },
225 }),
226 );
227 + const trimmedBranchQuery = branchQuery.trim();
228 const branchRefState = usePaginatedBranches({
229 environmentId,
230 cwd: branchCwd,
231 // Substring search needs sanitized names to detect new-branch collisions; refs cannot contain ASCII
232 // spaces.
234 - query: sanitizeNewRefName(deferredBranchQuery.trim()),
233 + query: sanitizeNewRefName(trimmedBranchQuery),
234 });
236 - const trimmedBranchQuery = branchQuery.trim();
237 - const deferredTrimmedBranchQuery = deferredBranchQuery.trim();
235 const refs = branchRefState.refs;
236 const branchByName = new Map(refs.map((refName) => [refName.name, refName] as const));
240 - const normalizedDeferredBranchQuery = deferredTrimmedBranchQuery.toLowerCase();
237 + const normalizedBranchQuery = trimmedBranchQuery.toLowerCase();
238 const prReference = parsePullRequestReference(trimmedBranchQuery);
239 const isSelectingWorktreeBase =
240 effectiveEnvMode === "worktree" && !envLocked && !activeWorktreePath;
@@ -260,12 +257,12 @@ export function BranchToolbarBranchSelector({
257 ...(pickerCreateBranchItemValue ? [pickerCreateBranchItemValue] : []),
258 ];
259 const filteredBranchPickerItems =
263 - normalizedDeferredBranchQuery.length === 0
260 + normalizedBranchQuery.length === 0
261 ? branchPickerItems
262 : branchPickerItems.filter((itemValue) =>
263 shouldIncludeBranchPickerItem({
264 itemValue,
268 - normalizedQuery: normalizedDeferredBranchQuery,
265 + normalizedQuery: normalizedBranchQuery,
266 createBranchItemValue: pickerCreateBranchItemValue,
267 checkoutPullRequestItemValue,
268 }),
apps/web/src/components/WorktreeBaseBranchPicker.browser.test.tsx new
+77
@@ -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
+2 -3
@@ -1,6 +1,6 @@
1 import type { EnvironmentId } from "@t3tools/contracts";
2 import { ChevronDownIcon, GitBranchIcon } from "lucide-react";
3 -import { useDeferredValue, useState } from "react";
3 +import { useState } from "react";
4
5 import { usePaginatedBranches } from "../state/queries";
6 import { useEnvironmentQuery } from "../state/query";
@@ -32,11 +32,10 @@ export function WorktreeBaseBranchPicker({
32 }) {
33 const [open, setOpen] = useState(false);
34 const [query, setQuery] = useState("");
35 - const deferredQuery = useDeferredValue(query.trim());
35 const branches = usePaginatedBranches({
36 environmentId,
37 cwd,
39 - query: sanitizeNewRefName(deferredQuery),
38 + query: sanitizeNewRefName(query.trim()),
39 });
40 const selectedRefQuery = useEnvironmentQuery(
41 cwd && value