From b7a2cfc138f2737897fe0cb0d081c40b56ceae13 Mon Sep 17 00:00:00 2001 From: Luke Parker <10430890+Hona@users.noreply.github.com> Date: Fri, 23 Oct 2026 22:31:35 +1000 Subject: [PATCH] fix(ui): stop typeahead aborts from pinning disposed batches (#58447) --- bun.lock | 1 + packages/ui/package.json | 1 + packages/ui/src/forms/typeahead/typeahead.tsx | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bun.lock b/bun.lock index e57dfb37e94..af0ad0a3fe2 100644 --- a/bun.lock +++ b/bun.lock @@ -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:", diff --git a/packages/ui/package.json b/packages/ui/package.json index 774721f7a8a..c21ccc8a3af 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -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:", diff --git a/packages/ui/src/forms/typeahead/typeahead.tsx b/packages/ui/src/forms/typeahead/typeahead.tsx index 3109c7fe668..5d489e7f17f 100644 --- a/packages/ui/src/forms/typeahead/typeahead.tsx +++ b/packages/ui/src/forms/typeahead/typeahead.tsx @@ -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(props: { const cache = new Map() 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(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)) })