@ark-ui/solid 0.2.0 → 0.4.0

package/dist/pagination/pagination-list-item.cjs

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const web = require('solid-js/web');
+const factory = require('../factory.cjs');
+const pagination_anatomy = require('./pagination.anatomy.cjs');
+
+const PaginationListItem = props => web.createComponent(factory.ark.li, web.mergeProps(() => pagination_anatomy.parts.listItem.attrs, props));
+
+exports.PaginationListItem = PaginationListItem;

package/dist/pagination/pagination-list-item.d.ts

@@ -0,0 +1,4 @@
+import type { JSX } from 'solid-js';
+import { type HTMLArkProps } from '../factory';
+export type PaginationListItemProps = HTMLArkProps<'li'>;
+export declare const PaginationListItem: (props: PaginationListItemProps) => JSX.Element;

package/dist/pagination/pagination-list-item.mjs

@@ -0,0 +1,7 @@
+import { createComponent, mergeProps } from 'solid-js/web';
+import { ark } from '../factory.mjs';
+import { parts } from './pagination.anatomy.mjs';
+
+const PaginationListItem = props => createComponent(ark.li, mergeProps(() => parts.listItem.attrs, props));
+
+export { PaginationListItem };

package/dist/pagination/pagination-list.cjs

@@ -4,7 +4,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
 const factory = require('../factory.cjs');
+const pagination_anatomy = require('./pagination.anatomy.cjs');
 
-const PaginationList = props => web.createComponent(factory.ark.ul, props);
+const PaginationList = props => web.createComponent(factory.ark.ul, web.mergeProps(() => pagination_anatomy.parts.list.attrs, props));
 
 exports.PaginationList = PaginationList;

package/dist/pagination/pagination-list.mjs

@@ -1,6 +1,7 @@
-import { createComponent } from 'solid-js/web';
+import { createComponent, mergeProps } from 'solid-js/web';
 import { ark } from '../factory.mjs';
+import { parts } from './pagination.anatomy.mjs';
 
-const PaginationList = props => createComponent(ark.ul, props);
+const PaginationList = props => createComponent(ark.ul, mergeProps(() => parts.list.attrs, props));
 
 export { PaginationList };

package/dist/pagination/pagination-page-trigger.d.ts

@@ -1,6 +1,6 @@
-import { type Assign } from '@polymorphic-factory/solid';
 import { type JSX } from 'solid-js';
 import { type HTMLArkProps } from '../factory';
+import type { Assign } from '../types';
 type PaginationPageTriggerParams = {
     children: JSX.Element;
     value: number;

package/dist/pagination/pagination-prev-page-trigger.cjs

@@ -8,12 +8,12 @@ const factory = require('../factory.cjs');
 const paginationContext = require('./pagination-context.cjs');
 
 const PaginationPrevPageTrigger = props => {
-  const pagination = paginationContext.usePaginationContext();
+  const api = paginationContext.usePaginationContext();
   const getChildren = solidJs.children(() => props.children);
   solidJs.createEffect(() => {
     const children = getChildren();
     if (children instanceof HTMLElement) {
-      web.spread(children, pagination().prevPageTriggerProps);
+      web.spread(children, api().prevPageTriggerProps);
     }
   });
   return web.createComponent(factory.ark.li, web.mergeProps(props, {

package/dist/pagination/pagination-prev-page-trigger.mjs

@@ -4,12 +4,12 @@ import { ark } from '../factory.mjs';
 import { usePaginationContext } from './pagination-context.mjs';
 
 const PaginationPrevPageTrigger = props => {
-  const pagination = usePaginationContext();
+  const api = usePaginationContext();
   const getChildren = children(() => props.children);
   createEffect(() => {
     const children = getChildren();
     if (children instanceof HTMLElement) {
-      spread(children, pagination().prevPageTriggerProps);
+      spread(children, api().prevPageTriggerProps);
     }
   });
   return createComponent(ark.li, mergeProps(props, {

package/dist/pagination/pagination.anatomy.cjs

@@ -4,6 +4,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const pagination = require('@zag-js/pagination');
 
-const paginationAnatomy = pagination.anatomy.extendWith("list");
+const paginationAnatomy = pagination.anatomy.extendWith("list", "listItem");
+const parts = paginationAnatomy.build();
 
 exports.paginationAnatomy = paginationAnatomy;
+exports.parts = parts;

package/dist/pagination/pagination.anatomy.d.ts

@@ -1,2 +1,3 @@
-import type { AnatomyInstance } from '@zag-js/anatomy/dist/create-anatomy';
-export declare const paginationAnatomy: AnatomyInstance<"ellipsis" | "list" | "root" | "pageTrigger" | "prevPageTrigger" | "nextPageTrigger">;
+import type { AnatomyInstance, AnatomyPart } from '@zag-js/anatomy/dist/create-anatomy';
+export declare const paginationAnatomy: AnatomyInstance<"ellipsis" | "list" | "root" | "pageTrigger" | "prevPageTrigger" | "nextPageTrigger" | "listItem">;
+export declare const parts: Record<"ellipsis" | "list" | "root" | "pageTrigger" | "prevPageTrigger" | "nextPageTrigger" | "listItem", AnatomyPart>;

package/dist/pagination/pagination.anatomy.mjs

@@ -1,5 +1,6 @@
 import { anatomy } from '@zag-js/pagination';
 
-const paginationAnatomy = anatomy.extendWith("list");
+const paginationAnatomy = anatomy.extendWith("list", "listItem");
+const parts = paginationAnatomy.build();
 
-export { paginationAnatomy };
+export { paginationAnatomy, parts };

package/dist/pagination/pagination.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
 const solidJs = require('solid-js');
 const createSplitProps = require('../create-split-props.cjs');
 const factory = require('../factory.cjs');
@@ -11,16 +12,17 @@ const paginationContext = require('./pagination-context.cjs');
 const usePagination = require('./use-pagination.cjs');
 
 const Pagination = props => {
-  const [paginationProps, restProps] = createSplitProps.createSplitProps()(props, ['count', 'dir', 'getRootNode', 'id', 'ids', 'onChange', 'page', 'pageSize', 'siblingCount', 'translations']);
-  const [local, navProps] = solidJs.splitProps(restProps, ['children']);
-  const pagination = usePagination.usePagination(paginationProps);
-  const view = () => solidJs.children(() => runIfFn.runIfFn(local.children, pagination()));
+  const [paginationParams, restProps] = createSplitProps.createSplitProps()(props, ['count', 'dir', 'getRootNode', 'id', 'ids', 'onChange', 'page', 'pageSize', 'siblingCount', 'translations', 'type']);
+  const [childrenProps, localProps] = solidJs.splitProps(restProps, ['children']);
+  const api = usePagination.usePagination(paginationParams);
+  const getChildren = () => runIfFn.runIfFn(childrenProps.children, api);
+  const rootProps = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(paginationContext.PaginationProvider, {
-    value: pagination,
+    value: api,
     get children() {
-      return web.createComponent(factory.ark.nav, web.mergeProps(() => pagination().rootProps, navProps, {
+      return web.createComponent(factory.ark.nav, web.mergeProps(rootProps, {
         get children() {
-          return view();
+          return getChildren();
         }
       }));
     }

package/dist/pagination/pagination.d.ts

@@ -1,8 +1,8 @@
-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 UsePaginationProps, type UsePaginationReturn } from './use-pagination';
-export type PaginationProps = Assign<Assign<HTMLArkProps<'nav'>, UsePaginationProps>, {
-    children: JSX.Element | ((pages: ReturnType<UsePaginationReturn>) => JSX.Element);
+export type PaginationProps = Assign<HTMLArkProps<'nav'>, UsePaginationProps & {
+    children: JSX.Element | ((pages: UsePaginationReturn) => JSX.Element);
 }>;
 export declare const Pagination: (props: PaginationProps) => JSX.Element;

package/dist/pagination/pagination.mjs

@@ -1,5 +1,6 @@
-import { createComponent, mergeProps } from 'solid-js/web';
-import { splitProps, children } 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 { runIfFn } from '../run-if-fn.mjs';
@@ -7,16 +8,17 @@ import { PaginationProvider } from './pagination-context.mjs';
 import { usePagination } from './use-pagination.mjs';
 
 const Pagination = props => {
-  const [paginationProps, restProps] = createSplitProps()(props, ['count', 'dir', 'getRootNode', 'id', 'ids', 'onChange', 'page', 'pageSize', 'siblingCount', 'translations']);
-  const [local, navProps] = splitProps(restProps, ['children']);
-  const pagination = usePagination(paginationProps);
-  const view = () => children(() => runIfFn(local.children, pagination()));
+  const [paginationParams, restProps] = createSplitProps()(props, ['count', 'dir', 'getRootNode', 'id', 'ids', 'onChange', 'page', 'pageSize', 'siblingCount', 'translations', 'type']);
+  const [childrenProps, localProps] = splitProps(restProps, ['children']);
+  const api = usePagination(paginationParams);
+  const getChildren = () => runIfFn(childrenProps.children, api);
+  const rootProps = mergeProps(() => api().rootProps, localProps);
   return createComponent(PaginationProvider, {
-    value: pagination,
+    value: api,
     get children() {
-      return createComponent(ark.nav, mergeProps(() => pagination().rootProps, navProps, {
+      return createComponent(ark.nav, mergeProps$1(rootProps, {
         get children() {
-          return view();
+          return getChildren();
         }
       }));
     }

package/dist/pagination/use-pagination.cjs

@@ -28,7 +28,7 @@ const pagination__namespace = /*#__PURE__*/_interopNamespaceDefault(pagination);
 
 const usePagination = (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(pagination__namespace.machine(context), { context });
   return solidJs.createMemo(() => pagination__namespace.connect(state, send, solid.normalizeProps));
 };

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

@@ -1,4 +1,4 @@
-import type { PaginationRange } from '@zag-js/pagination/dist/pagination.types';
+import type { PaginationRange, EllipsisProps, PageTriggerProps } from '@zag-js/pagination/dist/pagination.types';
 import type { Accessor, JSX } from 'solid-js';
 import * as pagination from '@zag-js/pagination';
 import { type Optional } from '../types';
@@ -20,13 +20,8 @@ export declare const usePagination: (props: UsePaginationProps) => Accessor<{
     setPageSize(size: number): void;
     setPage(page: number): void;
     rootProps: JSX.HTMLAttributes<any>;
-    getEllipsisProps(props: {
-        index: number;
-    }): JSX.HTMLAttributes<any>;
-    getPageTriggerProps(page: {
-        type: "page";
-        value: number;
-    }): JSX.HTMLAttributes<any>;
+    getEllipsisProps(props: EllipsisProps): JSX.HTMLAttributes<any>;
+    getPageTriggerProps(page: PageTriggerProps): JSX.HTMLAttributes<any>;
     prevPageTriggerProps: JSX.HTMLAttributes<any>;
     nextPageTriggerProps: JSX.HTMLAttributes<any>;
 }>;

package/dist/pagination/use-pagination.mjs

@@ -1,6 +1,6 @@
 import * as pagination from '@zag-js/pagination';
-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 usePagination = (props) => {

package/dist/pin-input/pin-input-control.cjs

@@ -3,17 +3,21 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
+const solidJs = require('solid-js');
 const factory = require('../factory.cjs');
 const pinInputContext = require('./pin-input-context.cjs');
 
 const _tmpl$ = /*#__PURE__*/web.template(`<input>`);
 const PinInputControl = props => {
-  const pinInput = pinInputContext.usePinInputContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => pinInput().controlProps, props, {
+  const api = pinInputContext.usePinInputContext();
+  const [childrenProps, restProps] = solidJs.splitProps(props, ['children']);
+  const controlProps = solid.mergeProps(() => api().controlProps, restProps);
+  return web.createComponent(factory.ark.div, web.mergeProps(controlProps, {
     get children() {
-      return [web.memo(() => props.children), (() => {
+      return [web.memo(() => childrenProps.children), (() => {
         const _el$ = _tmpl$();
-        web.spread(_el$, web.mergeProps(() => pinInput().hiddenInputProps), false, false);
+        web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
         return _el$;
       })()];
     }

package/dist/pin-input/pin-input-control.mjs

@@ -1,15 +1,19 @@
-import { createComponent, mergeProps, memo, spread, template } from 'solid-js/web';
+import { createComponent, mergeProps as mergeProps$1, memo, spread, template } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
+import { splitProps } from 'solid-js';
 import { ark } from '../factory.mjs';
 import { usePinInputContext } from './pin-input-context.mjs';
 
 const _tmpl$ = /*#__PURE__*/template(`<input>`);
 const PinInputControl = props => {
-  const pinInput = usePinInputContext();
-  return createComponent(ark.div, mergeProps(() => pinInput().controlProps, props, {
+  const api = usePinInputContext();
+  const [childrenProps, restProps] = splitProps(props, ['children']);
+  const controlProps = mergeProps(() => api().controlProps, restProps);
+  return createComponent(ark.div, mergeProps$1(controlProps, {
     get children() {
-      return [memo(() => props.children), (() => {
+      return [memo(() => childrenProps.children), (() => {
         const _el$ = _tmpl$();
-        spread(_el$, mergeProps(() => pinInput().hiddenInputProps), false, false);
+        spread(_el$, mergeProps$1(() => api().hiddenInputProps), false, false);
         return _el$;
       })()];
     }

package/dist/pin-input/pin-input-field.cjs

@@ -3,18 +3,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const web = require('solid-js/web');
+const solid = require('@zag-js/solid');
+const solidJs = require('solid-js');
 const factory = require('../factory.cjs');
 const pinInputContext = require('./pin-input-context.cjs');
 
 const PinInputField = props => {
-  const {
-    index,
-    ...htmlProps
-  } = props;
-  const pinInput = pinInputContext.usePinInputContext();
-  return web.createComponent(factory.ark.input, web.mergeProps(() => pinInput().getInputProps({
-    index
-  }), htmlProps));
+  const [inputParams, localProps] = solidJs.splitProps(props, ['index']);
+  const api = pinInputContext.usePinInputContext();
+  const inputProps = solid.mergeProps(() => api().getInputProps(inputParams), localProps);
+  return web.createComponent(factory.ark.input, inputProps);
 };
 
 exports.PinInputField = PinInputField;

package/dist/pin-input/pin-input-field.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';
 export type PinInputFieldProps = Assign<HTMLArkProps<'input'>, {
     index: number;
 }>;

package/dist/pin-input/pin-input-field.mjs

@@ -1,16 +1,14 @@
-import { createComponent, mergeProps } from 'solid-js/web';
+import { createComponent } from 'solid-js/web';
+import { mergeProps } from '@zag-js/solid';
+import { splitProps } from 'solid-js';
 import { ark } from '../factory.mjs';
 import { usePinInputContext } from './pin-input-context.mjs';
 
 const PinInputField = props => {
-  const {
-    index,
-    ...htmlProps
-  } = props;
-  const pinInput = usePinInputContext();
-  return createComponent(ark.input, mergeProps(() => pinInput().getInputProps({
-    index
-  }), htmlProps));
+  const [inputParams, localProps] = splitProps(props, ['index']);
+  const api = usePinInputContext();
+  const inputProps = mergeProps(() => api().getInputProps(inputParams), localProps);
+  return createComponent(ark.input, inputProps);
 };
 
 export { PinInputField };

package/dist/pin-input/pin-input-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 pinInputContext = require('./pin-input-context.cjs');
 
 const PinInputLabel = props => {
-  const pinInput = pinInputContext.usePinInputContext();
-  return web.createComponent(factory.ark.label, web.mergeProps(() => pinInput().labelProps, props));
+  const api = pinInputContext.usePinInputContext();
+  const labelProps = solid.mergeProps(() => api().labelProps, props);
+  return web.createComponent(factory.ark.label, labelProps);
 };
 
 exports.PinInputLabel = PinInputLabel;

package/dist/pin-input/pin-input-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 { usePinInputContext } from './pin-input-context.mjs';
 
 const PinInputLabel = props => {
-  const pinInput = usePinInputContext();
-  return createComponent(ark.label, mergeProps(() => pinInput().labelProps, props));
+  const api = usePinInputContext();
+  const labelProps = mergeProps(() => api().labelProps, props);
+  return createComponent(ark.label, labelProps);
 };
 
 export { PinInputLabel };

package/dist/pin-input/pin-input.cjs

@@ -3,6 +3,7 @@
 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 pinInputContext = require('./pin-input-context.cjs');
@@ -10,11 +11,12 @@ const usePinInput = require('./use-pin-input.cjs');
 
 const PinInput = props => {
   const [pinInputProps, htmlProps] = createSplitProps.createSplitProps()(props, ['autoFocus', 'blurOnComplete', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'mask', 'name', 'onChange', 'onComplete', 'onInvalid', 'otp', 'pattern', 'placeholder', 'selectOnFocus', 'translations', 'type', 'value']);
-  const pinInput = usePinInput.usePinInput(pinInputProps);
+  const api = usePinInput.usePinInput(pinInputProps);
+  const rootProps = solid.mergeProps(() => api().rootProps, htmlProps);
   return web.createComponent(pinInputContext.PinInputProvider, {
-    value: pinInput,
+    value: api,
     get children() {
-      return web.createComponent(factory.ark.div, web.mergeProps(() => pinInput().rootProps, htmlProps));
+      return web.createComponent(factory.ark.div, rootProps);
     }
   });
 };

package/dist/pin-input/pin-input.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 UsePinInputProps } from './use-pin-input';
 export type PinInputProps = Assign<HTMLArkProps<'div'>, UsePinInputProps>;
 export declare const PinInput: (props: PinInputProps) => JSX.Element;

package/dist/pin-input/pin-input.mjs

@@ -1,4 +1,5 @@
-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 { PinInputProvider } from './pin-input-context.mjs';
@@ -6,11 +7,12 @@ import { usePinInput } from './use-pin-input.mjs';
 
 const PinInput = props => {
   const [pinInputProps, htmlProps] = createSplitProps()(props, ['autoFocus', 'blurOnComplete', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'mask', 'name', 'onChange', 'onComplete', 'onInvalid', 'otp', 'pattern', 'placeholder', 'selectOnFocus', 'translations', 'type', 'value']);
-  const pinInput = usePinInput(pinInputProps);
+  const api = usePinInput(pinInputProps);
+  const rootProps = mergeProps(() => api().rootProps, htmlProps);
   return createComponent(PinInputProvider, {
-    value: pinInput,
+    value: api,
     get children() {
-      return createComponent(ark.div, mergeProps(() => pinInput().rootProps, htmlProps));
+      return createComponent(ark.div, rootProps);
     }
   });
 };

package/dist/pin-input/use-pin-input.cjs

@@ -28,7 +28,7 @@ const pinInput__namespace = /*#__PURE__*/_interopNamespaceDefault(pinInput);
 
 const usePinInput = (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(pinInput__namespace.machine(context), { context });
   return solidJs.createMemo(() => pinInput__namespace.connect(state, send, solid.normalizeProps));
 };

package/dist/pin-input/use-pin-input.mjs

@@ -1,6 +1,6 @@
 import * as pinInput from '@zag-js/pin-input';
-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 usePinInput = (props) => {

package/dist/popover/popover-anchor.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 PopoverAnchor = props => {
-  const popover = popoverContext.usePopoverContext();
-  const anchorProps = popover().anchorProps;
-  const getChildren = solidJs.children(() => ssrSpread.ssrSpread(props.children, anchorProps));
-  solidJs.createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      spread.spread(children, anchorProps);
-    }
-  });
-  return getChildren();
+  const api = popoverContext.usePopoverContext();
+  const anchorProps = solid.mergeProps(() => api().anchorProps, props);
+  return web.createComponent(factory.ark.div, anchorProps);
 };
 
 exports.PopoverAnchor = PopoverAnchor;

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

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

package/dist/popover/popover-anchor.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 PopoverAnchor = props => {
-  const popover = usePopoverContext();
-  const anchorProps = popover().anchorProps;
-  const getChildren = children(() => ssrSpread(props.children, anchorProps));
-  createEffect(() => {
-    const children = getChildren();
-    if (children instanceof HTMLElement) {
-      spread(children, anchorProps);
-    }
-  });
-  return getChildren();
+  const api = usePopoverContext();
+  const anchorProps = mergeProps(() => api().anchorProps, props);
+  return createComponent(ark.div, anchorProps);
 };
 
 export { PopoverAnchor };

package/dist/popover/popover-arrow-tip.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 PopoverArrowTip = props => {
   const popover = popoverContext.usePopoverContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => popover().arrowTipProps, props));
+  const arrowTipProps = solid.mergeProps(() => popover().arrowTipProps, props);
+  return web.createComponent(factory.ark.div, arrowTipProps);
 };
 
 exports.PopoverArrowTip = PopoverArrowTip;

package/dist/popover/popover-arrow-tip.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 PopoverArrowTip = props => {
   const popover = usePopoverContext();
-  return createComponent(ark.div, mergeProps(() => popover().arrowTipProps, props));
+  const arrowTipProps = mergeProps(() => popover().arrowTipProps, props);
+  return createComponent(ark.div, arrowTipProps);
 };
 
 export { PopoverArrowTip };

package/dist/popover/popover-arrow.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 PopoverArrow = props => {
   const popover = popoverContext.usePopoverContext();
-  return web.createComponent(factory.ark.div, web.mergeProps(() => popover().arrowProps, props));
+  const arrowProps = solid.mergeProps(() => popover().arrowProps, props);
+  return web.createComponent(factory.ark.div, arrowProps);
 };
 
 exports.PopoverArrow = PopoverArrow;

package/dist/popover/popover-arrow.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 PopoverArrow = props => {
   const popover = usePopoverContext();
-  return createComponent(ark.div, mergeProps(() => popover().arrowProps, props));
+  const arrowProps = mergeProps(() => popover().arrowProps, props);
+  return createComponent(ark.div, arrowProps);
 };
 
 export { PopoverArrow };