@opencode/ui 2.2.4 → 2.2.6
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.
- package/dist/actions/button/button.d.ts +2 -2
- package/dist/actions/icon-button/icon-button.d.ts +1 -1
- package/dist/components/animated-number-machine.d.ts +95 -0
- package/dist/components/file-icon-machine.d.ts +40 -0
- package/dist/components/file-icon.d.ts +0 -2
- package/dist/components/file-icons/choose-icon-name.d.ts +2 -0
- package/dist/components/image-flight-machine.d.ts +135 -0
- package/dist/components/image-zoom-machine.d.ts +95 -0
- package/dist/components/image-zoom.d.ts +6 -3
- package/dist/components/list.d.ts +2 -6
- package/dist/components/menu-scroll.d.ts +12 -0
- package/dist/components/popover-machine.d.ts +96 -0
- package/dist/components/popover.d.ts +2 -2
- package/dist/components/resize-handle-machine.d.ts +71 -0
- package/dist/components/resize-handle.d.ts +2 -0
- package/dist/components/scroll-view-machine.d.ts +68 -0
- package/dist/components/scroll-view.d.ts +2 -2
- package/dist/components/spinner.d.ts +11 -3
- package/dist/components/text-field-machine.d.ts +62 -0
- package/dist/components/text-reveal-machine.d.ts +90 -0
- package/dist/components/typewriter-machine.d.ts +62 -0
- package/dist/context/dialog-machine.d.ts +125 -0
- package/dist/context/dialog.d.ts +17 -16
- package/dist/data-display/line-comment/line-comment.d.ts +9 -0
- package/dist/data-display/line-comment/machine.d.ts +157 -0
- package/dist/data-display/project-avatar/animation-machine.d.ts +62 -0
- package/dist/data-display/project-avatar/animation.d.ts +1 -1
- package/dist/feedback/activity-ring/activity-ring.d.ts +2 -1
- package/dist/feedback/toast/machine.d.ts +57 -0
- package/dist/feedback/toast/toast.d.ts +1 -1
- package/dist/forms/checkbox/checkbox.d.ts +6 -1
- package/dist/forms/select/machine.d.ts +45 -0
- package/dist/forms/select/select.d.ts +4 -0
- package/dist/forms/text-input/text-input.d.ts +4 -2
- package/dist/forms/textarea/textarea.d.ts +1 -0
- package/dist/forms/typeahead/machine.d.ts +85 -0
- package/dist/hooks/auto-scroll-machine.d.ts +89 -0
- package/dist/hooks/create-auto-scroll.d.ts +1 -1
- package/dist/hooks/list-machine.d.ts +150 -0
- package/dist/hooks/use-filtered-list.d.ts +21 -35
- package/dist/i18n/en.d.ts +5 -0
- package/dist/icons/catalog.d.ts +8 -0
- package/dist/navigation/menu/machine.d.ts +49 -0
- package/dist/navigation/menu/menu.d.ts +5 -3
- package/dist/navigation/segmented-control/machine.d.ts +46 -0
- package/dist/overlays/mcp-sign-in/machine.d.ts +184 -0
- package/dist/overlays/mcp-sign-in/mcp-sign-in.d.ts +40 -0
- package/dist/overlays/tooltip/machine.d.ts +146 -0
- package/dist/theme/context.d.ts +38 -14
- package/dist/theme/machine.d.ts +174 -0
- package/dist/typography/text-shimmer/machine.d.ts +48 -0
- package/package.json +19 -3
- package/src/actions/button/button.tsx +11 -6
- package/src/actions/icon-button/icon-button.tsx +17 -4
- package/src/components/animated-number-machine.ts +214 -0
- package/src/components/animated-number.tsx +134 -83
- package/src/components/file-icon-machine.ts +78 -0
- package/src/components/file-icon.tsx +96 -579
- package/src/components/file-icons/choose-icon-name.ts +574 -0
- package/src/components/image-flight-machine.ts +247 -0
- package/src/components/image-preview.css +5 -2
- package/src/components/image-preview.tsx +390 -252
- package/src/components/image-zoom-machine.ts +191 -0
- package/src/components/image-zoom.ts +22 -14
- package/src/components/list.tsx +46 -137
- package/src/components/menu-scroll.css +70 -0
- package/src/components/menu-scroll.tsx +161 -0
- package/src/components/popover-machine.ts +198 -0
- package/src/components/popover.tsx +157 -89
- package/src/components/resize-handle-machine.ts +174 -0
- package/src/components/resize-handle.tsx +116 -67
- package/src/components/scroll-view-machine.ts +244 -0
- package/src/components/scroll-view.tsx +163 -116
- package/src/components/spinner.css +18 -5
- package/src/components/spinner.tsx +28 -14
- package/src/components/text-field-machine.ts +102 -0
- package/src/components/text-field.tsx +78 -24
- package/src/components/text-reveal-machine.ts +184 -0
- package/src/components/text-reveal.tsx +96 -93
- package/src/components/typewriter-machine.ts +134 -0
- package/src/components/typewriter.tsx +50 -39
- package/src/context/dialog-machine.ts +280 -0
- package/src/context/dialog.tsx +168 -177
- package/src/data-display/line-comment/line-comment.tsx +196 -132
- package/src/data-display/line-comment/machine.ts +391 -0
- package/src/data-display/project-avatar/animation-machine.ts +182 -0
- package/src/data-display/project-avatar/animation.ts +67 -38
- package/src/feedback/activity-ring/activity-ring.tsx +1 -1
- package/src/feedback/toast/machine.ts +115 -0
- package/src/feedback/toast/toast.tsx +55 -59
- package/src/forms/checkbox/checkbox-compact.css +169 -0
- package/src/forms/checkbox/checkbox.tsx +93 -31
- package/src/forms/search-list/search-list.css +5 -1
- package/src/forms/search-list/search-list.tsx +4 -4
- package/src/forms/select/machine.ts +81 -0
- package/src/forms/select/select.css +59 -17
- package/src/forms/select/select.tsx +67 -31
- package/src/forms/text-input/text-input.css +30 -16
- package/src/forms/text-input/text-input.tsx +6 -2
- package/src/forms/textarea/textarea.css +13 -8
- package/src/forms/textarea/textarea.tsx +3 -1
- package/src/forms/typeahead/machine.ts +253 -0
- package/src/forms/typeahead/typeahead.tsx +75 -66
- package/src/hooks/auto-scroll-machine.ts +261 -0
- package/src/hooks/create-auto-scroll.tsx +110 -205
- package/src/hooks/list-machine.ts +359 -0
- package/src/hooks/use-filtered-list.tsx +101 -112
- package/src/i18n/en.ts +6 -1
- package/src/icons/catalog.ts +8 -0
- package/src/navigation/menu/machine.ts +109 -0
- package/src/navigation/menu/menu.tsx +130 -22
- package/src/navigation/segmented-control/machine.ts +72 -0
- package/src/navigation/segmented-control/segmented-control.tsx +46 -46
- package/src/overlays/dialog/dialog.tsx +7 -1
- package/src/overlays/mcp-sign-in/machine.ts +343 -0
- package/src/overlays/mcp-sign-in/mcp-sign-in.ts +159 -0
- package/src/overlays/tooltip/machine.ts +303 -0
- package/src/overlays/tooltip/tooltip.tsx +157 -92
- package/src/styles/theme.css +10 -2
- package/src/styles/tokens/theme.css +13 -0
- package/src/theme/context.tsx +192 -269
- package/src/theme/machine.ts +508 -0
- package/src/theme/themes/oc-2.json +2 -0
- package/src/theme/v2/mapping.ts +12 -8
- package/src/typography/text-shimmer/machine.ts +90 -0
- package/src/typography/text-shimmer/text-shimmer.css +71 -39
- package/src/typography/text-shimmer/text-shimmer.tsx +41 -24
|
@@ -0,0 +1,303 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Every tooltip trigger runs this machine, so it never allocates: each reachable state, event and transition is a
|
|
3
|
+
* frozen module singleton, and an event that changes nothing returns the state it was given.
|
|
4
|
+
*/
|
|
5
|
+
export type TooltipState =
|
|
6
|
+
/** Kobalte is not mounted yet. Most triggers are never hovered, so it mounts on the first hover or focus. */
|
|
7
|
+
| { readonly status: "unmounted"; readonly disabled: boolean }
|
|
8
|
+
| { readonly status: "idle"; readonly hovered: boolean; readonly disabled: boolean }
|
|
9
|
+
/** `pressing` lasts from a press on the trigger until that press ends, so its click keeps the tooltip open. */
|
|
10
|
+
| { readonly status: "open"; readonly hovered: boolean; readonly pressing: boolean }
|
|
11
|
+
/**
|
|
12
|
+
* A popup the trigger opened (a menu, a popover) hides the tooltip. While it is open, a modal layer turns pointer
|
|
13
|
+
* events off for the page, so the trigger's own enter and leave events lie and `hovered` follows the pointer's
|
|
14
|
+
* position instead. Once it closes over a hovered trigger, the tooltip stays hidden until the pointer moves off the
|
|
15
|
+
* trigger or the trigger itself takes focus.
|
|
16
|
+
*/
|
|
17
|
+
| { readonly status: "suppressed"; readonly popup: "open"; readonly hovered: boolean; readonly disabled: boolean }
|
|
18
|
+
| { readonly status: "suppressed"; readonly popup: "closed"; readonly disabled: boolean }
|
|
19
|
+
/** The caller sets `forceOpen`. `expanded` tracks the popup so releasing control can suppress the tooltip. */
|
|
20
|
+
| {
|
|
21
|
+
readonly status: "controlled"
|
|
22
|
+
readonly open: boolean
|
|
23
|
+
readonly hovered: boolean
|
|
24
|
+
readonly expanded: boolean
|
|
25
|
+
readonly disabled: boolean
|
|
26
|
+
}
|
|
27
|
+
| { readonly status: "disposed" }
|
|
28
|
+
|
|
29
|
+
export type TooltipEvent =
|
|
30
|
+
| { readonly type: "props.synced"; readonly forceOpen: boolean | undefined; readonly disabled: boolean }
|
|
31
|
+
/** The pointer entered or left the trigger. Touch never hovers. */
|
|
32
|
+
| { readonly type: "pointer.entered" }
|
|
33
|
+
| { readonly type: "pointer.left" }
|
|
34
|
+
/** Where a pointer move landed while a popup suppresses the tooltip, measured against the trigger's box. */
|
|
35
|
+
| { readonly type: "pointer.moved"; readonly inside: boolean }
|
|
36
|
+
/** The trigger element itself took focus. */
|
|
37
|
+
| { readonly type: "focused" }
|
|
38
|
+
| { readonly type: "trigger.pressed" }
|
|
39
|
+
/** The press ended, after the click it caused, if any. */
|
|
40
|
+
| { readonly type: "press.ended" }
|
|
41
|
+
/** The microtask after the pointer left, once Kobalte has seen the tooltip open and started its skip-delay window. */
|
|
42
|
+
| { readonly type: "leave.settled" }
|
|
43
|
+
| { readonly type: "popup.changed"; readonly expanded: boolean }
|
|
44
|
+
| { readonly type: "kobalte.changed"; readonly open: boolean }
|
|
45
|
+
| { readonly type: "disposed" }
|
|
46
|
+
|
|
47
|
+
/** `replay` forwards the mounting hover or focus to Kobalte, which attached its listeners too late to receive it. */
|
|
48
|
+
export type TooltipEffect = "replay" | "schedule-leave"
|
|
49
|
+
|
|
50
|
+
export type TooltipTransition = {
|
|
51
|
+
readonly state: TooltipState
|
|
52
|
+
readonly effects: readonly TooltipEffect[]
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const settled = new Map<TooltipState, TooltipTransition>()
|
|
56
|
+
|
|
57
|
+
const NO_EFFECTS: readonly TooltipEffect[] = Object.freeze([])
|
|
58
|
+
|
|
59
|
+
function freeze<S extends TooltipState>(state: S) {
|
|
60
|
+
Object.freeze(state)
|
|
61
|
+
settled.set(state, Object.freeze({ state, effects: NO_EFFECTS }))
|
|
62
|
+
|
|
63
|
+
return state
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
const bit = (value: boolean) => (value ? 1 : 0)
|
|
67
|
+
|
|
68
|
+
const UNMOUNTED = [false, true].map((disabled) => freeze({ status: "unmounted", disabled }))
|
|
69
|
+
|
|
70
|
+
const IDLE = [0, 1, 2, 3].map((key) => freeze({ status: "idle", hovered: !!(key & 1), disabled: !!(key & 2) }))
|
|
71
|
+
|
|
72
|
+
const OPEN = [0, 1, 2, 3].map((key) => freeze({ status: "open", hovered: !!(key & 1), pressing: !!(key & 2) }))
|
|
73
|
+
|
|
74
|
+
const POPUP_OPEN = [0, 1, 2, 3].map((key) =>
|
|
75
|
+
freeze({ status: "suppressed", popup: "open", hovered: !!(key & 1), disabled: !!(key & 2) }),
|
|
76
|
+
)
|
|
77
|
+
|
|
78
|
+
const POPUP_CLOSED = [false, true].map((disabled) => freeze({ status: "suppressed", popup: "closed", disabled }))
|
|
79
|
+
|
|
80
|
+
const CONTROLLED = Array.from({ length: 16 }, (_, key) =>
|
|
81
|
+
freeze({
|
|
82
|
+
status: "controlled",
|
|
83
|
+
open: !!(key & 1),
|
|
84
|
+
hovered: !!(key & 2),
|
|
85
|
+
expanded: !!(key & 4),
|
|
86
|
+
disabled: !!(key & 8),
|
|
87
|
+
}),
|
|
88
|
+
)
|
|
89
|
+
|
|
90
|
+
const DISPOSED = freeze({ status: "disposed" })
|
|
91
|
+
|
|
92
|
+
const unmounted = (disabled: boolean) => UNMOUNTED[bit(disabled)]
|
|
93
|
+
|
|
94
|
+
const idle = (hovered: boolean, disabled: boolean) => IDLE[bit(hovered) | (bit(disabled) << 1)]
|
|
95
|
+
|
|
96
|
+
const open = (hovered: boolean, pressing: boolean) => OPEN[bit(hovered) | (bit(pressing) << 1)]
|
|
97
|
+
|
|
98
|
+
const popupOpen = (hovered: boolean, disabled: boolean) => POPUP_OPEN[bit(hovered) | (bit(disabled) << 1)]
|
|
99
|
+
|
|
100
|
+
const popupClosed = (disabled: boolean) => POPUP_CLOSED[bit(disabled)]
|
|
101
|
+
|
|
102
|
+
const controlled = (open: boolean, hovered: boolean, expanded: boolean, disabled: boolean) =>
|
|
103
|
+
CONTROLLED[bit(open) | (bit(hovered) << 1) | (bit(expanded) << 2) | (bit(disabled) << 3)]
|
|
104
|
+
|
|
105
|
+
const REPLAY: readonly TooltipEffect[] = Object.freeze(["replay"])
|
|
106
|
+
|
|
107
|
+
const REPLAY_HOVER: TooltipTransition = Object.freeze({ state: idle(true, false), effects: REPLAY })
|
|
108
|
+
|
|
109
|
+
const REPLAY_FOCUS: TooltipTransition = Object.freeze({ state: idle(false, false), effects: REPLAY })
|
|
110
|
+
|
|
111
|
+
const LEAVING: TooltipTransition = Object.freeze({
|
|
112
|
+
state: open(false, false),
|
|
113
|
+
effects: Object.freeze<TooltipEffect[]>(["schedule-leave"]),
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
export const POINTER_ENTERED: TooltipEvent = Object.freeze({ type: "pointer.entered" })
|
|
117
|
+
|
|
118
|
+
export const POINTER_LEFT: TooltipEvent = Object.freeze({ type: "pointer.left" })
|
|
119
|
+
|
|
120
|
+
export const POINTER_INSIDE: TooltipEvent = Object.freeze({ type: "pointer.moved", inside: true })
|
|
121
|
+
|
|
122
|
+
export const POINTER_OUTSIDE: TooltipEvent = Object.freeze({ type: "pointer.moved", inside: false })
|
|
123
|
+
|
|
124
|
+
export const FOCUSED: TooltipEvent = Object.freeze({ type: "focused" })
|
|
125
|
+
|
|
126
|
+
export const TRIGGER_PRESSED: TooltipEvent = Object.freeze({ type: "trigger.pressed" })
|
|
127
|
+
|
|
128
|
+
export const PRESS_ENDED: TooltipEvent = Object.freeze({ type: "press.ended" })
|
|
129
|
+
|
|
130
|
+
export const LEAVE_SETTLED: TooltipEvent = Object.freeze({ type: "leave.settled" })
|
|
131
|
+
|
|
132
|
+
export const POPUP_EXPANDED: TooltipEvent = Object.freeze({ type: "popup.changed", expanded: true })
|
|
133
|
+
|
|
134
|
+
export const POPUP_COLLAPSED: TooltipEvent = Object.freeze({ type: "popup.changed", expanded: false })
|
|
135
|
+
|
|
136
|
+
export const KOBALTE_OPENED: TooltipEvent = Object.freeze({ type: "kobalte.changed", open: true })
|
|
137
|
+
|
|
138
|
+
export const KOBALTE_CLOSED: TooltipEvent = Object.freeze({ type: "kobalte.changed", open: false })
|
|
139
|
+
|
|
140
|
+
export const DISPOSED_EVENT: TooltipEvent = Object.freeze({ type: "disposed" })
|
|
141
|
+
|
|
142
|
+
const PROPS = [undefined, false, true].flatMap((forceOpen) =>
|
|
143
|
+
[false, true].map((disabled): TooltipEvent => Object.freeze({ type: "props.synced", forceOpen, disabled })),
|
|
144
|
+
)
|
|
145
|
+
|
|
146
|
+
export function syncPropsEvent(forceOpen: boolean | undefined, disabled: boolean) {
|
|
147
|
+
return PROPS[(forceOpen === undefined ? 0 : forceOpen ? 4 : 2) + bit(disabled)]
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
export function createTooltipState(forceOpen: boolean | undefined, disabled: boolean): TooltipState {
|
|
151
|
+
if (forceOpen === undefined) return unmounted(disabled)
|
|
152
|
+
|
|
153
|
+
return controlled(forceOpen, false, false, disabled)
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
export function transitionTooltip(state: TooltipState, event: TooltipEvent): TooltipTransition {
|
|
157
|
+
const result = next(state, event)
|
|
158
|
+
|
|
159
|
+
if ("state" in result) return result
|
|
160
|
+
|
|
161
|
+
return settled.get(result)!
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/** Kobalte is mounted: the trigger owns its listeners and the popup observer runs. */
|
|
165
|
+
export function selectTooltipMounted(state: TooltipState) {
|
|
166
|
+
return state.status !== "unmounted" && state.status !== "disposed"
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
export function selectTooltipOpen(state: TooltipState) {
|
|
170
|
+
if (state.status === "open") return true
|
|
171
|
+
|
|
172
|
+
if (state.status === "controlled") return state.open
|
|
173
|
+
|
|
174
|
+
return false
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
export function selectTooltipForceOpen(state: TooltipState) {
|
|
178
|
+
return state.status === "controlled" ? state.open : undefined
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/** A press is in progress, so the driver listens for its end. */
|
|
182
|
+
export function selectTooltipPressing(state: TooltipState) {
|
|
183
|
+
return state.status === "open" && state.pressing
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/** A popup suppresses the tooltip, so the driver reports where the pointer moves. */
|
|
187
|
+
export function selectTooltipTracking(state: TooltipState) {
|
|
188
|
+
return state.status === "suppressed"
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
function next(state: TooltipState, event: TooltipEvent): TooltipState | TooltipTransition {
|
|
192
|
+
if (state.status === "disposed") return state
|
|
193
|
+
|
|
194
|
+
if (event.type === "disposed") return DISPOSED
|
|
195
|
+
|
|
196
|
+
if (event.type === "props.synced") return sync(state, event.forceOpen, event.disabled)
|
|
197
|
+
|
|
198
|
+
if (state.status === "unmounted") {
|
|
199
|
+
if (state.disabled) return state
|
|
200
|
+
|
|
201
|
+
if (event.type === "pointer.entered") return REPLAY_HOVER
|
|
202
|
+
|
|
203
|
+
if (event.type === "focused") return REPLAY_FOCUS
|
|
204
|
+
|
|
205
|
+
return state
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
if (state.status === "idle") {
|
|
209
|
+
if (event.type === "pointer.entered") return idle(true, state.disabled)
|
|
210
|
+
|
|
211
|
+
if (event.type === "pointer.left") return idle(false, state.disabled)
|
|
212
|
+
|
|
213
|
+
if (event.type === "popup.changed" && event.expanded) return popupOpen(state.hovered, state.disabled)
|
|
214
|
+
|
|
215
|
+
if (event.type === "kobalte.changed" && event.open && !state.disabled) return open(state.hovered, false)
|
|
216
|
+
|
|
217
|
+
return state
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
if (state.status === "open") {
|
|
221
|
+
if (event.type === "pointer.entered") return open(true, state.pressing)
|
|
222
|
+
|
|
223
|
+
if (event.type === "pointer.left") return state.hovered || state.pressing ? LEAVING : state
|
|
224
|
+
|
|
225
|
+
if (event.type === "leave.settled") return state.hovered ? state : idle(false, false)
|
|
226
|
+
|
|
227
|
+
if (event.type === "trigger.pressed") return open(state.hovered, true)
|
|
228
|
+
|
|
229
|
+
if (event.type === "press.ended") return open(state.hovered, false)
|
|
230
|
+
|
|
231
|
+
if (event.type === "popup.changed" && event.expanded) return popupOpen(state.hovered, false)
|
|
232
|
+
|
|
233
|
+
// Kobalte closes the tooltip on every click of its trigger; the click that ends a press keeps it open.
|
|
234
|
+
if (event.type === "kobalte.changed" && !event.open) {
|
|
235
|
+
return state.pressing ? open(state.hovered, false) : idle(state.hovered, false)
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
return state
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
if (state.status === "suppressed") {
|
|
242
|
+
if (event.type === "popup.changed" && event.expanded) {
|
|
243
|
+
return popupOpen(state.popup === "closed" || state.hovered, state.disabled)
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
if (state.popup === "open") {
|
|
247
|
+
if (event.type === "pointer.moved") return popupOpen(event.inside, state.disabled)
|
|
248
|
+
|
|
249
|
+
if (event.type === "popup.changed") {
|
|
250
|
+
return state.hovered ? popupClosed(state.disabled) : idle(false, state.disabled)
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
return state
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
if (event.type === "pointer.moved" && !event.inside) return idle(false, state.disabled)
|
|
257
|
+
|
|
258
|
+
if (event.type === "focused") return idle(true, state.disabled)
|
|
259
|
+
|
|
260
|
+
return state
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
if (event.type === "pointer.entered") return controlled(state.open, true, state.expanded, state.disabled)
|
|
264
|
+
|
|
265
|
+
if (event.type === "pointer.left") return controlled(state.open, false, state.expanded, state.disabled)
|
|
266
|
+
|
|
267
|
+
if (event.type === "popup.changed") return controlled(state.open, state.hovered, event.expanded, state.disabled)
|
|
268
|
+
|
|
269
|
+
return state
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
function sync(state: TooltipState, forceOpen: boolean | undefined, disabled: boolean) {
|
|
273
|
+
if (state.status === "disposed") return state
|
|
274
|
+
|
|
275
|
+
if (forceOpen !== undefined) {
|
|
276
|
+
if (state.status === "unmounted") return controlled(forceOpen, false, false, disabled)
|
|
277
|
+
|
|
278
|
+
if (state.status === "controlled") return controlled(forceOpen, state.hovered, state.expanded, disabled)
|
|
279
|
+
|
|
280
|
+
if (state.status === "suppressed" && state.popup === "open") {
|
|
281
|
+
return controlled(forceOpen, state.hovered, true, disabled)
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
if (state.status === "suppressed") return controlled(forceOpen, true, false, disabled)
|
|
285
|
+
|
|
286
|
+
return controlled(forceOpen, state.hovered, false, disabled)
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
if (state.status === "unmounted") return unmounted(disabled)
|
|
290
|
+
|
|
291
|
+
if (state.status === "idle") return idle(state.hovered, disabled)
|
|
292
|
+
|
|
293
|
+
if (state.status === "open") return disabled ? idle(state.hovered, true) : state
|
|
294
|
+
|
|
295
|
+
if (state.status === "suppressed" && state.popup === "open") return popupOpen(state.hovered, disabled)
|
|
296
|
+
|
|
297
|
+
if (state.status === "suppressed") return popupClosed(disabled)
|
|
298
|
+
|
|
299
|
+
// Releasing control closes the tooltip; it opens again on the next hover or focus.
|
|
300
|
+
if (state.expanded) return popupOpen(state.hovered, disabled)
|
|
301
|
+
|
|
302
|
+
return idle(state.hovered, disabled)
|
|
303
|
+
}
|
|
@@ -1,7 +1,32 @@
|
|
|
1
1
|
import { Content, Portal, Root, Trigger } from "@kobalte/core/tooltip"
|
|
2
|
-
import {
|
|
2
|
+
import { createComputed, createSignal, onCleanup, onMount, Show, splitProps, untrack, type JSX } from "solid-js"
|
|
3
3
|
import type { ComponentProps } from "solid-js"
|
|
4
|
-
import {
|
|
4
|
+
import { spread } from "solid-js/web"
|
|
5
|
+
import {
|
|
6
|
+
createTooltipState,
|
|
7
|
+
DISPOSED_EVENT,
|
|
8
|
+
FOCUSED,
|
|
9
|
+
KOBALTE_CLOSED,
|
|
10
|
+
KOBALTE_OPENED,
|
|
11
|
+
LEAVE_SETTLED,
|
|
12
|
+
POINTER_ENTERED,
|
|
13
|
+
POINTER_INSIDE,
|
|
14
|
+
POINTER_LEFT,
|
|
15
|
+
POINTER_OUTSIDE,
|
|
16
|
+
POPUP_COLLAPSED,
|
|
17
|
+
POPUP_EXPANDED,
|
|
18
|
+
PRESS_ENDED,
|
|
19
|
+
selectTooltipForceOpen,
|
|
20
|
+
selectTooltipMounted,
|
|
21
|
+
selectTooltipOpen,
|
|
22
|
+
selectTooltipPressing,
|
|
23
|
+
selectTooltipTracking,
|
|
24
|
+
syncPropsEvent,
|
|
25
|
+
transitionTooltip,
|
|
26
|
+
TRIGGER_PRESSED,
|
|
27
|
+
type TooltipEvent,
|
|
28
|
+
type TooltipState,
|
|
29
|
+
} from "./machine"
|
|
5
30
|
import "./tooltip.css"
|
|
6
31
|
|
|
7
32
|
export interface TooltipProps extends ComponentProps<typeof Root> {
|
|
@@ -15,14 +40,26 @@ export interface TooltipProps extends ComponentProps<typeof Root> {
|
|
|
15
40
|
triggerTabIndex?: number
|
|
16
41
|
}
|
|
17
42
|
|
|
43
|
+
type TriggerHandlers = {
|
|
44
|
+
onPointerEnter?: (event: PointerEvent) => void
|
|
45
|
+
onFocus?: (event: FocusEvent) => void
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
// Expanded panels still need tooltips; only an open popup suppresses its trigger's tooltip.
|
|
49
|
+
const POPUP = '[aria-haspopup]:not([aria-haspopup="false"]):is([aria-expanded="true"], [data-expanded])'
|
|
50
|
+
|
|
18
51
|
export function Tooltip(props: TooltipProps) {
|
|
19
|
-
|
|
52
|
+
return (
|
|
53
|
+
<Show when={!props.inactive} fallback={props.children}>
|
|
54
|
+
<ActiveTooltip {...props} />
|
|
55
|
+
</Show>
|
|
56
|
+
)
|
|
57
|
+
}
|
|
20
58
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
})
|
|
59
|
+
function ActiveTooltip(props: TooltipProps) {
|
|
60
|
+
let ref: HTMLDivElement | undefined
|
|
61
|
+
let handlers: TriggerHandlers | undefined
|
|
62
|
+
let observer: MutationObserver | undefined
|
|
26
63
|
|
|
27
64
|
const [local, others] = splitProps(props, [
|
|
28
65
|
"children",
|
|
@@ -37,77 +74,125 @@ export function Tooltip(props: TooltipProps) {
|
|
|
37
74
|
"value",
|
|
38
75
|
])
|
|
39
76
|
|
|
40
|
-
|
|
41
|
-
|
|
77
|
+
// Kobalte's tooltip costs dozens of computations and listeners per trigger, and most triggers (an action on every
|
|
78
|
+
// timeline row, a copy button on every code block) are never hovered. It mounts on the first interaction that could
|
|
79
|
+
// open it, or as soon as a caller controls it with forceOpen.
|
|
80
|
+
const [tooltip, setTooltip] = createSignal(createTooltipState(local.forceOpen, !!others.disabled))
|
|
42
81
|
|
|
43
|
-
const
|
|
44
|
-
const
|
|
82
|
+
const dispatch = (event: TooltipEvent, source?: PointerEvent | FocusEvent) => {
|
|
83
|
+
const previous = untrack(tooltip)
|
|
84
|
+
const transition = transitionTooltip(previous, event)
|
|
85
|
+
|
|
86
|
+
if (transition.state !== previous) {
|
|
87
|
+
setTooltip(transition.state)
|
|
88
|
+
reconcile(previous, transition.state)
|
|
89
|
+
}
|
|
45
90
|
|
|
46
|
-
|
|
91
|
+
for (const effect of transition.effects) {
|
|
92
|
+
if (effect === "schedule-leave") queueMicrotask(settleLeave)
|
|
47
93
|
|
|
48
|
-
|
|
94
|
+
// Kobalte attached its listeners while this event was being dispatched, too late to receive it.
|
|
95
|
+
if (effect === "replay" && source instanceof PointerEvent) handlers?.onPointerEnter?.(source)
|
|
96
|
+
|
|
97
|
+
if (effect === "replay" && source instanceof FocusEvent) handlers?.onFocus?.(source)
|
|
98
|
+
}
|
|
49
99
|
}
|
|
50
100
|
|
|
51
|
-
|
|
52
|
-
|
|
101
|
+
// Kobalte's own pointerleave handler runs after this one and only starts the skip-delay window for neighbouring
|
|
102
|
+
// tooltips if it still sees this one open.
|
|
103
|
+
const settleLeave = () => dispatch(LEAVE_SETTLED)
|
|
104
|
+
const syncPopup = () => dispatch(ref?.querySelector(POPUP) ? POPUP_EXPANDED : POPUP_COLLAPSED)
|
|
105
|
+
// The press's click, if any, follows its pointerup in the same task.
|
|
106
|
+
const onPressEnd = () => setTimeout(dispatch, 0, PRESS_ENDED)
|
|
53
107
|
|
|
54
|
-
|
|
108
|
+
const onPointerMove = (event: PointerEvent) => {
|
|
109
|
+
if (!ref) return
|
|
110
|
+
const box = ref.getBoundingClientRect()
|
|
55
111
|
|
|
56
|
-
|
|
57
|
-
|
|
112
|
+
const inside =
|
|
113
|
+
event.clientX >= box.left && event.clientX <= box.right && event.clientY >= box.top && event.clientY <= box.bottom
|
|
114
|
+
|
|
115
|
+
dispatch(inside ? POINTER_INSIDE : POINTER_OUTSIDE)
|
|
58
116
|
}
|
|
59
117
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
const
|
|
63
|
-
'[aria-haspopup]:not([aria-haspopup="false"]):is([aria-expanded="true"], [data-expanded])',
|
|
64
|
-
)
|
|
118
|
+
// Attaches the listeners and observer the state needs and detaches the rest.
|
|
119
|
+
const reconcile = (previous: TooltipState, state: TooltipState) => {
|
|
120
|
+
const pressing = selectTooltipPressing(state)
|
|
65
121
|
|
|
66
|
-
|
|
122
|
+
if (pressing && !selectTooltipPressing(previous)) {
|
|
123
|
+
window.addEventListener("pointerup", onPressEnd, true)
|
|
124
|
+
window.addEventListener("pointercancel", onPressEnd, true)
|
|
125
|
+
}
|
|
67
126
|
|
|
68
|
-
if (
|
|
69
|
-
|
|
70
|
-
|
|
127
|
+
if (!pressing && selectTooltipPressing(previous)) {
|
|
128
|
+
window.removeEventListener("pointerup", onPressEnd, true)
|
|
129
|
+
window.removeEventListener("pointercancel", onPressEnd, true)
|
|
130
|
+
}
|
|
71
131
|
|
|
72
|
-
|
|
132
|
+
const tracking = selectTooltipTracking(state)
|
|
133
|
+
|
|
134
|
+
if (tracking && !selectTooltipTracking(previous)) {
|
|
135
|
+
window.addEventListener("pointermove", onPointerMove, { capture: true, passive: true })
|
|
73
136
|
}
|
|
74
137
|
|
|
75
|
-
|
|
76
|
-
}
|
|
138
|
+
if (!tracking && selectTooltipTracking(previous)) window.removeEventListener("pointermove", onPointerMove, true)
|
|
77
139
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
close()
|
|
81
|
-
}
|
|
140
|
+
if (state.status === "disposed") {
|
|
141
|
+
observer?.disconnect()
|
|
82
142
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
// skip-delay window for neighbouring tooltips if it still sees this one open.
|
|
86
|
-
queueMicrotask(() => {
|
|
87
|
-
if (!inside()) close()
|
|
88
|
-
drop()
|
|
89
|
-
})
|
|
90
|
-
}
|
|
143
|
+
return
|
|
144
|
+
}
|
|
91
145
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
const obs = new MutationObserver(sync)
|
|
96
|
-
obs.observe(ref, {
|
|
146
|
+
if (!ref || observer || !selectTooltipMounted(state)) return
|
|
147
|
+
observer = new MutationObserver(syncPopup)
|
|
148
|
+
observer.observe(ref, {
|
|
97
149
|
subtree: true,
|
|
98
150
|
childList: true,
|
|
99
151
|
attributes: true,
|
|
100
152
|
attributeFilter: ["aria-expanded", "data-expanded", "aria-haspopup"],
|
|
101
153
|
})
|
|
102
|
-
|
|
103
|
-
}
|
|
154
|
+
syncPopup()
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
createComputed(() => dispatch(syncPropsEvent(local.forceOpen, !!others.disabled)))
|
|
158
|
+
onMount(() => reconcile(untrack(tooltip), untrack(tooltip)))
|
|
159
|
+
onCleanup(() => dispatch(DISPOSED_EVENT))
|
|
104
160
|
|
|
105
|
-
|
|
161
|
+
// Kobalte's trigger takes over the element rendered below instead of rendering one, so mounting the tooltip leaves
|
|
162
|
+
// the trigger and its children in place, with their focus and hover.
|
|
163
|
+
const adopt = (triggerProps: TriggerHandlers) => {
|
|
164
|
+
handlers = triggerProps
|
|
165
|
+
|
|
166
|
+
if (!ref) return null
|
|
167
|
+
// Kobalte owns the open state attributes from here, and spread never removes an attribute it did not set, so a
|
|
168
|
+
// tooltip that mounts open would keep the closed marker.
|
|
169
|
+
ref.removeAttribute("data-closed")
|
|
170
|
+
spread(ref, triggerProps, false, true)
|
|
171
|
+
|
|
172
|
+
return null
|
|
173
|
+
}
|
|
106
174
|
|
|
107
175
|
return (
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
<
|
|
176
|
+
<>
|
|
177
|
+
{/* These listeners are attached before Kobalte's, so the machine sees each hover and focus first. */}
|
|
178
|
+
<div
|
|
179
|
+
ref={(el) => {
|
|
180
|
+
ref = el
|
|
181
|
+
// Kobalte's trigger sets this on the element it renders; it sets it again here once it mounts.
|
|
182
|
+
el.setAttribute("type", "button")
|
|
183
|
+
}}
|
|
184
|
+
data-closed=""
|
|
185
|
+
tabIndex={local.triggerTabIndex}
|
|
186
|
+
data-component="tooltip-v2-trigger"
|
|
187
|
+
class={local.class}
|
|
188
|
+
onPointerEnter={(event) => {
|
|
189
|
+
if (event.pointerType !== "touch") dispatch(POINTER_ENTERED, event)
|
|
190
|
+
}}
|
|
191
|
+
onFocus={(event) => dispatch(FOCUSED, event)}
|
|
192
|
+
>
|
|
193
|
+
{local.children}
|
|
194
|
+
</div>
|
|
195
|
+
<Show when={selectTooltipMounted(tooltip())}>
|
|
111
196
|
<Root
|
|
112
197
|
gutter={4}
|
|
113
198
|
openDelay={400}
|
|
@@ -115,37 +200,18 @@ export function Tooltip(props: TooltipProps) {
|
|
|
115
200
|
{...others}
|
|
116
201
|
closeDelay={0}
|
|
117
202
|
ignoreSafeArea={local.ignoreSafeArea ?? true}
|
|
118
|
-
open={
|
|
119
|
-
onOpenChange={(open) =>
|
|
120
|
-
if (controlled()) return
|
|
121
|
-
|
|
122
|
-
if (state.block && open) return
|
|
123
|
-
|
|
124
|
-
if (justClickedTrigger) {
|
|
125
|
-
justClickedTrigger = false
|
|
126
|
-
|
|
127
|
-
return
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
setState("open", open)
|
|
131
|
-
}}
|
|
203
|
+
open={selectTooltipOpen(tooltip())}
|
|
204
|
+
onOpenChange={(open) => dispatch(open ? KOBALTE_OPENED : KOBALTE_CLOSED)}
|
|
132
205
|
>
|
|
206
|
+
{/* Kobalte calls these inside its own listeners. As separate listeners, the leave microtask would close the
|
|
207
|
+
tooltip before Kobalte's listener ran, which then skipped the skip-delay window. */}
|
|
133
208
|
<Trigger
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
class={local.class}
|
|
139
|
-
onPointerDownCapture={arm}
|
|
140
|
-
onKeyDownCapture={(event: KeyboardEvent) => {
|
|
141
|
-
if (event.key !== "Enter" && event.key !== " ") return
|
|
142
|
-
arm()
|
|
209
|
+
as={adopt}
|
|
210
|
+
onPointerDown={() => dispatch(TRIGGER_PRESSED)}
|
|
211
|
+
onPointerLeave={(event: PointerEvent) => {
|
|
212
|
+
if (event.pointerType !== "touch") dispatch(POINTER_LEFT)
|
|
143
213
|
}}
|
|
144
|
-
|
|
145
|
-
onFocusOut={() => requestAnimationFrame(() => drop())}
|
|
146
|
-
>
|
|
147
|
-
{local.children}
|
|
148
|
-
</Trigger>
|
|
214
|
+
/>
|
|
149
215
|
<Portal>
|
|
150
216
|
<Content
|
|
151
217
|
ref={(el) => {
|
|
@@ -156,22 +222,21 @@ export function Tooltip(props: TooltipProps) {
|
|
|
156
222
|
data-component="tooltip-v2"
|
|
157
223
|
data-appearance={local.appearance ?? "compact"}
|
|
158
224
|
data-placement={props.placement}
|
|
159
|
-
data-force-open={
|
|
225
|
+
data-force-open={selectTooltipForceOpen(tooltip())}
|
|
160
226
|
class={local.contentClass}
|
|
161
227
|
style={local.contentStyle}
|
|
162
|
-
onPointerDownOutside={
|
|
163
|
-
if (ref === e.target || (e.target instanceof Node && ref?.contains(e.target))) {
|
|
164
|
-
justClickedTrigger = true
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
e.preventDefault()
|
|
168
|
-
}}
|
|
228
|
+
onPointerDownOutside={preventDismiss}
|
|
169
229
|
>
|
|
170
230
|
{local.value}
|
|
171
231
|
</Content>
|
|
172
232
|
</Portal>
|
|
173
233
|
</Root>
|
|
174
|
-
</
|
|
175
|
-
|
|
234
|
+
</Show>
|
|
235
|
+
</>
|
|
176
236
|
)
|
|
177
237
|
}
|
|
238
|
+
|
|
239
|
+
// A press on the trigger is outside the tooltip's layer; the machine decides whether it closes the tooltip.
|
|
240
|
+
function preventDismiss(event: Event) {
|
|
241
|
+
event.preventDefault()
|
|
242
|
+
}
|
package/src/styles/theme.css
CHANGED
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
--font-size-base: 14px;
|
|
10
10
|
--font-size-large: 16px;
|
|
11
11
|
--font-size-x-large: 20px;
|
|
12
|
-
--font-weight-regular:
|
|
13
|
-
--font-weight-medium:
|
|
12
|
+
--font-weight-regular: 440;
|
|
13
|
+
--font-weight-medium: 530;
|
|
14
14
|
--font-weight-bold: 670;
|
|
15
15
|
--line-height-normal: 130%;
|
|
16
16
|
--line-height-large: 150%;
|
|
@@ -630,3 +630,11 @@
|
|
|
630
630
|
--text-stronger: rgba(255, 255, 255, 0.936);
|
|
631
631
|
}
|
|
632
632
|
}
|
|
633
|
+
|
|
634
|
+
/* CJK system fonts ship fixed weights, so 440 and 530 snap up to Medium and Semibold. */
|
|
635
|
+
:lang(zh),
|
|
636
|
+
:lang(ja),
|
|
637
|
+
:lang(ko) {
|
|
638
|
+
--font-weight-regular: 400;
|
|
639
|
+
--font-weight-medium: 500;
|
|
640
|
+
}
|
|
@@ -112,6 +112,9 @@
|
|
|
112
112
|
--v2-elevation-overlay:
|
|
113
113
|
0px 16px 32px 0px var(--v2-alpha-dark-4), 0px 8px 16px 0px var(--v2-alpha-dark-8),
|
|
114
114
|
0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0);
|
|
115
|
+
--v2-elevation-input:
|
|
116
|
+
0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
|
|
117
|
+
0px 0px 0px 0px var(--v2-alpha-dark-0);
|
|
115
118
|
--v2-elevation-button-neutral:
|
|
116
119
|
0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
|
|
117
120
|
0px 0px 0px 0px var(--v2-alpha-dark-0);
|
|
@@ -229,6 +232,10 @@
|
|
|
229
232
|
0px 8px 16px 0px var(--v2-alpha-dark-30),
|
|
230
233
|
0px 0px 0px 0.5px var(--v2-alpha-light-16),
|
|
231
234
|
0px -0.5px 0px 0px var(--v2-alpha-light-6);
|
|
235
|
+
--v2-elevation-input:
|
|
236
|
+
0px 1px 2px 0px var(--v2-alpha-dark-0),
|
|
237
|
+
0px 0px 0px 0.5px var(--v2-alpha-light-16),
|
|
238
|
+
0px -0.5px 0px 0px var(--v2-alpha-light-6);
|
|
232
239
|
--v2-elevation-button-neutral:
|
|
233
240
|
0px 1px 2px 0px var(--v2-alpha-dark-40),
|
|
234
241
|
0px 0px 0px 0.5px var(--v2-alpha-light-20),
|
|
@@ -342,6 +349,9 @@
|
|
|
342
349
|
--v2-elevation-overlay:
|
|
343
350
|
0px 16px 32px 0px var(--v2-alpha-dark-4), 0px 8px 16px 0px var(--v2-alpha-dark-8),
|
|
344
351
|
0px 0px 0px 0.5px var(--v2-alpha-dark-12), 0px 0px 0px 0px var(--v2-alpha-dark-0);
|
|
352
|
+
--v2-elevation-input:
|
|
353
|
+
0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
|
|
354
|
+
0px 0px 0px 0px var(--v2-alpha-dark-0);
|
|
345
355
|
--v2-elevation-button-neutral:
|
|
346
356
|
0px 1px 1.5px 0px var(--v2-alpha-dark-10), 0px 0px 0px 0.5px var(--v2-alpha-dark-14),
|
|
347
357
|
0px 0px 0px 0px var(--v2-alpha-dark-0);
|
|
@@ -488,6 +498,9 @@
|
|
|
488
498
|
--v2-elevation-overlay:
|
|
489
499
|
0px 16px 32px 0px var(--v2-alpha-dark-30), 0px 8px 16px 0px var(--v2-alpha-dark-30),
|
|
490
500
|
0px 0px 0px 0.5px var(--v2-alpha-light-16), 0px -0.5px 0px 0px var(--v2-alpha-light-6);
|
|
501
|
+
--v2-elevation-input:
|
|
502
|
+
0px 1px 2px 0px var(--v2-alpha-dark-0), 0px 0px 0px 0.5px var(--v2-alpha-light-16),
|
|
503
|
+
0px -0.5px 0px 0px var(--v2-alpha-light-6);
|
|
491
504
|
--v2-elevation-button-neutral:
|
|
492
505
|
0px 1px 2px 0px var(--v2-alpha-dark-40), 0px 0px 0px 0.5px var(--v2-alpha-light-20),
|
|
493
506
|
0px -0.5px 0px 0px var(--v2-alpha-light-10);
|