@glasshome/ui 1.42.0 → 1.44.0

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.
Files changed (153) hide show
  1. package/SPEC.md +8 -5
  2. package/dist/index.js +2 -2
  3. package/dist/lib/anchor-placement.d.ts +4 -0
  4. package/dist/lib/balance-rows.d.ts +10 -4
  5. package/dist/lib/behavior/anchored.d.ts +16 -3
  6. package/dist/lib/behavior/button-root.d.ts +7 -0
  7. package/dist/lib/behavior/collection.d.ts +8 -0
  8. package/dist/lib/behavior/dismiss.d.ts +6 -4
  9. package/dist/lib/behavior/focus-scope.d.ts +9 -1
  10. package/dist/lib/behavior/hide-outside.d.ts +1 -1
  11. package/dist/lib/behavior/layer-stack.d.ts +3 -2
  12. package/dist/lib/behavior/menu.d.ts +62 -0
  13. package/dist/lib/behavior/modal-root.d.ts +2 -0
  14. package/dist/lib/behavior/range.d.ts +44 -0
  15. package/dist/lib/color/color.d.ts +41 -0
  16. package/dist/lib/color/index.d.ts +2 -0
  17. package/dist/lib/color/intl.d.ts +40 -0
  18. package/dist/lib/dock-slot-classes.d.ts +2 -0
  19. package/dist/lib/hold.d.ts +1 -1
  20. package/dist/lib/locale.d.ts +3 -0
  21. package/dist/lib/menu-classes.d.ts +2 -0
  22. package/dist/lib/motion-classes.d.ts +2 -1
  23. package/dist/lib/overlay-classes.d.ts +1 -0
  24. package/dist/lib/scroll-track.d.ts +3 -2
  25. package/dist/lib/section-tokens.d.ts +1 -1
  26. package/dist/lib/segment-classes.d.ts +2 -0
  27. package/dist/lib/shadow-layer.d.ts +0 -45
  28. package/dist/lib/toggle-set.d.ts +44 -0
  29. package/dist/lib/visually-hidden.d.ts +3 -0
  30. package/dist/solid/accordion.d.ts +35 -11
  31. package/dist/solid/avatar.d.ts +8 -4
  32. package/dist/solid/bottom-sheet/bottom-sheet.d.ts +1 -1
  33. package/dist/solid/button.d.ts +5 -4
  34. package/dist/solid/charts.d.ts +1 -1
  35. package/dist/solid/checkbox.d.ts +14 -4
  36. package/dist/solid/collapsible.d.ts +33 -5
  37. package/dist/solid/color-disc.d.ts +1 -1
  38. package/dist/solid/color-slider.d.ts +1 -1
  39. package/dist/solid/color-wheel.d.ts +1 -1
  40. package/dist/solid/context-menu.d.ts +58 -24
  41. package/dist/solid/data-table.d.ts +4 -2
  42. package/dist/solid/dialog-parts.d.ts +8 -8
  43. package/dist/solid/dropdown-menu.d.ts +55 -24
  44. package/dist/solid/empty.d.ts +1 -1
  45. package/dist/solid/form.d.ts +5 -6
  46. package/dist/solid/hover-card.d.ts +65 -9
  47. package/dist/solid/index.d.ts +1 -1
  48. package/dist/solid/index.js +7752 -13493
  49. package/dist/solid/input-group.d.ts +6 -6
  50. package/dist/solid/item.d.ts +1 -1
  51. package/dist/solid/menu-parts.d.ts +175 -24
  52. package/dist/solid/option-card.d.ts +1 -4
  53. package/dist/solid/picker-row.d.ts +2 -0
  54. package/dist/solid/popover.d.ts +77 -12
  55. package/dist/solid/progress.d.ts +11 -3
  56. package/dist/solid/radio-group.d.ts +31 -6
  57. package/dist/solid/responsive-dialog.d.ts +1 -1
  58. package/dist/solid/scroll-area.d.ts +1 -1
  59. package/dist/solid/section-card.d.ts +2 -3
  60. package/dist/solid/select.d.ts +107 -10
  61. package/dist/solid/selection.d.ts +10 -1
  62. package/dist/solid/sheet.d.ts +1 -1
  63. package/dist/solid/sliding-indicator.d.ts +1 -1
  64. package/dist/solid/sonner.d.ts +1 -1
  65. package/dist/solid/toggle.d.ts +11 -3
  66. package/dist/solid/tooltip.d.ts +22 -22
  67. package/dist/tokens/index.js +54 -51
  68. package/dist/{utils-CxAii-e9.js → utils-BbIeGt7o.js} +376 -314
  69. package/package.json +3 -6
  70. package/src/lib/anchor-placement.ts +10 -3
  71. package/src/lib/balance-rows.ts +115 -40
  72. package/src/lib/behavior/anchored.ts +41 -9
  73. package/src/lib/behavior/button-root.tsx +103 -0
  74. package/src/lib/behavior/collection.ts +56 -28
  75. package/src/lib/behavior/dismiss.ts +61 -21
  76. package/src/lib/behavior/focus-scope.ts +75 -9
  77. package/src/lib/behavior/hide-outside.ts +2 -2
  78. package/src/lib/behavior/layer-stack.ts +33 -8
  79. package/src/lib/behavior/menu.ts +462 -0
  80. package/src/lib/behavior/modal-root.tsx +24 -18
  81. package/src/lib/behavior/polymorphic.tsx +1 -1
  82. package/src/lib/behavior/presence.ts +1 -1
  83. package/src/lib/behavior/range.ts +212 -0
  84. package/src/lib/clipboard.ts +2 -3
  85. package/src/lib/color/color.ts +746 -0
  86. package/src/lib/color/index.ts +2 -0
  87. package/src/lib/color/intl.ts +60 -0
  88. package/src/lib/dock-slot-classes.ts +3 -0
  89. package/src/lib/hold.ts +1 -1
  90. package/src/lib/locale.ts +62 -0
  91. package/src/lib/menu-classes.ts +3 -0
  92. package/src/lib/motion-classes.ts +8 -9
  93. package/src/lib/overlay-classes.ts +1 -3
  94. package/src/lib/scroll-track.ts +11 -6
  95. package/src/lib/section-tokens.ts +1 -1
  96. package/src/lib/segment-classes.ts +3 -0
  97. package/src/lib/shadow-layer.ts +0 -118
  98. package/src/lib/toggle-set.ts +133 -0
  99. package/src/lib/visually-hidden.ts +15 -0
  100. package/src/solid/accordion.tsx +294 -20
  101. package/src/solid/area-picker.tsx +4 -4
  102. package/src/solid/avatar.tsx +98 -24
  103. package/src/solid/bottom-sheet/arbitration.ts +4 -11
  104. package/src/solid/bottom-sheet/bottom-sheet.tsx +4 -5
  105. package/src/solid/bottom-sheet/drag-controller.ts +7 -20
  106. package/src/solid/button.tsx +12 -6
  107. package/src/solid/charts.tsx +1 -1
  108. package/src/solid/checkbox.tsx +167 -44
  109. package/src/solid/collapsible.tsx +260 -12
  110. package/src/solid/color-disc.tsx +11 -12
  111. package/src/solid/color-slider.tsx +114 -47
  112. package/src/solid/color-wheel.tsx +137 -39
  113. package/src/solid/context-menu.tsx +285 -94
  114. package/src/solid/data-table.tsx +48 -22
  115. package/src/solid/dialog-parts.tsx +39 -17
  116. package/src/solid/dock.tsx +44 -43
  117. package/src/solid/dropdown-menu.tsx +252 -115
  118. package/src/solid/empty.tsx +1 -1
  119. package/src/solid/entity-selector.tsx +3 -3
  120. package/src/solid/face-toggle.tsx +43 -18
  121. package/src/solid/form.tsx +5 -6
  122. package/src/solid/glyph-tile.tsx +48 -21
  123. package/src/solid/hover-card.tsx +287 -25
  124. package/src/solid/icon-picker.tsx +1 -2
  125. package/src/solid/image-picker.tsx +2 -2
  126. package/src/solid/index.ts +1 -3
  127. package/src/solid/input-group.tsx +2 -2
  128. package/src/solid/item.tsx +1 -1
  129. package/src/solid/menu-parts.tsx +610 -155
  130. package/src/solid/option-card.tsx +7 -13
  131. package/src/solid/picker-row.tsx +5 -1
  132. package/src/solid/popover.tsx +423 -80
  133. package/src/solid/preview-tile.tsx +1 -1
  134. package/src/solid/progress.tsx +84 -15
  135. package/src/solid/radio-group.tsx +271 -34
  136. package/src/solid/responsive-dialog.tsx +1 -1
  137. package/src/solid/schema-form.tsx +1 -6
  138. package/src/solid/scroll-area.tsx +1 -1
  139. package/src/solid/section-card.tsx +3 -4
  140. package/src/solid/select.tsx +939 -95
  141. package/src/solid/selection.tsx +165 -74
  142. package/src/solid/sheet.tsx +1 -1
  143. package/src/solid/slider.tsx +115 -65
  144. package/src/solid/sliding-indicator.tsx +4 -16
  145. package/src/solid/sonner.tsx +1 -1
  146. package/src/solid/tabs.tsx +12 -6
  147. package/src/solid/term.tsx +3 -4
  148. package/src/solid/toggle-group.tsx +34 -101
  149. package/src/solid/toggle.tsx +43 -9
  150. package/src/solid/tooltip.tsx +24 -24
  151. package/src/styles/globals.css +61 -50
  152. package/src/styles/theme.css +12 -6
  153. package/src/tokens/material.ts +11 -2
@@ -1,150 +1,994 @@
1
- import { Select as SelectPrimitive, useSelectContext } from "@kobalte/core/select";
2
- import { usePortalMount } from "./portal-mount.js";
3
1
  import {
2
+ type Accessor,
4
3
  type Component,
5
4
  type ComponentProps,
5
+ createComponent,
6
+ createContext,
7
+ createMemo,
6
8
  createSignal,
7
- type ParentComponent,
9
+ createUniqueId,
10
+ For,
11
+ type JSX,
12
+ onCleanup,
13
+ Show,
8
14
  splitProps,
15
+ untrack,
16
+ useContext,
9
17
  } from "solid-js";
10
- import { shadowLayer } from "../lib/shadow-layer.js";
18
+ import { Portal } from "solid-js/web";
19
+ import { createAnchored } from "../lib/behavior/anchored.js";
20
+ import { ButtonRoot, type ButtonRootProps } from "../lib/behavior/button-root.js";
21
+ import { createCollection, createTypeahead } from "../lib/behavior/collection.js";
22
+ import { createControllableSignal } from "../lib/behavior/controllable.js";
23
+ import { createDismiss } from "../lib/behavior/dismiss.js";
24
+ import { focusFell, focusWithoutTracking } from "../lib/behavior/focus-scope.js";
25
+ import { registerLayer } from "../lib/behavior/layer-stack.js";
26
+ import {
27
+ type InteractOutsideEvent,
28
+ interactOutside,
29
+ type PointerDownOutsideEvent,
30
+ vetoed,
31
+ } from "../lib/behavior/modal-root.js";
32
+ import { createPresence } from "../lib/behavior/presence.js";
33
+ import { effect, merge } from "../lib/behavior/solid.js";
11
34
  import { CONTROL_H, INPUT_SURFACE } from "../lib/input-classes.js";
12
35
  import { nestedLayerAttrs, Z_CLASS } from "../lib/layers.js";
13
- import { MENU_ITEM, MENU_LABEL, MENU_SEPARATOR } from "../lib/menu-classes.js";
14
- import { FIELD_MOTION, STAGGER } from "../lib/motion-classes.js";
15
- import { ignoreOpeningRelease } from "../lib/opening-release.js";
16
- import { anchorToTriggerTop } from "../lib/overlay-classes.js";
36
+ import { MENU_ITEM, MENU_ITEM_RADIUS, MENU_LABEL, MENU_SEPARATOR } from "../lib/menu-classes.js";
37
+ import { FIELD_MOTION, MOTION_EXIT_MS } from "../lib/motion-classes.js";
17
38
  import { PICKER_LIST, PICKER_TRIGGER } from "../lib/picker-classes.js";
18
39
  import { cn } from "../lib/utils.js";
19
40
  import { Icon } from "./icon.js";
41
+ import { usePortalMount } from "./portal-mount.js";
20
42
  import { SelectionHighlight, SelectionScope } from "./selection.js";
21
43
 
22
- const Select = ((props: ComponentProps<typeof SelectPrimitive>) => (
23
- <SelectPrimitive gutter={0} getAnchorRect={anchorToTriggerTop} flip={false} overlap {...props} />
24
- )) as typeof SelectPrimitive;
25
- const SelectValue = SelectPrimitive.Value;
44
+ /** One row of the list: an option, or the heading of a group of options. */
45
+ interface SelectNode<T> {
46
+ type: "item" | "section";
47
+ key: string;
48
+ rawValue: T;
49
+ textValue: string;
50
+ disabled: boolean;
51
+ level: number;
52
+ index: number;
53
+ prevKey?: string;
54
+ nextKey?: string;
55
+ }
56
+
57
+ type Field<T, V> = keyof Exclude<T, null> | ((option: Exclude<T, null>) => V);
58
+
59
+ interface SelectBaseProps<Option, OptGroup> extends Omit<
60
+ ComponentProps<"div">,
61
+ "onChange" | "placeholder" | "children"
62
+ > {
63
+ options: (Option | OptGroup)[];
64
+ optionValue?: Field<Option, string | number>;
65
+ optionTextValue?: Field<Option, string>;
66
+ optionDisabled?: Field<Option, boolean>;
67
+ optionGroupChildren?: keyof Exclude<OptGroup, null>;
68
+ itemComponent?: Component<{ item: SelectNode<Option> }>;
69
+ sectionComponent?: Component<{ section: SelectNode<OptGroup> }>;
70
+ placeholder?: JSX.Element;
71
+ open?: boolean;
72
+ defaultOpen?: boolean;
73
+ onOpenChange?: (open: boolean) => void;
74
+ closeOnSelection?: boolean;
75
+ disabled?: boolean;
76
+ required?: boolean;
77
+ readOnly?: boolean;
78
+ validationState?: "valid" | "invalid";
79
+ children?: JSX.Element;
80
+ /** @deprecated Ignored; removed in 2.0.0. */
81
+ name?: string;
82
+ /** @deprecated Ignored; removed in 2.0.0. */
83
+ placement?: string;
84
+ /** @deprecated Ignored; removed in 2.0.0. */
85
+ gutter?: number;
86
+ /** @deprecated Ignored; removed in 2.0.0. */
87
+ flip?: boolean | string;
88
+ /** @deprecated Ignored; removed in 2.0.0. */
89
+ overlap?: boolean;
90
+ /** @deprecated Ignored; removed in 2.0.0. */
91
+ sameWidth?: boolean;
92
+ /** @deprecated Ignored; removed in 2.0.0. */
93
+ getAnchorRect?: (anchor?: HTMLElement) => unknown;
94
+ /** @deprecated Ignored; removed in 2.0.0. */
95
+ modal?: boolean;
96
+ /** @deprecated Ignored; removed in 2.0.0. */
97
+ preventScroll?: boolean;
98
+ /** @deprecated Ignored; removed in 2.0.0. */
99
+ disallowEmptySelection?: boolean;
100
+ /** @deprecated Ignored; removed in 2.0.0. */
101
+ allowDuplicateSelectionEvents?: boolean;
102
+ }
103
+
104
+ interface SingleProps<Option> {
105
+ multiple?: false;
106
+ value?: Option | null;
107
+ defaultValue?: Option;
108
+ onChange?: (value: Option | null) => void;
109
+ }
110
+
111
+ interface MultipleProps<Option> {
112
+ multiple: true;
113
+ value?: Option[];
114
+ defaultValue?: Option[];
115
+ onChange?: (value: Option[]) => void;
116
+ }
117
+
118
+ type SelectProps<Option, OptGroup = never> = SelectBaseProps<Option, OptGroup> &
119
+ (SingleProps<Option> | MultipleProps<Option>);
120
+
121
+ type CloseReason = "commit" | "outside" | "parent";
122
+
123
+ interface SelectContextValue {
124
+ ids: { root: string; trigger: Accessor<string>; value: string; listbox: string };
125
+ setTriggerId: (id: string) => void;
126
+ open: Accessor<boolean>;
127
+ openFrom: Accessor<"first" | "last">;
128
+ show: (from: "first" | "last") => void;
129
+ close: (reason: CloseReason) => void;
130
+ /** The panel unmounted: a close by an outside press refocuses the trigger only if focus fell to the page. */
131
+ settle: () => void;
132
+ setCloseAutoFocus: (handler: ((event: Event) => void) | undefined) => void;
133
+ nodes: Accessor<readonly SelectNode<unknown>[]>;
134
+ optionId: (key: string | undefined) => string | undefined;
135
+ multiple: Accessor<boolean>;
136
+ isSelected: (key: string) => boolean;
137
+ firstSelected: Accessor<string | undefined>;
138
+ empty: Accessor<boolean>;
139
+ choose: (key: string) => void;
140
+ step: (by: 1 | -1) => void;
141
+ typeahead: (event: KeyboardEvent) => boolean;
142
+ selectedOptions: Accessor<unknown[]>;
143
+ remove: (option: unknown) => void;
144
+ clear: () => void;
145
+ placeholder: () => JSX.Element;
146
+ itemComponent: Accessor<Component<{ item: SelectNode<unknown> }> | undefined>;
147
+ sectionComponent: Accessor<Component<{ section: SelectNode<unknown> }> | undefined>;
148
+ trigger: Accessor<HTMLElement | undefined>;
149
+ setTrigger: (el: HTMLElement | undefined) => void;
150
+ labelId: Accessor<string | undefined>;
151
+ setLabelId: (id: string | undefined) => void;
152
+ listboxLabelledBy: Accessor<string | undefined>;
153
+ setListboxLabelledBy: (ids: string | undefined) => void;
154
+ blocked: Accessor<boolean>;
155
+ disabled: Accessor<boolean>;
156
+ attrs: StateAttrs;
157
+ }
158
+
159
+ type StateAttrs = {
160
+ [
161
+ K in
162
+ | "data-expanded"
163
+ | "data-closed"
164
+ | "data-valid"
165
+ | "data-invalid"
166
+ | "data-required"
167
+ | "data-disabled"
168
+ | "data-readonly"
169
+ ]: "" | undefined;
170
+ };
171
+
172
+ const SelectContext = createContext<SelectContextValue | null>(null);
173
+
174
+ const useSelect = (): SelectContextValue => {
175
+ const ctx = useContext(SelectContext);
176
+ if (!ctx) throw new Error("Select parts render inside a Select");
177
+ return ctx;
178
+ };
179
+
180
+ interface SelectListValue {
181
+ highlighted: Accessor<string | undefined>;
182
+ }
183
+
184
+ const SelectListContext = createContext<SelectListValue | null>(null);
185
+
186
+ const useSelectList = (): SelectListValue => {
187
+ const ctx = useContext(SelectListContext);
188
+ if (!ctx) throw new Error("SelectItem renders inside SelectContent, through itemComponent");
189
+ return ctx;
190
+ };
191
+
192
+ const ITEM = '[role="option"][data-key]';
193
+ const TAP_SLOP_PX = 10;
194
+ const flag = (on: boolean) => (on ? "" : undefined);
195
+
196
+ function read<T, V>(option: T, by: Field<T, V> | undefined): unknown {
197
+ if (by === undefined || option === null || option === undefined) return undefined;
198
+ if (typeof by === "function") return by(option as Exclude<T, null>);
199
+ return (option as Record<PropertyKey, unknown>)[by as PropertyKey];
200
+ }
201
+
202
+ const sameKeys = (a: readonly string[], b: readonly string[]) =>
203
+ a.length === b.length && a.every((key, i) => key === b[i]);
26
204
 
27
- const SelectTrigger: ParentComponent<
28
- ComponentProps<typeof SelectPrimitive.Trigger> & { size?: "sm" | "default" }
29
- > = (props) => {
30
- const [local, rest] = splitProps(props, ["class", "children", "size"]);
205
+ type SelectionProps = {
206
+ multiple?: unknown;
207
+ value?: unknown;
208
+ defaultValue?: unknown;
209
+ onChange?: unknown;
210
+ };
211
+
212
+ function Select<Option, OptGroup = never>(props: SelectProps<Option, OptGroup>): JSX.Element {
213
+ const [local, , rest] = splitProps(
214
+ props as SelectBaseProps<Option, OptGroup> & SelectionProps,
215
+ [
216
+ "options",
217
+ "optionValue",
218
+ "optionTextValue",
219
+ "optionDisabled",
220
+ "optionGroupChildren",
221
+ "itemComponent",
222
+ "sectionComponent",
223
+ "placeholder",
224
+ "open",
225
+ "defaultOpen",
226
+ "onOpenChange",
227
+ "closeOnSelection",
228
+ "disabled",
229
+ "required",
230
+ "readOnly",
231
+ "validationState",
232
+ "children",
233
+ "id",
234
+ "name",
235
+ "placement",
236
+ "gutter",
237
+ "flip",
238
+ "overlap",
239
+ "sameWidth",
240
+ "getAnchorRect",
241
+ "modal",
242
+ "preventScroll",
243
+ "disallowEmptySelection",
244
+ "allowDuplicateSelectionEvents",
245
+ ],
246
+ ["multiple", "value", "defaultValue", "onChange"],
247
+ );
248
+
249
+ const keyOf = (option: Option): string =>
250
+ local.optionValue === undefined ? String(option) : String(read(option, local.optionValue));
251
+ const textOf = (option: Option): string =>
252
+ local.optionTextValue === undefined
253
+ ? String(option)
254
+ : String(read(option, local.optionTextValue));
255
+ const disabledOf = (option: Option): boolean => read(option, local.optionDisabled) === true;
256
+
257
+ const nodes = createMemo(() => {
258
+ const out: SelectNode<unknown>[] = [];
259
+ let items = 0;
260
+ const groupKey = local.optionGroupChildren;
261
+ const add = (option: Option, level: number) =>
262
+ out.push({
263
+ type: "item",
264
+ key: keyOf(option),
265
+ rawValue: option,
266
+ textValue: textOf(option),
267
+ disabled: disabledOf(option),
268
+ level,
269
+ index: items++,
270
+ });
271
+ for (const entry of local.options) {
272
+ const children =
273
+ groupKey !== undefined && entry !== null && typeof entry === "object"
274
+ ? (entry as Record<PropertyKey, unknown>)[groupKey as PropertyKey]
275
+ : undefined;
276
+ if (Array.isArray(children)) {
277
+ out.push({
278
+ type: "section",
279
+ key: `section-${out.length}`,
280
+ rawValue: entry,
281
+ textValue: "",
282
+ disabled: false,
283
+ level: 0,
284
+ index: out.length,
285
+ });
286
+ for (const child of children as Option[]) add(child, 1);
287
+ } else add(entry as Option, 0);
288
+ }
289
+ out.forEach((node, i) => {
290
+ node.prevKey = out[i - 1]?.key;
291
+ node.nextKey = out[i + 1]?.key;
292
+ });
293
+ return out;
294
+ });
295
+ const items = createMemo(() => nodes().filter((node) => node.type === "item"));
296
+ const byKey = createMemo(() => new Map(items().map((node) => [node.key, node])));
297
+
298
+ const toKeys = (value: Option | Option[] | null | undefined): string[] | undefined => {
299
+ if (value === undefined) return undefined;
300
+ if (value === null) return [];
301
+ return props.multiple ? (value as Option[]).map(keyOf) : [keyOf(value as Option)];
302
+ };
303
+ const optionsOf = (keys: readonly string[]) =>
304
+ keys.flatMap((key) => {
305
+ const node = byKey().get(key);
306
+ return node ? [node.rawValue as Option] : [];
307
+ });
308
+ const [keys, setKeys] = createControllableSignal<readonly string[]>({
309
+ value: () => toKeys(props.value),
310
+ defaultValue: () => toKeys(props.defaultValue) ?? [],
311
+ equals: sameKeys,
312
+ onChange: (next) => {
313
+ const chosen = optionsOf(next);
314
+ if (props.multiple) props.onChange?.(chosen);
315
+ else props.onChange?.(chosen[0] ?? null);
316
+ },
317
+ });
318
+ const selected = createMemo(() => new Set(keys()));
319
+
320
+ const [open, setOpen] = createControllableSignal<boolean>({
321
+ value: () => local.open,
322
+ defaultValue: () => local.defaultOpen ?? false,
323
+ onChange: (next) => local.onOpenChange?.(next),
324
+ });
325
+ const [openFrom, setOpenFrom] = createSignal<"first" | "last">("first");
326
+ const [trigger, setTrigger] = createSignal<HTMLElement>();
327
+ const [triggerId, setTriggerId] = createSignal<string>("");
328
+ const [labelId, setLabelId] = createSignal<string>();
329
+ const [listboxLabelledBy, setListboxLabelledBy] = createSignal<string>();
330
+ let closeAutoFocus: ((event: Event) => void) | undefined;
331
+ let refocusIfLost = false;
332
+
333
+ const blocked = () => !!local.disabled || !!local.readOnly;
334
+ const focusTrigger = () => {
335
+ const event = new Event("closeautofocus", { cancelable: true });
336
+ closeAutoFocus?.(event);
337
+ if (!event.defaultPrevented) focusWithoutTracking(trigger());
338
+ };
339
+
340
+ const id = untrack(() => local.id) ?? createUniqueId();
341
+ const typer = createTypeahead();
342
+
343
+ const ctx: SelectContextValue = {
344
+ ids: { root: id, trigger: triggerId, value: `${id}-value`, listbox: `${id}-listbox` },
345
+ setTriggerId,
346
+ open,
347
+ openFrom,
348
+ show: (from) => {
349
+ if (blocked() || untrack(open)) return;
350
+ if (items().length === 0 && local.open === undefined) return;
351
+ refocusIfLost = false;
352
+ setOpenFrom(from);
353
+ setOpen(true);
354
+ },
355
+ close: (reason) => {
356
+ if (!untrack(open)) return;
357
+ refocusIfLost = false;
358
+ setOpen(false);
359
+ if (untrack(open)) return;
360
+ if (reason === "commit") focusTrigger();
361
+ else if (reason === "outside") refocusIfLost = true;
362
+ },
363
+ settle: () => {
364
+ const near = trigger();
365
+ if (!refocusIfLost || !near) return;
366
+ refocusIfLost = false;
367
+ if (focusFell(near)) focusTrigger();
368
+ },
369
+ setCloseAutoFocus: (handler) => {
370
+ closeAutoFocus = handler;
371
+ },
372
+ nodes,
373
+ optionId: (key) => {
374
+ const node = key === undefined ? undefined : byKey().get(key);
375
+ return node ? `${id}-option-${node.index}` : undefined;
376
+ },
377
+ multiple: () => !!props.multiple,
378
+ isSelected: (key) => selected().has(key),
379
+ firstSelected: () => keys()[0],
380
+ empty: () => keys().length === 0,
381
+ choose: (key) => {
382
+ const node = byKey().get(key);
383
+ if (!node || node.disabled || blocked()) return;
384
+ if (props.multiple) {
385
+ const current = untrack(keys);
386
+ setKeys(current.includes(key) ? current.filter((k) => k !== key) : [...current, key]);
387
+ } else if (!untrack(selected).has(key)) setKeys([key]);
388
+ if (local.closeOnSelection ?? !props.multiple) ctx.close("commit");
389
+ },
390
+ step: (by) => {
391
+ if (props.multiple || blocked()) return;
392
+ const enabled = items().filter((node) => !node.disabled);
393
+ const at = enabled.findIndex((node) => node.key === untrack(keys)[0]);
394
+ const next = at < 0 ? enabled[0] : enabled[at + by];
395
+ if (next) setKeys([next.key]);
396
+ },
397
+ typeahead: (event) => {
398
+ const enabled = items().filter((node) => !node.disabled);
399
+ const from = enabled.findIndex((node) => node.key === untrack(keys)[0]);
400
+ const index = typer.match(
401
+ event,
402
+ enabled.map((node) => node.textValue),
403
+ from,
404
+ );
405
+ if (index === undefined) return false;
406
+ const next = enabled[index];
407
+ if (next && !props.multiple && !blocked()) setKeys([next.key]);
408
+ return true;
409
+ },
410
+ selectedOptions: () => optionsOf(keys()),
411
+ remove: (option) => {
412
+ const key = keyOf(option as Option);
413
+ setKeys(untrack(keys).filter((k) => k !== key));
414
+ },
415
+ clear: () => setKeys([]),
416
+ placeholder: () => local.placeholder,
417
+ itemComponent: () =>
418
+ local.itemComponent as Component<{ item: SelectNode<unknown> }> | undefined,
419
+ sectionComponent: () =>
420
+ local.sectionComponent as Component<{ section: SelectNode<unknown> }> | undefined,
421
+ trigger,
422
+ setTrigger,
423
+ labelId,
424
+ setLabelId,
425
+ listboxLabelledBy,
426
+ setListboxLabelledBy,
427
+ blocked,
428
+ disabled: () => !!local.disabled,
429
+ attrs: {
430
+ get "data-expanded"() {
431
+ return flag(open());
432
+ },
433
+ get "data-closed"() {
434
+ return flag(!open());
435
+ },
436
+ get "data-valid"() {
437
+ return flag(local.validationState === "valid");
438
+ },
439
+ get "data-invalid"() {
440
+ return flag(local.validationState === "invalid");
441
+ },
442
+ get "data-required"() {
443
+ return flag(!!local.required);
444
+ },
445
+ get "data-disabled"() {
446
+ return flag(!!local.disabled);
447
+ },
448
+ get "data-readonly"() {
449
+ return flag(!!local.readOnly);
450
+ },
451
+ },
452
+ };
453
+
454
+ return (
455
+ <SelectContext.Provider value={ctx}>
456
+ <div {...merge(rest, ctx.attrs, { role: "group" as const, id })}>{local.children}</div>
457
+ </SelectContext.Provider>
458
+ );
459
+ }
460
+
461
+ interface SelectValueState<Option> {
462
+ selectedOption: () => Option;
463
+ selectedOptions: () => Option[];
464
+ remove: (option: Option) => void;
465
+ clear: () => void;
466
+ }
467
+
468
+ interface SelectValueProps<Option> extends Omit<ComponentProps<"span">, "children"> {
469
+ children?: JSX.Element | ((state: SelectValueState<Option>) => JSX.Element);
470
+ }
471
+
472
+ function SelectValue<Option>(props: SelectValueProps<Option>): JSX.Element {
473
+ const ctx = useSelect();
474
+ const [local, others] = splitProps(props, ["children"]);
475
+ const child = createMemo(() => local.children);
476
+ const state: SelectValueState<Option> = {
477
+ selectedOption: () => ctx.selectedOptions()[0] as Option,
478
+ selectedOptions: () => ctx.selectedOptions() as Option[],
479
+ remove: (option) => ctx.remove(option),
480
+ clear: () => ctx.clear(),
481
+ };
482
+ const shown = () => {
483
+ const value = child();
484
+ return typeof value === "function" ? value(state) : value;
485
+ };
486
+ return (
487
+ <span
488
+ {...merge(others, ctx.attrs, {
489
+ id: ctx.ids.value,
490
+ get "data-placeholder-shown"() {
491
+ return flag(ctx.empty());
492
+ },
493
+ })}
494
+ >
495
+ <Show when={!ctx.empty()} fallback={ctx.placeholder()}>
496
+ {shown()}
497
+ </Show>
498
+ </span>
499
+ );
500
+ }
501
+
502
+ type SelectTriggerProps = ButtonRootProps<"button"> & { size?: "sm" | "default" };
503
+
504
+ const SelectTrigger: Component<SelectTriggerProps> = (props) => {
505
+ const ctx = useSelect();
506
+ const [local, rest] = splitProps(props as SelectTriggerProps & { ref?: unknown }, [
507
+ "class",
508
+ "children",
509
+ "size",
510
+ "ref",
511
+ "id",
512
+ "aria-label",
513
+ "aria-labelledby",
514
+ ]);
31
515
  const size = () => local.size ?? "default";
516
+ const triggerId = () => local.id ?? `${ctx.ids.root}-trigger`;
517
+ const labelledBy = () =>
518
+ [
519
+ local["aria-labelledby"] ?? ctx.labelId(),
520
+ local["aria-label"] !== undefined ? triggerId() : undefined,
521
+ ]
522
+ .filter(Boolean)
523
+ .join(" ") || undefined;
524
+ effect(triggerId, (next) => {
525
+ ctx.setTriggerId(next);
526
+ });
527
+ effect(labelledBy, (next) => {
528
+ ctx.setListboxLabelledBy(next);
529
+ });
530
+
531
+ effect(ctx.trigger, (el) => {
532
+ if (!el) return;
533
+ let touch: { x: number; y: number } | undefined;
534
+ let pressed = false;
535
+ const onPointerDown = (event: PointerEvent) => {
536
+ touch = undefined;
537
+ pressed = true;
538
+ if (ctx.blocked()) return;
539
+ if (event.pointerType === "touch") {
540
+ touch = { x: event.clientX, y: event.clientY };
541
+ return;
542
+ }
543
+ if (event.button !== 0 || event.ctrlKey) return;
544
+ event.preventDefault();
545
+ if (ctx.open()) ctx.close("commit");
546
+ else ctx.show("first");
547
+ };
548
+ const onPointerMove = (event: PointerEvent) => {
549
+ if (touch && Math.hypot(event.clientX - touch.x, event.clientY - touch.y) > TAP_SLOP_PX)
550
+ touch = undefined;
551
+ };
552
+ const onPointerCancel = () => {
553
+ touch = undefined;
554
+ pressed = false;
555
+ };
556
+ // A click with no pointer press before it comes from assistive technology.
557
+ const onClick = () => {
558
+ const tapped = touch !== undefined;
559
+ const unpressed = !pressed;
560
+ touch = undefined;
561
+ pressed = false;
562
+ if (!tapped && (!unpressed || ctx.blocked())) return;
563
+ if (ctx.open()) ctx.close("commit");
564
+ else ctx.show("first");
565
+ };
566
+ const onKeyDown = (event: KeyboardEvent) => {
567
+ if (event.ctrlKey || event.metaKey || event.altKey || ctx.blocked() || ctx.open()) return;
568
+ if (event.key === " " && ctx.typeahead(event)) return event.preventDefault();
569
+ if (event.key === "Enter" || event.key === " " || event.key === "ArrowDown") {
570
+ event.preventDefault();
571
+ ctx.show("first");
572
+ } else if (event.key === "ArrowUp") {
573
+ event.preventDefault();
574
+ ctx.show("last");
575
+ } else if (event.key === "ArrowLeft" || event.key === "ArrowRight") {
576
+ if (ctx.multiple()) return;
577
+ event.preventDefault();
578
+ ctx.step(event.key === "ArrowLeft" ? -1 : 1);
579
+ } else if (ctx.typeahead(event)) event.preventDefault();
580
+ };
581
+ el.addEventListener("pointerdown", onPointerDown);
582
+ el.addEventListener("pointermove", onPointerMove);
583
+ el.addEventListener("pointercancel", onPointerCancel);
584
+ el.addEventListener("click", onClick);
585
+ el.addEventListener("keydown", onKeyDown);
586
+ return () => {
587
+ el.removeEventListener("pointerdown", onPointerDown);
588
+ el.removeEventListener("pointermove", onPointerMove);
589
+ el.removeEventListener("pointercancel", onPointerCancel);
590
+ el.removeEventListener("click", onClick);
591
+ el.removeEventListener("keydown", onKeyDown);
592
+ };
593
+ });
594
+
32
595
  return (
33
- <SelectPrimitive.Trigger
34
- data-slot="select-trigger"
35
- data-size={size()}
36
- class={cn(
37
- PICKER_TRIGGER,
38
- // The one deviation from the shared recipe: a Select sizes to its
39
- // value, every other picker fills its field.
40
- "data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground w-fit whitespace-nowrap [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
41
- size() === "sm" && CONTROL_H.sm,
42
- local.class,
43
- )}
44
- {...rest}
596
+ <ButtonRoot
597
+ {...merge(rest, ctx.attrs, {
598
+ ref: (el: HTMLButtonElement) => {
599
+ ctx.setTrigger(el);
600
+ if (typeof local.ref === "function") local.ref(el);
601
+ },
602
+ get id() {
603
+ return triggerId();
604
+ },
605
+ get disabled() {
606
+ return ctx.disabled();
607
+ },
608
+ "aria-haspopup": "listbox" as const,
609
+ get "aria-expanded"() {
610
+ return ctx.open() ? ("true" as const) : ("false" as const);
611
+ },
612
+ get "aria-controls"() {
613
+ return ctx.open() ? ctx.ids.listbox : undefined;
614
+ },
615
+ get "aria-label"() {
616
+ return local["aria-label"];
617
+ },
618
+ get "aria-labelledby"() {
619
+ return [labelledBy(), ctx.ids.value].filter(Boolean).join(" ");
620
+ },
621
+ "data-slot": "select-trigger",
622
+ get "data-size"() {
623
+ return size();
624
+ },
625
+ get class() {
626
+ return cn(
627
+ PICKER_TRIGGER,
628
+ // The one deviation from the shared recipe: a Select sizes to its
629
+ // value, every other picker fills its field.
630
+ "data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground w-fit whitespace-nowrap [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
631
+ size() === "sm" && CONTROL_H.sm,
632
+ local.class,
633
+ );
634
+ },
635
+ })}
45
636
  >
46
637
  {local.children}
47
- <SelectPrimitive.Icon>
638
+ <span aria-hidden="true" {...ctx.attrs}>
48
639
  <Icon
49
640
  icon="lucide:chevron-down"
50
641
  width={16}
51
642
  height={16}
52
643
  class="text-muted-foreground size-4 opacity-50"
53
644
  />
54
- </SelectPrimitive.Icon>
55
- </SelectPrimitive.Trigger>
645
+ </span>
646
+ </ButtonRoot>
56
647
  );
57
648
  };
58
649
 
59
- const SelectContent: ParentComponent<
60
- ComponentProps<typeof SelectPrimitive.Content> & { listboxClass?: string }
61
- > = (props) => {
62
- const [local, rest] = splitProps(props, [
650
+ interface SelectContentProps extends Omit<ComponentProps<"div">, "children"> {
651
+ listboxClass?: string;
652
+ onEscapeKeyDown?: (event: KeyboardEvent) => void;
653
+ onPointerDownOutside?: (event: PointerDownOutsideEvent) => void;
654
+ onInteractOutside?: (event: InteractOutsideEvent) => void;
655
+ onCloseAutoFocus?: (event: Event) => void;
656
+ /** @deprecated Ignored; removed in 2.0.0. */
657
+ children?: JSX.Element;
658
+ /** @deprecated Ignored; removed in 2.0.0. */
659
+ forceMount?: boolean;
660
+ /** @deprecated Ignored; removed in 2.0.0. */
661
+ onOpenAutoFocus?: (event: Event) => void;
662
+ }
663
+
664
+ const SelectContent: Component<SelectContentProps> = (props) => {
665
+ const ctx = useSelect();
666
+ const [local, others] = splitProps(props, [
63
667
  "class",
64
668
  "children",
65
669
  "listboxClass",
66
670
  "ref",
671
+ "onEscapeKeyDown",
672
+ "onPointerDownOutside",
67
673
  "onInteractOutside",
68
674
  "onCloseAutoFocus",
675
+ "onOpenAutoFocus",
676
+ "forceMount",
69
677
  ]);
70
- const select = useSelectContext();
71
678
  const [panel, setPanel] = createSignal<HTMLElement>();
72
- const [list, setList] = createSignal<HTMLElement>();
73
- const layer = shadowLayer({
74
- content: panel,
75
- open: () => select.isOpen(),
76
- dismiss: () => select.close(),
77
- trigger: () => select.triggerRef(),
78
- consumer: local,
679
+ const [listbox, setListbox] = createSignal<HTMLElement>();
680
+
681
+ effect(
682
+ () => local.onCloseAutoFocus,
683
+ (handler) => {
684
+ ctx.setCloseAutoFocus(handler);
685
+ return () => ctx.setCloseAutoFocus(undefined);
686
+ },
687
+ );
688
+
689
+ const presence = createPresence({
690
+ present: ctx.open,
691
+ element: panel,
692
+ exitMs: MOTION_EXIT_MS.field,
79
693
  });
80
- return (
81
- <SelectPrimitive.Portal mount={usePortalMount()}>
82
- <SelectPrimitive.Content
83
- ref={(el: HTMLElement) => {
84
- setPanel(el);
85
- if (typeof local.ref === "function") local.ref(el);
86
- }}
87
- onInteractOutside={layer.onInteractOutside}
88
- onCloseAutoFocus={layer.onCloseAutoFocus}
89
- data-slot="select-content"
90
- {...nestedLayerAttrs(select.isModal())}
91
- class={cn(
92
- // Same concave surface as the trigger: opening reads as the input
93
- // expanding, not a separate floating panel.
94
- INPUT_SURFACE,
95
- FIELD_MOTION,
96
- `relative ${Z_CLASS.overlay} text-popover-foreground overflow-hidden rounded-md p-1`,
97
- local.class,
98
- )}
99
- {...rest}
694
+ const layer = registerLayer({
695
+ element: panel,
696
+ open: ctx.open,
697
+ kind: "popover",
698
+ escape: () => true,
699
+ dismiss: () => ctx.close("parent"),
700
+ trigger: ctx.trigger,
701
+ });
702
+ createDismiss({
703
+ layer,
704
+ onDismiss: (reason, event) => {
705
+ if (reason === "escape") {
706
+ if (vetoed(local.onEscapeKeyDown, event as KeyboardEvent)) return;
707
+ ctx.close("commit");
708
+ return;
709
+ }
710
+ const outside = interactOutside(event as PointerEvent, (e) => {
711
+ local.onPointerDownOutside?.(e);
712
+ local.onInteractOutside?.(e);
713
+ });
714
+ if (outside.defaultPrevented) return;
715
+ ctx.close("outside");
716
+ },
717
+ });
718
+ createAnchored({
719
+ anchor: ctx.trigger,
720
+ floating: panel,
721
+ open: ctx.open,
722
+ side: () => "bottom",
723
+ align: () => "start",
724
+ offset: 0,
725
+ matchAnchorWidth: true,
726
+ coverAnchor: true,
727
+ });
728
+
729
+ const collection = createCollection({
730
+ root: listbox,
731
+ itemSelector: ITEM,
732
+ orientation: () => "vertical",
733
+ focus: "virtual",
734
+ });
735
+
736
+ effect(
737
+ () => [ctx.open(), listbox()] as const,
738
+ ([open, list]) => {
739
+ if (!open || !list) return;
740
+ const enabled = [...list.querySelectorAll<HTMLElement>(ITEM)].filter(
741
+ (el) => el.getAttribute("aria-disabled") !== "true",
742
+ );
743
+ const chosen = ctx.firstSelected();
744
+ const start =
745
+ enabled.find((el) => el.dataset.key === chosen) ??
746
+ (ctx.openFrom() === "last" ? enabled.at(-1) : enabled[0]);
747
+ if (start?.dataset.key) collection.highlight(start.dataset.key, "keyboard");
748
+ focusWithoutTracking(list);
749
+ },
750
+ );
751
+
752
+ const keyAt = (target: EventTarget | null): string | undefined => {
753
+ const list = listbox();
754
+ const option = target instanceof Element ? target.closest<HTMLElement>(ITEM) : null;
755
+ return option && list?.contains(option) ? option.dataset.key : undefined;
756
+ };
757
+
758
+ let press: { x: number; y: number; type: string; moved: boolean } | undefined;
759
+ let pointerPressed = false;
760
+ const onPointerDown = (event: PointerEvent) => {
761
+ pointerPressed = true;
762
+ press =
763
+ event.button === 0
764
+ ? { x: event.clientX, y: event.clientY, type: event.pointerType, moved: false }
765
+ : undefined;
766
+ };
767
+ const onPointerMove = (event: PointerEvent) => {
768
+ if (press && Math.hypot(event.clientX - press.x, event.clientY - press.y) > TAP_SLOP_PX)
769
+ press.moved = true;
770
+ if (event.pointerType !== "mouse" || !ctx.open()) return;
771
+ const key = keyAt(event.target);
772
+ if (key && key !== collection.highlighted()) collection.highlight(key, "pointer");
773
+ };
774
+ const onPointerUp = (event: PointerEvent) => {
775
+ const started = press;
776
+ press = undefined;
777
+ if (!started || !ctx.open()) return;
778
+ if (started.type !== "mouse" && started.moved) return;
779
+ const key = keyAt(event.target);
780
+ if (key) ctx.choose(key);
781
+ };
782
+ const onPointerCancel = () => {
783
+ press = undefined;
784
+ pointerPressed = false;
785
+ };
786
+ // A click with no pointer press before it comes from assistive technology.
787
+ const onClick = (event: MouseEvent) => {
788
+ const pressed = pointerPressed;
789
+ pointerPressed = false;
790
+ if (pressed || !ctx.open()) return;
791
+ const key = keyAt(event.target);
792
+ if (key) ctx.choose(key);
793
+ };
794
+ const onKeyDown = (event: KeyboardEvent) => {
795
+ if (!ctx.open()) return;
796
+ collection.onKeyDown(event);
797
+ if (event.defaultPrevented) return;
798
+ if (event.key === "Enter" || event.key === " ") {
799
+ event.preventDefault();
800
+ const key = collection.highlighted();
801
+ if (key) ctx.choose(key);
802
+ } else if (event.key === "Tab") ctx.close("commit");
803
+ };
804
+
805
+ const Row: Component<{ node: SelectNode<unknown> }> = (row) => (
806
+ <Show when={ctx.itemComponent()} keyed>
807
+ {(Item) =>
808
+ createComponent(Item, {
809
+ get item() {
810
+ return row.node;
811
+ },
812
+ })
813
+ }
814
+ </Show>
815
+ );
816
+ const Section: Component<{ node: SelectNode<unknown> }> = (row) => (
817
+ <li role="presentation">
818
+ <Show when={ctx.sectionComponent()} keyed>
819
+ {(Heading) =>
820
+ createComponent(Heading, {
821
+ get section() {
822
+ return row.node;
823
+ },
824
+ })
825
+ }
826
+ </Show>
827
+ </li>
828
+ );
829
+
830
+ const Panel: Component = () => {
831
+ onCleanup(() => {
832
+ setPanel(undefined);
833
+ setListbox(undefined);
834
+ ctx.settle();
835
+ });
836
+ return (
837
+ <div
838
+ {...merge(others, nestedLayerAttrs(false), {
839
+ ref: (el: HTMLDivElement) => {
840
+ setPanel(el);
841
+ if (typeof local.ref === "function") local.ref(el);
842
+ },
843
+ "data-slot": "select-content",
844
+ get "data-expanded"() {
845
+ return flag(ctx.open());
846
+ },
847
+ get "data-closed"() {
848
+ return flag(!ctx.open());
849
+ },
850
+ get class() {
851
+ return cn(
852
+ // Same concave surface as the trigger: opening reads as the input
853
+ // expanding, not a separate floating panel.
854
+ INPUT_SURFACE,
855
+ FIELD_MOTION,
856
+ `relative ${Z_CLASS.overlay} text-popover-foreground overflow-hidden rounded-md p-1`,
857
+ local.class,
858
+ );
859
+ },
860
+ })}
100
861
  >
101
862
  <SelectionScope
102
- ref={(el: HTMLElement) => {
103
- ignoreOpeningRelease(el);
104
- setList(el);
105
- }}
106
863
  marker="highlighted"
864
+ radius={MENU_ITEM_RADIUS}
107
865
  class={cn("w-full", PICKER_LIST)}
108
866
  >
109
- {/* Kobalte scrolls its scrollRef to the highlighted option; the scope is what scrolls. */}
110
- <SelectPrimitive.Listbox scrollRef={list} class={cn(STAGGER, local.listboxClass)} />
867
+ <ul
868
+ ref={setListbox}
869
+ role="listbox"
870
+ id={ctx.ids.listbox}
871
+ tabindex="-1"
872
+ aria-labelledby={ctx.listboxLabelledBy()}
873
+ aria-multiselectable={ctx.multiple() ? "true" : undefined}
874
+ aria-activedescendant={ctx.optionId(collection.highlighted())}
875
+ class={local.listboxClass}
876
+ on:keydown={onKeyDown}
877
+ on:pointerdown={onPointerDown}
878
+ on:pointermove={onPointerMove}
879
+ on:pointerup={onPointerUp}
880
+ on:pointercancel={onPointerCancel}
881
+ on:click={onClick}
882
+ >
883
+ <For each={ctx.nodes()}>
884
+ {(node) => (node.type === "section" ? <Section node={node} /> : <Row node={node} />)}
885
+ </For>
886
+ </ul>
111
887
  </SelectionScope>
112
- </SelectPrimitive.Content>
113
- </SelectPrimitive.Portal>
888
+ </div>
889
+ );
890
+ };
891
+
892
+ return (
893
+ <SelectListContext.Provider value={{ highlighted: collection.highlighted }}>
894
+ <Show when={presence.mounted()}>
895
+ <Portal mount={usePortalMount()}>
896
+ <Panel />
897
+ </Portal>
898
+ </Show>
899
+ </SelectListContext.Provider>
114
900
  );
115
901
  };
116
902
 
117
- const SelectLabel: Component<ComponentProps<typeof SelectPrimitive.Label>> = (props) => {
118
- const [local, rest] = splitProps(props, ["class"]);
903
+ const SelectLabel: Component<ComponentProps<"span">> = (props) => {
904
+ const ctx = useSelect();
905
+ const [local, rest] = splitProps(props, ["class", "id"]);
906
+ const labelId = () => local.id ?? `${ctx.ids.root}-label`;
907
+ effect(labelId, (next) => {
908
+ ctx.setLabelId(next);
909
+ return () => ctx.setLabelId(undefined);
910
+ });
119
911
  return (
120
- <SelectPrimitive.Label
121
- data-slot="select-label"
122
- class={cn(MENU_LABEL, "font-normal", local.class)}
123
- {...rest}
912
+ <span
913
+ {...merge(rest, ctx.attrs, {
914
+ get id() {
915
+ return labelId();
916
+ },
917
+ "data-slot": "select-label",
918
+ get class() {
919
+ return cn(MENU_LABEL, "font-normal", local.class);
920
+ },
921
+ })}
922
+ on:click={() => focusWithoutTracking(ctx.trigger())}
124
923
  />
125
924
  );
126
925
  };
127
926
 
128
- const SelectItem: ParentComponent<ComponentProps<typeof SelectPrimitive.Item>> = (props) => {
129
- const [local, rest] = splitProps(props, ["class", "children"]);
927
+ interface SelectItemProps extends Omit<ComponentProps<"li">, "children"> {
928
+ item: SelectNode<unknown>;
929
+ children?: JSX.Element;
930
+ }
931
+
932
+ const SelectItem: Component<SelectItemProps> = (props) => {
933
+ const ctx = useSelect();
934
+ const list = useSelectList();
935
+ const [local, rest] = splitProps(props, ["class", "children", "item"]);
936
+ const key = () => local.item.key;
937
+ const optionId = () => ctx.optionId(key());
938
+ const labelId = () => `${optionId()}-label`;
939
+ const isSelected = () => ctx.isSelected(key());
940
+ const marks = {
941
+ get "data-selected"() {
942
+ return flag(isSelected());
943
+ },
944
+ get "data-highlighted"() {
945
+ return flag(list.highlighted() === key());
946
+ },
947
+ get "data-disabled"() {
948
+ return flag(local.item.disabled);
949
+ },
950
+ };
130
951
  return (
131
- <SelectPrimitive.Item
132
- data-slot="select-item"
133
- class={cn(
134
- MENU_ITEM,
135
- "focus:text-foreground data-[highlighted]:text-foreground w-full pr-8 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
136
- local.class,
137
- )}
138
- {...rest}
952
+ <li
953
+ {...merge(rest, marks, {
954
+ role: "option" as const,
955
+ get id() {
956
+ return optionId();
957
+ },
958
+ get "data-key"() {
959
+ return key();
960
+ },
961
+ get "aria-selected"() {
962
+ return isSelected() ? ("true" as const) : ("false" as const);
963
+ },
964
+ get "aria-disabled"() {
965
+ return local.item.disabled ? ("true" as const) : ("false" as const);
966
+ },
967
+ get "aria-labelledby"() {
968
+ return labelId();
969
+ },
970
+ "data-slot": "select-item",
971
+ get class() {
972
+ return cn(
973
+ MENU_ITEM,
974
+ "focus:text-foreground data-[highlighted]:text-foreground w-full pr-8 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
975
+ local.class,
976
+ );
977
+ },
978
+ })}
139
979
  >
140
- <SelectionHighlight />
141
- <span class="absolute right-2 flex size-3.5 items-center justify-center">
142
- <SelectPrimitive.ItemIndicator>
143
- <Icon icon="lucide:check" width={16} height={16} class="size-4 text-current" />
144
- </SelectPrimitive.ItemIndicator>
145
- </span>
146
- <SelectPrimitive.ItemLabel>{local.children}</SelectPrimitive.ItemLabel>
147
- </SelectPrimitive.Item>
980
+ <SelectionHighlight active={list.highlighted() === key()} />
981
+ <Show when={isSelected()}>
982
+ <span class="absolute right-2 flex size-3.5 items-center justify-center">
983
+ <div aria-hidden="true" {...marks}>
984
+ <Icon icon="lucide:check" width={16} height={16} class="size-4 text-current" />
985
+ </div>
986
+ </span>
987
+ </Show>
988
+ <div id={labelId()} {...marks}>
989
+ {local.children}
990
+ </div>
991
+ </li>
148
992
  );
149
993
  };
150
994