ui-ingredients 0.0.28 → 0.0.30

package/dist/select/root.svelte

@@ -1,94 +1,71 @@
-<script lang="ts" module>
-  import type {AsChild, Assign, GenericHtmlProps, HtmlProps} from '../types.js';
-  import type {Snippet} from 'svelte';
-  import type {CreateSelectProps, CreateSelectReturn} from './create-select.svelte.js';
-
-  export interface SelectProps<T>
-    extends Assign<Omit<HtmlProps<'div'>, 'children'>, CreateSelectProps<T>> {
-    asChild?: AsChild<GenericHtmlProps, CreateSelectReturn>;
-    children?: Snippet<[select: CreateSelectReturn]>;
-  }
-</script>
-
-<script lang="ts" generics="T">
-  import {mergeProps} from '../utils.svelte.js';
-  import {selectContext} from './context.svelte.js';
-  import {createSelect} from './create-select.svelte.js';
-
-  let {
-    id,
-    ids,
-    form,
-    name,
-    open,
-    defaultOpen,
-    value,
-    items,
-    invalid,
-    multiple,
-    disabled,
-    readOnly,
-    required,
-    loopFocus,
-    composite,
-    positioning,
-    closeOnSelect,
-    highlightedValue,
-    itemToValue,
-    itemToString,
-    isItemDisabled,
-    onOpenChange,
-    onValueChange,
-    onFocusOutside,
-    onHighlightChange,
-    onInteractOutside,
-    onPointerDownOutside,
-    scrollToIndexFn,
-    asChild,
-    children,
-    ...props
-  }: SelectProps<T> = $props();
-
-  let select = createSelect({
-    id,
-    ids,
-    form,
-    name,
-    open,
-    defaultOpen,
-    value: $state.snapshot(value),
-    items,
-    invalid,
-    multiple,
-    disabled,
-    readOnly,
-    required,
-    loopFocus,
-    composite,
-    positioning,
-    closeOnSelect,
-    highlightedValue,
-    itemToValue,
-    itemToString,
-    isItemDisabled,
-    onOpenChange,
-    onValueChange,
-    onFocusOutside,
-    onHighlightChange,
-    onInteractOutside,
-    onPointerDownOutside,
-    scrollToIndexFn,
-  });
-
-  let attrs = $derived(mergeProps<Record<string, any>>(props, select.getRootProps()));
-
-  selectContext.set(select);
-</script>
-
-{#if asChild}
-  {@render asChild(attrs, select)}
-{:else}
-  <div {...attrs}>
-    {@render children?.(select)}
-  </div>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, Assign, HTMLProps} from '../types.js';
+  import type {Snippet} from 'svelte';
+  import type {
+    CreateSelectProps,
+    CreateSelectReturn,
+  } from './create-select.svelte.js';
+
+  export interface SelectProps<T>
+    extends Assign<Omit<HTMLProps<'div'>, 'children'>, CreateSelectProps<T>> {
+    asChild?: AsChild<CreateSelectReturn>;
+    children?: Snippet<[CreateSelectReturn]>;
+  }
+</script>
+
+<script lang="ts" generics="T">
+  import {mergeProps} from '../merge-props.js';
+  import {reflect} from '@zag-js/svelte';
+  import {createSplitProps} from '@zag-js/utils';
+  import {selectContext} from './context.svelte.js';
+  import {createSelect} from './create-select.svelte.js';
+
+  let {asChild, children, ...props}: SelectProps<T> = $props();
+
+  let [selectProps, otherProps] = $derived(
+    createSplitProps<CreateSelectProps<T>>([
+      'id',
+      'ids',
+      'form',
+      'name',
+      'open',
+      'defaultOpen',
+      'value',
+      'items',
+      'invalid',
+      'multiple',
+      'disabled',
+      'readOnly',
+      'required',
+      'loopFocus',
+      'composite',
+      'positioning',
+      'closeOnSelect',
+      'highlightedValue',
+      'itemToValue',
+      'itemToString',
+      'isItemDisabled',
+      'onOpenChange',
+      'onValueChange',
+      'onFocusOutside',
+      'onHighlightChange',
+      'onInteractOutside',
+      'onPointerDownOutside',
+      'scrollToIndexFn',
+    ])(props),
+  );
+
+  let select = createSelect(reflect(() => selectProps));
+
+  let mergedProps = $derived(mergeProps(otherProps, select.getRootProps()));
+
+  selectContext.set(select);
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps, select)}
+{:else}
+  <div {...mergedProps}>
+    {@render children?.(select)}
+  </div>
+{/if}

package/dist/select/trigger.svelte

@@ -1,26 +1,26 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SelectTriggerProps extends HtmlProps<'button'> {
-    asChild?: AsChild<HtmlProps<'button'>>;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {selectContext} from './context.svelte.js';
-
-  let {asChild, children, ...props}: SelectTriggerProps = $props();
-
-  let select = selectContext.get();
-
-  let attrs = $derived(mergeProps(props, select.getTriggerProps()));
-</script>
-
-{#if asChild}
-  {@render asChild(attrs)}
-{:else}
-  <button type="button" {...attrs}>
-    {@render children?.()}
-  </button>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SelectTriggerProps extends HTMLProps<'button'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {selectContext} from './context.svelte.js';
+
+  let {asChild, children, ...props}: SelectTriggerProps = $props();
+
+  let select = selectContext.get();
+
+  let mergedProps = $derived(mergeProps(props, select.getTriggerProps()));
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps)}
+{:else}
+  <button type="button" {...mergedProps}>
+    {@render children?.()}
+  </button>
+{/if}

package/dist/select/value-text.svelte

@@ -1,32 +1,33 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SelectValueTextProps extends HtmlProps<'span'> {
-    asChild?: AsChild;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {selectContext} from './context.svelte.js';
-
-  let {asChild, children, placeholder, ...props}: SelectValueTextProps = $props();
-
-  let select = selectContext.get();
-
-  let attrs = $derived(mergeProps(props, select.getValueTextProps()));
-</script>
-
-{#if asChild}
-  {@render asChild(attrs)}
-{:else}
-  <span {...attrs}>
-    {#if children}
-      {@render children?.()}
-    {:else if select.value.length}
-      {select.valueAsString}
-    {:else}
-      {placeholder}
-    {/if}
-  </span>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SelectValueTextProps extends HTMLProps<'span'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {selectContext} from './context.svelte.js';
+
+  let {asChild, children, placeholder, ...props}: SelectValueTextProps =
+    $props();
+
+  let select = selectContext.get();
+
+  let mergedProps = $derived(mergeProps(props, select.getValueTextProps()));
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps)}
+{:else}
+  <span {...mergedProps}>
+    {#if children}
+      {@render children?.()}
+    {:else if select.value.length}
+      {select.valueAsString}
+    {:else}
+      {placeholder}
+    {/if}
+  </span>
+{/if}

package/dist/signature-pad/clear-trigger.svelte

@@ -1,26 +1,28 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SignaturePadClearTriggerProps extends HtmlProps<'button'> {
-    asChild?: AsChild<HtmlProps<'button'>>;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {signaturePadContext} from './context.svelte.js';
-
-  let {asChild, children, ...props}: SignaturePadClearTriggerProps = $props();
-
-  let signaturePad = signaturePadContext.get();
-
-  let attrs = $derived(mergeProps(props, signaturePad.getClearTriggerProps()));
-</script>
-
-{#if asChild}
-  {@render asChild(attrs)}
-{:else}
-  <button type="button" {...attrs}>
-    {@render children?.()}
-  </button>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SignaturePadClearTriggerProps extends HTMLProps<'button'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {signaturePadContext} from './context.svelte.js';
+
+  let {asChild, children, ...props}: SignaturePadClearTriggerProps = $props();
+
+  let signaturePad = signaturePadContext.get();
+
+  let mergedProps = $derived(
+    mergeProps(props, signaturePad.getClearTriggerProps()),
+  );
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps)}
+{:else}
+  <button type="button" {...mergedProps}>
+    {@render children?.()}
+  </button>
+{/if}

package/dist/signature-pad/context.svelte.d.ts

@@ -1,3 +1,3 @@
-import { Context } from '../utils.svelte.js';
+import { Context } from '../context.svelte.js';
 import type { CreateSignaturePadReturn } from './create-signature-pad.svelte.js';
 export declare const signaturePadContext: Context<CreateSignaturePadReturn>;

package/dist/signature-pad/context.svelte.js

@@ -1,2 +1,2 @@
-import { Context } from '../utils.svelte.js';
+import { Context } from '../context.svelte.js';
 export const signaturePadContext = new Context('SignaturePad');

package/dist/signature-pad/control.svelte

@@ -1,26 +1,26 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SignaturePadControlProps extends HtmlProps<'div'> {
-    asChild?: AsChild;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {signaturePadContext} from './context.svelte.js';
-
-  let {asChild, children, ...props}: SignaturePadControlProps = $props();
-
-  let signaturePad = signaturePadContext.get();
-
-  let attrs = $derived(mergeProps(props, signaturePad.getControlProps()));
-</script>
-
-{#if asChild}
-  {@render asChild(attrs)}
-{:else}
-  <div {...attrs}>
-    {@render children?.()}
-  </div>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SignaturePadControlProps extends HTMLProps<'div'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {signaturePadContext} from './context.svelte.js';
+
+  let {asChild, children, ...props}: SignaturePadControlProps = $props();
+
+  let signaturePad = signaturePadContext.get();
+
+  let mergedProps = $derived(mergeProps(props, signaturePad.getControlProps()));
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps)}
+{:else}
+  <div {...mergedProps}>
+    {@render children?.()}
+  </div>
+{/if}

package/dist/signature-pad/create-signature-pad.svelte.js

@@ -1,6 +1,6 @@
+import { createUniqueId } from '../create-unique-id.js';
 import { getEnvironmentContext } from '../environment-provider/context.svelte.js';
 import { getLocaleContext } from '../locale-provider/context.svelte.js';
-import { createUniqueId } from '../utils.svelte.js';
 import * as signaturePad from '@zag-js/signature-pad';
 import { normalizeProps, reflect, useMachine } from '@zag-js/svelte';
 export function createSignaturePad(props) {

package/dist/signature-pad/current-segment-path.svelte

@@ -1,35 +1,37 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SignaturePadCurrentSegmentPathProps extends HtmlProps<'path'> {
-    asChild?: AsChild<HtmlProps<'path'>>;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {signaturePadContext} from './context.svelte.js';
-
-  let {path, asChild, children, ...props}: SignaturePadCurrentSegmentPathProps = $props();
-
-  let signaturePad = signaturePadContext.get();
-
-  let attrs = $derived(
-    mergeProps(
-      props,
-      signaturePad.getSegmentPathProps({
-        path: signaturePad.currentPath ?? '',
-      }),
-    ),
-  );
-</script>
-
-{#if signaturePad.currentPath}
-  {#if asChild}
-    {@render asChild(attrs)}
-  {:else}
-    <path {...attrs}>
-      {@render children?.()}
-    </path>
-  {/if}
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SignaturePadCurrentSegmentPathProps
+    extends HTMLProps<'path'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {signaturePadContext} from './context.svelte.js';
+
+  let {asChild, children, ...props}: SignaturePadCurrentSegmentPathProps =
+    $props();
+
+  let signaturePad = signaturePadContext.get();
+
+  let mergedProps = $derived(
+    mergeProps(
+      props,
+      signaturePad.getSegmentPathProps({
+        path: signaturePad.currentPath ?? '',
+      }),
+    ),
+  );
+</script>
+
+{#if signaturePad.currentPath}
+  {#if asChild}
+    {@render asChild(mergedProps)}
+  {:else}
+    <path {...mergedProps}>
+      {@render children?.()}
+    </path>
+  {/if}
+{/if}

package/dist/signature-pad/guide.svelte

@@ -1,26 +1,26 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SignaturePadGuideProps extends HtmlProps<'div'> {
-    asChild?: AsChild;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {signaturePadContext} from './context.svelte.js';
-
-  let {asChild, children, ...props}: SignaturePadGuideProps = $props();
-
-  let signaturePad = signaturePadContext.get();
-
-  let attrs = $derived(mergeProps(props, signaturePad.getGuideProps()));
-</script>
-
-{#if asChild}
-  {@render asChild(attrs)}
-{:else}
-  <div {...attrs}>
-    {@render children?.()}
-  </div>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SignaturePadGuideProps extends HTMLProps<'div'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {signaturePadContext} from './context.svelte.js';
+
+  let {asChild, children, ...props}: SignaturePadGuideProps = $props();
+
+  let signaturePad = signaturePadContext.get();
+
+  let mergedProps = $derived(mergeProps(props, signaturePad.getGuideProps()));
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps)}
+{:else}
+  <div {...mergedProps}>
+    {@render children?.()}
+  </div>
+{/if}

package/dist/signature-pad/hidden-input.svelte

@@ -1,20 +1,22 @@
-<script lang="ts" module>
-  import type {Assign, HtmlProps} from '../types.js';
-  import type {HiddenInputProps} from '@zag-js/signature-pad';
-
-  export interface SignaturePadHiddenInputProps
-    extends Assign<HtmlProps<'input'>, HiddenInputProps> {}
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {signaturePadContext} from './context.svelte.js';
-
-  let {value, ...props}: SignaturePadHiddenInputProps = $props();
-
-  let signaturePad = signaturePadContext.get();
-
-  let attrs = $derived(mergeProps(props, signaturePad.getHiddenInputProps({value})));
-</script>
-
-<input {...attrs} />
+<script lang="ts" module>
+  import type {Assign, HTMLProps} from '../types.js';
+  import type {HiddenInputProps} from '@zag-js/signature-pad';
+
+  export interface SignaturePadHiddenInputProps
+    extends Assign<HTMLProps<'input'>, HiddenInputProps> {}
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {signaturePadContext} from './context.svelte.js';
+
+  let {value, ...props}: SignaturePadHiddenInputProps = $props();
+
+  let signaturePad = signaturePadContext.get();
+
+  let mergedProps = $derived(
+    mergeProps(props, signaturePad.getHiddenInputProps({value})),
+  );
+</script>
+
+<input {...mergedProps} />

package/dist/signature-pad/label.svelte

@@ -1,26 +1,26 @@
-<script lang="ts" module>
-  import type {AsChild, HtmlProps} from '../types.js';
-
-  export interface SignaturePadLabelProps extends HtmlProps<'label'> {
-    asChild?: AsChild<HtmlProps<'label'>>;
-  }
-</script>
-
-<script lang="ts">
-  import {mergeProps} from '../utils.svelte.js';
-  import {signaturePadContext} from './context.svelte.js';
-
-  let {asChild, children, ...props}: SignaturePadLabelProps = $props();
-
-  let signaturePad = signaturePadContext.get();
-
-  let attrs = $derived(mergeProps(props, signaturePad.getLabelProps()));
-</script>
-
-{#if asChild}
-  {@render asChild(attrs)}
-{:else}
-  <label {...attrs}>
-    {@render children?.()}
-  </label>
-{/if}
+<script lang="ts" module>
+  import type {AsChild, HTMLProps} from '../types.js';
+
+  export interface SignaturePadLabelProps extends HTMLProps<'label'> {
+    asChild?: AsChild;
+  }
+</script>
+
+<script lang="ts">
+  import {mergeProps} from '../merge-props.js';
+  import {signaturePadContext} from './context.svelte.js';
+
+  let {asChild, children, ...props}: SignaturePadLabelProps = $props();
+
+  let signaturePad = signaturePadContext.get();
+
+  let mergedProps = $derived(mergeProps(props, signaturePad.getLabelProps()));
+</script>
+
+{#if asChild}
+  {@render asChild(mergedProps)}
+{:else}
+  <label {...mergedProps}>
+    {@render children?.()}
+  </label>
+{/if}