@pzerelles/headlessui-svelte 2.1.2-next.29 → 2.1.2-next.30

package/dist/menu/MenuItem.svelte

@@ -1,149 +1,114 @@
-<script lang="ts" module>
-  import type { Props, ElementType } from "../utils/types.js"
-  import { onMount } from "svelte"
-
-  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>
-  }
-  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
-    }
-  >
+<script lang="ts" module>import { onMount } from "svelte";
+const DEFAULT_ITEM_TAG = "svelte:fragment";
 </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 })
+<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 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 bag = $derived({
+  disabled,
+  domRef: { current: ref || null },
+  get textValue() {
+    return getTextValue();
   }
-
-  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,
-    })
-  )
+});
+onMount(() => {
+  _state.registerItem(id, {
+    get current() {
+      return bag;
+    }
+  });
+  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>
 
 <ElementOrComponent {ourProps} {theirProps} {slot} defaultTag={DEFAULT_ITEM_TAG} name="MenuItem" bind:ref />