@pzerelles/headlessui-svelte 2.1.2-next.13 → 2.1.2-next.15

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.
@@ -25,7 +25,7 @@ export type CheckboxProps<TTag extends ElementType = typeof DEFAULT_CHECKBOX_TAG
25
25
  declare class __sveltets_Render<TType, TTag extends ElementType = typeof DEFAULT_CHECKBOX_TAG> {
26
26
  props(): {
27
27
  as?: TTag | undefined;
28
- } & (Exclude<keyof PropsOf<TTag>, "form" | ("as" | "children" | "refName" | "class") | "disabled" | "autofocus" | "name" | "value" | "checked" | "onchange" | "indeterminate" | CheckboxPropsWeControl | "defaultChecked"> extends infer T extends keyof PropsOf<TTag> ? { [P in T]: PropsOf<TTag>[P]; } : never) & {
28
+ } & (Exclude<keyof PropsOf<TTag>, "form" | ("as" | "children" | "refName" | "class") | "disabled" | "autofocus" | "value" | "checked" | "name" | "onchange" | "indeterminate" | CheckboxPropsWeControl | "defaultChecked"> extends infer T extends keyof PropsOf<TTag> ? { [P in T]: PropsOf<TTag>[P]; } : never) & {
29
29
  children?: import("../utils/types.js").Children<CheckboxRenderPropArg> | undefined;
30
30
  ref?: HTMLElement;
31
31
  } & (true extends (PropsOf<TTag> extends infer T_1 ? T_1 extends PropsOf<TTag> ? T_1 extends never ? never : "class" extends infer T_2 ? T_2 extends "class" ? T_2 extends keyof T_1 ? true : never : never : never : never : never) ? {
@@ -1,7 +1,7 @@
1
1
  import { getContext, setContext } from "svelte";
2
2
  export function useDescriptionContext() {
3
3
  let context = getContext("DescriptionContext");
4
- if (context === null) {
4
+ if (!context) {
5
5
  let err = new Error("You used a <Description /> component, but it is not inside a relevant parent.");
6
6
  if (Error.captureStackTrace)
7
7
  Error.captureStackTrace(err, useDescriptionContext);
@@ -6,7 +6,6 @@ import { DialogStates, useDialogContext } from "./context.svelte.js";
6
6
  import ElementOrComponent from "../utils/ElementOrComponent.svelte";
7
7
  import { mergeProps } from "../utils/render.js";
8
8
  import TransitionChild from "../transition/TransitionChild.svelte";
9
- import { onMount } from "svelte";
10
9
  let internalId = useId();
11
10
  let {
12
11
  ref = $bindable(),
@@ -6,7 +6,7 @@ export var DialogStates;
6
6
  })(DialogStates || (DialogStates = {}));
7
7
  export function useDialogContext(component) {
8
8
  const context = getContext("DialogContext");
9
- if (context === null) {
9
+ if (!context) {
10
10
  let err = new Error(`<${component} /> is missing a parent <Dialog /> component.`);
11
11
  if (Error.captureStackTrace)
12
12
  Error.captureStackTrace(err, useDialogContext);
@@ -8,7 +8,13 @@ import { setContext } from "svelte";
8
8
  import { useLabels } from "../label/context.svelte.js";
9
9
  import { useDescriptions } from "../description/context.svelte.js";
10
10
  import ElementOrComponent from "../utils/ElementOrComponent.svelte";
11
- let { ref = $bindable(), disabled: ownDisabled = false, ...theirProps } = $props();
11
+ import FormFieldsProvider from "../internal/FormFieldsProvider.svelte";
12
+ let {
13
+ ref = $bindable(),
14
+ disabled: ownDisabled = false,
15
+ children: theirChildren,
16
+ ...theirProps
17
+ } = $props();
12
18
  const inputId = `headlessui-control-${nanoid(8)}`;
13
19
  createIdContext(inputId);
14
20
  useLabels();
@@ -27,4 +33,17 @@ const ourProps = $derived({
27
33
  });
28
34
  </script>
29
35
 
30
- <ElementOrComponent {ourProps} {theirProps} {slot} defaultTag={DEFAULT_FIELD_TAG} name="Field" bind:ref />
36
+ {#snippet children(slot: FieldRenderPropArg, props: Record<string, any>)}
37
+ <FormFieldsProvider>
38
+ {#if theirChildren}{@render theirChildren(slot, props)}{/if}
39
+ </FormFieldsProvider>
40
+ {/snippet}
41
+
42
+ <ElementOrComponent
43
+ {ourProps}
44
+ theirProps={{ ...theirProps, children }}
45
+ {slot}
46
+ defaultTag={DEFAULT_FIELD_TAG}
47
+ name="Field"
48
+ bind:ref
49
+ />
package/dist/index.d.ts CHANGED
@@ -11,6 +11,7 @@ export * from "./label/index.js";
11
11
  export * from "./legend/index.js";
12
12
  export * from "./listbox/index.js";
13
13
  export * from "./menu/index.js";
14
+ export * from "./select/index.js";
14
15
  export * from "./switch/index.js";
15
16
  export * from "./tabs/index.js";
16
17
  export * from "./textarea/index.js";
package/dist/index.js CHANGED
@@ -11,6 +11,7 @@ export * from "./label/index.js";
11
11
  export * from "./legend/index.js";
12
12
  export * from "./listbox/index.js";
13
13
  export * from "./menu/index.js";
14
+ export * from "./select/index.js";
14
15
  export * from "./switch/index.js";
15
16
  export * from "./tabs/index.js";
16
17
  export * from "./textarea/index.js";
@@ -1,7 +1,7 @@
1
1
  <script lang="ts">import { disposables } from "../utils/disposables.js";
2
2
  import { objectToFormEntries } from "../utils/form.js";
3
3
  import FormResolver from "./FormResolver.svelte";
4
- import HoistFormFields from "./HoistFormFields.svelte";
4
+ import { hoistFormFields } from "./form-fields.svelte.js";
5
5
  import Hidden, { HiddenFeatures } from "./Hidden.svelte";
6
6
  import { compact } from "../utils/object.js";
7
7
  let {
@@ -18,25 +18,28 @@ $effect(() => {
18
18
  if (!form) return;
19
19
  return d.addEventListener(form, "reset", onReset);
20
20
  });
21
+ const fields = $derived(
22
+ objectToFormEntries(data).map(
23
+ ([name, value]) => compact({
24
+ key: name,
25
+ as: "input",
26
+ type: "hidden",
27
+ form: formId,
28
+ disabled,
29
+ name,
30
+ value,
31
+ ...overrides
32
+ })
33
+ )
34
+ );
35
+ const hoisted = hoistFormFields(formFields);
21
36
  </script>
22
37
 
23
- <HoistFormFields>
38
+ {#snippet formFields()}
24
39
  <FormResolver setForm={(value) => (form = value)} {formId} />
25
- {#each objectToFormEntries(data) as [name, value]}
26
- <Hidden
27
- features={HiddenFeatures.Hidden}
28
- {...compact({
29
- key: name,
30
- as: "input",
31
- type: "hidden",
32
- hidden: true,
33
- readOnly: true,
34
- form: formId,
35
- disabled,
36
- name,
37
- value,
38
- ...overrides,
39
- })}
40
- />
40
+ {#each fields as props}
41
+ <Hidden features={HiddenFeatures.Hidden} {...props} />
41
42
  {/each}
42
- </HoistFormFields>
43
+ {/snippet}
44
+
45
+ {#if !hoisted}{@render formFields()}{/if}
@@ -0,0 +1,13 @@
1
+ <script lang="ts">import Hidden, { HiddenFeatures } from "./Hidden.svelte";
2
+ import { createFormFieldsContext } from "./form-fields.svelte.js";
3
+ const { children } = $props();
4
+ const context = createFormFieldsContext();
5
+ const { fields } = $derived(context);
6
+ </script>
7
+
8
+ {#if children}{@render children()}{/if}
9
+ <Hidden features={HiddenFeatures.Hidden}>
10
+ {#each fields as field}
11
+ {@render field()}
12
+ {/each}
13
+ </Hidden>
@@ -1,4 +1,4 @@
1
- import { type Snippet } from "svelte";
1
+ import type { Snippet } from "svelte";
2
2
  interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
3
3
  new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
4
4
  $$bindings?: Bindings;
@@ -12,10 +12,10 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
12
12
  };
13
13
  z_$$bindings?: Bindings;
14
14
  }
15
- declare const HoistFormFields: $$__sveltets_2_IsomorphicComponent<{
16
- children: Snippet;
15
+ declare const FormFieldsProvider: $$__sveltets_2_IsomorphicComponent<{
16
+ children?: Snippet;
17
17
  }, {
18
18
  [evt: string]: CustomEvent<any>;
19
19
  }, {}, {}, "">;
20
- type HoistFormFields = InstanceType<typeof HoistFormFields>;
21
- export default HoistFormFields;
20
+ type FormFieldsProvider = InstanceType<typeof FormFieldsProvider>;
21
+ export default FormFieldsProvider;
@@ -4,7 +4,13 @@ export * from "./HiddenFeatures.js";
4
4
  const DEFAULT_VISUALLY_HIDDEN_TAG = "span";
5
5
  </script>
6
6
 
7
- <script lang="ts" generics="TTag extends ElementType = typeof DEFAULT_VISUALLY_HIDDEN_TAG">let { ref = $bindable(), features = HiddenFeatures.None, ...theirProps } = $props();
7
+ <script lang="ts" generics="TTag extends ElementType = typeof DEFAULT_VISUALLY_HIDDEN_TAG">let {
8
+ ref = $bindable(),
9
+ value,
10
+ checked,
11
+ features = HiddenFeatures.None,
12
+ ...theirProps
13
+ } = $props();
8
14
  let ourProps = {
9
15
  "aria-hidden": (features & HiddenFeatures.Focusable) === HiddenFeatures.Focusable ? true : theirProps["aria-hidden"] ?? void 0,
10
16
  hidden: (features & HiddenFeatures.Hidden) === HiddenFeatures.Hidden ? true : void 0,
@@ -25,4 +31,12 @@ let ourProps = {
25
31
  };
26
32
  </script>
27
33
 
28
- <ElementOrComponent {ourProps} {theirProps} defaultTag={DEFAULT_VISUALLY_HIDDEN_TAG} name="Hidden" bind:ref />
34
+ <ElementOrComponent
35
+ {ourProps}
36
+ {theirProps}
37
+ defaultTag={DEFAULT_VISUALLY_HIDDEN_TAG}
38
+ name="Hidden"
39
+ bind:ref
40
+ {value}
41
+ {checked}
42
+ />
@@ -0,0 +1,10 @@
1
+ import { type Snippet } from "svelte";
2
+ import { SvelteSet } from "svelte/reactivity";
3
+ export type FormFieldsContext = {
4
+ registerField: (field: Snippet) => () => void;
5
+ };
6
+ export declare const createFormFieldsContext: () => {
7
+ registerField: (field: Snippet) => () => boolean;
8
+ readonly fields: SvelteSet<Snippet<[]>>;
9
+ };
10
+ export declare const hoistFormFields: (fields: Snippet) => false | undefined;
@@ -0,0 +1,22 @@
1
+ import { getContext, setContext } from "svelte";
2
+ import { SvelteSet } from "svelte/reactivity";
3
+ export const createFormFieldsContext = () => {
4
+ const fields = new SvelteSet();
5
+ const context = {
6
+ registerField: (field) => {
7
+ fields.add(field);
8
+ return () => fields.delete(field);
9
+ },
10
+ get fields() {
11
+ return fields;
12
+ },
13
+ };
14
+ setContext("FormFieldsContext", context);
15
+ return context;
16
+ };
17
+ export const hoistFormFields = (fields) => {
18
+ const context = getContext("FormFieldsContext");
19
+ if (!context)
20
+ return false;
21
+ $effect(() => context.registerField(fields));
22
+ };
@@ -1,7 +1,7 @@
1
1
  import { getContext, setContext } from "svelte";
2
2
  export function useLabelContext() {
3
3
  let context = getContext("LabelContext");
4
- if (context === null) {
4
+ if (!context) {
5
5
  let err = new Error("You used a <Label /> component, but it is not inside a relevant parent.");
6
6
  if (Error.captureStackTrace)
7
7
  Error.captureStackTrace(err, useLabelContext);
@@ -26,7 +26,7 @@ export * from "./context.svelte.js";
26
26
  declare class __sveltets_Render<TType, TActualType, TTag extends ElementType = typeof DEFAULT_LISTBOX_TAG> {
27
27
  props(): {
28
28
  as?: TTag | undefined;
29
- } & (Exclude<keyof import("../utils/types.js").PropsOf<TTag>, "form" | ("as" | "children" | "refName" | "class") | "invalid" | "disabled" | "name" | "value" | "onchange" | "multiple" | "__demoMode" | "horizontal" | "defaultValue" | "by"> extends infer T extends keyof import("../utils/types.js").PropsOf<TTag> ? { [P in T]: import("../utils/types.js").PropsOf<TTag>[P]; } : never) & {
29
+ } & (Exclude<keyof import("../utils/types.js").PropsOf<TTag>, "form" | ("as" | "children" | "refName" | "class") | "invalid" | "disabled" | "value" | "name" | "onchange" | "multiple" | "__demoMode" | "horizontal" | "defaultValue" | "by"> extends infer T extends keyof import("../utils/types.js").PropsOf<TTag> ? { [P in T]: import("../utils/types.js").PropsOf<TTag>[P]; } : never) & {
30
30
  children?: import("../utils/types.js").Children<ListboxRenderPropArg<TType>> | undefined;
31
31
  ref?: HTMLElement;
32
32
  } & (true extends (import("../utils/types.js").PropsOf<TTag> extends infer T_1 ? T_1 extends import("../utils/types.js").PropsOf<TTag> ? T_1 extends never ? never : "class" extends infer T_2 ? T_2 extends "class" ? T_2 extends keyof T_1 ? true : never : never : never : never : never) ? {
@@ -26,7 +26,7 @@ export function useActions(component) {
26
26
  }
27
27
  export function useData(component) {
28
28
  const context = getContext("ListboxDataContext");
29
- if (context === null) {
29
+ if (!context) {
30
30
  let err = new Error(`<${component} /> is missing a parent <Listbox /> component.`);
31
31
  if (Error.captureStackTrace)
32
32
  Error.captureStackTrace(err, useData);
@@ -1,9 +1,8 @@
1
1
  <script lang="ts" module>import { useOutsideClick } from "../hooks/use-outside-click.svelte.js";
2
2
  import { useFloatingProvider } from "../internal/floating.svelte.js";
3
3
  import { createOpenClosedContext, State } from "../internal/open-closed.js";
4
- import { calculateActiveIndex, Focus } from "../utils/calculate-active-index.js";
5
4
  import ElementOrComponent from "../utils/ElementOrComponent.svelte";
6
- import { FocusableMode, isFocusableElement, sortByDomNode } from "../utils/focus-management.js";
5
+ import { FocusableMode, isFocusableElement } from "../utils/focus-management.js";
7
6
  import { match } from "../utils/match.js";
8
7
  let DEFAULT_MENU_TAG = "svelte:fragment";
9
8
  </script>
@@ -11,180 +10,9 @@ let DEFAULT_MENU_TAG = "svelte:fragment";
11
10
  <script lang="ts" generics="TTag extends ElementType = typeof DEFAULT_MENU_TAG">import { setContext } from "svelte";
12
11
  import {
13
12
  ActivationTrigger,
14
- MenuStates
13
+ MenuStates,
14
+ stateReducer
15
15
  } from "./context.svelte.js";
16
- function adjustOrderedState(state, adjustment = (i) => i) {
17
- let currentActiveItem = state.activeItemIndex !== null ? state.items[state.activeItemIndex] : null;
18
- let sortedItems = sortByDomNode(adjustment(state.items.slice()), (item) => item.dataRef.current.domRef.current);
19
- let adjustedActiveItemIndex = currentActiveItem ? sortedItems.indexOf(currentActiveItem) : null;
20
- if (adjustedActiveItemIndex === -1) {
21
- adjustedActiveItemIndex = null;
22
- }
23
- return {
24
- items: sortedItems,
25
- activeItemIndex: adjustedActiveItemIndex
26
- };
27
- }
28
- const stateReducer = (initialState) => {
29
- let _state2 = $state(initialState);
30
- return {
31
- get menuState() {
32
- return _state2.menuState;
33
- },
34
- get buttonElement() {
35
- return _state2.buttonElement;
36
- },
37
- get itemsElement() {
38
- return _state2.itemsElement;
39
- },
40
- get items() {
41
- return _state2.items;
42
- },
43
- get searchQuery() {
44
- return _state2.searchQuery;
45
- },
46
- get activeItemIndex() {
47
- return _state2.activeItemIndex;
48
- },
49
- get activationTrigger() {
50
- return _state2.activationTrigger;
51
- },
52
- get __demoMode() {
53
- return _state2.__demoMode;
54
- },
55
- closeMenu() {
56
- if (_state2.menuState === MenuStates.Closed) return _state2;
57
- _state2.activeItemIndex = null;
58
- _state2.menuState = MenuStates.Closed;
59
- return _state2;
60
- },
61
- openMenu() {
62
- if (_state2.menuState === MenuStates.Open) return _state2;
63
- _state2.__demoMode = false;
64
- _state2.menuState = MenuStates.Open;
65
- return _state2;
66
- },
67
- goToItem(action) {
68
- if (_state2.menuState === MenuStates.Closed) return _state2;
69
- _state2.searchQuery = "";
70
- _state2.activationTrigger = action.trigger ?? ActivationTrigger.Other;
71
- _state2.__demoMode = false;
72
- if (action.focus === Focus.Nothing) {
73
- _state2.activeItemIndex = null;
74
- return _state2;
75
- }
76
- if (action.focus === Focus.Specific) {
77
- _state2.activeItemIndex = _state2.items.findIndex((o) => o.id === action.id);
78
- return _state2;
79
- } else if (action.focus === Focus.Previous) {
80
- let activeItemIdx = _state2.activeItemIndex;
81
- if (activeItemIdx !== null) {
82
- let currentDom = _state2.items[activeItemIdx].dataRef.current.domRef;
83
- let previousItemIndex = calculateActiveIndex(action, {
84
- resolveItems: () => _state2.items,
85
- resolveActiveIndex: () => _state2.activeItemIndex,
86
- resolveId: (item) => item.id,
87
- resolveDisabled: (item) => item.dataRef.current.disabled
88
- });
89
- if (previousItemIndex !== null) {
90
- let previousDom = _state2.items[previousItemIndex].dataRef.current.domRef;
91
- if (
92
- // Next to each other
93
- currentDom.current?.previousElementSibling === previousDom.current || // Or already the first element
94
- previousDom.current?.previousElementSibling === null
95
- ) {
96
- _state2.activeItemIndex = previousItemIndex;
97
- return _state2;
98
- }
99
- }
100
- }
101
- } else if (action.focus === Focus.Next) {
102
- let activeItemIdx = _state2.activeItemIndex;
103
- if (activeItemIdx !== null) {
104
- let currentDom = _state2.items[activeItemIdx].dataRef.current.domRef;
105
- let nextItemIndex = calculateActiveIndex(action, {
106
- resolveItems: () => _state2.items,
107
- resolveActiveIndex: () => _state2.activeItemIndex,
108
- resolveId: (item) => item.id,
109
- resolveDisabled: (item) => item.dataRef.current.disabled
110
- });
111
- if (nextItemIndex !== null) {
112
- let nextDom = _state2.items[nextItemIndex].dataRef.current.domRef;
113
- if (
114
- // Next to each other
115
- currentDom.current?.nextElementSibling === nextDom.current || // Or already the last element
116
- nextDom.current?.nextElementSibling === null
117
- ) {
118
- _state2.activeItemIndex = nextItemIndex;
119
- return _state2;
120
- }
121
- }
122
- }
123
- }
124
- let adjustedState = adjustOrderedState(_state2);
125
- let activeItemIndex = calculateActiveIndex(action, {
126
- resolveItems: () => adjustedState.items,
127
- resolveActiveIndex: () => adjustedState.activeItemIndex,
128
- resolveId: (item) => item.id,
129
- resolveDisabled: (item) => item.dataRef.current.disabled
130
- });
131
- _state2.items = adjustedState.items;
132
- _state2.activeItemIndex = activeItemIndex;
133
- return _state2;
134
- },
135
- search(value) {
136
- let wasAlreadySearching = _state2.searchQuery !== "";
137
- let offset = wasAlreadySearching ? 0 : 1;
138
- let searchQuery = _state2.searchQuery + value.toLowerCase();
139
- let reOrderedItems = _state2.activeItemIndex !== null ? _state2.items.slice(_state2.activeItemIndex + offset).concat(_state2.items.slice(0, _state2.activeItemIndex + offset)) : _state2.items;
140
- let matchingItem = reOrderedItems.find(
141
- (item) => item.dataRef.current.textValue?.startsWith(searchQuery) && !item.dataRef.current.disabled
142
- );
143
- let matchIdx = matchingItem ? _state2.items.indexOf(matchingItem) : -1;
144
- if (matchIdx === -1 || matchIdx === _state2.activeItemIndex) {
145
- _state2.searchQuery = searchQuery;
146
- return _state2;
147
- }
148
- _state2.searchQuery = searchQuery;
149
- _state2.activeItemIndex = matchIdx;
150
- _state2.activationTrigger = ActivationTrigger.Other;
151
- return _state2;
152
- },
153
- clearSearch() {
154
- if (_state2.searchQuery === "") return _state2;
155
- _state2.searchQuery = "";
156
- return _state2;
157
- },
158
- registerItem(id, dataRef) {
159
- let item = { id, dataRef };
160
- let adjustedState = adjustOrderedState(_state2, (items) => [...items, item]);
161
- _state2.items = adjustedState.items;
162
- _state2.activeItemIndex = adjustedState.activeItemIndex;
163
- return _state2;
164
- },
165
- unregisterItem(id) {
166
- let adjustedState = adjustOrderedState(_state2, (items) => {
167
- let idx = items.findIndex((a) => a.id === id);
168
- if (idx !== -1) items.splice(idx, 1);
169
- return items;
170
- });
171
- _state2.items = adjustedState.items;
172
- _state2.activeItemIndex = adjustedState.activeItemIndex;
173
- _state2.activationTrigger = ActivationTrigger.Other;
174
- return _state2;
175
- },
176
- setButtonElement(element) {
177
- if (_state2.buttonElement === element) return _state2;
178
- _state2.buttonElement = element;
179
- return _state2;
180
- },
181
- setItemsElement(element) {
182
- if (_state2.itemsElement === element) return _state2;
183
- _state2.itemsElement = element;
184
- return _state2;
185
- }
186
- };
187
- };
188
16
  let { ref = $bindable(), __demoMode = false, ...theirProps } = $props();
189
17
  const _state = stateReducer({
190
18
  __demoMode,
@@ -1,4 +1,4 @@
1
- import type { Focus } from "../utils/calculate-active-index.js";
1
+ import { Focus } from "../utils/calculate-active-index.js";
2
2
  import type { MutableRefObject } from "../utils/ref.svelte.js";
3
3
  export declare enum MenuStates {
4
4
  Open = 0,
@@ -45,3 +45,32 @@ export type MenuContext = StateDefinition & {
45
45
  setItemsElement(element: HTMLElement | null): void;
46
46
  };
47
47
  export declare function useMenuContext(component: string): MenuContext;
48
+ export declare const stateReducer: (initialState: StateDefinition) => {
49
+ readonly menuState: MenuStates;
50
+ readonly buttonElement: HTMLButtonElement | null;
51
+ readonly itemsElement: HTMLElement | null;
52
+ readonly items: {
53
+ id: string;
54
+ dataRef: MenuItemDataRef;
55
+ }[];
56
+ readonly searchQuery: string;
57
+ readonly activeItemIndex: number | null;
58
+ readonly activationTrigger: ActivationTrigger;
59
+ readonly __demoMode: boolean;
60
+ closeMenu(): StateDefinition;
61
+ openMenu(): StateDefinition;
62
+ goToItem(action: {
63
+ focus: Focus.Specific;
64
+ id: string;
65
+ trigger?: ActivationTrigger;
66
+ } | {
67
+ focus: Exclude<Focus, Focus.Specific>;
68
+ trigger?: ActivationTrigger;
69
+ }): StateDefinition;
70
+ search(value: string): StateDefinition;
71
+ clearSearch(): StateDefinition;
72
+ registerItem(id: string, dataRef: MenuItemDataRef): StateDefinition;
73
+ unregisterItem(id: string): StateDefinition;
74
+ setButtonElement(element: HTMLButtonElement | null): StateDefinition;
75
+ setItemsElement(element: HTMLElement | null): StateDefinition;
76
+ };
@@ -1,3 +1,5 @@
1
+ import { calculateActiveIndex, Focus } from "../utils/calculate-active-index.js";
2
+ import { sortByDomNode } from "../utils/focus-management.js";
1
3
  import { getContext } from "svelte";
2
4
  export var MenuStates;
3
5
  (function (MenuStates) {
@@ -19,3 +21,209 @@ export function useMenuContext(component) {
19
21
  }
20
22
  return context;
21
23
  }
24
+ function adjustOrderedState(state, adjustment = (i) => i) {
25
+ let currentActiveItem = state.activeItemIndex !== null ? state.items[state.activeItemIndex] : null;
26
+ let sortedItems = sortByDomNode(adjustment(state.items.slice()), (item) => item.dataRef.current.domRef.current);
27
+ // If we inserted an item before the current active item then the active item index
28
+ // would be wrong. To fix this, we will re-lookup the correct index.
29
+ let adjustedActiveItemIndex = currentActiveItem ? sortedItems.indexOf(currentActiveItem) : null;
30
+ // Reset to `null` in case the currentActiveItem was removed.
31
+ if (adjustedActiveItemIndex === -1) {
32
+ adjustedActiveItemIndex = null;
33
+ }
34
+ return {
35
+ items: sortedItems,
36
+ activeItemIndex: adjustedActiveItemIndex,
37
+ };
38
+ }
39
+ export const stateReducer = (initialState) => {
40
+ let _state = $state(initialState);
41
+ return {
42
+ get menuState() {
43
+ return _state.menuState;
44
+ },
45
+ get buttonElement() {
46
+ return _state.buttonElement;
47
+ },
48
+ get itemsElement() {
49
+ return _state.itemsElement;
50
+ },
51
+ get items() {
52
+ return _state.items;
53
+ },
54
+ get searchQuery() {
55
+ return _state.searchQuery;
56
+ },
57
+ get activeItemIndex() {
58
+ return _state.activeItemIndex;
59
+ },
60
+ get activationTrigger() {
61
+ return _state.activationTrigger;
62
+ },
63
+ get __demoMode() {
64
+ return _state.__demoMode;
65
+ },
66
+ closeMenu() {
67
+ if (_state.menuState === MenuStates.Closed)
68
+ return _state;
69
+ _state.activeItemIndex = null;
70
+ _state.menuState = MenuStates.Closed;
71
+ return _state;
72
+ },
73
+ openMenu() {
74
+ if (_state.menuState === MenuStates.Open)
75
+ return _state;
76
+ /* We can turn off demo mode once we re-open the `Menu` */
77
+ _state.__demoMode = false;
78
+ _state.menuState = MenuStates.Open;
79
+ return _state;
80
+ },
81
+ goToItem(action) {
82
+ if (_state.menuState === MenuStates.Closed)
83
+ return _state;
84
+ _state.searchQuery = "";
85
+ _state.activationTrigger = action.trigger ?? ActivationTrigger.Other;
86
+ _state.__demoMode = false;
87
+ // Optimization:
88
+ //
89
+ // There is no need to sort the DOM nodes if we know that we don't want to focus anything
90
+ if (action.focus === Focus.Nothing) {
91
+ _state.activeItemIndex = null;
92
+ return _state;
93
+ }
94
+ // Optimization:
95
+ //
96
+ // There is no need to sort the DOM nodes if we know exactly where to go
97
+ if (action.focus === Focus.Specific) {
98
+ _state.activeItemIndex = _state.items.findIndex((o) => o.id === action.id);
99
+ return _state;
100
+ }
101
+ // Optimization:
102
+ //
103
+ // If the current DOM node and the previous DOM node are next to each other,
104
+ // or if the previous DOM node is already the first DOM node, then we don't
105
+ // have to sort all the DOM nodes.
106
+ else if (action.focus === Focus.Previous) {
107
+ let activeItemIdx = _state.activeItemIndex;
108
+ if (activeItemIdx !== null) {
109
+ let currentDom = _state.items[activeItemIdx].dataRef.current.domRef;
110
+ let previousItemIndex = calculateActiveIndex(action, {
111
+ resolveItems: () => _state.items,
112
+ resolveActiveIndex: () => _state.activeItemIndex,
113
+ resolveId: (item) => item.id,
114
+ resolveDisabled: (item) => item.dataRef.current.disabled,
115
+ });
116
+ if (previousItemIndex !== null) {
117
+ let previousDom = _state.items[previousItemIndex].dataRef.current.domRef;
118
+ if (
119
+ // Next to each other
120
+ currentDom.current?.previousElementSibling === previousDom.current ||
121
+ // Or already the first element
122
+ previousDom.current?.previousElementSibling === null) {
123
+ _state.activeItemIndex = previousItemIndex;
124
+ return _state;
125
+ }
126
+ }
127
+ }
128
+ }
129
+ // Optimization:
130
+ //
131
+ // If the current DOM node and the next DOM node are next to each other, or
132
+ // if the next DOM node is already the last DOM node, then we don't have to
133
+ // sort all the DOM nodes.
134
+ else if (action.focus === Focus.Next) {
135
+ let activeItemIdx = _state.activeItemIndex;
136
+ if (activeItemIdx !== null) {
137
+ let currentDom = _state.items[activeItemIdx].dataRef.current.domRef;
138
+ let nextItemIndex = calculateActiveIndex(action, {
139
+ resolveItems: () => _state.items,
140
+ resolveActiveIndex: () => _state.activeItemIndex,
141
+ resolveId: (item) => item.id,
142
+ resolveDisabled: (item) => item.dataRef.current.disabled,
143
+ });
144
+ if (nextItemIndex !== null) {
145
+ let nextDom = _state.items[nextItemIndex].dataRef.current.domRef;
146
+ if (
147
+ // Next to each other
148
+ currentDom.current?.nextElementSibling === nextDom.current ||
149
+ // Or already the last element
150
+ nextDom.current?.nextElementSibling === null) {
151
+ _state.activeItemIndex = nextItemIndex;
152
+ return _state;
153
+ }
154
+ }
155
+ }
156
+ }
157
+ // Slow path:
158
+ //
159
+ // Ensure all the items are correctly sorted according to DOM position
160
+ let adjustedState = adjustOrderedState(_state);
161
+ let activeItemIndex = calculateActiveIndex(action, {
162
+ resolveItems: () => adjustedState.items,
163
+ resolveActiveIndex: () => adjustedState.activeItemIndex,
164
+ resolveId: (item) => item.id,
165
+ resolveDisabled: (item) => item.dataRef.current.disabled,
166
+ });
167
+ _state.items = adjustedState.items;
168
+ _state.activeItemIndex = activeItemIndex;
169
+ return _state;
170
+ },
171
+ search(value) {
172
+ let wasAlreadySearching = _state.searchQuery !== "";
173
+ let offset = wasAlreadySearching ? 0 : 1;
174
+ let searchQuery = _state.searchQuery + value.toLowerCase();
175
+ let reOrderedItems = _state.activeItemIndex !== null
176
+ ? _state.items
177
+ .slice(_state.activeItemIndex + offset)
178
+ .concat(_state.items.slice(0, _state.activeItemIndex + offset))
179
+ : _state.items;
180
+ let matchingItem = reOrderedItems.find((item) => item.dataRef.current.textValue?.startsWith(searchQuery) && !item.dataRef.current.disabled);
181
+ let matchIdx = matchingItem ? _state.items.indexOf(matchingItem) : -1;
182
+ if (matchIdx === -1 || matchIdx === _state.activeItemIndex) {
183
+ _state.searchQuery = searchQuery;
184
+ return _state;
185
+ }
186
+ _state.searchQuery = searchQuery;
187
+ _state.activeItemIndex = matchIdx;
188
+ _state.activationTrigger = ActivationTrigger.Other;
189
+ return _state;
190
+ },
191
+ clearSearch() {
192
+ if (_state.searchQuery === "")
193
+ return _state;
194
+ _state.searchQuery = "";
195
+ return _state;
196
+ },
197
+ registerItem(id, dataRef) {
198
+ let item = { id, dataRef };
199
+ let adjustedState = adjustOrderedState(_state, (items) => [...items, item]);
200
+ _state.items = adjustedState.items;
201
+ _state.activeItemIndex = adjustedState.activeItemIndex;
202
+ return _state;
203
+ },
204
+ unregisterItem(id) {
205
+ let adjustedState = adjustOrderedState(_state, (items) => {
206
+ let idx = items.findIndex((a) => a.id === id);
207
+ if (idx !== -1)
208
+ items.splice(idx, 1);
209
+ return items;
210
+ });
211
+ _state.items = adjustedState.items;
212
+ _state.activeItemIndex = adjustedState.activeItemIndex;
213
+ _state.activationTrigger = ActivationTrigger.Other;
214
+ return _state;
215
+ },
216
+ setButtonElement(element) {
217
+ if (_state.buttonElement === element)
218
+ return _state;
219
+ _state.buttonElement = element;
220
+ return _state;
221
+ },
222
+ setItemsElement(element) {
223
+ if (_state.itemsElement === element)
224
+ return _state;
225
+ _state.itemsElement = element;
226
+ return _state;
227
+ },
228
+ };
229
+ };
@@ -0,0 +1,74 @@
1
+ <script lang="ts" module>let DEFAULT_SELECT_TAG = "select";
2
+ </script>
3
+
4
+ <script lang="ts" generics="TTag extends ElementType = typeof DEFAULT_SELECT_TAG">import { useId } from "../hooks/use-id.js";
5
+ import { useProvidedId } from "../utils/id.js";
6
+ import { useDisabled } from "../hooks/use-disabled.js";
7
+ import { useFocusRing } from "../hooks/use-focus-ring.svelte.js";
8
+ import { useHover } from "../hooks/use-hover.svelte.js";
9
+ import { useActivePress } from "../hooks/use-active-press.svelte.js";
10
+ import { useLabelledBy } from "../label/context.svelte.js";
11
+ import { useDescribedBy } from "../description/context.svelte.js";
12
+ import { mergeProps } from "../utils/render.js";
13
+ import ElementOrComponent from "../utils/ElementOrComponent.svelte";
14
+ const internalId = useId();
15
+ const providedId = useProvidedId();
16
+ const providedDisabled = useDisabled();
17
+ let {
18
+ ref = $bindable(),
19
+ id = providedId || `headlessui-select-${internalId}`,
20
+ disabled: theirDisabled = false,
21
+ invalid = false,
22
+ autofocus = false,
23
+ ...theirProps
24
+ } = $props();
25
+ const disabled = $derived(providedDisabled?.value ?? theirDisabled);
26
+ const labelledBy = useLabelledBy();
27
+ const describedBy = useDescribedBy();
28
+ const { isFocusVisible: focus, focusProps } = $derived(
29
+ useFocusRing({
30
+ get autofocus() {
31
+ return autofocus;
32
+ }
33
+ })
34
+ );
35
+ const { isHovered: hover, hoverProps } = $derived(
36
+ useHover({
37
+ get disabled() {
38
+ return disabled;
39
+ }
40
+ })
41
+ );
42
+ const { pressed: active, pressProps } = $derived(
43
+ useActivePress({
44
+ get disabled() {
45
+ return disabled;
46
+ }
47
+ })
48
+ );
49
+ const ourProps = $derived(
50
+ mergeProps(
51
+ {
52
+ id,
53
+ "aria-labelledby": labelledBy.value,
54
+ "aria-describedby": describedBy.value,
55
+ "aria-invalid": invalid ? "" : void 0,
56
+ disabled: disabled || void 0,
57
+ autofocus
58
+ },
59
+ focusProps,
60
+ hoverProps,
61
+ pressProps
62
+ )
63
+ );
64
+ const slot = $derived({
65
+ disabled,
66
+ invalid,
67
+ hover,
68
+ focus,
69
+ active,
70
+ autofocus
71
+ });
72
+ </script>
73
+
74
+ <ElementOrComponent {ourProps} {theirProps} {slot} defaultTag={DEFAULT_SELECT_TAG} name="Select" bind:ref />
@@ -0,0 +1,48 @@
1
+ import type { ElementType, Props, PropsOf } from "../utils/types.js";
2
+ declare let DEFAULT_SELECT_TAG: "select";
3
+ type SelectRenderPropArg = {
4
+ disabled: boolean;
5
+ hover: boolean;
6
+ focus: boolean;
7
+ active: boolean;
8
+ autofocus: boolean;
9
+ invalid: boolean;
10
+ };
11
+ type SelectPropsWeControl = "aria-labelledby" | "aria-describedby";
12
+ export type SelectProps<TTag extends ElementType = typeof DEFAULT_SELECT_TAG> = Props<TTag, SelectRenderPropArg, SelectPropsWeControl, {
13
+ disabled?: boolean;
14
+ invalid?: boolean;
15
+ autofocus?: boolean;
16
+ }>;
17
+ declare class __sveltets_Render<TTag extends ElementType = typeof DEFAULT_SELECT_TAG> {
18
+ props(): {
19
+ as?: TTag | undefined;
20
+ } & (Exclude<keyof PropsOf<TTag>, ("as" | "children" | "refName" | "class") | "invalid" | "disabled" | "autofocus" | SelectPropsWeControl> extends infer T extends keyof PropsOf<TTag> ? { [P in T]: PropsOf<TTag>[P]; } : never) & {
21
+ children?: import("../utils/types.js").Children<SelectRenderPropArg> | undefined;
22
+ ref?: HTMLElement;
23
+ } & (true extends (PropsOf<TTag> extends infer T_1 ? T_1 extends PropsOf<TTag> ? T_1 extends never ? never : "class" extends infer T_2 ? T_2 extends "class" ? T_2 extends keyof T_1 ? true : never : never : never : never : never) ? {
24
+ class?: PropsOf<TTag>["class"] | ((bag: SelectRenderPropArg) => string) | undefined;
25
+ } : {}) & {
26
+ disabled?: boolean;
27
+ invalid?: boolean;
28
+ autofocus?: boolean;
29
+ };
30
+ events(): {} & {
31
+ [evt: string]: CustomEvent<any>;
32
+ };
33
+ slots(): {};
34
+ bindings(): "ref";
35
+ exports(): {};
36
+ }
37
+ interface $$IsomorphicComponent {
38
+ new <TTag extends ElementType = typeof DEFAULT_SELECT_TAG>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<TTag>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<TTag>['props']>, ReturnType<__sveltets_Render<TTag>['events']>, ReturnType<__sveltets_Render<TTag>['slots']>> & {
39
+ $$bindings?: ReturnType<__sveltets_Render<TTag>['bindings']>;
40
+ } & ReturnType<__sveltets_Render<TTag>['exports']>;
41
+ <TTag extends ElementType = typeof DEFAULT_SELECT_TAG>(internal: unknown, props: ReturnType<__sveltets_Render<TTag>['props']> & {
42
+ $$events?: ReturnType<__sveltets_Render<TTag>['events']>;
43
+ }): ReturnType<__sveltets_Render<TTag>['exports']>;
44
+ z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
45
+ }
46
+ declare const Select: $$IsomorphicComponent;
47
+ type Select<TTag extends ElementType = typeof DEFAULT_SELECT_TAG> = InstanceType<typeof Select<TTag>>;
48
+ export default Select;
@@ -0,0 +1 @@
1
+ export { default as Select, type SelectProps } from "./Select.svelte";
@@ -0,0 +1 @@
1
+ export { default as Select } from "./Select.svelte";
@@ -24,7 +24,7 @@ export type SwitchProps<TTag extends ElementType = typeof DEFAULT_SWITCH_TAG> =
24
24
  declare class __sveltets_Render<TTag extends ElementType = typeof DEFAULT_SWITCH_TAG> {
25
25
  props(): {
26
26
  as?: TTag | undefined;
27
- } & (Exclude<keyof PropsOf<TTag>, "form" | ("as" | "children" | "refName" | "class") | "disabled" | "autofocus" | "name" | "value" | "checked" | "onchange" | "tabIndex" | "defaultChecked" | SwitchPropsWeControl> extends infer T extends keyof PropsOf<TTag> ? { [P in T]: PropsOf<TTag>[P]; } : never) & {
27
+ } & (Exclude<keyof PropsOf<TTag>, "form" | ("as" | "children" | "refName" | "class") | "disabled" | "autofocus" | "value" | "checked" | "name" | "onchange" | "tabIndex" | "defaultChecked" | SwitchPropsWeControl> extends infer T extends keyof PropsOf<TTag> ? { [P in T]: PropsOf<TTag>[P]; } : never) & {
28
28
  children?: import("../utils/types.js").Children<SwitchRenderPropArg> | undefined;
29
29
  ref?: HTMLElement;
30
30
  } & (true extends (PropsOf<TTag> extends infer T_1 ? T_1 extends PropsOf<TTag> ? T_1 extends never ? never : "class" extends infer T_2 ? T_2 extends "class" ? T_2 extends keyof T_1 ? true : never : never : never : never : never) ? {
@@ -10,14 +10,14 @@ export var TreeStates;
10
10
  })(TreeStates || (TreeStates = {}));
11
11
  export function useTransitionContext() {
12
12
  const context = getContext("TransitionContext");
13
- if (context === null) {
13
+ if (!context) {
14
14
  throw new Error("A <Transition.Child /> is used but it is missing a parent <Transition /> or <Transition.Root />.");
15
15
  }
16
16
  return context;
17
17
  }
18
18
  export function useParentNesting() {
19
19
  let context = getContext("NestingContext");
20
- if (context === null) {
20
+ if (!context) {
21
21
  throw new Error("A <Transition.Child /> is used but it is missing a parent <Transition /> or <Transition.Root />.");
22
22
  }
23
23
  return context;
@@ -23,4 +23,4 @@ const hiddenProps = $derived(
23
23
  );
24
24
  </script>
25
25
 
26
- {#if render}<Generic {...rest} {...hiddenProps} {slot} tag={defaultTag} {name} bind:ref bind:value bind:checked />{/if}
26
+ {#if render}<Generic {...rest} {...hiddenProps} {slot} tag={defaultTag} bind:ref bind:value bind:checked />{/if}
@@ -2,7 +2,6 @@
2
2
  let {
3
3
  slot = {},
4
4
  tag,
5
- name,
6
5
  ref = $bindable(),
7
6
  value = $bindable(),
8
7
  checked = $bindable(),
@@ -4,7 +4,6 @@ declare class __sveltets_Render<TTag extends keyof SvelteHTMLProps, TSlot, TValu
4
4
  as?: TTag | undefined;
5
5
  slot: TSlot;
6
6
  tag: ElementType;
7
- name: string;
8
7
  ref?: HTMLElement;
9
8
  value?: TValue | undefined;
10
9
  checked?: boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pzerelles/headlessui-svelte",
3
- "version": "2.1.2-next.13",
3
+ "version": "2.1.2-next.15",
4
4
  "exports": {
5
5
  ".": {
6
6
  "types": "./dist/index.d.ts",
@@ -1,11 +0,0 @@
1
- <script lang="ts">import { getContext } from "svelte";
2
- import Portal from "./Portal.svelte";
3
- let { children } = $props();
4
- const formFieldsContext = getContext("FormFieldsContext");
5
- </script>
6
-
7
- {#if !formFieldsContext}
8
- {@render children()}
9
- {:else if formFieldsContext.target}
10
- <Portal target={formFieldsContext.target}>{@render children()}</Portal>
11
- {/if}