@pzerelles/headlessui-svelte 2.1.2-next.23 → 2.1.2-next.24

package/dist/menu/MenuHeading.svelte.d.ts

@@ -6,15 +6,17 @@ type HeadingPropsWeControl = "role";
 export type MenuHeadingProps<TTag extends ElementType = typeof DEFAULT_HEADING_TAG> = Props<TTag, HeadingRenderPropArg, HeadingPropsWeControl, {
     id?: string;
 }>;
-export type MenuHeadingChildren = Snippet<[HeadingRenderPropArg]>;
 declare class __sveltets_Render<TTag extends ElementType = typeof DEFAULT_HEADING_TAG> {
     props(): {
         as?: TTag | undefined;
-    } & (Exclude<keyof import("../utils/types.js").PropsOf<TTag>, ("as" | "children" | "refName" | "class") | "id" | "role"> extends infer T extends keyof import("../utils/types.js").PropsOf<TTag> ? { [P in T]: import("../utils/types.js").PropsOf<TTag>[P]; } : never) & {
-        children?: Snippet<[HeadingRenderPropArg, Record<string, any>]> | undefined;
+    } & (Exclude<keyof import("../utils/types.js").PropsOf<TTag>, ("as" | "children" | "class") | "id" | "role"> extends infer T extends keyof import("../utils/types.js").PropsOf<TTag> ? { [P in T]: import("../utils/types.js").PropsOf<TTag>[P]; } : never) & {
+        children?: Snippet<[{
+            slot: HeadingRenderPropArg;
+            props: Record<string, any>;
+        }]> | undefined;
         ref?: HTMLElement;
-    } & (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) ? {
-        class?: import("../utils/types.js").PropsOf<TTag>["class"] | ((bag: HeadingRenderPropArg) => string) | undefined;
+    } & (true extends (import("svelte/elements").SvelteHTMLElements[TTag] extends infer T_1 ? T_1 extends import("svelte/elements").SvelteHTMLElements[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) ? {
+        class?: string | ((bag: HeadingRenderPropArg) => string) | null | undefined;
     } : {}) & {
         id?: string;
     };

package/dist/menu/MenuItem.svelte

@@ -1,114 +1,149 @@
-<script lang="ts" module>import { onMount } from "svelte";
-const DEFAULT_ITEM_TAG = "svelte:fragment";
-</script>
+<script lang="ts" module>
+  import type { Props, ElementType, ChildrenArgs } from "../utils/types.js"
+  import { onMount, type Snippet } from "svelte"
 
-<script lang="ts" generics="TTag extends ElementType = typeof DEFAULT_ITEM_TAG">import { useId } from "../hooks/use-id.js";
-import { ActivationTrigger, MenuStates, useMenuContext } from "./context.svelte.js";
-import { disposables } from "../utils/disposables.js";
-import { useTextValue } from "../hooks/use-text-value.svelte.js";
-import { restoreFocusIfNecessary } from "../utils/focus-management.js";
-import { Focus } from "../utils/calculate-active-index.js";
-import { useTrackedPointer } from "../hooks/use-tracked-pointer.js";
-import { useLabels } from "../label/context.svelte.js";
-import ElementOrComponent from "../utils/ElementOrComponent.svelte";
-import { mergeProps } from "../utils/render.js";
-import { useDescriptions } from "../description/context.svelte.js";
-const internalId = useId();
-let {
-  ref = $bindable(),
-  id = `headlessui-menu-item-${internalId}`,
-  disabled = false,
-  ...theirProps
-} = $props();
-const _state = useMenuContext("MenuItem");
-const active = $derived(_state.activeItemIndex !== null ? _state.items[_state.activeItemIndex].id === id : false);
-$effect(() => {
-  _state.activeItemIndex;
-  if (_state.__demoMode) return;
-  if (_state.menuState !== MenuStates.Open) return;
-  if (!active) return;
-  if (_state.activationTrigger === ActivationTrigger.Pointer) return;
-  return disposables().requestAnimationFrame(() => {
-    ;
-    ref?.scrollIntoView?.({ block: "nearest" });
-  });
-});
-const getTextValue = useTextValue({
-  get element() {
-    return ref || null;
-  }
-});
-const bag = $derived({
-  disabled,
-  domRef: { current: ref || null },
-  get textValue() {
-    return getTextValue();
+  const DEFAULT_ITEM_TAG = "svelte:fragment" as const
+  type ItemRenderPropArg = {
+    /** @deprecated use `focus` instead */
+    active: boolean
+    focus: boolean
+    disabled: boolean
+    close: () => void
+    props?: Record<string, any>
   }
-});
-onMount(() => {
-  _state.registerItem(id, {
-    get current() {
-      return bag;
+  type ItemPropsWeControl = "aria-describedby" | "aria-disabled" | "aria-labelledby" | "role" | "tabIndex"
+
+  export type MenuItemProps<TTag extends ElementType = typeof DEFAULT_ITEM_TAG> = Props<
+    TTag,
+    ItemRenderPropArg,
+    ItemPropsWeControl,
+    {
+      id?: string
+      disabled?: boolean
     }
-  });
-  return () => _state.unregisterItem(id);
-});
-const handleClick = (event) => {
-  if (disabled) return event.preventDefault();
-  _state.closeMenu();
-  restoreFocusIfNecessary(_state.buttonElement);
-};
-const handleFocus = () => {
-  if (disabled) return _state.goToItem({ focus: Focus.Nothing });
-  _state.goToItem({ focus: Focus.Specific, id });
-};
-const pointer = useTrackedPointer();
-const handleEnter = (evt) => {
-  pointer.update(evt);
-  if (disabled) return;
-  if (active) return;
-  _state.goToItem({ focus: Focus.Specific, id, trigger: ActivationTrigger.Pointer });
-};
-const handleMove = (evt) => {
-  if (!pointer.wasMoved(evt)) return;
-  if (disabled) return;
-  if (active) return;
-  _state.goToItem({ focus: Focus.Specific, id, trigger: ActivationTrigger.Pointer });
-};
-const handleLeave = (evt) => {
-  if (!pointer.wasMoved(evt)) return;
-  if (disabled) return;
-  if (!active) return;
-  _state.goToItem({ focus: Focus.Nothing });
-};
-const labelledby = useLabels();
-const describedby = useDescriptions();
-const slot = $derived({
-  active,
-  focus: active,
-  disabled,
-  close: _state.closeMenu
-});
-const ourProps = $derived(
-  mergeProps({
-    id,
-    role: "menuitem",
-    tabindex: disabled === true ? void 0 : -1,
-    "aria-disabled": disabled === true ? true : void 0,
-    "aria-labelledby": labelledby.value,
-    "aria-describedby": describedby.value,
-    disabled: void 0,
-    // Never forward the `disabled` prop
-    onclick: handleClick,
-    onfocus: handleFocus,
-    onpointerenter: handleEnter,
-    onmouseenter: handleEnter,
-    onpointermove: handleMove,
-    onmousemove: handleMove,
-    onpointerleave: handleLeave,
-    onmouseleave: handleLeave
+  >
+</script>
+
+<script lang="ts" generics="TTag extends ElementType = typeof DEFAULT_ITEM_TAG">
+  import { useId } from "../hooks/use-id.js"
+  import { ActivationTrigger, MenuStates, useMenuContext, type MenuItemDataRef } from "./context.svelte.js"
+  import { disposables } from "../utils/disposables.js"
+  import { useTextValue } from "../hooks/use-text-value.svelte.js"
+  import { restoreFocusIfNecessary } from "../utils/focus-management.js"
+  import { Focus } from "../utils/calculate-active-index.js"
+  import { useTrackedPointer } from "../hooks/use-tracked-pointer.js"
+  import { useLabels } from "../label/context.svelte.js"
+  import ElementOrComponent from "../utils/ElementOrComponent.svelte"
+  import { mergeProps } from "../utils/render.js"
+  import { useDescriptions } from "../description/context.svelte.js"
+
+  const internalId = useId()
+  let {
+    ref = $bindable(),
+    id = `headlessui-menu-item-${internalId}`,
+    disabled = false,
+    ...theirProps
+  }: { as?: TTag } & MenuItemProps<TTag> = $props()
+  const _state = useMenuContext("MenuItem")
+  const active = $derived(_state.activeItemIndex !== null ? _state.items[_state.activeItemIndex].id === id : false)
+
+  $effect(() => {
+    /* We also want to trigger this when the position of the active item changes so that we can re-trigger the scrollIntoView */
+    _state.activeItemIndex
+    if (_state.__demoMode) return
+    if (_state.menuState !== MenuStates.Open) return
+    if (!active) return
+    if (_state.activationTrigger === ActivationTrigger.Pointer) return
+    return disposables().requestAnimationFrame(() => {
+      ;(ref as HTMLElement)?.scrollIntoView?.({ block: "nearest" })
+    })
+  })
+
+  const getTextValue = useTextValue({
+    get element() {
+      return ref || null
+    },
+  })
+
+  const bag: MenuItemDataRef["current"] = $derived({
+    disabled,
+    domRef: { current: ref || null },
+    get textValue() {
+      return getTextValue()
+    },
+  })
+
+  onMount(() => {
+    _state.registerItem(id, {
+      get current() {
+        return bag
+      },
+    })
+    return () => _state.unregisterItem(id)
   })
-);
+
+  const handleClick = (event: MouseEvent) => {
+    if (disabled) return event.preventDefault()
+    _state.closeMenu()
+    restoreFocusIfNecessary(_state.buttonElement)
+  }
+
+  const handleFocus = () => {
+    if (disabled) return _state.goToItem({ focus: Focus.Nothing })
+    _state.goToItem({ focus: Focus.Specific, id })
+  }
+
+  const pointer = useTrackedPointer()
+
+  const handleEnter = (evt: PointerEvent) => {
+    pointer.update(evt)
+    if (disabled) return
+    if (active) return
+    _state.goToItem({ focus: Focus.Specific, id, trigger: ActivationTrigger.Pointer })
+  }
+
+  const handleMove = (evt: PointerEvent) => {
+    if (!pointer.wasMoved(evt)) return
+    if (disabled) return
+    if (active) return
+    _state.goToItem({ focus: Focus.Specific, id, trigger: ActivationTrigger.Pointer })
+  }
+
+  const handleLeave = (evt: PointerEvent) => {
+    if (!pointer.wasMoved(evt)) return
+    if (disabled) return
+    if (!active) return
+    _state.goToItem({ focus: Focus.Nothing })
+  }
+
+  const labelledby = useLabels()
+  const describedby = useDescriptions()
+
+  const slot = $derived({
+    active,
+    focus: active,
+    disabled,
+    close: _state.closeMenu,
+  } satisfies ItemRenderPropArg)
+  const ourProps = $derived(
+    mergeProps({
+      id,
+      role: "menuitem",
+      tabindex: disabled === true ? undefined : -1,
+      "aria-disabled": disabled === true ? true : undefined,
+      "aria-labelledby": labelledby.value,
+      "aria-describedby": describedby.value,
+      disabled: undefined, // Never forward the `disabled` prop
+      onclick: handleClick,
+      onfocus: handleFocus,
+      onpointerenter: handleEnter,
+      onmouseenter: handleEnter,
+      onpointermove: handleMove,
+      onmousemove: handleMove,
+      onpointerleave: handleLeave,
+      onmouseleave: handleLeave,
+    })
+  )
 </script>
 
 <ElementOrComponent {ourProps} {theirProps} {slot} defaultTag={DEFAULT_ITEM_TAG} name="MenuItem" bind:ref />

package/dist/menu/MenuItem.svelte.d.ts

@@ -10,24 +10,24 @@ type ItemRenderPropArg = {
     props?: Record<string, any>;
 };
 type ItemPropsWeControl = "aria-describedby" | "aria-disabled" | "aria-labelledby" | "role" | "tabIndex";
-export type MenuItemProps<TTag extends ElementType = typeof DEFAULT_ITEM_TAG> = Props<TTag, ItemRenderPropArg, ItemPropsWeControl | "children", {
+export type MenuItemProps<TTag extends ElementType = typeof DEFAULT_ITEM_TAG> = Props<TTag, ItemRenderPropArg, ItemPropsWeControl, {
     id?: string;
     disabled?: boolean;
-    children: Snippet<[ItemRenderPropArg]>;
 }>;
-export type MenuItemChildren = Snippet<[ItemRenderPropArg]>;
 declare class __sveltets_Render<TTag extends ElementType = typeof DEFAULT_ITEM_TAG> {
     props(): {
         as?: TTag | undefined;
-    } & (Exclude<keyof import("../utils/types.js").PropsOf<TTag>, ("as" | "children" | "refName" | "class") | "disabled" | "id" | ItemPropsWeControl> extends infer T extends keyof import("../utils/types.js").PropsOf<TTag> ? { [P in T]: import("../utils/types.js").PropsOf<TTag>[P]; } : never) & {
-        children?: Snippet<[ItemRenderPropArg, Record<string, any>]> | undefined;
+    } & (Exclude<keyof import("../utils/types.js").PropsOf<TTag>, ("as" | "children" | "class") | "disabled" | "id" | ItemPropsWeControl> extends infer T extends keyof import("../utils/types.js").PropsOf<TTag> ? { [P in T]: import("../utils/types.js").PropsOf<TTag>[P]; } : never) & {
+        children?: Snippet<[{
+            slot: ItemRenderPropArg;
+            props: Record<string, any>;
+        }]> | undefined;
         ref?: HTMLElement;
-    } & (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) ? {
-        class?: import("../utils/types.js").PropsOf<TTag>["class"] | ((bag: ItemRenderPropArg) => string) | undefined;
+    } & (true extends (import("svelte/elements.js").SvelteHTMLElements[TTag] extends infer T_1 ? T_1 extends import("svelte/elements.js").SvelteHTMLElements[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) ? {
+        class?: string | ((bag: ItemRenderPropArg) => string) | null | undefined;
     } : {}) & {
         id?: string;
         disabled?: boolean;
-        children: Snippet<[ItemRenderPropArg]>;
     };
     events(): {} & {
         [evt: string]: CustomEvent<any>;