@opencode/ui 0.0.0-dev-406 → 0.0.0-dev-408
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.
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type ComponentProps } from "solid-js";
|
|
2
|
+
import "./menu-scroll.css";
|
|
3
|
+
export declare function MenuScroll(props: Omit<ComponentProps<"div">, "ref" | "onScroll"> & {
|
|
4
|
+
viewportClass?: string;
|
|
5
|
+
viewportRef?: (element: HTMLDivElement) => void;
|
|
6
|
+
}): import("solid-js").JSX.Element;
|
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-408",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -288,7 +288,7 @@
|
|
|
288
288
|
"dependencies": {
|
|
289
289
|
"@kitlangton/solid-motion": "0.2.2",
|
|
290
290
|
"@kobalte/core": "0.13.13",
|
|
291
|
-
"@opencode/util": "0.0.0-dev-
|
|
291
|
+
"@opencode/util": "0.0.0-dev-408",
|
|
292
292
|
"@pierre/diffs": "1.6.1",
|
|
293
293
|
"@pierre/highlights": "0.2.0",
|
|
294
294
|
"@solid-primitives/event-listener": "2.4.6",
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
[data-component="menu-scroll"] {
|
|
2
|
+
position: relative;
|
|
3
|
+
display: flex;
|
|
4
|
+
min-height: 0;
|
|
5
|
+
flex-direction: column;
|
|
6
|
+
overflow: hidden;
|
|
7
|
+
isolation: isolate;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
[data-slot="menu-scroll-viewport"] {
|
|
11
|
+
min-height: 0;
|
|
12
|
+
overflow-y: auto;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
[data-slot="menu-scroll-thumb"] {
|
|
16
|
+
display: none;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
@media (hover: hover) and (pointer: fine) {
|
|
20
|
+
[data-slot="menu-scroll-viewport"] {
|
|
21
|
+
scrollbar-width: none;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
[data-slot="menu-scroll-viewport"]::-webkit-scrollbar {
|
|
25
|
+
display: none;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
[data-slot="menu-scroll-thumb"] {
|
|
29
|
+
position: absolute;
|
|
30
|
+
z-index: 1;
|
|
31
|
+
inset-inline-end: 0;
|
|
32
|
+
top: 0;
|
|
33
|
+
display: block;
|
|
34
|
+
width: 8px;
|
|
35
|
+
opacity: 0;
|
|
36
|
+
pointer-events: none;
|
|
37
|
+
touch-action: none;
|
|
38
|
+
user-select: none;
|
|
39
|
+
|
|
40
|
+
&::after {
|
|
41
|
+
position: absolute;
|
|
42
|
+
inset: 0 2px;
|
|
43
|
+
border-radius: 9999px;
|
|
44
|
+
background: var(--v2-border-border-muted);
|
|
45
|
+
content: "";
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
&:hover::after,
|
|
49
|
+
&[data-dragging]::after {
|
|
50
|
+
background: var(--v2-border-border-strong);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
[data-component="menu-scroll"]:hover > [data-slot="menu-scroll-thumb"],
|
|
55
|
+
[data-slot="menu-scroll-thumb"][data-dragging] {
|
|
56
|
+
opacity: 1;
|
|
57
|
+
pointer-events: auto;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { createResizeObserver } from "@solid-primitives/resize-observer"
|
|
2
|
+
import { onMount, Show, splitProps, type ComponentProps } from "solid-js"
|
|
3
|
+
import { createStore } from "solid-js/store"
|
|
4
|
+
import "./menu-scroll.css"
|
|
5
|
+
|
|
6
|
+
export function MenuScroll(
|
|
7
|
+
props: Omit<ComponentProps<"div">, "ref" | "onScroll"> & {
|
|
8
|
+
viewportClass?: string
|
|
9
|
+
viewportRef?: (element: HTMLDivElement) => void
|
|
10
|
+
},
|
|
11
|
+
) {
|
|
12
|
+
const [local, rest] = splitProps(props, ["class", "children", "viewportClass", "viewportRef"])
|
|
13
|
+
|
|
14
|
+
const [state, setState] = createStore<{ size: number; start: number; overflow: boolean; grab?: number }>({
|
|
15
|
+
size: 0,
|
|
16
|
+
start: 4,
|
|
17
|
+
overflow: false,
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
let viewport!: HTMLDivElement
|
|
21
|
+
|
|
22
|
+
let content!: HTMLDivElement
|
|
23
|
+
|
|
24
|
+
const measure = () => {
|
|
25
|
+
const track = Math.max(0, viewport.clientHeight - 8)
|
|
26
|
+
|
|
27
|
+
const size = Math.min(track, Math.max(32, (viewport.clientHeight / Math.max(1, viewport.scrollHeight)) * track))
|
|
28
|
+
|
|
29
|
+
const max = viewport.scrollHeight - viewport.clientHeight
|
|
30
|
+
|
|
31
|
+
setState({ size, start: 4 + (max > 0 ? (viewport.scrollTop / max) * (track - size) : 0), overflow: max > 0 })
|
|
32
|
+
|
|
33
|
+
if (max <= 0) setState("grab", undefined)
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
onMount(() => {
|
|
37
|
+
local.viewportRef?.(viewport)
|
|
38
|
+
createResizeObserver([viewport, content], measure)
|
|
39
|
+
})
|
|
40
|
+
|
|
41
|
+
return (
|
|
42
|
+
<div data-component="menu-scroll" class={local.class}>
|
|
43
|
+
<div
|
|
44
|
+
{...rest}
|
|
45
|
+
ref={viewport}
|
|
46
|
+
data-slot="menu-scroll-viewport"
|
|
47
|
+
data-scrollable
|
|
48
|
+
class={local.viewportClass}
|
|
49
|
+
onScroll={measure}
|
|
50
|
+
>
|
|
51
|
+
<div ref={content}>{local.children}</div>
|
|
52
|
+
</div>
|
|
53
|
+
<Show when={state.overflow}>
|
|
54
|
+
<div
|
|
55
|
+
data-slot="menu-scroll-thumb"
|
|
56
|
+
data-dragging={state.grab !== undefined ? "" : undefined}
|
|
57
|
+
aria-hidden="true"
|
|
58
|
+
style={{ height: `${state.size}px`, transform: `translateY(${state.start}px)` }}
|
|
59
|
+
onPointerDown={(event) => {
|
|
60
|
+
if (event.button !== 0) return
|
|
61
|
+
event.preventDefault()
|
|
62
|
+
event.stopPropagation()
|
|
63
|
+
setState("grab", event.clientY - event.currentTarget.getBoundingClientRect().top)
|
|
64
|
+
event.currentTarget.setPointerCapture(event.pointerId)
|
|
65
|
+
}}
|
|
66
|
+
onPointerMove={(event) => {
|
|
67
|
+
if (state.grab === undefined) return
|
|
68
|
+
const travel = viewport.clientHeight - 8 - state.size
|
|
69
|
+
|
|
70
|
+
if (travel <= 0) return
|
|
71
|
+
viewport.scrollTop =
|
|
72
|
+
((event.clientY - viewport.getBoundingClientRect().top - 4 - state.grab) / travel) *
|
|
73
|
+
(viewport.scrollHeight - viewport.clientHeight)
|
|
74
|
+
}}
|
|
75
|
+
onPointerUp={(event) => {
|
|
76
|
+
if (state.grab === undefined) return
|
|
77
|
+
event.currentTarget.releasePointerCapture(event.pointerId)
|
|
78
|
+
}}
|
|
79
|
+
onLostPointerCapture={() => setState("grab", undefined)}
|
|
80
|
+
/>
|
|
81
|
+
</Show>
|
|
82
|
+
</div>
|
|
83
|
+
)
|
|
84
|
+
}
|
|
@@ -5,6 +5,7 @@ import { Icon } from "@opencode/ui/icon"
|
|
|
5
5
|
import { abort } from "@opencode/util/abort"
|
|
6
6
|
import { useI18n } from "../../context/i18n"
|
|
7
7
|
import { Loader } from "../../feedback/loader/loader"
|
|
8
|
+
import { MenuScroll } from "../../components/menu-scroll"
|
|
8
9
|
import { createTypeahead } from "./controller"
|
|
9
10
|
|
|
10
11
|
export { createTypeahead } from "./controller"
|
|
@@ -165,12 +166,12 @@ export function Typeahead<T>(props: {
|
|
|
165
166
|
)
|
|
166
167
|
}
|
|
167
168
|
>
|
|
168
|
-
|
|
169
|
-
<div
|
|
169
|
+
<MenuScroll
|
|
170
170
|
id={typeahead.listID}
|
|
171
171
|
role="listbox"
|
|
172
|
-
|
|
173
|
-
|
|
172
|
+
class="max-h-56"
|
|
173
|
+
viewportClass="p-1"
|
|
174
|
+
classList={{ hidden: results().items.length === 0 }}
|
|
174
175
|
>
|
|
175
176
|
<For each={results().items}>
|
|
176
177
|
{(item) => (
|
|
@@ -195,7 +196,7 @@ export function Typeahead<T>(props: {
|
|
|
195
196
|
</div>
|
|
196
197
|
)}
|
|
197
198
|
</For>
|
|
198
|
-
</
|
|
199
|
+
</MenuScroll>
|
|
199
200
|
{/* Stays mounted while a retry or a newer query is pending, so the list never collapses to nothing. */}
|
|
200
201
|
<Show when={results().items.length === 0}>
|
|
201
202
|
<div
|