Skip to content

fix(tui): stabilize dialog mouse selection #37674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opencode-agent wants to merge 1 commit into
base: v2
Choose a base branch
from
+35 −3
Open

fix(tui): stabilize dialog mouse selection #37674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/tui/src/ui/dialog-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
setTimeout(() => {
if (filter.length > 0) {
moveTo(0, true, false)
} else if (current && props.focusCurrent !== false) {
} else if (current && props.focusCurrent !== false && store.input !== "mouse") {
const currentIndex = flat().findIndex((opt) => isDeepEqual(opt.value, current))
if (currentIndex >= 0) {
moveTo(currentIndex, true)
Expand Down
36 changes: 34 additions & 2 deletions packages/tui/test/cli/tui/dialog-select.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ async function renderSelect(
return app
}

async function mountSelect(root: string, initial: DialogSelectOption<string>[]) {
async function mountSelect(root: string, initial: DialogSelectOption<string>[], trackCurrent = false) {
const state = path.join(root, "state")
await mkdir(state, { recursive: true })
const config = createTuiResolvedConfig()
Expand All @@ -105,6 +105,7 @@ async function mountSelect(root: string, initial: DialogSelectOption<string>[])

function Harness() {
const [options, setOptions] = createSignal(initial)
const [current, setCurrent] = createSignal(initial[0]?.value)
replaceOptions = setOptions

function Fixture() {
Expand All @@ -114,7 +115,11 @@ async function mountSelect(root: string, initial: DialogSelectOption<string>[])
<DialogSelect
title="Mutable options"
options={options()}
onMove={(option) => moved.push(option.value)}
current={trackCurrent ? current() : undefined}
onMove={(option) => {
moved.push(option.value)
if (trackCurrent) setCurrent(option.value)
}}
onSelect={(option) => selected.push(option.value)}
/>
)),
Expand Down Expand Up @@ -272,3 +277,30 @@ test("selects a repopulated option after removing the only option", async () =>
select.app.renderer.destroy()
}
})

test("hover stays on the row when current follows selection", async () => {
await using tmp = await tmpdir()
const select = await mountSelect(
tmp.path,
["first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth"].map((value) => ({
title: value,
value,
})),
true,
)

try {
await select.app.mockMouse.moveTo(20, 11)
await select.app.flush()
await select.app.mockMouse.moveTo(20, 12)
await select.app.waitFor(() => select.moved.includes("second"))
select.moved.length = 0
await select.app.mockMouse.moveTo(20, 14)
await select.app.waitFor(() => select.moved.length > 0)
await select.app.waitForVisualIdle()

expect(select.moved).toEqual(["fourth"])
} finally {
select.app.renderer.destroy()
}
})
Loading