fix(ui): stop typeahead aborts from pinning disposed batches (#58447)

This commit is contained in:
Luke Parker
2026-10-23 22:31:35 +10:00
committed by GitHub
Unverified
parent 1e3d32167f
commit b7a2cfc138
3 changed files with 8 additions and 5 deletions
+1
View File
@@ -882,6 +882,7 @@
"dependencies": {
"@kitlangton/solid-motion": "0.2.2",
"@kobalte/core": "catalog:",
"@opencode/util": "workspace:*",
"@pierre/diffs": "catalog:",
"@pierre/highlights": "catalog:",
"@solid-primitives/event-listener": "catalog:",
+1
View File
@@ -124,6 +124,7 @@
"dependencies": {
"@kitlangton/solid-motion": "0.2.2",
"@kobalte/core": "catalog:",
"@opencode/util": "workspace:*",
"@pierre/diffs": "catalog:",
"@pierre/highlights": "catalog:",
"@solid-primitives/event-listener": "catalog:",
@@ -2,6 +2,7 @@ import { createResizeObserver } from "@solid-primitives/resize-observer"
import { createEffect, createMemo, For, type JSX, onCleanup, Show } from "solid-js"
import { createStore } from "solid-js/store"
import { Icon } from "@opencode/ui/icon"
import { abort } from "@opencode/util/abort"
import { useI18n } from "../../context/i18n"
import { Loader } from "../../feedback/loader/loader"
import { createTypeahead } from "./controller"
@@ -32,18 +33,18 @@ export function Typeahead<T>(props: {
const cache = new Map<string, T[]>()
let seen: T[] = []
let abort: AbortController | undefined
let request: AbortController | undefined
let input: HTMLInputElement | undefined
onCleanup(() => abort?.abort())
onCleanup(() => abort(request))
const query = () => store.query.trim()
const pending = () => store.loading || store.answered !== query()
const search = (query: string) => {
abort?.abort()
abort(request)
if (cache.has(query)) return setStore({ answered: query, failed: false, loading: false })
const current = (abort = new AbortController())
const current = (request = new AbortController())
setStore("loading", true)
props.source(query, current.signal).then(
(items) => {
@@ -62,7 +63,7 @@ export function Typeahead<T>(props: {
const next = query()
if (!next || cache.has(next)) return search(next)
abort?.abort()
abort(request)
const timer = setTimeout(() => search(next), props.delay)
onCleanup(() => clearTimeout(timer))
})