ui-ingredients 0.31.0 → 0.31.2

package/dist/file-upload/file-upload-root.svelte

@@ -1,68 +1,68 @@
-<script lang="ts" module>
-  import type {Assign, HtmlIngredientProps} from '../types.js';
-  import type {
-    CreateFileUploadProps,
-    CreateFileUploadReturn,
-  } from './create-file-upload.svelte.js';
-
-  export interface FileUploadProps
-    extends Assign<
-      HtmlIngredientProps<'div', HTMLDivElement, CreateFileUploadReturn>,
-      CreateFileUploadProps
-    > {}
-</script>
-
-<script lang="ts">
-  import {reflect} from '@zag-js/svelte';
-  import {createSplitProps} from '../create-split-props.js';
-  import {mergeProps} from '../merge-props.js';
-  import {createFileUpload} from './create-file-upload.svelte.js';
-  import {setFileUploadContext} from './file-upload-context.svelte.js';
-
-  let {
-    ref = $bindable(null),
-    asChild,
-    children,
-    ...props
-  }: FileUploadProps = $props();
-
-  let [createFileUploadProps, localProps] = $derived(
-    createSplitProps<CreateFileUploadProps>([
-      'accept',
-      'allowDrop',
-      'capture',
-      'directory',
-      'disabled',
-      'id',
-      'ids',
-      'invalid',
-      'locale',
-      'maxFileSize',
-      'maxFiles',
-      'minFileSize',
-      'minFileSize',
-      'name',
-      'onFileAccept',
-      'onFileChange',
-      'onFileReject',
-      'preventDocumentDrop',
-      'required',
-      'translations',
-      'validate',
-    ])(props),
-  );
-
-  let fileUpload = createFileUpload(reflect(() => createFileUploadProps));
-
-  let mergedProps = $derived(mergeProps(fileUpload.getRootProps(), localProps));
-
-  setFileUploadContext(fileUpload);
-</script>
-
-{#if asChild}
-  {@render asChild(mergedProps, fileUpload)}
-{:else}
-  <div bind:this={ref} {...mergedProps}>
-    {@render children?.(fileUpload)}
-  </div>
-{/if}
+<script lang="ts" module>
+  import type {Assign, HtmlIngredientProps} from '../types.js';
+  import type {
+    CreateFileUploadProps,
+    CreateFileUploadReturn,
+  } from './create-file-upload.svelte.js';
+
+  export interface FileUploadProps
+    extends Assign<
+      HtmlIngredientProps<'div', HTMLDivElement, CreateFileUploadReturn>,
+      CreateFileUploadProps
+    > {}
+</script>
+
+<script lang="ts">
+  import {reflect} from '@zag-js/svelte';
+  import {createSplitProps} from '../create-split-props.js';
+  import {mergeProps} from '../merge-props.js';
+  import {createFileUpload} from './create-file-upload.svelte.js';
+  import {setFileUploadContext} from './file-upload-context.svelte.js';
+
+  let {
+    ref = $bindable(null),
+    asChild,
+    children,
+    ...props
+  }: FileUploadProps = $props();
+
+  let [createFileUploadProps, localProps] = $derived(
+    createSplitProps<CreateFileUploadProps>([
+      'accept',
+      'allowDrop',
+      'capture',
+      'directory',
+      'disabled',
+      'id',
+      'ids',
+      'invalid',
+      'locale',
+      'maxFileSize',
+      'maxFiles',
+      'minFileSize',
+      'minFileSize',
+      'name',
+      'onFileAccept',
+      'onFileChange',
+      'onFileReject',
+      'preventDocumentDrop',
+      'required',
+      'translations',
+      'validate',
+    ])(props),
+  );
+
+  let fileUpload = createFileUpload(reflect(() => createFileUploadProps));
+
+  let mergedProps = $derived(mergeProps(fileUpload.getRootProps(), localProps));
+
+  setFileUploadContext(fileUpload);
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps, fileUpload)}
+{:else}
+  <div bind:this={ref} {...mergedProps}>
+    {@render children?.(fileUpload)}
+  </div>
+{/if}

package/dist/floating-panel/floating-panel-root.svelte

@@ -1,47 +1,47 @@
-<script lang="ts" module>
-  import type {Snippet} from 'svelte';
-  import type {PresenceStrategyProps} from '../presence/create-presence.svelte.js';
-  import type {
-    CreateFloatingPanelProps,
-    CreateFloatingPanelReturn,
-  } from './create-floating-panel.svelte.js';
-
-  export interface FloatingPanelProps
-    extends CreateFloatingPanelProps,
-      PresenceStrategyProps {
-    children?: Snippet<[CreateFloatingPanelReturn]>;
-  }
-</script>
-
-<script lang="ts">
-  import {reflect} from '@zag-js/svelte';
-  import {createSplitProps} from '../create-split-props.js';
-  import {createPresence} from '../presence/create-presence.svelte.js';
-  import {setPresenceContext} from '../presence/presence-context.svelte.js';
-  import {createFloatingPanel} from './create-floating-panel.svelte.js';
-  import {setFloatingPanelContext} from './floating-panel-context.svelte.js';
-
-  let {children, ...props}: FloatingPanelProps = $props();
-
-  let [presenceStrategyProps, createFloatingPanelProps] = $derived(
-    createSplitProps<PresenceStrategyProps>(['lazyMount', 'keepMounted'])(
-      props,
-    ),
-  );
-
-  let floatingPanel = createFloatingPanel(
-    reflect(() => createFloatingPanelProps),
-  );
-
-  let presence = createPresence(
-    reflect(() => ({
-      ...presenceStrategyProps,
-      present: floatingPanel.open,
-    })),
-  );
-
-  setFloatingPanelContext(floatingPanel);
-  setPresenceContext(presence);
-</script>
-
-{@render children?.(floatingPanel)}
+<script lang="ts" module>
+  import type {Snippet} from 'svelte';
+  import type {PresenceStrategyProps} from '../presence/create-presence.svelte.js';
+  import type {
+    CreateFloatingPanelProps,
+    CreateFloatingPanelReturn,
+  } from './create-floating-panel.svelte.js';
+
+  export interface FloatingPanelProps
+    extends CreateFloatingPanelProps,
+      PresenceStrategyProps {
+    children?: Snippet<[CreateFloatingPanelReturn]>;
+  }
+</script>
+
+<script lang="ts">
+  import {reflect} from '@zag-js/svelte';
+  import {createSplitProps} from '../create-split-props.js';
+  import {createPresence} from '../presence/create-presence.svelte.js';
+  import {setPresenceContext} from '../presence/presence-context.svelte.js';
+  import {createFloatingPanel} from './create-floating-panel.svelte.js';
+  import {setFloatingPanelContext} from './floating-panel-context.svelte.js';
+
+  let {children, ...props}: FloatingPanelProps = $props();
+
+  let [presenceStrategyProps, createFloatingPanelProps] = $derived(
+    createSplitProps<PresenceStrategyProps>(['lazyMount', 'keepMounted'])(
+      props,
+    ),
+  );
+
+  let floatingPanel = createFloatingPanel(
+    reflect(() => createFloatingPanelProps),
+  );
+
+  let presence = createPresence(
+    reflect(() => ({
+      ...presenceStrategyProps,
+      present: floatingPanel.open,
+    })),
+  );
+
+  setFloatingPanelContext(floatingPanel);
+  setPresenceContext(presence);
+</script>
+
+{@render children?.(floatingPanel)}

package/dist/highlight/highlight.svelte

@@ -1,42 +1,42 @@
-<script lang="ts" module>
-  import type {HighlightWordProps} from '@zag-js/highlight-word';
-  import type {Assign, HtmlIngredientProps} from '../types.js';
-
-  export interface HighlightProps
-    extends Assign<
-      Omit<HtmlIngredientProps<'div', HTMLDivElement>, 'children'>,
-      HighlightWordProps
-    > {}
-</script>
-
-<script lang="ts">
-  import {highlightWord} from '@zag-js/highlight-word';
-  import {createSplitProps} from '../create-split-props.js';
-
-  let {ref = $bindable(null), asChild, ...props}: HighlightProps = $props();
-
-  let [highlightWordProps, localProps] = $derived(
-    createSplitProps<HighlightWordProps>([
-      'ignoreCase',
-      'matchAll',
-      'query',
-      'text',
-    ])(props),
-  );
-
-  let chunks = $derived(highlightWord(highlightWordProps));
-</script>
-
-{#if asChild}
-  {@render asChild(localProps)}
-{:else}
-  <div bind:this={ref} data-scope="highlight" data-part="root" {...localProps}>
-    {#each chunks as chunk}
-      {#if chunk.match}
-        <mark>{chunk.text}</mark>
-      {:else}
-        {chunk.text}
-      {/if}
-    {/each}
-  </div>
-{/if}
+<script lang="ts" module>
+  import type {HighlightWordProps} from '@zag-js/highlight-word';
+  import type {Assign, HtmlIngredientProps} from '../types.js';
+
+  export interface HighlightProps
+    extends Assign<
+      Omit<HtmlIngredientProps<'div', HTMLDivElement>, 'children'>,
+      HighlightWordProps
+    > {}
+</script>
+
+<script lang="ts">
+  import {highlightWord} from '@zag-js/highlight-word';
+  import {createSplitProps} from '../create-split-props.js';
+
+  let {ref = $bindable(null), asChild, ...props}: HighlightProps = $props();
+
+  let [highlightWordProps, localProps] = $derived(
+    createSplitProps<HighlightWordProps>([
+      'ignoreCase',
+      'matchAll',
+      'query',
+      'text',
+    ])(props),
+  );
+
+  let chunks = $derived(highlightWord(highlightWordProps));
+</script>
+
+{#if asChild}
+  {@render asChild(localProps)}
+{:else}
+  <div bind:this={ref} data-scope="highlight" data-part="root" {...localProps}>
+    {#each chunks as chunk}
+      {#if chunk.match}
+        <mark>{chunk.text}</mark>
+      {:else}
+        {chunk.text}
+      {/if}
+    {/each}
+  </div>
+{/if}

package/dist/hover-card/hover-card-root.svelte

@@ -1,51 +1,51 @@
-<script lang="ts" module>
-  import type {Snippet} from 'svelte';
-  import type {PresenceStrategyProps} from '../presence/create-presence.svelte.js';
-  import type {
-    CreateHoverCardProps,
-    CreateHoverCardReturn,
-  } from './create-hover-card.svelte.js';
-
-  export interface HoverCardProps
-    extends CreateHoverCardProps,
-      PresenceStrategyProps {
-    children?: Snippet<[CreateHoverCardReturn]>;
-  }
-</script>
-
-<script lang="ts">
-  import {reflect} from '@zag-js/svelte';
-  import {createSplitProps} from '../create-split-props.js';
-  import {createPresence} from '../presence/create-presence.svelte.js';
-  import {setPresenceContext} from '../presence/presence-context.svelte.js';
-  import {createHoverCard} from './create-hover-card.svelte.js';
-  import {setHoverCardContext} from './hover-card-context.svelte.js';
-
-  let {children, ...props}: HoverCardProps = $props();
-
-  let [createHoverCardProps, presenceStrategyProps] = $derived(
-    createSplitProps<CreateHoverCardProps>([
-      'closeDelay',
-      'id',
-      'ids',
-      'onOpenChange',
-      'open',
-      'openControlled',
-      'openDelay',
-      'positioning',
-    ])(props),
-  );
-
-  let hoverCard = createHoverCard(reflect(() => createHoverCardProps));
-  let presence = createPresence(
-    reflect(() => ({
-      ...presenceStrategyProps,
-      present: hoverCard.open,
-    })),
-  );
-
-  setHoverCardContext(hoverCard);
-  setPresenceContext(presence);
-</script>
-
-{@render children?.(hoverCard)}
+<script lang="ts" module>
+  import type {Snippet} from 'svelte';
+  import type {PresenceStrategyProps} from '../presence/create-presence.svelte.js';
+  import type {
+    CreateHoverCardProps,
+    CreateHoverCardReturn,
+  } from './create-hover-card.svelte.js';
+
+  export interface HoverCardProps
+    extends CreateHoverCardProps,
+      PresenceStrategyProps {
+    children?: Snippet<[CreateHoverCardReturn]>;
+  }
+</script>
+
+<script lang="ts">
+  import {reflect} from '@zag-js/svelte';
+  import {createSplitProps} from '../create-split-props.js';
+  import {createPresence} from '../presence/create-presence.svelte.js';
+  import {setPresenceContext} from '../presence/presence-context.svelte.js';
+  import {createHoverCard} from './create-hover-card.svelte.js';
+  import {setHoverCardContext} from './hover-card-context.svelte.js';
+
+  let {children, ...props}: HoverCardProps = $props();
+
+  let [createHoverCardProps, presenceStrategyProps] = $derived(
+    createSplitProps<CreateHoverCardProps>([
+      'closeDelay',
+      'id',
+      'ids',
+      'onOpenChange',
+      'open',
+      'openControlled',
+      'openDelay',
+      'positioning',
+    ])(props),
+  );
+
+  let hoverCard = createHoverCard(reflect(() => createHoverCardProps));
+  let presence = createPresence(
+    reflect(() => ({
+      ...presenceStrategyProps,
+      present: hoverCard.open,
+    })),
+  );
+
+  setHoverCardContext(hoverCard);
+  setPresenceContext(presence);
+</script>
+
+{@render children?.(hoverCard)}

package/dist/menu/menu-root.svelte

@@ -1,74 +1,74 @@
-<script lang="ts" module>
-  import type {Snippet} from 'svelte';
-  import type {PresenceStrategyProps} from '../presence/create-presence.svelte.js';
-  import {
-    type CreateMenuProps,
-    type CreateMenuReturn,
-  } from './create-menu.svelte.js';
-
-  export interface MenuRootProps
-    extends CreateMenuProps,
-      PresenceStrategyProps {
-    children?: Snippet<[CreateMenuReturn]>;
-  }
-</script>
-
-<script lang="ts">
-  import {reflect} from '@zag-js/svelte';
-  import {createSplitProps} from '../create-split-props.js';
-  import {createPresence} from '../presence/create-presence.svelte.js';
-  import {setPresenceContext} from '../presence/presence-context.svelte.js';
-  import {createMenu} from './create-menu.svelte.js';
-  import {
-    getMenuContext,
-    setMenuContext,
-    setMenuTriggerItemContext,
-  } from './menu-context.svelte.js';
-
-  let {children, ...props}: MenuRootProps = $props();
-
-  let [createMenuProps, presenceStrategyProps] = $derived(
-    createSplitProps<CreateMenuProps>([
-      'anchorPoint',
-      'aria-label',
-      'closeOnSelect',
-      'composite',
-      'highlightedValue',
-      'id',
-      'ids',
-      'loopFocus',
-      'navigate',
-      'onEscapeKeyDown',
-      'onFocusOutside',
-      'onHighlightChange',
-      'onInteractOutside',
-      'onOpenChange',
-      'onPointerDownOutside',
-      'onSelect',
-      'open',
-      'openControlled',
-      'positioning',
-      'typeahead',
-    ])(props),
-  );
-
-  let parentMenu = getMenuContext();
-  let menu = createMenu(reflect(() => createMenuProps));
-  let presence = createPresence(
-    reflect(() => ({
-      ...presenceStrategyProps,
-      present: menu.open,
-    })),
-  );
-
-  setMenuContext(menu);
-  setPresenceContext(presence);
-  setMenuTriggerItemContext(() => parentMenu?.getTriggerItemProps(menu) ?? {});
-
-  if (parentMenu) {
-    parentMenu.setChild(menu.machine);
-    menu.setParent(parentMenu.machine);
-  }
-</script>
-
-{@render children?.(menu)}
+<script lang="ts" module>
+  import type {Snippet} from 'svelte';
+  import type {PresenceStrategyProps} from '../presence/create-presence.svelte.js';
+  import {
+    type CreateMenuProps,
+    type CreateMenuReturn,
+  } from './create-menu.svelte.js';
+
+  export interface MenuRootProps
+    extends CreateMenuProps,
+      PresenceStrategyProps {
+    children?: Snippet<[CreateMenuReturn]>;
+  }
+</script>
+
+<script lang="ts">
+  import {reflect} from '@zag-js/svelte';
+  import {createSplitProps} from '../create-split-props.js';
+  import {createPresence} from '../presence/create-presence.svelte.js';
+  import {setPresenceContext} from '../presence/presence-context.svelte.js';
+  import {createMenu} from './create-menu.svelte.js';
+  import {
+    getMenuContext,
+    setMenuContext,
+    setMenuTriggerItemContext,
+  } from './menu-context.svelte.js';
+
+  let {children, ...props}: MenuRootProps = $props();
+
+  let [createMenuProps, presenceStrategyProps] = $derived(
+    createSplitProps<CreateMenuProps>([
+      'anchorPoint',
+      'aria-label',
+      'closeOnSelect',
+      'composite',
+      'highlightedValue',
+      'id',
+      'ids',
+      'loopFocus',
+      'navigate',
+      'onEscapeKeyDown',
+      'onFocusOutside',
+      'onHighlightChange',
+      'onInteractOutside',
+      'onOpenChange',
+      'onPointerDownOutside',
+      'onSelect',
+      'open',
+      'openControlled',
+      'positioning',
+      'typeahead',
+    ])(props),
+  );
+
+  let parentMenu = getMenuContext();
+  let menu = createMenu(reflect(() => createMenuProps));
+  let presence = createPresence(
+    reflect(() => ({
+      ...presenceStrategyProps,
+      present: menu.open,
+    })),
+  );
+
+  setMenuContext(menu);
+  setPresenceContext(presence);
+  setMenuTriggerItemContext(() => parentMenu?.getTriggerItemProps(menu) ?? {});
+
+  if (parentMenu) {
+    parentMenu.setChild(menu.machine);
+    menu.setParent(parentMenu.machine);
+  }
+</script>
+
+{@render children?.(menu)}

package/dist/merge-props.js

@@ -1,22 +1,20 @@
-import { mergeProps as zagMergeProps } from '@zag-js/core';
+import { mergeProps as zagMergeProps } from '@zag-js/svelte';
 import { clsx } from 'clsx';
 export function mergeProps(...args) {
-    let res = {};
-    /* class */
-    for (const arg of args) {
-        const obj = { ...arg };
-        if (obj.class)
-            obj.class = clsx(arg.class);
-        res = zagMergeProps(res, obj);
-    }
-    /* style */
-    if (res.style) {
-        let style = '';
-        for (const key in res.style) {
-            const val = res.style[key];
-            style += `${key}:${val};`;
+    const l = [];
+    /* support svelte class value */
+    for (const o of args) {
+        const c = { ...o };
+        if (c.class && !isString(c.class)) {
+            c.class = clsx(o.class);
+        }
+        if (c.className && !isString(c.class)) {
+            c.className = clsx(o.className);
         }
-        res.style = style;
+        l.push(c);
     }
-    return res;
+    return zagMergeProps(...l);
+}
+function isString(value) {
+    return typeof value === 'string';
 }