@ark-ui/solid 0.2.0 → 0.3.0

package/dist/combobox/combobox-option.mjs

@@ -1,19 +1,18 @@
-import { createComponent, mergeProps } from 'solid-js/web';
-import { mergeProps as mergeProps$1 } from 'solid-js';
+import { createComponent, mergeProps as mergeProps$1 } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
+import { splitProps } from 'solid-js';
 import { createSplitProps } from '../create-split-props.mjs';
 import { ark } from '../factory.mjs';
 import { useComboboxContext } from './combobox-context.mjs';
 
 const ComboboxOption = props => {
-  const [optionProps, {
-    children,
-    ...liProps
-  }] = createSplitProps()(props, ['count', 'disabled', 'label', 'value', 'index']);
+  const [optionProps, localProps] = createSplitProps()(props, ['count', 'disabled', 'label', 'value', 'index']);
+  const [childrenProps, restProps] = splitProps(localProps, ['children']);
   const combobox = useComboboxContext();
-  const mergedProps = () => mergeProps$1(combobox().getOptionProps(optionProps), liProps);
-  return createComponent(ark.li, mergeProps(mergedProps, {
+  const mergedProps = mergeProps(() => combobox().getOptionProps(optionProps), restProps);
+  return createComponent(ark.li, mergeProps$1(mergedProps, {
     get children() {
-      return children ? children : optionProps.label;
+      return childrenProps.children || optionProps.label;
     }
   }));
 };

package/dist/combobox/combobox-positioner.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const comboboxContext = require('./combobox-context.cjs');
 
 const ComboboxPositioner = props => {
   const combobox = comboboxContext.useComboboxContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => combobox().positionerProps, props));
+  const positionProps = solid.mergeProps(() => combobox().positionerProps, props);
+  return web.createComponent(factory.ark.div, positionProps);
 };
 
 exports.ComboboxPositioner = ComboboxPositioner;

package/dist/combobox/combobox-positioner.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useComboboxContext } from './combobox-context.mjs';
 
 const ComboboxPositioner = props => {
   const combobox = useComboboxContext();
-  return createComponent(ark.div, mergeProps(() => combobox().positionerProps, props));
+  const positionProps = mergeProps(() => combobox().positionerProps, props);
+  return createComponent(ark.div, positionProps);
 };
 
 export { ComboboxPositioner };

package/dist/combobox/combobox-trigger.cjs

@@ -2,22 +2,15 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const solidJs = require('solid-js');
 const web = require('solid-js/web');
-const ssrSpread = require('../ssr-spread.cjs');
+const solid = require('@zag-js/solid');
+const factory = require('../factory.cjs');
 const comboboxContext = require('./combobox-context.cjs');
 
 const ComboboxTrigger = props => {
   const combobox = comboboxContext.useComboboxContext();
-  const triggerProps = combobox().triggerProps;
-  const getChildren = solidJs.children(() => ssrSpread.ssrSpread(props.children, triggerProps));
-  solidJs.createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      web.spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const triggerProps = solid.mergeProps(() => combobox().triggerProps, props);
+  return web.createComponent(factory.ark.button, triggerProps);
 };
 
 exports.ComboboxTrigger = ComboboxTrigger;

package/dist/combobox/combobox-trigger.d.ts

@@ -1,6 +1,4 @@
-import type { ResolvedChildren } from 'solid-js/types/reactive/signal';
-import { type JSX } from 'solid-js';
-export type ComboboxTriggerProps = {
-    children: JSX.Element;
-};
-export declare const ComboboxTrigger: (props: ComboboxTriggerProps) => ResolvedChildren;
+import type { JSX } from 'solid-js';
+import { type HTMLArkProps } from '../factory';
+export type ComboboxTriggerProps = HTMLArkProps<'button'>;
+export declare const ComboboxTrigger: (props: ComboboxTriggerProps) => JSX.Element;

package/dist/combobox/combobox-trigger.mjs

@@ -1,19 +1,12 @@
-import { children, createEffect } from 'solid-js';
-import { spread } from 'solid-js/web';
-import { ssrSpread } from '../ssr-spread.mjs';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
+import { ark } from '../factory.mjs';
 import { useComboboxContext } from './combobox-context.mjs';
 
 const ComboboxTrigger = props => {
   const combobox = useComboboxContext();
-  const triggerProps = combobox().triggerProps;
-  const getChildren = children(() => ssrSpread(props.children, triggerProps));
-  createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const triggerProps = mergeProps(() => combobox().triggerProps, props);
+  return createComponent(ark.button, triggerProps);
 };
 
 export { ComboboxTrigger };

package/dist/combobox/combobox.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
-const solidJs = require('solid-js');
+const solid = require('@zag-js/solid');
 const createSplitProps = require('../create-split-props.cjs');
 const factory = require('../factory.cjs');
 const runIfFn = require('../run-if-fn.cjs');
@@ -11,23 +11,20 @@ const comboboxContext = require('./combobox-context.cjs');
 const useCombobox = require('./use-combobox.cjs');
 
 const Combobox = props => {
-  const [useComboboxProps, divProps] = createSplitProps.createSplitProps()(props, ['allowCustomValue', 'ariaHidden', 'autoFocus', 'blurOnSelect', 'dir', 'disabled', 'focusOnClear', 'form', 'getRootNode', 'id', 'ids', 'inputBehavior', 'inputValue', 'invalid', 'isCustomValue', 'loop', 'name', 'onClose', 'onHighlight', 'onInputChange', 'onInputChange', 'onInteractOutside', 'onOpen', 'onSelect', 'openOnClick', 'placeholder', 'positioning', 'readOnly', 'selectInputOnFocus', 'selectOnTab', 'selectionBehavior', 'selectionData', 'translations']);
+  const [useComboboxProps, localProps] = createSplitProps.createSplitProps()(props, ['allowCustomValue', 'ariaHidden', 'autoFocus', 'blurOnSelect', 'dir', 'disabled', 'focusOnClear', 'form', 'getRootNode', 'id', 'ids', 'inputBehavior', 'inputValue', 'invalid', 'isCustomValue', 'loop', 'name', 'onClose', 'onHighlight', 'onInputChange', 'onInputChange', 'onInteractOutside', 'onOpen', 'onSelect', 'openOnClick', 'placeholder', 'positioning', 'readOnly', 'selectInputOnFocus', 'selectOnTab', 'selectionBehavior', 'selectionData', 'translations']);
   const combobox = useCombobox.useCombobox(useComboboxProps);
+  const rootProps = solid.mergeProps(() => combobox().rootProps, localProps);
+  const getChildren = () => runIfFn.runIfFn(localProps.children, combobox);
   return web.createComponent(comboboxContext.ComboboxProvider, {
     value: combobox,
     get children() {
-      return web.createComponent(ComboboxContextWrapper, divProps);
+      return web.createComponent(factory.ark.div, web.mergeProps(rootProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
-const ComboboxContextWrapper = props => {
-  const combobox = comboboxContext.useComboboxContext();
-  const view = solidJs.children(() => runIfFn.runIfFn(props.children, combobox));
-  return web.createComponent(factory.ark.div, web.mergeProps(() => combobox().rootProps, props, {
-    get children() {
-      return view();
-    }
-  }));
-};
 
 exports.Combobox = Combobox;

package/dist/combobox/combobox.d.ts

@@ -1,11 +1,9 @@
-import { type Assign } from '@polymorphic-factory/solid';
 import { type JSX } from 'solid-js';
 import { type HTMLArkProps } from '../factory';
+import type { Assign } from '../types';
 import { type ComboboxContext } from './combobox-context';
 import { type UseComboboxProps } from './use-combobox';
-export type ComboboxProps = Assign<ComboboxContextWrapperProps, UseComboboxProps>;
-export declare const Combobox: (props: ComboboxProps) => JSX.Element;
-type ComboboxContextWrapperProps = Assign<HTMLArkProps<'div'>, {
+export type ComboboxProps = Assign<HTMLArkProps<'div'>, UseComboboxProps & {
     children: JSX.Element | ((context: ComboboxContext) => JSX.Element);
 }>;
-export {};
+export declare const Combobox: (props: ComboboxProps) => JSX.Element;

package/dist/combobox/combobox.mjs

@@ -1,29 +1,26 @@
-import { createComponent, mergeProps } from 'solid-js/web';
-import { children } from 'solid-js';
+import { createComponent, mergeProps as mergeProps$1 } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { createSplitProps } from '../create-split-props.mjs';
 import { ark } from '../factory.mjs';
 import { runIfFn } from '../run-if-fn.mjs';
-import { ComboboxProvider, useComboboxContext } from './combobox-context.mjs';
+import { ComboboxProvider } from './combobox-context.mjs';
 import { useCombobox } from './use-combobox.mjs';
 
 const Combobox = props => {
-  const [useComboboxProps, divProps] = createSplitProps()(props, ['allowCustomValue', 'ariaHidden', 'autoFocus', 'blurOnSelect', 'dir', 'disabled', 'focusOnClear', 'form', 'getRootNode', 'id', 'ids', 'inputBehavior', 'inputValue', 'invalid', 'isCustomValue', 'loop', 'name', 'onClose', 'onHighlight', 'onInputChange', 'onInputChange', 'onInteractOutside', 'onOpen', 'onSelect', 'openOnClick', 'placeholder', 'positioning', 'readOnly', 'selectInputOnFocus', 'selectOnTab', 'selectionBehavior', 'selectionData', 'translations']);
+  const [useComboboxProps, localProps] = createSplitProps()(props, ['allowCustomValue', 'ariaHidden', 'autoFocus', 'blurOnSelect', 'dir', 'disabled', 'focusOnClear', 'form', 'getRootNode', 'id', 'ids', 'inputBehavior', 'inputValue', 'invalid', 'isCustomValue', 'loop', 'name', 'onClose', 'onHighlight', 'onInputChange', 'onInputChange', 'onInteractOutside', 'onOpen', 'onSelect', 'openOnClick', 'placeholder', 'positioning', 'readOnly', 'selectInputOnFocus', 'selectOnTab', 'selectionBehavior', 'selectionData', 'translations']);
   const combobox = useCombobox(useComboboxProps);
+  const rootProps = mergeProps(() => combobox().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, combobox);
   return createComponent(ComboboxProvider, {
     value: combobox,
     get children() {
-      return createComponent(ComboboxContextWrapper, divProps);
+      return createComponent(ark.div, mergeProps$1(rootProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
-const ComboboxContextWrapper = props => {
-  const combobox = useComboboxContext();
-  const view = children(() => runIfFn(props.children, combobox));
-  return createComponent(ark.div, mergeProps(() => combobox().rootProps, props, {
-    get children() {
-      return view();
-    }
-  }));
-};
 
 export { Combobox };

package/dist/create-split-props.d.ts

@@ -1 +1,3 @@
-export declare const createSplitProps: <Target extends Record<never, never>>() => <Keys extends (keyof Target)[], Props extends Target = Target>(props: Props, keys: Keys & ([keyof Target] extends [Keys[number]] ? unknown : never)) => [Pick<Props, Extract<Keys & ([keyof Target] extends [Keys[number]] ? unknown : never), readonly (keyof Props)[]>[number]>, Omit<Props, (Keys & ([keyof Target] extends [Keys[number]] ? unknown : never))[number]>];
+type EnsureKeys<ExpectedKeys extends (keyof Target)[], Target> = ExpectedKeys extends (keyof Target)[] ? [keyof Target] extends [ExpectedKeys[number]] ? unknown : `Missing required keys: ${Exclude<keyof Target, ExpectedKeys[number]>}` : never;
+export declare const createSplitProps: <Target extends Record<never, never>>() => <Keys extends (keyof Target)[], Props extends Target = Target>(props: Props, keys: Keys & EnsureKeys<Keys, Target>) => [Pick<Props, Extract<Keys & EnsureKeys<Keys, Target>, readonly (keyof Props)[]>[number]>, Omit<Props, (Keys & EnsureKeys<Keys, Target>)[number]>];
+export {};

package/dist/dialog/dialog-backdrop.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogBackdrop = props => {
   const dialog = dialogContext.useDialogContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => dialog().backdropProps, props));
+  const backdropProps = solid.mergeProps(() => dialog().backdropProps, props);
+  return web.createComponent(factory.ark.div, backdropProps);
 };
 
 exports.DialogBackdrop = DialogBackdrop;

package/dist/dialog/dialog-backdrop.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogBackdrop = props => {
   const dialog = useDialogContext();
-  return createComponent(ark.div, mergeProps(() => dialog().backdropProps, props));
+  const backdropProps = mergeProps(() => dialog().backdropProps, props);
+  return createComponent(ark.div, backdropProps);
 };
 
 export { DialogBackdrop };

package/dist/dialog/dialog-close-trigger.cjs

@@ -2,22 +2,15 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const solidJs = require('solid-js');
 const web = require('solid-js/web');
-const ssrSpread = require('../ssr-spread.cjs');
+const solid = require('@zag-js/solid');
+const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogCloseTrigger = props => {
   const dialog = dialogContext.useDialogContext();
-  const triggerProps = dialog().closeTriggerProps;
-  const getChildren = solidJs.children(() => ssrSpread.ssrSpread(props.children, triggerProps));
-  solidJs.createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      web.spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const triggerProps = solid.mergeProps(() => dialog().triggerProps, props);
+  return web.createComponent(factory.ark.button, triggerProps);
 };
 
 exports.DialogCloseTrigger = DialogCloseTrigger;

package/dist/dialog/dialog-close-trigger.d.ts

@@ -1,6 +1,4 @@
-import type { ResolvedChildren } from 'solid-js/types/reactive/signal';
-import { type JSX } from 'solid-js';
-export type DialogCloseTriggerProps = {
-    children: JSX.Element;
-};
-export declare const DialogCloseTrigger: (props: DialogCloseTriggerProps) => ResolvedChildren;
+import type { JSX } from 'solid-js';
+import { type HTMLArkProps } from '../factory';
+export type DialogCloseTriggerProps = HTMLArkProps<'button'>;
+export declare const DialogCloseTrigger: (props: DialogCloseTriggerProps) => JSX.Element;

package/dist/dialog/dialog-close-trigger.mjs

@@ -1,19 +1,12 @@
-import { children, createEffect } from 'solid-js';
-import { spread } from 'solid-js/web';
-import { ssrSpread } from '../ssr-spread.mjs';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
+import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogCloseTrigger = props => {
   const dialog = useDialogContext();
-  const triggerProps = dialog().closeTriggerProps;
-  const getChildren = children(() => ssrSpread(props.children, triggerProps));
-  createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const triggerProps = mergeProps(() => dialog().triggerProps, props);
+  return createComponent(ark.button, triggerProps);
 };
 
 export { DialogCloseTrigger };

package/dist/dialog/dialog-container.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogContainer = props => {
   const dialog = dialogContext.useDialogContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => dialog().containerProps, props));
+  const containerProps = solid.mergeProps(() => dialog().containerProps, props);
+  return web.createComponent(factory.ark.div, containerProps);
 };
 
 exports.DialogContainer = DialogContainer;

package/dist/dialog/dialog-container.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogContainer = props => {
   const dialog = useDialogContext();
-  return createComponent(ark.div, mergeProps(() => dialog().containerProps, props));
+  const containerProps = mergeProps(() => dialog().containerProps, props);
+  return createComponent(ark.div, containerProps);
 };
 
 export { DialogContainer };

package/dist/dialog/dialog-content.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogContent = props => {
   const dialog = dialogContext.useDialogContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => dialog().contentProps, props));
+  const contentProps = solid.mergeProps(() => dialog().contentProps, props);
+  return web.createComponent(factory.ark.div, contentProps);
 };
 
 exports.DialogContent = DialogContent;

package/dist/dialog/dialog-content.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogContent = props => {
   const dialog = useDialogContext();
-  return createComponent(ark.div, mergeProps(() => dialog().contentProps, props));
+  const contentProps = mergeProps(() => dialog().contentProps, props);
+  return createComponent(ark.div, contentProps);
 };
 
 export { DialogContent };

package/dist/dialog/dialog-description.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogDescription = props => {
   const dialog = dialogContext.useDialogContext();
-  return web.createComponent(factory.ark.p, web.mergeProps(() => dialog().descriptionProps, props));
+  const descriptionProps = solid.mergeProps(() => dialog().descriptionProps, props);
+  return web.createComponent(factory.ark.p, descriptionProps);
 };
 
 exports.DialogDescription = DialogDescription;

package/dist/dialog/dialog-description.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogDescription = props => {
   const dialog = useDialogContext();
-  return createComponent(ark.p, mergeProps(() => dialog().descriptionProps, props));
+  const descriptionProps = mergeProps(() => dialog().descriptionProps, props);
+  return createComponent(ark.p, descriptionProps);
 };
 
 export { DialogDescription };

package/dist/dialog/dialog-title.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogTitle = props => {
   const dialog = dialogContext.useDialogContext();
-  return web.createComponent(factory.ark.h2, web.mergeProps(() => dialog().titleProps, props));
+  const titleProps = solid.mergeProps(() => dialog().titleProps, props);
+  return web.createComponent(factory.ark.h2, titleProps);
 };
 
 exports.DialogTitle = DialogTitle;

package/dist/dialog/dialog-title.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogTitle = props => {
   const dialog = useDialogContext();
-  return createComponent(ark.h2, mergeProps(() => dialog().titleProps, props));
+  const titleProps = mergeProps(() => dialog().titleProps, props);
+  return createComponent(ark.h2, titleProps);
 };
 
 export { DialogTitle };

package/dist/dialog/dialog-trigger.cjs

@@ -2,22 +2,15 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const solidJs = require('solid-js');
 const web = require('solid-js/web');
-const ssrSpread = require('../ssr-spread.cjs');
+const solid = require('@zag-js/solid');
+const factory = require('../factory.cjs');
 const dialogContext = require('./dialog-context.cjs');
 
 const DialogTrigger = props => {
   const dialog = dialogContext.useDialogContext();
-  const triggerProps = dialog().triggerProps;
-  const getChildren = solidJs.children(() => ssrSpread.ssrSpread(props.children, triggerProps));
-  solidJs.createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      web.spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const triggerProps = solid.mergeProps(() => dialog().triggerProps, props);
+  return web.createComponent(factory.ark.button, triggerProps);
 };
 
 exports.DialogTrigger = DialogTrigger;

package/dist/dialog/dialog-trigger.d.ts

@@ -1,6 +1,4 @@
-import type { ResolvedChildren } from 'solid-js/types/reactive/signal';
-import { type JSX } from 'solid-js';
-export type DialogTriggerProps = {
-    children: JSX.Element;
-};
-export declare const DialogTrigger: (props: DialogTriggerProps) => ResolvedChildren;
+import type { JSX } from 'solid-js';
+import { type HTMLArkProps } from '../factory';
+export type DialogTriggerProps = HTMLArkProps<'button'>;
+export declare const DialogTrigger: (props: DialogTriggerProps) => JSX.Element;

package/dist/dialog/dialog-trigger.mjs

@@ -1,19 +1,12 @@
-import { children, createEffect } from 'solid-js';
-import { spread } from 'solid-js/web';
-import { ssrSpread } from '../ssr-spread.mjs';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
+import { ark } from '../factory.mjs';
 import { useDialogContext } from './dialog-context.mjs';
 
 const DialogTrigger = props => {
   const dialog = useDialogContext();
-  const triggerProps = dialog().triggerProps;
-  const getChildren = children(() => ssrSpread(props.children, triggerProps));
-  createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const triggerProps = mergeProps(() => dialog().triggerProps, props);
+  return createComponent(ark.button, triggerProps);
 };
 
 export { DialogTrigger };

package/dist/dialog/dialog.cjs

@@ -3,20 +3,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
-const solidJs = require('solid-js');
 const createSplitProps = require('../create-split-props.cjs');
 const runIfFn = require('../run-if-fn.cjs');
 const dialogContext = require('./dialog-context.cjs');
 const useDialog = require('./use-dialog.cjs');
 
 const Dialog = props => {
-  const [useDialogProps, restProps] = createSplitProps.createSplitProps()(props, ['aria-label', 'closeOnEsc', 'closeOnOutsideClick', 'dir', 'finalFocusEl', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onClose', 'onEsc', 'onOutsideClick', 'open', 'preventScroll', 'restoreFocus', 'role', 'trapFocus', 'onOpen']);
-  const dialog = useDialog.useDialog(useDialogProps);
-  const view = solidJs.children(() => runIfFn.runIfFn(restProps.children, dialog()));
+  const [dialogParams, localProps] = createSplitProps.createSplitProps()(props, ['aria-label', 'closeOnEsc', 'closeOnOutsideClick', 'dir', 'finalFocusEl', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onClose', 'onEsc', 'onOutsideClick', 'open', 'preventScroll', 'restoreFocus', 'role', 'trapFocus', 'onOpen']);
+  const api = useDialog.useDialog(dialogParams);
+  const getChildren = () => runIfFn.runIfFn(localProps.children, api);
   return web.createComponent(dialogContext.DialogProvider, {
-    value: dialog,
+    value: api,
     get children() {
-      return view();
+      return getChildren();
     }
   });
 };

package/dist/dialog/dialog.d.ts

@@ -1,6 +1,6 @@
 import { type JSX } from 'solid-js';
 import { type UseDialogProps, type UseDialogReturn } from './use-dialog';
 export type DialogProps = UseDialogProps & {
-    children?: JSX.Element | ((state: ReturnType<UseDialogReturn>) => JSX.Element);
+    children?: JSX.Element | ((state: UseDialogReturn) => JSX.Element);
 };
 export declare const Dialog: (props: DialogProps) => JSX.Element;

package/dist/dialog/dialog.mjs

@@ -1,18 +1,17 @@
 import { createComponent } from 'solid-js/web';
-import { children } from 'solid-js';
 import { createSplitProps } from '../create-split-props.mjs';
 import { runIfFn } from '../run-if-fn.mjs';
 import { DialogProvider } from './dialog-context.mjs';
 import { useDialog } from './use-dialog.mjs';
 
 const Dialog = props => {
-  const [useDialogProps, restProps] = createSplitProps()(props, ['aria-label', 'closeOnEsc', 'closeOnOutsideClick', 'dir', 'finalFocusEl', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onClose', 'onEsc', 'onOutsideClick', 'open', 'preventScroll', 'restoreFocus', 'role', 'trapFocus', 'onOpen']);
-  const dialog = useDialog(useDialogProps);
-  const view = children(() => runIfFn(restProps.children, dialog()));
+  const [dialogParams, localProps] = createSplitProps()(props, ['aria-label', 'closeOnEsc', 'closeOnOutsideClick', 'dir', 'finalFocusEl', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onClose', 'onEsc', 'onOutsideClick', 'open', 'preventScroll', 'restoreFocus', 'role', 'trapFocus', 'onOpen']);
+  const api = useDialog(dialogParams);
+  const getChildren = () => runIfFn(localProps.children, api);
   return createComponent(DialogProvider, {
-    value: dialog,
+    value: api,
     get children() {
-      return view();
+      return getChildren();
     }
   });
 };

package/dist/editable/editable-area.cjs

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const factory = require('../factory.cjs');
 const editableContext = require('./editable-context.cjs');
 
 const EditableArea = props => {
   const editable = editableContext.useEditableContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => editable().areaProps, props));
+  const areaProps = solid.mergeProps(() => editable().areaProps, props);
+  return web.createComponent(factory.ark.div, areaProps);
 };
 
 exports.EditableArea = EditableArea;

package/dist/editable/editable-area.mjs

@@ -1,10 +1,12 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { ark } from '../factory.mjs';
 import { useEditableContext } from './editable-context.mjs';
 
 const EditableArea = props => {
   const editable = useEditableContext();
-  return createComponent(ark.div, mergeProps(() => editable().areaProps, props));
+  const areaProps = mergeProps(() => editable().areaProps, props);
+  return createComponent(ark.div, areaProps);
 };
 
 export { EditableArea };