@ark-ui/solid 0.2.0 → 0.4.0

package/dist/popover/popover-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 popoverContext = require('./popover-context.cjs');
 
 const PopoverCloseTrigger = props => {
-  const popover = popoverContext.usePopoverContext();
-  const triggerProps = popover().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 api = popoverContext.usePopoverContext();
+  const triggerProps = solid.mergeProps(() => api().closeTriggerProps, props);
+  return web.createComponent(factory.ark.button, triggerProps);
 };
 
 exports.PopoverCloseTrigger = PopoverCloseTrigger;

package/dist/popover/popover-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 PopoverCloseTriggerProps = {
-    children: JSX.Element;
-};
-export declare const PopoverCloseTrigger: (props: PopoverCloseTriggerProps) => ResolvedChildren;
+import type { JSX } from 'solid-js';
+import { type HTMLArkProps } from '../factory';
+export type PopoverCloseTriggerProps = HTMLArkProps<'button'>;
+export declare const PopoverCloseTrigger: (props: PopoverCloseTriggerProps) => JSX.Element;

package/dist/popover/popover-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 { usePopoverContext } from './popover-context.mjs';
 
 const PopoverCloseTrigger = props => {
-  const popover = usePopoverContext();
-  const triggerProps = popover().closeTriggerProps;
-  const getChildren = children(() => ssrSpread(props.children, triggerProps));
-  createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      spread(children, triggerProps);
-    }
-  });
-  return getChildren();
+  const api = usePopoverContext();
+  const triggerProps = mergeProps(() => api().closeTriggerProps, props);
+  return createComponent(ark.button, triggerProps);
 };
 
 export { PopoverCloseTrigger };

package/dist/popover/popover-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 popoverContext = require('./popover-context.cjs');
 
 const PopoverContent = props => {
-  const popover = popoverContext.usePopoverContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => popover().contentProps, props));
+  const api = popoverContext.usePopoverContext();
+  const contentProps = solid.mergeProps(() => api().contentProps, props);
+  return web.createComponent(factory.ark.div, contentProps);
 };
 
 exports.PopoverContent = PopoverContent;

package/dist/popover/popover-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 { usePopoverContext } from './popover-context.mjs';
 
 const PopoverContent = props => {
-  const popover = usePopoverContext();
-  return createComponent(ark.div, mergeProps(() => popover().contentProps, props));
+  const api = usePopoverContext();
+  const contentProps = mergeProps(() => api().contentProps, props);
+  return createComponent(ark.div, contentProps);
 };
 
 export { PopoverContent };

package/dist/popover/popover-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 popoverContext = require('./popover-context.cjs');
 
 const PopoverDescription = props => {
-  const popover = popoverContext.usePopoverContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => popover().descriptionProps, props));
+  const api = popoverContext.usePopoverContext();
+  const descriptionProps = solid.mergeProps(() => api().descriptionProps, props);
+  return web.createComponent(factory.ark.div, descriptionProps);
 };
 
 exports.PopoverDescription = PopoverDescription;

package/dist/popover/popover-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 { usePopoverContext } from './popover-context.mjs';
 
 const PopoverDescription = props => {
-  const popover = usePopoverContext();
-  return createComponent(ark.div, mergeProps(() => popover().descriptionProps, props));
+  const api = usePopoverContext();
+  const descriptionProps = mergeProps(() => api().descriptionProps, props);
+  return createComponent(ark.div, descriptionProps);
 };
 
 export { PopoverDescription };

package/dist/popover/popover-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 popoverContext = require('./popover-context.cjs');
 
 const PopoverPositioner = props => {
-  const popover = popoverContext.usePopoverContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => popover().positionerProps, props));
+  const api = popoverContext.usePopoverContext();
+  const positionerProps = solid.mergeProps(() => api().positionerProps, props);
+  return web.createComponent(factory.ark.div, positionerProps);
 };
 
 exports.PopoverPositioner = PopoverPositioner;

package/dist/popover/popover-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 { usePopoverContext } from './popover-context.mjs';
 
 const PopoverPositioner = props => {
-  const popover = usePopoverContext();
-  return createComponent(ark.div, mergeProps(() => popover().positionerProps, props));
+  const api = usePopoverContext();
+  const positionerProps = mergeProps(() => api().positionerProps, props);
+  return createComponent(ark.div, positionerProps);
 };
 
 export { PopoverPositioner };

package/dist/popover/popover-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 popoverContext = require('./popover-context.cjs');
 
 const PopoverTitle = props => {
-  const popover = popoverContext.usePopoverContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => popover().titleProps, props));
+  const api = popoverContext.usePopoverContext();
+  const titleProps = solid.mergeProps(() => api().titleProps, props);
+  return web.createComponent(factory.ark.div, titleProps);
 };
 
 exports.PopoverTitle = PopoverTitle;

package/dist/popover/popover-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 { usePopoverContext } from './popover-context.mjs';
 
 const PopoverTitle = props => {
-  const popover = usePopoverContext();
-  return createComponent(ark.div, mergeProps(() => popover().titleProps, props));
+  const api = usePopoverContext();
+  const titleProps = mergeProps(() => api().titleProps, props);
+  return createComponent(ark.div, titleProps);
 };
 
 export { PopoverTitle };

package/dist/popover/popover-trigger.cjs

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

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

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

package/dist/popover/popover-trigger.mjs

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

package/dist/popover/popover.cjs

@@ -9,9 +9,9 @@ const usePopover = require('./use-popover.cjs');
 
 const Popover = props => {
   const [usePopoverProps, restProps] = createSplitProps.createSplitProps()(props, ['autoFocus', 'closeOnEsc', 'closeOnInteractOutside', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onClose', 'onEscapeKeyDown', 'onFocusOutside', 'onInteractOutside', 'onOpen', 'onPointerDownOutside', 'open', 'portalled', 'positioning']);
-  const popover = usePopover.usePopover(usePopoverProps);
+  const api = usePopover.usePopover(usePopoverProps);
   return web.createComponent(popoverContext.PopoverProvider, {
-    value: popover,
+    value: api,
     get children() {
       return restProps.children;
     }

package/dist/popover/popover.mjs

@@ -5,9 +5,9 @@ import { usePopover } from './use-popover.mjs';
 
 const Popover = props => {
   const [usePopoverProps, restProps] = createSplitProps()(props, ['autoFocus', 'closeOnEsc', 'closeOnInteractOutside', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'modal', 'onClose', 'onEscapeKeyDown', 'onFocusOutside', 'onInteractOutside', 'onOpen', 'onPointerDownOutside', 'open', 'portalled', 'positioning']);
-  const popover = usePopover(usePopoverProps);
+  const api = usePopover(usePopoverProps);
   return createComponent(PopoverProvider, {
-    value: popover,
+    value: api,
     get children() {
       return restProps.children;
     }

package/dist/popover/use-popover.cjs

@@ -28,7 +28,7 @@ const popover__namespace = /*#__PURE__*/_interopNamespaceDefault(popover);
 
 const usePopover = (props) => {
   const getRootNode = environmentContext.useEnvironmentContext();
-  const context = solidJs.mergeProps({ id: solidJs.createUniqueId(), getRootNode }, props);
+  const context = solid.mergeProps({ id: solidJs.createUniqueId(), getRootNode }, props);
   const [state, send] = solid.useMachine(popover__namespace.machine(context), { context });
   return solidJs.createMemo(() => popover__namespace.connect(state, send, solid.normalizeProps));
 };

package/dist/popover/use-popover.mjs

@@ -1,6 +1,6 @@
 import * as popover from '@zag-js/popover';
-import { useMachine, normalizeProps } from '@zag-js/solid';
-import { mergeProps, createUniqueId, createMemo } from 'solid-js';
+import { mergeProps, useMachine, normalizeProps } from '@zag-js/solid';
+import { createUniqueId, createMemo } from 'solid-js';
 import { useEnvironmentContext } from '../environment/environment-context.mjs';
 
 const usePopover = (props) => {

package/dist/pressable/pressable.cjs

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const createSplitProps = require('../create-split-props.cjs');
 const factory = require('../factory.cjs');
 const usePressable = require('./use-pressable.cjs');
 
 const Pressable = props => {
-  const [usePressableProps, buttonProps] = createSplitProps.createSplitProps()(props, ['allowTextSelectionOnPress', 'cancelOnPointerExit', 'dir', 'disabled', 'getRootNode', 'id', 'onLongPress', 'onPress', 'onPressEnd', 'onPressStart', 'onPressUp', 'preventFocusOnPress']);
-  const {
-    pressableProps
-  } = usePressable.usePressable(usePressableProps);
-  return web.createComponent(factory.ark.button, web.mergeProps(pressableProps, buttonProps));
+  const [pressableParams, restProps] = createSplitProps.createSplitProps()(props, ['allowTextSelectionOnPress', 'cancelOnPointerExit', 'dir', 'disabled', 'getRootNode', 'id', 'onLongPress', 'onPress', 'onPressEnd', 'onPressStart', 'onPressUp', 'preventFocusOnPress']);
+  const api = usePressable.usePressable(pressableParams);
+  const buttonProps = solid.mergeProps(() => api().pressableProps, restProps);
+  return web.createComponent(factory.ark.button, buttonProps);
 };
 
 exports.Pressable = Pressable;

package/dist/pressable/pressable.d.ts

@@ -1,6 +1,6 @@
 import type { JSX } from 'solid-js';
-import { type Assign } from '@polymorphic-factory/solid';
 import { type HTMLArkProps } from '../factory';
+import type { Assign } from '../types';
 import { type UsePressableProps } from './use-pressable';
 export type PressableProps = Assign<HTMLArkProps<'button'>, UsePressableProps>;
 export declare const Pressable: (props: PressableProps) => JSX.Element;

package/dist/pressable/pressable.mjs

@@ -1,14 +1,14 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
 import { createSplitProps } from '../create-split-props.mjs';
 import { ark } from '../factory.mjs';
 import { usePressable } from './use-pressable.mjs';
 
 const Pressable = props => {
-  const [usePressableProps, buttonProps] = createSplitProps()(props, ['allowTextSelectionOnPress', 'cancelOnPointerExit', 'dir', 'disabled', 'getRootNode', 'id', 'onLongPress', 'onPress', 'onPressEnd', 'onPressStart', 'onPressUp', 'preventFocusOnPress']);
-  const {
-    pressableProps
-  } = usePressable(usePressableProps);
-  return createComponent(ark.button, mergeProps(pressableProps, buttonProps));
+  const [pressableParams, restProps] = createSplitProps()(props, ['allowTextSelectionOnPress', 'cancelOnPointerExit', 'dir', 'disabled', 'getRootNode', 'id', 'onLongPress', 'onPress', 'onPressEnd', 'onPressStart', 'onPressUp', 'preventFocusOnPress']);
+  const api = usePressable(pressableParams);
+  const buttonProps = mergeProps(() => api().pressableProps, restProps);
+  return createComponent(ark.button, buttonProps);
 };
 
 export { Pressable };

package/dist/pressable/use-pressable.cjs

@@ -28,14 +28,14 @@ const pressable__namespace = /*#__PURE__*/_interopNamespaceDefault(pressable);
 
 const usePressable = props => {
   const getRootNode = environmentContext.useEnvironmentContext();
-  const context = solidJs.mergeProps({
+  const context = solid.mergeProps({
     id: solidJs.createUniqueId(),
     getRootNode
   }, props);
   const [state, send] = solid.useMachine(pressable__namespace.machine(context), {
     context
   });
-  return pressable__namespace.connect(state, send, solid.normalizeProps);
+  return solidJs.createMemo(() => pressable__namespace.connect(state, send, solid.normalizeProps));
 };
 
 exports.usePressable = usePressable;

package/dist/pressable/use-pressable.d.ts

@@ -1,9 +1,9 @@
-import type { JSX } from 'solid-js';
+import type { Accessor, JSX } from 'solid-js';
 import * as pressable from '@zag-js/pressable';
 import { type Optional } from '../types';
 export type UsePressableProps = Optional<pressable.Context, 'id'>;
 export type UsePressableReturn = ReturnType<typeof usePressable>;
-export declare const usePressable: (props?: UsePressableProps) => {
+export declare const usePressable: (props: UsePressableProps) => Accessor<{
     isPressed: boolean;
     pressableProps: JSX.HTMLAttributes<any>;
-};
+}>;

package/dist/pressable/use-pressable.mjs

@@ -1,6 +1,6 @@
 import * as pressable from '@zag-js/pressable';
-import { useMachine, normalizeProps } from '@zag-js/solid';
-import { mergeProps, createUniqueId } from 'solid-js';
+import { mergeProps, useMachine, normalizeProps } from '@zag-js/solid';
+import { createUniqueId, createMemo } from 'solid-js';
 import { useEnvironmentContext } from '../environment/environment-context.mjs';
 
 const usePressable = props => {
@@ -12,7 +12,7 @@ const usePressable = props => {
   const [state, send] = useMachine(pressable.machine(context), {
     context
   });
-  return pressable.connect(state, send, normalizeProps);
+  return createMemo(() => pressable.connect(state, send, normalizeProps));
 };
 
 export { usePressable };

package/dist/prop-trap.cjs

@@ -0,0 +1,37 @@
+'use strict';
+
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const solidJs = require('solid-js');
+
+function trueFn() {
+  return true;
+}
+const propTraps = {
+  get(_, property, receiver) {
+    if (property === solidJs.$PROXY)
+      return receiver;
+    return _.get(property);
+  },
+  has(_, property) {
+    return _.has(property);
+  },
+  set: trueFn,
+  deleteProperty: trueFn,
+  getOwnPropertyDescriptor(_, property) {
+    return {
+      configurable: true,
+      enumerable: true,
+      get() {
+        return _.get(property);
+      },
+      set: trueFn,
+      deleteProperty: trueFn
+    };
+  },
+  ownKeys(_) {
+    return _.keys();
+  }
+};
+
+exports.propTraps = propTraps;

package/dist/prop-trap.d.ts

@@ -0,0 +1,5 @@
+export declare const propTraps: ProxyHandler<{
+    get: (k: string | number | symbol) => any;
+    has: (k: string | number | symbol) => boolean;
+    keys: () => string[];
+}>;

package/dist/prop-trap.mjs

@@ -0,0 +1,33 @@
+import { $PROXY } from 'solid-js';
+
+function trueFn() {
+  return true;
+}
+const propTraps = {
+  get(_, property, receiver) {
+    if (property === $PROXY)
+      return receiver;
+    return _.get(property);
+  },
+  has(_, property) {
+    return _.has(property);
+  },
+  set: trueFn,
+  deleteProperty: trueFn,
+  getOwnPropertyDescriptor(_, property) {
+    return {
+      configurable: true,
+      enumerable: true,
+      get() {
+        return _.get(property);
+      },
+      set: trueFn,
+      deleteProperty: trueFn
+    };
+  },
+  ownKeys(_) {
+    return _.keys();
+  }
+};
+
+export { propTraps };

package/dist/radio-group/radio-control.cjs

@@ -3,14 +3,16 @@
 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 radioContext = require('./radio-context.cjs');
 const radioGroupContext = require('./radio-group-context.cjs');
 
 const RadioControl = props => {
-  const radioGroup = radioGroupContext.useRadioGroupContext();
-  const context = radioContext.useRadioContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => radioGroup().getRadioControlProps(context), props));
+  const api = radioGroupContext.useRadioGroupContext();
+  const radioParams = radioContext.useRadioContext();
+  const controlProps = solid.mergeProps(() => api().getRadioControlProps(radioParams), props);
+  return web.createComponent(factory.ark.div, controlProps);
 };
 
 exports.RadioControl = RadioControl;

package/dist/radio-group/radio-control.mjs

@@ -1,12 +1,14 @@
-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 { useRadioContext } from './radio-context.mjs';
 import { useRadioGroupContext } from './radio-group-context.mjs';
 
 const RadioControl = props => {
-  const radioGroup = useRadioGroupContext();
-  const context = useRadioContext();
-  return createComponent(ark.div, mergeProps(() => radioGroup().getRadioControlProps(context), props));
+  const api = useRadioGroupContext();
+  const radioParams = useRadioContext();
+  const controlProps = mergeProps(() => api().getRadioControlProps(radioParams), props);
+  return createComponent(ark.div, controlProps);
 };
 
 export { RadioControl };

package/dist/radio-group/radio-group-context.d.ts

@@ -25,6 +25,7 @@ export declare const RadioGroupProvider: ContextProviderComponent<Accessor<{
     getRadioLabelProps(props: RadioProps): JSX.HTMLAttributes<any>;
     getRadioControlProps(props: RadioProps): JSX.HTMLAttributes<any>;
     getRadioInputProps(props: InputProps): JSX.InputHTMLAttributes<HTMLInputElement>;
+    indicatorProps: JSX.HTMLAttributes<any>;
 }>>, useRadioGroupContext: () => Accessor<{
     value: string | null;
     setValue(value: string): void;
@@ -47,4 +48,5 @@ export declare const RadioGroupProvider: ContextProviderComponent<Accessor<{
     getRadioLabelProps(props: RadioProps): JSX.HTMLAttributes<any>;
     getRadioControlProps(props: RadioProps): JSX.HTMLAttributes<any>;
     getRadioInputProps(props: InputProps): JSX.InputHTMLAttributes<HTMLInputElement>;
+    indicatorProps: JSX.HTMLAttributes<any>;
 }>;

package/dist/radio-group/radio-group-label.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 radioGroupContext = require('./radio-group-context.cjs');
 
 const RadioGroupLabel = props => {
-  const radioGroup = radioGroupContext.useRadioGroupContext();
-  return web.createComponent(factory.ark.label, web.mergeProps(() => radioGroup().labelProps, props));
+  const api = radioGroupContext.useRadioGroupContext();
+  const labelProps = solid.mergeProps(() => api().labelProps, props);
+  return web.createComponent(factory.ark.label, labelProps);
 };
 
 exports.RadioGroupLabel = RadioGroupLabel;

package/dist/radio-group/radio-group-label.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 { useRadioGroupContext } from './radio-group-context.mjs';
 
 const RadioGroupLabel = props => {
-  const radioGroup = useRadioGroupContext();
-  return createComponent(ark.label, mergeProps(() => radioGroup().labelProps, props));
+  const api = useRadioGroupContext();
+  const labelProps = mergeProps(() => api().labelProps, props);
+  return createComponent(ark.label, labelProps);
 };
 
 export { RadioGroupLabel };

package/dist/radio-group/radio-group.cjs

@@ -3,18 +3,20 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const createSplitProps = require('../create-split-props.cjs');
 const factory = require('../factory.cjs');
 const radioGroupContext = require('./radio-group-context.cjs');
 const useRadioGroup = require('./use-radio-group.cjs');
 
 const RadioGroup = props => {
-  const [useRadioGroupProps, divProps] = createSplitProps.createSplitProps()(props, ['dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'name', 'onChange', 'orientation', 'readOnly', 'value']);
-  const radioGroup = useRadioGroup.useRadioGroup(useRadioGroupProps);
+  const [groupParams, restProps] = createSplitProps.createSplitProps()(props, ['dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'name', 'onChange', 'orientation', 'readOnly', 'value']);
+  const api = useRadioGroup.useRadioGroup(groupParams);
+  const rootProps = solid.mergeProps(() => api().rootProps, restProps);
   return web.createComponent(radioGroupContext.RadioGroupProvider, {
-    value: radioGroup,
+    value: api,
     get children() {
-      return web.createComponent(factory.ark.div, web.mergeProps(() => radioGroup().rootProps, divProps));
+      return web.createComponent(factory.ark.div, rootProps);
     }
   });
 };

package/dist/radio-group/radio-group.d.ts

@@ -1,6 +1,6 @@
 import type { JSX } from 'solid-js';
-import { type Assign } from '@polymorphic-factory/solid';
 import { type HTMLArkProps } from '../factory';
+import type { Assign } from '../types';
 import { type UseRadioGroupProps } from './use-radio-group';
 export type RadioGroupProps = Assign<HTMLArkProps<'div'>, UseRadioGroupProps>;
 export declare const RadioGroup: (props: RadioGroupProps) => JSX.Element;