@opencode/ui 0.0.0-dev-91 → 0.0.0-dev-96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,6 +3,11 @@ export { createTypeahead } from "./controller";
|
|
|
3
3
|
/** A search field over results from `source` that keeps rows on screen while a query is pending. */
|
|
4
4
|
export declare function Typeahead<T>(props: {
|
|
5
5
|
source: (query: string, signal: AbortSignal) => Promise<T[]>;
|
|
6
|
+
/** Preloaded opening results, including a failed request that the user can retry. */
|
|
7
|
+
initial?: {
|
|
8
|
+
items: T[];
|
|
9
|
+
failed?: boolean;
|
|
10
|
+
};
|
|
6
11
|
/** Narrows earlier results while the request for the current query is pending. */
|
|
7
12
|
match: (item: T, query: string) => boolean;
|
|
8
13
|
key: (item: T) => string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opencode/ui",
|
|
3
|
-
"version": "0.0.0-dev-
|
|
3
|
+
"version": "0.0.0-dev-96",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -286,7 +286,7 @@
|
|
|
286
286
|
"dependencies": {
|
|
287
287
|
"@kitlangton/solid-motion": "0.2.2",
|
|
288
288
|
"@kobalte/core": "0.13.13",
|
|
289
|
-
"@opencode/util": "0.0.0-dev-
|
|
289
|
+
"@opencode/util": "0.0.0-dev-96",
|
|
290
290
|
"@pierre/diffs": "1.6.1",
|
|
291
291
|
"@pierre/highlights": "0.2.0",
|
|
292
292
|
"@solid-primitives/event-listener": "2.4.6",
|
|
@@ -13,20 +13,10 @@
|
|
|
13
13
|
background-clip: padding-box;
|
|
14
14
|
box-shadow: var(--shadow-md);
|
|
15
15
|
|
|
16
|
-
transform-origin: var(--kb-popover-content-transform-origin);
|
|
17
|
-
|
|
18
16
|
&:focus-within {
|
|
19
17
|
outline: none;
|
|
20
18
|
}
|
|
21
19
|
|
|
22
|
-
&[data-closed] {
|
|
23
|
-
animation: popover-close 0.15s ease-out;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
&[data-expanded] {
|
|
27
|
-
animation: popover-open 0.15s ease-out;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
20
|
[data-slot="popover-header"] {
|
|
31
21
|
display: flex;
|
|
32
22
|
padding: 12px;
|
|
@@ -74,25 +64,3 @@
|
|
|
74
64
|
fill: var(--surface-raised-stronger-non-alpha);
|
|
75
65
|
}
|
|
76
66
|
}
|
|
77
|
-
|
|
78
|
-
@keyframes popover-open {
|
|
79
|
-
from {
|
|
80
|
-
opacity: 0;
|
|
81
|
-
transform: scale(0.96);
|
|
82
|
-
}
|
|
83
|
-
to {
|
|
84
|
-
opacity: 1;
|
|
85
|
-
transform: scale(1);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
@keyframes popover-close {
|
|
90
|
-
from {
|
|
91
|
-
opacity: 1;
|
|
92
|
-
transform: scale(1);
|
|
93
|
-
}
|
|
94
|
-
to {
|
|
95
|
-
opacity: 0;
|
|
96
|
-
transform: scale(0.96);
|
|
97
|
-
}
|
|
98
|
-
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createResizeObserver } from "@solid-primitives/resize-observer"
|
|
2
|
-
import { createEffect, createMemo, For, type JSX, onCleanup, Show } from "solid-js"
|
|
2
|
+
import { createEffect, createMemo, For, type JSX, on, onCleanup, Show } from "solid-js"
|
|
3
3
|
import { createStore } from "solid-js/store"
|
|
4
4
|
import { Icon } from "@opencode/ui/icon"
|
|
5
5
|
import { abort } from "@opencode/util/abort"
|
|
@@ -12,6 +12,8 @@ export { createTypeahead } from "./controller"
|
|
|
12
12
|
/** A search field over results from `source` that keeps rows on screen while a query is pending. */
|
|
13
13
|
export function Typeahead<T>(props: {
|
|
14
14
|
source: (query: string, signal: AbortSignal) => Promise<T[]>
|
|
15
|
+
/** Preloaded opening results, including a failed request that the user can retry. */
|
|
16
|
+
initial?: { items: T[]; failed?: boolean }
|
|
15
17
|
/** Narrows earlier results while the request for the current query is pending. */
|
|
16
18
|
match: (item: T, query: string) => boolean
|
|
17
19
|
key: (item: T) => string
|
|
@@ -27,17 +29,23 @@ export function Typeahead<T>(props: {
|
|
|
27
29
|
}) {
|
|
28
30
|
const i18n = useI18n()
|
|
29
31
|
|
|
30
|
-
const [store, setStore] = createStore<{
|
|
31
|
-
query:
|
|
32
|
-
|
|
32
|
+
const [store, setStore] = createStore<{
|
|
33
|
+
query: string
|
|
34
|
+
searched: boolean
|
|
35
|
+
answered?: string
|
|
36
|
+
failed?: boolean
|
|
37
|
+
loading?: boolean
|
|
38
|
+
}>({ query: "", searched: false, answered: props.initial ? "" : undefined })
|
|
33
39
|
|
|
34
40
|
const cache = new Map<string, T[]>()
|
|
35
|
-
let seen: T[] = []
|
|
36
41
|
let request: AbortController | undefined
|
|
37
42
|
let input: HTMLInputElement | undefined
|
|
38
43
|
onCleanup(() => abort(request))
|
|
39
44
|
|
|
40
45
|
const query = () => store.query.trim()
|
|
46
|
+
// The parent owns the opening list, so a refresh reaches an open panel without remounting the input.
|
|
47
|
+
const opening = () => (query() ? undefined : props.initial)
|
|
48
|
+
const failed = () => (opening() ? opening()?.failed : store.failed)
|
|
41
49
|
const pending = () => store.loading || store.answered !== query()
|
|
42
50
|
|
|
43
51
|
const search = (query: string) => {
|
|
@@ -49,9 +57,7 @@ export function Typeahead<T>(props: {
|
|
|
49
57
|
props.source(query, current.signal).then(
|
|
50
58
|
(items) => {
|
|
51
59
|
if (current.signal.aborted) return
|
|
52
|
-
const keys = new Set(items.map(props.key))
|
|
53
60
|
cache.set(query, items)
|
|
54
|
-
seen = [...items, ...seen.filter((item) => !keys.has(props.key(item)))].slice(0, 500)
|
|
55
61
|
setStore({ answered: query, failed: false, loading: false })
|
|
56
62
|
},
|
|
57
63
|
() => !current.signal.aborted && setStore({ answered: query, failed: true, loading: false }),
|
|
@@ -59,27 +65,36 @@ export function Typeahead<T>(props: {
|
|
|
59
65
|
}
|
|
60
66
|
|
|
61
67
|
// A cached or empty query answers at once; a typed one waits, and the request it supersedes is aborted.
|
|
62
|
-
createEffect(
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
createEffect(
|
|
69
|
+
on(
|
|
70
|
+
query,
|
|
71
|
+
(next) => {
|
|
72
|
+
if (!next || cache.has(next)) return search(next)
|
|
73
|
+
abort(request)
|
|
74
|
+
const timer = setTimeout(() => search(next), props.delay)
|
|
75
|
+
onCleanup(() => clearTimeout(timer))
|
|
76
|
+
},
|
|
77
|
+
{ defer: !!props.initial },
|
|
78
|
+
),
|
|
79
|
+
)
|
|
70
80
|
|
|
71
|
-
//
|
|
81
|
+
// Narrow visible rows while pending; broadening waits for a cached or server answer, avoiding speculative rows flashing.
|
|
72
82
|
const results = createMemo<{ items: T[]; stale: boolean }>((previous) => {
|
|
73
83
|
const next = query()
|
|
84
|
+
const preloaded = opening()
|
|
85
|
+
|
|
86
|
+
if (preloaded) return { items: preloaded.failed ? [] : preloaded.items, stale: false }
|
|
74
87
|
|
|
75
88
|
if (store.answered === next && store.failed) return { items: [], stale: false }
|
|
76
|
-
const cached = cache.get(next) ??
|
|
89
|
+
const cached = cache.get(next) ?? previous?.items.filter((item) => props.match(item, next)) ?? []
|
|
77
90
|
|
|
78
91
|
if (cache.has(next) || cached.length > 0) return { items: cached, stale: false }
|
|
79
92
|
|
|
80
93
|
return { items: previous?.items ?? [], stale: !!previous?.items.length }
|
|
81
94
|
})
|
|
82
95
|
|
|
96
|
+
const animateHeight = () => store.searched && results().items.length > 0
|
|
97
|
+
|
|
83
98
|
const typeahead = createTypeahead<T>({
|
|
84
99
|
items: () => results().items,
|
|
85
100
|
key: (item) => props.key(item),
|
|
@@ -119,7 +134,7 @@ export function Typeahead<T>(props: {
|
|
|
119
134
|
autocomplete="off"
|
|
120
135
|
spellcheck={false}
|
|
121
136
|
class="h-8 min-w-0 flex-1 outline-none placeholder:text-v2-text-text-faint"
|
|
122
|
-
onInput={(event) => setStore(
|
|
137
|
+
onInput={(event) => setStore({ query: event.currentTarget.value, searched: true })}
|
|
123
138
|
onKeyDown={typeahead.onKeyDown}
|
|
124
139
|
/>
|
|
125
140
|
<Show when={store.query}>
|
|
@@ -137,8 +152,11 @@ export function Typeahead<T>(props: {
|
|
|
137
152
|
</button>
|
|
138
153
|
</Show>
|
|
139
154
|
</div>
|
|
140
|
-
{/*
|
|
141
|
-
<div
|
|
155
|
+
{/* Initial results and the empty state snap into place; other search resizing animates. */}
|
|
156
|
+
<div
|
|
157
|
+
class="overflow-hidden duration-[200ms] ease-[cubic-bezier(0.645,0.045,0.355,1)] motion-reduce:transition-none"
|
|
158
|
+
classList={{ "transition-[height]": animateHeight(), "transition-none": !animateHeight() }}
|
|
159
|
+
>
|
|
142
160
|
<div
|
|
143
161
|
ref={(element) =>
|
|
144
162
|
createResizeObserver(element, (rect) =>
|
|
@@ -146,11 +164,7 @@ export function Typeahead<T>(props: {
|
|
|
146
164
|
)
|
|
147
165
|
}
|
|
148
166
|
>
|
|
149
|
-
<div
|
|
150
|
-
id={typeahead.listID}
|
|
151
|
-
role="listbox"
|
|
152
|
-
class="max-h-56 overflow-y-auto px-1 pb-1 empty:hidden"
|
|
153
|
-
>
|
|
167
|
+
<div id={typeahead.listID} role="listbox" class="max-h-56 overflow-y-auto px-1 pb-1 empty:hidden">
|
|
154
168
|
<For each={results().items}>
|
|
155
169
|
{(item) => (
|
|
156
170
|
<div
|
|
@@ -178,10 +192,10 @@ export function Typeahead<T>(props: {
|
|
|
178
192
|
{/* Stays mounted while a retry or a newer query is pending, so the list never collapses to nothing. */}
|
|
179
193
|
<Show when={results().items.length === 0}>
|
|
180
194
|
<div
|
|
181
|
-
class="mx-1
|
|
195
|
+
class="mx-1 flex h-8 items-center px-2 pb-1 text-v2-text-text-faint"
|
|
182
196
|
classList={{ invisible: store.answered === undefined }}
|
|
183
197
|
>
|
|
184
|
-
<Show when={
|
|
198
|
+
<Show when={failed()} fallback={props.emptyLabel}>
|
|
185
199
|
<button
|
|
186
200
|
type="button"
|
|
187
201
|
class="-mx-2 flex h-7 flex-1 items-center rounded-sm px-2 text-start text-v2-text-text-base outline-none hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover"
|
|
@@ -23,9 +23,6 @@
|
|
|
23
23
|
-moz-osx-font-smoothing: grayscale;
|
|
24
24
|
text-rendering: geometricPrecision;
|
|
25
25
|
|
|
26
|
-
transform-origin: var(--kb-menu-content-transform-origin);
|
|
27
|
-
animation: menu-v2-in 120ms ease-out;
|
|
28
|
-
|
|
29
26
|
&:focus-visible {
|
|
30
27
|
outline: none;
|
|
31
28
|
}
|
|
@@ -196,11 +193,6 @@
|
|
|
196
193
|
background-clip: padding-box;
|
|
197
194
|
box-shadow: var(--shadow-md);
|
|
198
195
|
z-index: 60;
|
|
199
|
-
animation: dropdown-menu-open 150ms ease-out;
|
|
200
|
-
|
|
201
|
-
&[data-closed] {
|
|
202
|
-
animation: dropdown-menu-close 150ms ease-out;
|
|
203
|
-
}
|
|
204
196
|
|
|
205
197
|
[data-component="menu-v2-item"] {
|
|
206
198
|
position: relative;
|
|
@@ -285,28 +277,6 @@
|
|
|
285
277
|
}
|
|
286
278
|
}
|
|
287
279
|
|
|
288
|
-
@keyframes dropdown-menu-open {
|
|
289
|
-
from {
|
|
290
|
-
opacity: 0;
|
|
291
|
-
transform: scale(0.96);
|
|
292
|
-
}
|
|
293
|
-
to {
|
|
294
|
-
opacity: 1;
|
|
295
|
-
transform: scale(1);
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
|
|
299
|
-
@keyframes dropdown-menu-close {
|
|
300
|
-
from {
|
|
301
|
-
opacity: 1;
|
|
302
|
-
transform: scale(1);
|
|
303
|
-
}
|
|
304
|
-
to {
|
|
305
|
-
opacity: 0;
|
|
306
|
-
transform: scale(0.96);
|
|
307
|
-
}
|
|
308
|
-
}
|
|
309
|
-
|
|
310
280
|
@keyframes menu-v2-in {
|
|
311
281
|
from {
|
|
312
282
|
opacity: 0;
|