Skip to content

Commit cce0ae3

Browse files
AyushKaithwasclaude
andcommitted
fix(web): branch pickers highlight one row after refs load
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 0847a44 commit cce0ae3

2 files changed

Lines changed: 56 additions & 0 deletions

File tree

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
import { page, userEvent } from "vite-plus/test/browser";
3+
4+
import "~/index.css";
5+
import { render } from "../../test/render";
6+
import { BranchPicker } from "./BranchPicker";
7+
import { ComboboxItem, ComboboxTrigger } from "./ui/combobox";
8+
9+
function picker(items: string[]) {
10+
return (
11+
<BranchPicker
12+
items={items}
13+
filteredItems={items}
14+
value={null}
15+
query="dev"
16+
onQueryChange={() => {}}
17+
open
18+
onOpenChange={() => {}}
19+
onSelectItem={() => {}}
20+
hasNextPage={false}
21+
isFetchingNextPage={false}
22+
onLoadNext={() => {}}
23+
statusText={null}
24+
popupProps={{}}
25+
renderItem={(item, index) => (
26+
<ComboboxItem key={item} index={index} value={item}>
27+
{item}
28+
</ComboboxItem>
29+
)}
30+
>
31+
<ComboboxTrigger>Refs</ComboboxTrigger>
32+
</BranchPicker>
33+
);
34+
}
35+
36+
describe("BranchPicker", () => {
37+
it("highlights one row when refs arrive above a row that was already listed", async () => {
38+
// The create row shows alone until the server answers the query.
39+
await using screen = await render(picker(["Create dev"]));
40+
await userEvent.click(page.getByPlaceholder("Search refs..."));
41+
await userEvent.keyboard("{ArrowDown}");
42+
await expect
43+
.element(page.getByRole("option", { name: "Create dev" }))
44+
.toHaveAttribute("data-highlighted");
45+
await screen.rerender(picker(["origin/dev", "Create dev"]));
46+
47+
await expect
48+
.element(page.getByRole("option", { name: "origin/dev" }))
49+
.toHaveAttribute("data-highlighted");
50+
await expect
51+
.element(page.getByRole("option", { name: "Create dev" }))
52+
.not.toHaveAttribute("data-highlighted");
53+
});
54+
});

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ export function BranchPicker({
179179
<LegendList<string>
180180
ref={attachBranchList}
181181
data={filteredItems}
182+
// Rows whose item is unchanged keep their render, and with it a stale index.
183+
extraData={filteredItems}
182184
keyExtractor={(item) => item}
183185
{...(getItemType ? { getItemType } : {})}
184186
renderItem={({ item, index }) => renderItem(item, index)}

0 commit comments

Comments
 (0)