@ark-ui/solid 1.1.0 → 1.3.0

package/esm/index.js

@@ -19,6 +19,7 @@ import * as numberInput from '@zag-js/number-input';
 import * as pagination from '@zag-js/pagination';
 import * as pinInput from '@zag-js/pin-input';
 import * as popover from '@zag-js/popover';
+import * as progress from '@zag-js/progress';
 import * as radio from '@zag-js/radio-group';
 import * as rating from '@zag-js/rating-group';
 import * as select from '@zag-js/select';
@@ -74,6 +75,7 @@ const spread = (node, props) => {
   const nodeEvents = Object.fromEntries(Object.keys(node).filter(prop => prop.startsWith('$$'))
   // @ts-expect-error - fix later
   .map(prop => [prop, node[prop]]));
+  const isSVG = node instanceof SVGElement;
   const childProps = createMemo(() => mapProps(props, (key, value) => {
     const eventKey = getEventKey(key);
 
@@ -92,14 +94,14 @@ const spread = (node, props) => {
 
     // class composition
     if (key === 'class') {
-      return [node.className, value].filter(Boolean).join(' ');
+      return [node.classList.toString(), value].filter(Boolean).join(' ');
     }
 
     // don't override existing child attributes
     if (node.hasAttribute(key)) return;
     return value;
   }));
-  spread$1(node, mergeProps(childProps));
+  spread$1(node, mergeProps(childProps), isSVG);
 };
 
 const booleans = ['allowfullscreen', 'async', 'autofocus', 'autoplay', 'checked', 'controls', 'default', 'disabled', 'formnovalidate', 'hidden', 'indeterminate', 'ismap', 'loop', 'multiple', 'muted', 'nomodule', 'novalidate', 'open', 'playsinline', 'readonly', 'required', 'reversed', 'seamless', 'selected'];
@@ -371,7 +373,7 @@ function withAsChild(Component) {
     const getChildren = children(() => ssrSpread(localProps.children, restProps));
     createEffect(() => {
       const children = getChildren();
-      if (children instanceof HTMLElement) {
+      if (children instanceof HTMLElement || children instanceof SVGElement) {
         spread(children, restProps);
       }
     });
@@ -1127,14 +1129,14 @@ const [ComboboxProvider, useComboboxContext] = createContext({
 
 const useCombobox = props => {
   const [collectionOptions, rest] = createSplitProps()(props, ['isItemDisabled', 'itemToValue', 'itemToString', 'items']);
-  const collection = combobox.collection(collectionOptions);
+  const collection = () => combobox.collection(collectionOptions);
   const getRootNode = useEnvironmentContext();
-  const context = mergeProps$2({
+  const context = () => mergeProps$2({
     id: createUniqueId(),
     getRootNode,
-    collection
+    collection: collection()
   }, rest);
-  const [state, send] = useMachine(combobox.machine(context), {
+  const [state, send] = useMachine(combobox.machine(context()), {
     context
   });
   return createMemo(() => combobox.connect(state, send, normalizeProps));
@@ -1314,7 +1316,7 @@ const useDatePicker = props => {
 
 const DatePicker$1 = props => {
   const [presenceProps, datePickerProps] = splitPresenceProps(props);
-  const [useDatePickerProps, localProps] = createSplitProps()(datePickerProps, ['closeOnSelect', 'dir', 'disabled', 'fixedWeeks', 'focusedValue', 'format', 'getRootNode', 'id', 'ids', 'isDateUnavailable', 'isDateUnavailable', 'locale', 'max', 'messages', 'min', 'modal', 'name', 'numOfMonths', 'onFocusChange', 'onOpenChange', 'onValueChange', 'onViewChange', 'open', 'parse', 'positioning', 'readOnly', 'selectionMode', 'startOfWeek', 'timeZone', 'value', 'view']);
+  const [useDatePickerProps, localProps] = createSplitProps()(datePickerProps, ['closeOnSelect', 'dir', 'disabled', 'fixedWeeks', 'focusedValue', 'format', 'getRootNode', 'id', 'ids', 'isDateUnavailable', 'isDateUnavailable', 'locale', 'max', 'min', 'modal', 'name', 'numOfMonths', 'onFocusChange', 'onOpenChange', 'onValueChange', 'onViewChange', 'open', 'parse', 'positioning', 'readOnly', 'selectionMode', 'startOfWeek', 'timeZone', 'translations', 'value', 'view']);
   const api = useDatePicker(useDatePickerProps);
   const apiPresence = usePresence(mergeProps$2(presenceProps, () => ({
     present: api().isOpen
@@ -1764,13 +1766,12 @@ const useEditable = props => {
 };
 
 const Editable$1 = props => {
-  const [useEditableProps, restProps] = createSplitProps()(props, ['activationMode', 'autoResize', 'dir', 'disabled', 'finalFocusEl', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'maxLength', 'name', 'onEdit', 'onFocusOutside', 'onInteractOutside', 'onPointerDownOutside', 'onValueChange', 'onValueCommit', 'onValueRevert', 'placeholder', 'readOnly', 'selectOnFocus', 'startWithEditView', 'submitMode', 'translations', 'value']);
-  const editable = useEditable(useEditableProps);
-  const [childrenProps, localProps] = splitProps(restProps, ['children']);
-  const mergedProps = mergeProps$2(() => editable().rootProps, localProps);
-  const getChildren = () => runIfFn(childrenProps.children, editable);
+  const [useEditableProps, localProps] = createSplitProps()(props, ['activationMode', 'autoResize', 'dir', 'disabled', 'finalFocusEl', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'maxLength', 'name', 'onEdit', 'onFocusOutside', 'onInteractOutside', 'onPointerDownOutside', 'onValueChange', 'onValueCommit', 'onValueRevert', 'placeholder', 'readOnly', 'selectOnFocus', 'startWithEditView', 'submitMode', 'translations', 'value']);
+  const api = useEditable(useEditableProps);
+  const mergedProps = mergeProps$2(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
   return createComponent(EditableProvider, {
-    value: editable,
+    value: api,
     get children() {
       return createComponent(ark.div, mergeProps$1(mergedProps, {
         get children() {
@@ -1782,50 +1783,50 @@ const Editable$1 = props => {
 };
 
 const EditableArea = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().areaProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().areaProps, props);
   return createComponent(ark.div, mergedProps);
 };
 
 const EditableCancelTrigger = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().cancelTriggerProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().cancelTriggerProps, props);
   return createComponent(ark.button, mergedProps);
 };
 
 const EditableControl = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().controlProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().controlProps, props);
   return createComponent(ark.div, mergedProps);
 };
 
 const EditableEditTrigger = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().editTriggerProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().editTriggerProps, props);
   return createComponent(ark.button, mergedProps);
 };
 
 const EditableInput = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().inputProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().inputProps, props);
   return createComponent(ark.input, mergedProps);
 };
 
 const EditableLabel = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().labelProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().labelProps, props);
   return createComponent(ark.label, mergedProps);
 };
 
 const EditablePreview = props => {
-  const editable = useEditableContext();
-  const mergedProps = mergeProps$2(() => editable().previewProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().previewProps, props);
   return createComponent(ark.span, mergedProps);
 };
 
 const EditableSubmitTrigger = props => {
-  const dialog = useEditableContext();
-  const mergedProps = mergeProps$2(() => dialog().submitTriggerProps, props);
+  const api = useEditableContext();
+  const mergedProps = mergeProps$2(() => api().submitTriggerProps, props);
   return createComponent(ark.button, mergedProps);
 };
 
@@ -1859,7 +1860,7 @@ const useFileUpload = props => {
 };
 
 const FileUpload$1 = props => {
-  const [fileUploadProps, localProps] = createSplitProps()(props, ['accept', 'allowDrop', 'dir', 'disabled', 'files', 'getRootNode', 'id', 'isValidFile', 'locale', 'maxFiles', 'maxFileSize', 'minFileSize', 'name', 'onFilesChange']);
+  const [fileUploadProps, localProps] = createSplitProps()(props, ['accept', 'allowDrop', 'dir', 'disabled', 'files', 'getRootNode', 'id', 'ids', 'locale', 'maxFiles', 'maxFileSize', 'minFileSize', 'name', 'onFileAccept', 'onFileReject', 'onFilesChange', 'translations', 'validate']);
   const api = useFileUpload(fileUploadProps);
   const mergedProps = mergeProps$2(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
@@ -1939,20 +1940,23 @@ const FileUploadItemName = props => {
 };
 
 const FileUploadItemPreview = props => {
+  const api = useFileUploadContext();
+  const item = useFileUploadItemContext();
+  const mergedProps = mergeProps$2(() => api().getItemPreviewProps(item), props);
+  if (!item.file.type.match(props.type ?? '.*')) return null;
+  return createComponent(ark.div, mergedProps);
+};
+
+const FileUploadItemPreviewImage = props => {
   const api = useFileUploadContext();
   const item = useFileUploadItemContext();
   const [url, setUrl] = createSignal('');
   api().createFileUrl(item.file, url => setUrl(url));
-  try {
-    const mergedProps = mergeProps$2(api().getItemPreviewProps({
-      ...item,
-      url: url()
-    }), props);
-    return createComponent(ark.img, mergedProps);
-  } catch (e) {
-    // TODO We could render a fallback component
-    return null;
-  }
+  const mergedProps = mergeProps$2(api().getItemPreviewImageProps({
+    ...item,
+    url: url()
+  }), props);
+  return createComponent(ark.img, mergedProps);
 };
 
 const FileUploadItemSizeText = props => {
@@ -1982,14 +1986,15 @@ const FileUploadTrigger = props => {
 const FileUpload = Object.assign(FileUpload$1, {
   Root: FileUpload$1,
   Dropzone: FileUploadDropzone,
-  Label: FileUploadLabel,
-  Trigger: FileUploadTrigger,
-  ItemGroup: FileUploadItemGroup,
   Item: FileUploadItem,
+  ItemDeleteTrigger: FileUploadItemDeleteTrigger,
+  ItemGroup: FileUploadItemGroup,
   ItemName: FileUploadItemName,
   ItemPreview: FileUploadItemPreview,
+  ItemPreviewImage: FileUploadItemPreviewImage,
   ItemSizeText: FileUploadItemSizeText,
-  ItemDeleteTrigger: FileUploadItemDeleteTrigger
+  Label: FileUploadLabel,
+  Trigger: FileUploadTrigger
 });
 
 const [HoverCardProvider, useHoverCardContext] = createContext({
@@ -2325,18 +2330,18 @@ const NumberInputDecrementTrigger = props => {
   return createComponent(ark.button, mergedProps);
 };
 
-const NumberInputInput = props => {
-  const api = useNumberInputContext();
-  const mergedProps = mergeProps$2(() => api().inputProps, props);
-  return createComponent(ark.input, mergedProps);
-};
-
 const NumberInputIncrementTrigger = props => {
   const api = useNumberInputContext();
   const mergedProps = mergeProps$2(() => api().incrementTriggerProps, props);
   return createComponent(ark.button, mergedProps);
 };
 
+const NumberInputInput = props => {
+  const api = useNumberInputContext();
+  const mergedProps = mergeProps$2(() => api().inputProps, props);
+  return createComponent(ark.input, mergedProps);
+};
+
 const NumberInputLabel = props => {
   const api = useNumberInputContext();
   const mergedProps = mergeProps$2(() => api().labelProps, props);
@@ -2377,11 +2382,10 @@ const usePagination = props => {
 };
 
 const Pagination$1 = props => {
-  const [paginationParams, restProps] = createSplitProps()(props, ['count', 'dir', 'getRootNode', 'id', 'ids', 'onPageChange', 'page', 'pageSize', 'siblingCount', 'translations', 'type']);
-  const [childrenProps, localProps] = splitProps(restProps, ['children']);
+  const [paginationParams, localProps] = createSplitProps()(props, ['count', 'dir', 'getRootNode', 'id', 'ids', 'onPageChange', 'page', 'pageSize', 'siblingCount', 'translations', 'type']);
   const api = usePagination(paginationParams);
-  const getChildren = () => runIfFn(childrenProps.children, api);
   const mergedProps = mergeProps$2(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
   return createComponent(PaginationProvider, {
     value: api,
     get children() {
@@ -2395,9 +2399,9 @@ const Pagination$1 = props => {
 };
 
 const PaginationEllipsis = props => {
-  const [ellipsisProps, restProps] = createSplitProps()(props, ['index']);
+  const [ellipsisProps, localProps] = createSplitProps()(props, ['index']);
   const api = usePaginationContext();
-  const mergedProps = mergeProps$2(() => api().getEllipsisProps(ellipsisProps), restProps);
+  const mergedProps = mergeProps$2(() => api().getEllipsisProps(ellipsisProps), localProps);
   return createComponent(ark.div, mergedProps);
 };
 
@@ -2447,8 +2451,8 @@ const usePinInput = props => {
 
 const _tmpl$$6 = /*#__PURE__*/template(`<input>`);
 const PinInput$1 = props => {
-  const [pinInputProps, localProps] = createSplitProps()(props, ['autoFocus', 'blurOnComplete', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'mask', 'name', 'onValueChange', 'onValueComplete', 'onValueInvalid', 'otp', 'pattern', 'placeholder', 'selectOnFocus', 'translations', 'type', 'value']);
-  const api = usePinInput(pinInputProps);
+  const [usePinInputProps, localProps] = createSplitProps()(props, ['autoFocus', 'blurOnComplete', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'mask', 'name', 'onValueChange', 'onValueComplete', 'onValueInvalid', 'otp', 'pattern', 'placeholder', 'selectOnFocus', 'translations', 'type', 'value']);
+  const api = usePinInput(usePinInputProps);
   const mergedProps = mergeProps$2(() => api().rootProps, localProps);
   return createComponent(PinInputProvider, {
     value: api,
@@ -2567,7 +2571,7 @@ const PopoverContent = props => {
 const PopoverDescription = props => {
   const api = usePopoverContext();
   const mergedProps = mergeProps$2(() => api().descriptionProps, props);
-  return createComponent(ark.div, mergedProps);
+  return createComponent(ark.p, mergedProps);
 };
 
 const PopoverIndicator = props => {
@@ -2621,6 +2625,106 @@ const Popover = Object.assign(Popover$1, {
   Trigger: PopoverTrigger
 });
 
+const [ProgressProvider, useProgressContext] = createContext({
+  hookName: 'useProgressContext',
+  providerName: '<ProgressProvider />'
+});
+
+const useProgress = props => {
+  const getRootNode = useEnvironmentContext();
+  const context = mergeProps$2({
+    id: createUniqueId(),
+    getRootNode
+  }, props);
+  const [state, send] = useMachine(progress.machine(context), {
+    context
+  });
+  return createMemo(() => progress.connect(state, send, normalizeProps));
+};
+
+const Progress$1 = props => {
+  const [progressProps, localProps] = createSplitProps()(props, ['dir', 'getRootNode', 'id', 'max', 'min', 'orientation', 'translations', 'value']);
+  const api = useProgress(progressProps);
+  const mergedProps = mergeProps$2(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
+  return createComponent(ProgressProvider, {
+    value: api,
+    get children() {
+      return createComponent(ark.div, mergeProps$1(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
+    }
+  });
+};
+
+const ProgressCircle = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().circleProps, props);
+  return createComponent(ark.svg, mergedProps);
+};
+
+const ProgressCircleRange = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().circleRangeProps, props);
+  return createComponent(ark.circle, mergedProps);
+};
+
+const ProgressCircleTrack = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().circleTrackProps, props);
+  return createComponent(ark.circle, mergedProps);
+};
+
+const ProgressIndicator = props => {
+  const [state, localProps] = createSplitProps()(props, ['state']);
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().getIndicatorProps(state), localProps);
+  return createComponent(ark.span, mergedProps);
+};
+
+const ProgressLabel = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().labelProps, props);
+  return createComponent(ark.label, mergedProps);
+};
+
+const ProgressRange = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().rangeProps, props);
+  return createComponent(ark.div, mergedProps);
+};
+
+const ProgressTrack = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().trackProps, props);
+  return createComponent(ark.div, mergedProps);
+};
+
+const ProgressValueText = props => {
+  const api = useProgressContext();
+  const mergedProps = mergeProps$2(() => api().valueTextProps, props);
+  const getChildren = () => runIfFn(props.children, () => api().valueAsString);
+  return createComponent(ark.span, mergeProps$1(mergedProps, {
+    get children() {
+      return getChildren() || api().valueAsString;
+    }
+  }));
+};
+
+const Progress = Object.assign(Progress$1, {
+  Root: Progress$1,
+  Label: ProgressLabel,
+  Track: ProgressTrack,
+  Range: ProgressRange,
+  ValueText: ProgressValueText,
+  Indicator: ProgressIndicator,
+  Circle: ProgressCircle,
+  CircleTrack: ProgressCircleTrack,
+  CircleRange: ProgressCircleRange
+});
+
 const [RadioGroupProvider, useRadioGroupContext] = createContext({
   hookName: 'useRadioGroupContext',
   providerName: '<RadioGroupProvider />'
@@ -2656,19 +2760,25 @@ const RadioGroupIndicator = props => {
   return createComponent(ark.div, mergedProps);
 };
 
-const [RadioProvider, useRadioGroupItemContext] = createContext({
+const [RadioGroupItemProvider, useRadioGroupItemContext] = createContext({
   hookName: 'useRadioGroupItemContext',
-  providerName: '<RadioProvider />'
+  providerName: '<RadioGroupItemProvider />'
 });
 
 const RadioGroupItem = props => {
-  const [itemProps, restProps] = createSplitProps()(props, ['value', 'disabled', 'invalid']);
+  const [itemProps, localProps] = createSplitProps()(props, ['value', 'disabled', 'invalid']);
   const api = useRadioGroupContext();
-  const mergedProps = mergeProps$2(() => api().getItemProps(itemProps), restProps);
-  return createComponent(RadioProvider, {
+  const mergedProps = mergeProps$2(() => api().getItemProps(itemProps), localProps);
+  const itemState = api().getItemState(itemProps);
+  const getChildren = () => runIfFn(localProps.children, itemState);
+  return createComponent(RadioGroupItemProvider, {
     value: itemProps,
     get children() {
-      return createComponent(ark.label, mergedProps);
+      return createComponent(ark.label, mergeProps$1(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
@@ -2725,8 +2835,8 @@ const useRatingGroup = props => {
 };
 
 const RatingGroup$1 = props => {
-  const [ratingParams, localProps] = createSplitProps()(props, ['allowHalf', 'autoFocus', 'count', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'name', 'onHoverChange', 'onValueChange', 'readOnly', 'translations', 'value']);
-  const api = useRatingGroup(ratingParams);
+  const [useRatingProps, localProps] = createSplitProps()(props, ['allowHalf', 'autoFocus', 'count', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'name', 'onHoverChange', 'onValueChange', 'readOnly', 'translations', 'value']);
+  const api = useRatingGroup(useRatingProps);
   const mergedProps = mergeProps$2(() => api().rootProps, localProps);
   return createComponent(RatingGroupProvider, {
     value: api,
@@ -2739,8 +2849,8 @@ const RatingGroup$1 = props => {
 const _tmpl$$4 = /*#__PURE__*/template(`<input>`);
 const RatingGroupControl = props => {
   const api = useRatingGroupContext();
-  const getChildren = () => runIfFn(props.children, api);
   const mergedProps = mergeProps$2(() => api().controlProps, props);
+  const getChildren = () => runIfFn(props.children, api);
   return [createComponent(ark.div, mergeProps$1(mergedProps, {
     get children() {
       return getChildren();
@@ -2760,11 +2870,11 @@ const [RatingGroupItemProvider, useRatingGroupItemContext] = createContext({
 const RatingGroupItem = props => {
   const [itemProps, localProps] = createSplitProps()(props, ['index']);
   const api = useRatingGroupContext();
+  const mergedProps = mergeProps$2(() => api().getItemProps(itemProps), localProps);
   const itemState = createMemo(() => api().getItemState(itemProps));
   const getChildren = () => runIfFn(localProps.children, itemState);
-  const mergedProps = mergeProps$2(() => api().getItemProps(itemProps), localProps);
   return createComponent(RatingGroupItemProvider, {
-    value: itemState,
+    value: itemProps,
     get children() {
       return createComponent(ark.span, mergeProps$1(mergedProps, {
         get children() {
@@ -2823,19 +2933,25 @@ const SegmentGroupIndicator = props => {
   return createComponent(ark.div, mergedProps);
 };
 
-const [SegmentProvider, useSegmentGroupItemContext] = createContext({
+const [SegmentGroupItemProvider, useSegmentGroupItemContext] = createContext({
   hookName: 'useSegmentGroupItemContext',
-  providerName: '<SegmentProvider />'
+  providerName: '<SegmentGroupItemProvider />'
 });
 
 const SegmentGroupItem = props => {
-  const [itemProps, restProps] = createSplitProps()(props, ['value', 'disabled', 'invalid']);
+  const [itemProps, localProps] = createSplitProps()(props, ['value', 'disabled', 'invalid']);
   const api = useSegmentGroupContext();
-  const mergedProps = mergeProps$2(() => api().getItemProps(itemProps), segmentGroupAnatomy.build().item.attrs, restProps);
-  return createComponent(SegmentProvider, {
+  const mergedProps = mergeProps$2(() => api().getItemProps(itemProps), segmentGroupAnatomy.build().item.attrs, localProps);
+  const itemState = api().getItemState(itemProps);
+  const getChildren = () => runIfFn(localProps.children, itemState);
+  return createComponent(SegmentGroupItemProvider, {
     value: itemProps,
     get children() {
-      return createComponent(ark.label, mergedProps);
+      return createComponent(ark.label, mergeProps$1(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
@@ -2882,14 +2998,14 @@ const [SelectProvider, useSelectContext] = createContext({
 
 const useSelect = props => {
   const [collectionOptions, rest] = createSplitProps()(props, ['isItemDisabled', 'itemToValue', 'itemToString', 'items']);
-  const collection = select.collection(collectionOptions);
+  const collection = () => select.collection(collectionOptions);
   const getRootNode = useEnvironmentContext();
-  const context = mergeProps$2({
+  const context = () => mergeProps$2({
     id: createUniqueId(),
     getRootNode,
-    collection
+    collection: collection()
   }, rest);
-  const [state, send] = useMachine(select.machine(context), {
+  const [state, send] = useMachine(select.machine(context()), {
     context
   });
   return createMemo(() => select.connect(state, send, normalizeProps));
@@ -2899,16 +3015,16 @@ const Select$1 = props => {
   const [presenceProps, selectProps] = splitPresenceProps(props);
   const [useSelectProps, localProps] = createSplitProps()(selectProps, ['closeOnSelect', 'dir', 'disabled', 'form', 'getRootNode', 'highlightedValue', 'id', 'ids', 'invalid', 'isItemDisabled', 'items', 'itemToString', 'itemToValue', 'loop', 'multiple', 'name', 'onFocusOutside', 'onHighlightChange', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'open', 'positioning', 'readOnly', 'selectOnBlur', 'value']);
   const api = useSelect(useSelectProps);
-  const apiPresence = usePresence(mergeProps$2(presenceProps, () => ({
+  const presenceApi = usePresence(mergeProps$2(() => ({
     present: api().isOpen
-  })));
+  }), presenceProps));
   const mergedProps = mergeProps$2(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
   return createComponent(SelectProvider, {
     value: api,
     get children() {
       return createComponent(PresenceProvider, {
-        value: apiPresence,
+        value: presenceApi,
         get children() {
           return createComponent(ark.div, mergeProps$1(mergedProps, {
             get children() {
@@ -2966,7 +3082,7 @@ const SelectControl = props => {
 
 const SelectIndicator = props => {
   const api = useSelectContext();
-  const mergedProps = mergeProps$2(() => api().controlProps, props);
+  const mergedProps = mergeProps$2(() => api().indicatorProps, props);
   return createComponent(ark.div, mergedProps);
 };
 
@@ -2993,9 +3109,9 @@ const SelectItem = props => {
 };
 
 const SelectItemGroup = props => {
-  const [groupProps, localProps] = createSplitProps()(props, ['id']);
+  const [itemGroupProps, localProps] = createSplitProps()(props, ['id']);
   const api = useSelectContext();
-  const mergedProps = mergeProps$2(() => api().getItemGroupProps(groupProps), localProps);
+  const mergedProps = mergeProps$2(() => api().getItemGroupProps(itemGroupProps), localProps);
   return createComponent(ark.div, mergedProps);
 };
 
@@ -3248,9 +3364,9 @@ const useSwitch = props => {
 };
 
 const Switch$1 = props => {
-  const [switchProps, labelProps] = createSplitProps()(props, ['checked', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'label', 'name', 'onCheckedChange', 'required', 'value']);
+  const [switchProps, localProps] = createSplitProps()(props, ['checked', 'dir', 'disabled', 'form', 'getRootNode', 'id', 'ids', 'invalid', 'label', 'name', 'onCheckedChange', 'required', 'value']);
   const api = useSwitch(switchProps);
-  const mergedProps = mergeProps$2(() => api().rootProps, labelProps);
+  const mergedProps = mergeProps$2(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(props.children, api);
   return createComponent(SwitchProvider, {
     value: api,
@@ -3276,14 +3392,14 @@ const SwitchControl = props => {
 };
 
 const SwitchLabel = props => {
-  const checkbox = useSwitchContext();
-  const mergedProps = mergeProps$2(() => checkbox().labelProps, props);
+  const api = useSwitchContext();
+  const mergedProps = mergeProps$2(() => api().labelProps, props);
   return createComponent(ark.span, mergedProps);
 };
 
 const SwitchThumb = props => {
-  const checkbox = useSwitchContext();
-  const mergedProps = mergeProps$2(() => checkbox().thumbProps, props);
+  const api = useSwitchContext();
+  const mergedProps = mergeProps$2(() => api().thumbProps, props);
   return createComponent(ark.span, mergedProps);
 };
 
@@ -3502,6 +3618,10 @@ const [ToastProvider, useToastContext] = createContext({
   providerName: '<ToastProvider />'
 });
 
+const ToastGroup = props => {
+  return createComponent(ark.ol, props);
+};
+
 const createToaster = props => {
   const service = toast.group.machine({
     id: '1',
@@ -3520,7 +3640,7 @@ const createToaster = props => {
     const mergedProps = mergeProps$2(() => api().getGroupProps({
       placement: props.placement
     }), toasterProps);
-    return createComponent(ark.ol, mergeProps$1(mergedProps, {
+    return createComponent(ToastGroup, mergeProps$1(mergedProps, {
       get children() {
         return createComponent(Index, {
           get each() {
@@ -3574,9 +3694,10 @@ const ToastTitle = props => {
 
 const Toast = Object.assign(Toast$1, {
   Root: Toast$1,
-  Title: ToastTitle,
+  CloseTrigger: ToastCloseTrigger,
   Description: ToastDescription,
-  CloseTrigger: ToastCloseTrigger
+  Group: ToastGroup,
+  Title: ToastTitle
 });
 
 const [ToggleGroupProvider, useToggleGroupContext] = createContext({
@@ -3713,5 +3834,5 @@ const Tooltip = Object.assign(Tooltip$1, {
   Trigger: TooltipTrigger
 });
 
-export { Accordion, AccordionItem, AccordionItemContent, AccordionItemIndicator, AccordionItemTrigger, Avatar, AvatarFallback, AvatarImage, Carousel, CarouselControl, CarouselIndicator, CarouselIndicatorGroup, CarouselItem, CarouselItemGroup, CarouselNextTrigger, CarouselPrevTrigger, CarouselViewport, Checkbox, CheckboxControl, CheckboxIndicator, CheckboxLabel, ColorPicker, ColorPickerArea, ColorPickerAreaBackground, ColorPickerAreaThumb, ColorPickerChannelInput, ColorPickerChannelSlider, ColorPickerChannelSliderThumb, ColorPickerChannelSliderTrack, ColorPickerContent, ColorPickerControl, ColorPickerEyeDropperTrigger, ColorPickerFormatSelect, ColorPickerFormatTrigger, ColorPickerLabel, ColorPickerPositioner, ColorPickerSwatch, ColorPickerSwatchGroup, ColorPickerSwatchIndicator, ColorPickerSwatchTrigger, ColorPickerTransparencyGrid, ColorPickerTrigger, ColorPickerValueText, ColorPickerView, Combobox, ComboboxClearTrigger, ComboboxContent, ComboboxControl, ComboboxInput, ComboboxItem, ComboboxItemGroup, ComboboxItemGroupLabel, ComboboxItemIndicator, ComboboxItemText, ComboboxLabel, ComboboxPositioner, ComboboxTrigger, DatePicker, DatePickerClearTrigger, DatePickerContent, DatePickerControl, DatePickerInput, DatePickerLabel, DatePickerMonthSelect, DatePickerNextTrigger, DatePickerPositioner, DatePickerPrevTrigger, DatePickerRangeText, DatePickerTable, DatePickerTableBody, DatePickerTableCell, DatePickerTableCellTrigger, DatePickerTableHead, DatePickerTableHeader, DatePickerTableRow, DatePickerTrigger, DatePickerView, DatePickerViewControl, DatePickerViewTrigger, DatePickerYearSelect, Dialog, DialogBackdrop, DialogCloseTrigger, DialogContent, DialogDescription, DialogPositioner, DialogTitle, DialogTrigger, Editable, EditableArea, EditableCancelTrigger, EditableControl, EditableEditTrigger, EditableInput, EditableLabel, EditablePreview, EditableSubmitTrigger, Environment, FileUpload, FileUploadDropzone, FileUploadItem, FileUploadItemDeleteTrigger, FileUploadItemGroup, FileUploadItemName, FileUploadItemPreview, FileUploadItemSizeText, FileUploadLabel, FileUploadTrigger, HoverCard, HoverCardArrow, HoverCardArrowTip, HoverCardContent, HoverCardPositioner, HoverCardTrigger, Menu, MenuArrow, MenuArrowTip, MenuContent, MenuContextTrigger, MenuItem, MenuItemGroup, MenuItemGroupLabel, MenuOptionItem, MenuPositioner, MenuSeparator, MenuTrigger, MenuTriggerItem, NumberInput, NumberInputControl, NumberInputDecrementTrigger, NumberInputIncrementTrigger, NumberInputInput, NumberInputLabel, NumberInputScrubber, Pagination, PaginationEllipsis, PaginationItem, PaginationNextTrigger, PaginationPrevTrigger, PinInput, PinInputControl, PinInputInput, PinInputLabel, Popover, PopoverAnchor, PopoverArrow, PopoverArrowTip, PopoverCloseTrigger, PopoverContent, PopoverDescription, PopoverIndicator, PopoverPositioner, PopoverTitle, PopoverTrigger, Presence, PresencePropsProvider, PresenceProvider, RadioGroup, RadioGroupItem, RadioGroupItemControl, RadioGroupItemText, RadioGroupLabel, RatingGroup, RatingGroupControl, RatingGroupItem, RatingGroupLabel, SegmentGroup, SegmentGroupIndicator, SegmentGroupItem, SegmentGroupItemControl, SegmentGroupItemText, SegmentGroupLabel, Select, SelectClearTrigger, SelectContent, SelectControl, SelectIndicator, SelectItem, SelectItemGroup, SelectItemGroupLabel, SelectItemIndicator, SelectItemText, SelectLabel, SelectPositioner, SelectTrigger, SelectValueText, Slider, SliderControl, SliderLabel, SliderMarker, SliderMarkerGroup, SliderRange, SliderThumb, SliderTrack, SliderValueText, Splitter, SplitterPanel, SplitterResizeTrigger, Switch, SwitchControl, SwitchLabel, SwitchThumb, TabContent, TabIndicator, TabList, TabTrigger, Tabs, TagsInput, TagsInputClearTrigger, TagsInputControl, TagsInputInput, TagsInputItem, TagsInputItemDeleteTrigger, TagsInputItemInput, TagsInputItemText, TagsInputLabel, Toast, ToastCloseTrigger, ToastDescription, ToastTitle, ToggleGroup, ToggleGroupItem, Tooltip, TooltipArrow, TooltipArrowTip, TooltipContent, TooltipPositioner, TooltipTrigger, ark, createToaster, splitPresenceProps, useAccordionContext, useAccordionItemContext, useAvatarContext, useCarouselContext, useCheckboxContext, useColorPickerAreaContext, useColorPickerChannelSliderContext, useColorPickerContext, useComboboxContext, useDatePickerContext, useDatePickerTableCellContext, useDatePickerTableContext, useDatePickerViewContext, useDialogContext, useEditableContext, useEnvironmentContext, useFileUploadContext, useHoverCardContext, useMenuContext, useNumberInputContext, usePaginationContext, usePinInputContext, usePopoverContext, usePresence, usePresenceContext, usePresencePropsContext, useRadioGroupContext, useRadioGroupItemContext, useRatingGroupContext, useRatingGroupItemContext, useSegmentGroupContext, useSegmentGroupItemContext, useSelectContext, useSelectItemContext, useSliderContext, useSplitterContext, useSwitchContext, useTabsContext, useTagsInputContext, useTagsInputItemContext, useToggleGroupContext, useTooltipContext };
+export { Accordion, AccordionItem, AccordionItemContent, AccordionItemIndicator, AccordionItemTrigger, Avatar, AvatarFallback, AvatarImage, Carousel, CarouselControl, CarouselIndicator, CarouselIndicatorGroup, CarouselItem, CarouselItemGroup, CarouselNextTrigger, CarouselPrevTrigger, CarouselViewport, Checkbox, CheckboxControl, CheckboxIndicator, CheckboxLabel, ColorPicker, ColorPickerArea, ColorPickerAreaBackground, ColorPickerAreaThumb, ColorPickerChannelInput, ColorPickerChannelSlider, ColorPickerChannelSliderThumb, ColorPickerChannelSliderTrack, ColorPickerContent, ColorPickerControl, ColorPickerEyeDropperTrigger, ColorPickerFormatSelect, ColorPickerFormatTrigger, ColorPickerLabel, ColorPickerPositioner, ColorPickerSwatch, ColorPickerSwatchGroup, ColorPickerSwatchIndicator, ColorPickerSwatchTrigger, ColorPickerTransparencyGrid, ColorPickerTrigger, ColorPickerValueText, ColorPickerView, Combobox, ComboboxClearTrigger, ComboboxContent, ComboboxControl, ComboboxInput, ComboboxItem, ComboboxItemGroup, ComboboxItemGroupLabel, ComboboxItemIndicator, ComboboxItemText, ComboboxLabel, ComboboxPositioner, ComboboxTrigger, DatePicker, DatePickerClearTrigger, DatePickerContent, DatePickerControl, DatePickerInput, DatePickerLabel, DatePickerMonthSelect, DatePickerNextTrigger, DatePickerPositioner, DatePickerPrevTrigger, DatePickerRangeText, DatePickerTable, DatePickerTableBody, DatePickerTableCell, DatePickerTableCellTrigger, DatePickerTableHead, DatePickerTableHeader, DatePickerTableRow, DatePickerTrigger, DatePickerView, DatePickerViewControl, DatePickerViewTrigger, DatePickerYearSelect, Dialog, DialogBackdrop, DialogCloseTrigger, DialogContent, DialogDescription, DialogPositioner, DialogTitle, DialogTrigger, Editable, EditableArea, EditableCancelTrigger, EditableControl, EditableEditTrigger, EditableInput, EditableLabel, EditablePreview, EditableSubmitTrigger, Environment, FileUpload, FileUploadDropzone, FileUploadItem, FileUploadItemDeleteTrigger, FileUploadItemGroup, FileUploadItemName, FileUploadItemPreviewImage, FileUploadItemSizeText, FileUploadLabel, FileUploadTrigger, HoverCard, HoverCardArrow, HoverCardArrowTip, HoverCardContent, HoverCardPositioner, HoverCardTrigger, Menu, MenuArrow, MenuArrowTip, MenuContent, MenuContextTrigger, MenuItem, MenuItemGroup, MenuItemGroupLabel, MenuOptionItem, MenuPositioner, MenuSeparator, MenuTrigger, MenuTriggerItem, NumberInput, NumberInputControl, NumberInputDecrementTrigger, NumberInputIncrementTrigger, NumberInputInput, NumberInputLabel, NumberInputScrubber, Pagination, PaginationEllipsis, PaginationItem, PaginationNextTrigger, PaginationPrevTrigger, PinInput, PinInputControl, PinInputInput, PinInputLabel, Popover, PopoverAnchor, PopoverArrow, PopoverArrowTip, PopoverCloseTrigger, PopoverContent, PopoverDescription, PopoverIndicator, PopoverPositioner, PopoverTitle, PopoverTrigger, Presence, PresencePropsProvider, PresenceProvider, Progress, ProgressCircle, ProgressCircleRange, ProgressCircleTrack, ProgressIndicator, ProgressLabel, ProgressRange, ProgressTrack, ProgressValueText, RadioGroup, RadioGroupItem, RadioGroupItemControl, RadioGroupItemText, RadioGroupLabel, RatingGroup, RatingGroupControl, RatingGroupItem, RatingGroupLabel, SegmentGroup, SegmentGroupIndicator, SegmentGroupItem, SegmentGroupItemControl, SegmentGroupItemText, SegmentGroupLabel, Select, SelectClearTrigger, SelectContent, SelectControl, SelectIndicator, SelectItem, SelectItemGroup, SelectItemGroupLabel, SelectItemIndicator, SelectItemText, SelectLabel, SelectPositioner, SelectTrigger, SelectValueText, Slider, SliderControl, SliderLabel, SliderMarker, SliderMarkerGroup, SliderRange, SliderThumb, SliderTrack, SliderValueText, Splitter, SplitterPanel, SplitterResizeTrigger, Switch, SwitchControl, SwitchLabel, SwitchThumb, TabContent, TabIndicator, TabList, TabTrigger, Tabs, TagsInput, TagsInputClearTrigger, TagsInputControl, TagsInputInput, TagsInputItem, TagsInputItemDeleteTrigger, TagsInputItemInput, TagsInputItemText, TagsInputLabel, Toast, ToastCloseTrigger, ToastDescription, ToastGroup, ToastTitle, ToggleGroup, ToggleGroupItem, Tooltip, TooltipArrow, TooltipArrowTip, TooltipContent, TooltipPositioner, TooltipTrigger, ark, createToaster, splitPresenceProps, useAccordionContext, useAccordionItemContext, useAvatarContext, useCarouselContext, useCheckboxContext, useColorPickerAreaContext, useColorPickerChannelSliderContext, useColorPickerContext, useComboboxContext, useDatePickerContext, useDatePickerTableCellContext, useDatePickerTableContext, useDatePickerViewContext, useDialogContext, useEditableContext, useEnvironmentContext, useFileUploadContext, useHoverCardContext, useMenuContext, useNumberInputContext, usePaginationContext, usePinInputContext, usePopoverContext, usePresence, usePresenceContext, usePresencePropsContext, useProgressContext, useRadioGroupContext, useRadioGroupItemContext, useRatingGroupContext, useRatingGroupItemContext, useSegmentGroupContext, useSegmentGroupItemContext, useSelectContext, useSelectItemContext, useSliderContext, useSplitterContext, useSwitchContext, useTabsContext, useTagsInputContext, useTagsInputItemContext, useToggleGroupContext, useTooltipContext };
 //# sourceMappingURL=index.js.map