@ark-ui/solid 1.1.0 → 1.3.0

package/cjs/index.js

@@ -21,6 +21,7 @@ var numberInput = require('@zag-js/number-input');
 var pagination = require('@zag-js/pagination');
 var pinInput = require('@zag-js/pin-input');
 var popover = require('@zag-js/popover');
+var progress = require('@zag-js/progress');
 var radio = require('@zag-js/radio-group');
 var rating = require('@zag-js/rating-group');
 var select = require('@zag-js/select');
@@ -67,6 +68,7 @@ var numberInput__namespace = /*#__PURE__*/_interopNamespaceDefault(numberInput);
 var pagination__namespace = /*#__PURE__*/_interopNamespaceDefault(pagination);
 var pinInput__namespace = /*#__PURE__*/_interopNamespaceDefault(pinInput);
 var popover__namespace = /*#__PURE__*/_interopNamespaceDefault(popover);
+var progress__namespace = /*#__PURE__*/_interopNamespaceDefault(progress);
 var radio__namespace = /*#__PURE__*/_interopNamespaceDefault(radio);
 var rating__namespace = /*#__PURE__*/_interopNamespaceDefault(rating);
 var select__namespace = /*#__PURE__*/_interopNamespaceDefault(select);
@@ -122,6 +124,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 = solidJs.createMemo(() => mapProps(props, (key, value) => {
     const eventKey = getEventKey(key);
 
@@ -140,14 +143,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;
   }));
-  web.spread(node, solidJs.mergeProps(childProps));
+  web.spread(node, solidJs.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'];
@@ -419,7 +422,7 @@ function withAsChild(Component) {
     const getChildren = solidJs.children(() => ssrSpread(localProps.children, restProps));
     solidJs.createEffect(() => {
       const children = getChildren();
-      if (children instanceof HTMLElement) {
+      if (children instanceof HTMLElement || children instanceof SVGElement) {
         spread(children, restProps);
       }
     });
@@ -1175,14 +1178,14 @@ const [ComboboxProvider, useComboboxContext] = createContext({
 
 const useCombobox = props => {
   const [collectionOptions, rest] = createSplitProps()(props, ['isItemDisabled', 'itemToValue', 'itemToString', 'items']);
-  const collection = combobox__namespace.collection(collectionOptions);
+  const collection = () => combobox__namespace.collection(collectionOptions);
   const getRootNode = useEnvironmentContext();
-  const context = solid.mergeProps({
+  const context = () => solid.mergeProps({
     id: solidJs.createUniqueId(),
     getRootNode,
-    collection
+    collection: collection()
   }, rest);
-  const [state, send] = solid.useMachine(combobox__namespace.machine(context), {
+  const [state, send] = solid.useMachine(combobox__namespace.machine(context()), {
     context
   });
   return solidJs.createMemo(() => combobox__namespace.connect(state, send, solid.normalizeProps));
@@ -1362,7 +1365,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(solid.mergeProps(presenceProps, () => ({
     present: api().isOpen
@@ -1812,13 +1815,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] = solidJs.splitProps(restProps, ['children']);
-  const mergedProps = solid.mergeProps(() => 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 = solid.mergeProps(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(EditableProvider, {
-    value: editable,
+    value: api,
     get children() {
       return web.createComponent(ark.div, web.mergeProps(mergedProps, {
         get children() {
@@ -1830,50 +1832,50 @@ const Editable$1 = props => {
 };
 
 const EditableArea = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().areaProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().areaProps, props);
   return web.createComponent(ark.div, mergedProps);
 };
 
 const EditableCancelTrigger = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().cancelTriggerProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().cancelTriggerProps, props);
   return web.createComponent(ark.button, mergedProps);
 };
 
 const EditableControl = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().controlProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().controlProps, props);
   return web.createComponent(ark.div, mergedProps);
 };
 
 const EditableEditTrigger = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().editTriggerProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().editTriggerProps, props);
   return web.createComponent(ark.button, mergedProps);
 };
 
 const EditableInput = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().inputProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().inputProps, props);
   return web.createComponent(ark.input, mergedProps);
 };
 
 const EditableLabel = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().labelProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().labelProps, props);
   return web.createComponent(ark.label, mergedProps);
 };
 
 const EditablePreview = props => {
-  const editable = useEditableContext();
-  const mergedProps = solid.mergeProps(() => editable().previewProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().previewProps, props);
   return web.createComponent(ark.span, mergedProps);
 };
 
 const EditableSubmitTrigger = props => {
-  const dialog = useEditableContext();
-  const mergedProps = solid.mergeProps(() => dialog().submitTriggerProps, props);
+  const api = useEditableContext();
+  const mergedProps = solid.mergeProps(() => api().submitTriggerProps, props);
   return web.createComponent(ark.button, mergedProps);
 };
 
@@ -1907,7 +1909,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 = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
@@ -1987,20 +1989,23 @@ const FileUploadItemName = props => {
 };
 
 const FileUploadItemPreview = props => {
+  const api = useFileUploadContext();
+  const item = useFileUploadItemContext();
+  const mergedProps = solid.mergeProps(() => api().getItemPreviewProps(item), props);
+  if (!item.file.type.match(props.type ?? '.*')) return null;
+  return web.createComponent(ark.div, mergedProps);
+};
+
+const FileUploadItemPreviewImage = props => {
   const api = useFileUploadContext();
   const item = useFileUploadItemContext();
   const [url, setUrl] = solidJs.createSignal('');
   api().createFileUrl(item.file, url => setUrl(url));
-  try {
-    const mergedProps = solid.mergeProps(api().getItemPreviewProps({
-      ...item,
-      url: url()
-    }), props);
-    return web.createComponent(ark.img, mergedProps);
-  } catch (e) {
-    // TODO We could render a fallback component
-    return null;
-  }
+  const mergedProps = solid.mergeProps(api().getItemPreviewImageProps({
+    ...item,
+    url: url()
+  }), props);
+  return web.createComponent(ark.img, mergedProps);
 };
 
 const FileUploadItemSizeText = props => {
@@ -2030,14 +2035,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({
@@ -2373,18 +2379,18 @@ const NumberInputDecrementTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
-const NumberInputInput = props => {
-  const api = useNumberInputContext();
-  const mergedProps = solid.mergeProps(() => api().inputProps, props);
-  return web.createComponent(ark.input, mergedProps);
-};
-
 const NumberInputIncrementTrigger = props => {
   const api = useNumberInputContext();
   const mergedProps = solid.mergeProps(() => api().incrementTriggerProps, props);
   return web.createComponent(ark.button, mergedProps);
 };
 
+const NumberInputInput = props => {
+  const api = useNumberInputContext();
+  const mergedProps = solid.mergeProps(() => api().inputProps, props);
+  return web.createComponent(ark.input, mergedProps);
+};
+
 const NumberInputLabel = props => {
   const api = useNumberInputContext();
   const mergedProps = solid.mergeProps(() => api().labelProps, props);
@@ -2425,11 +2431,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] = solidJs.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 = solid.mergeProps(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(PaginationProvider, {
     value: api,
     get children() {
@@ -2443,9 +2448,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 = solid.mergeProps(() => api().getEllipsisProps(ellipsisProps), restProps);
+  const mergedProps = solid.mergeProps(() => api().getEllipsisProps(ellipsisProps), localProps);
   return web.createComponent(ark.div, mergedProps);
 };
 
@@ -2495,8 +2500,8 @@ const usePinInput = props => {
 
 const _tmpl$$6 = /*#__PURE__*/web.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 = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(PinInputProvider, {
     value: api,
@@ -2615,7 +2620,7 @@ const PopoverContent = props => {
 const PopoverDescription = props => {
   const api = usePopoverContext();
   const mergedProps = solid.mergeProps(() => api().descriptionProps, props);
-  return web.createComponent(ark.div, mergedProps);
+  return web.createComponent(ark.p, mergedProps);
 };
 
 const PopoverIndicator = props => {
@@ -2669,6 +2674,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 = solid.mergeProps({
+    id: solidJs.createUniqueId(),
+    getRootNode
+  }, props);
+  const [state, send] = solid.useMachine(progress__namespace.machine(context), {
+    context
+  });
+  return solidJs.createMemo(() => progress__namespace.connect(state, send, solid.normalizeProps));
+};
+
+const Progress$1 = props => {
+  const [progressProps, localProps] = createSplitProps()(props, ['dir', 'getRootNode', 'id', 'max', 'min', 'orientation', 'translations', 'value']);
+  const api = useProgress(progressProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
+  return web.createComponent(ProgressProvider, {
+    value: api,
+    get children() {
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
+    }
+  });
+};
+
+const ProgressCircle = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().circleProps, props);
+  return web.createComponent(ark.svg, mergedProps);
+};
+
+const ProgressCircleRange = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().circleRangeProps, props);
+  return web.createComponent(ark.circle, mergedProps);
+};
+
+const ProgressCircleTrack = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().circleTrackProps, props);
+  return web.createComponent(ark.circle, mergedProps);
+};
+
+const ProgressIndicator = props => {
+  const [state, localProps] = createSplitProps()(props, ['state']);
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().getIndicatorProps(state), localProps);
+  return web.createComponent(ark.span, mergedProps);
+};
+
+const ProgressLabel = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().labelProps, props);
+  return web.createComponent(ark.label, mergedProps);
+};
+
+const ProgressRange = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().rangeProps, props);
+  return web.createComponent(ark.div, mergedProps);
+};
+
+const ProgressTrack = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().trackProps, props);
+  return web.createComponent(ark.div, mergedProps);
+};
+
+const ProgressValueText = props => {
+  const api = useProgressContext();
+  const mergedProps = solid.mergeProps(() => api().valueTextProps, props);
+  const getChildren = () => runIfFn(props.children, () => api().valueAsString);
+  return web.createComponent(ark.span, web.mergeProps(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 />'
@@ -2704,19 +2809,25 @@ const RadioGroupIndicator = props => {
   return web.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 = solid.mergeProps(() => api().getItemProps(itemProps), restProps);
-  return web.createComponent(RadioProvider, {
+  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), localProps);
+  const itemState = api().getItemState(itemProps);
+  const getChildren = () => runIfFn(localProps.children, itemState);
+  return web.createComponent(RadioGroupItemProvider, {
     value: itemProps,
     get children() {
-      return web.createComponent(ark.label, mergedProps);
+      return web.createComponent(ark.label, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
@@ -2773,8 +2884,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 = solid.mergeProps(() => api().rootProps, localProps);
   return web.createComponent(RatingGroupProvider, {
     value: api,
@@ -2787,8 +2898,8 @@ const RatingGroup$1 = props => {
 const _tmpl$$4 = /*#__PURE__*/web.template(`<input>`);
 const RatingGroupControl = props => {
   const api = useRatingGroupContext();
-  const getChildren = () => runIfFn(props.children, api);
   const mergedProps = solid.mergeProps(() => api().controlProps, props);
+  const getChildren = () => runIfFn(props.children, api);
   return [web.createComponent(ark.div, web.mergeProps(mergedProps, {
     get children() {
       return getChildren();
@@ -2808,11 +2919,11 @@ const [RatingGroupItemProvider, useRatingGroupItemContext] = createContext({
 const RatingGroupItem = props => {
   const [itemProps, localProps] = createSplitProps()(props, ['index']);
   const api = useRatingGroupContext();
+  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), localProps);
   const itemState = solidJs.createMemo(() => api().getItemState(itemProps));
   const getChildren = () => runIfFn(localProps.children, itemState);
-  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), localProps);
   return web.createComponent(RatingGroupItemProvider, {
-    value: itemState,
+    value: itemProps,
     get children() {
       return web.createComponent(ark.span, web.mergeProps(mergedProps, {
         get children() {
@@ -2871,19 +2982,25 @@ const SegmentGroupIndicator = props => {
   return web.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 = solid.mergeProps(() => api().getItemProps(itemProps), anatomy.segmentGroupAnatomy.build().item.attrs, restProps);
-  return web.createComponent(SegmentProvider, {
+  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), anatomy.segmentGroupAnatomy.build().item.attrs, localProps);
+  const itemState = api().getItemState(itemProps);
+  const getChildren = () => runIfFn(localProps.children, itemState);
+  return web.createComponent(SegmentGroupItemProvider, {
     value: itemProps,
     get children() {
-      return web.createComponent(ark.label, mergedProps);
+      return web.createComponent(ark.label, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
@@ -2930,14 +3047,14 @@ const [SelectProvider, useSelectContext] = createContext({
 
 const useSelect = props => {
   const [collectionOptions, rest] = createSplitProps()(props, ['isItemDisabled', 'itemToValue', 'itemToString', 'items']);
-  const collection = select__namespace.collection(collectionOptions);
+  const collection = () => select__namespace.collection(collectionOptions);
   const getRootNode = useEnvironmentContext();
-  const context = solid.mergeProps({
+  const context = () => solid.mergeProps({
     id: solidJs.createUniqueId(),
     getRootNode,
-    collection
+    collection: collection()
   }, rest);
-  const [state, send] = solid.useMachine(select__namespace.machine(context), {
+  const [state, send] = solid.useMachine(select__namespace.machine(context()), {
     context
   });
   return solidJs.createMemo(() => select__namespace.connect(state, send, solid.normalizeProps));
@@ -2947,16 +3064,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(solid.mergeProps(presenceProps, () => ({
+  const presenceApi = usePresence(solid.mergeProps(() => ({
     present: api().isOpen
-  })));
+  }), presenceProps));
   const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(SelectProvider, {
     value: api,
     get children() {
       return web.createComponent(PresenceProvider, {
-        value: apiPresence,
+        value: presenceApi,
         get children() {
           return web.createComponent(ark.div, web.mergeProps(mergedProps, {
             get children() {
@@ -3014,7 +3131,7 @@ const SelectControl = props => {
 
 const SelectIndicator = props => {
   const api = useSelectContext();
-  const mergedProps = solid.mergeProps(() => api().controlProps, props);
+  const mergedProps = solid.mergeProps(() => api().indicatorProps, props);
   return web.createComponent(ark.div, mergedProps);
 };
 
@@ -3041,9 +3158,9 @@ const SelectItem = props => {
 };
 
 const SelectItemGroup = props => {
-  const [groupProps, localProps] = createSplitProps()(props, ['id']);
+  const [itemGroupProps, localProps] = createSplitProps()(props, ['id']);
   const api = useSelectContext();
-  const mergedProps = solid.mergeProps(() => api().getItemGroupProps(groupProps), localProps);
+  const mergedProps = solid.mergeProps(() => api().getItemGroupProps(itemGroupProps), localProps);
   return web.createComponent(ark.div, mergedProps);
 };
 
@@ -3296,9 +3413,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 = solid.mergeProps(() => api().rootProps, labelProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
   const getChildren = () => runIfFn(props.children, api);
   return web.createComponent(SwitchProvider, {
     value: api,
@@ -3324,14 +3441,14 @@ const SwitchControl = props => {
 };
 
 const SwitchLabel = props => {
-  const checkbox = useSwitchContext();
-  const mergedProps = solid.mergeProps(() => checkbox().labelProps, props);
+  const api = useSwitchContext();
+  const mergedProps = solid.mergeProps(() => api().labelProps, props);
   return web.createComponent(ark.span, mergedProps);
 };
 
 const SwitchThumb = props => {
-  const checkbox = useSwitchContext();
-  const mergedProps = solid.mergeProps(() => checkbox().thumbProps, props);
+  const api = useSwitchContext();
+  const mergedProps = solid.mergeProps(() => api().thumbProps, props);
   return web.createComponent(ark.span, mergedProps);
 };
 
@@ -3550,6 +3667,10 @@ const [ToastProvider, useToastContext] = createContext({
   providerName: '<ToastProvider />'
 });
 
+const ToastGroup = props => {
+  return web.createComponent(ark.ol, props);
+};
+
 const createToaster = props => {
   const service = toast__namespace.group.machine({
     id: '1',
@@ -3568,7 +3689,7 @@ const createToaster = props => {
     const mergedProps = solid.mergeProps(() => api().getGroupProps({
       placement: props.placement
     }), toasterProps);
-    return web.createComponent(ark.ol, web.mergeProps(mergedProps, {
+    return web.createComponent(ToastGroup, web.mergeProps(mergedProps, {
       get children() {
         return web.createComponent(solidJs.Index, {
           get each() {
@@ -3622,9 +3743,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({
@@ -3865,7 +3987,7 @@ exports.FileUploadItem = FileUploadItem;
 exports.FileUploadItemDeleteTrigger = FileUploadItemDeleteTrigger;
 exports.FileUploadItemGroup = FileUploadItemGroup;
 exports.FileUploadItemName = FileUploadItemName;
-exports.FileUploadItemPreview = FileUploadItemPreview;
+exports.FileUploadItemPreviewImage = FileUploadItemPreviewImage;
 exports.FileUploadItemSizeText = FileUploadItemSizeText;
 exports.FileUploadLabel = FileUploadLabel;
 exports.FileUploadTrigger = FileUploadTrigger;
@@ -3918,6 +4040,15 @@ exports.PopoverTrigger = PopoverTrigger;
 exports.Presence = Presence;
 exports.PresencePropsProvider = PresencePropsProvider;
 exports.PresenceProvider = PresenceProvider;
+exports.Progress = Progress;
+exports.ProgressCircle = ProgressCircle;
+exports.ProgressCircleRange = ProgressCircleRange;
+exports.ProgressCircleTrack = ProgressCircleTrack;
+exports.ProgressIndicator = ProgressIndicator;
+exports.ProgressLabel = ProgressLabel;
+exports.ProgressRange = ProgressRange;
+exports.ProgressTrack = ProgressTrack;
+exports.ProgressValueText = ProgressValueText;
 exports.RadioGroup = RadioGroup;
 exports.RadioGroupItem = RadioGroupItem;
 exports.RadioGroupItemControl = RadioGroupItemControl;
@@ -3980,6 +4111,7 @@ exports.TagsInputLabel = TagsInputLabel;
 exports.Toast = Toast;
 exports.ToastCloseTrigger = ToastCloseTrigger;
 exports.ToastDescription = ToastDescription;
+exports.ToastGroup = ToastGroup;
 exports.ToastTitle = ToastTitle;
 exports.ToggleGroup = ToggleGroup;
 exports.ToggleGroupItem = ToggleGroupItem;
@@ -4018,6 +4150,7 @@ exports.usePopoverContext = usePopoverContext;
 exports.usePresence = usePresence;
 exports.usePresenceContext = usePresenceContext;
 exports.usePresencePropsContext = usePresencePropsContext;
+exports.useProgressContext = useProgressContext;
 exports.useRadioGroupContext = useRadioGroupContext;
 exports.useRadioGroupItemContext = useRadioGroupItemContext;
 exports.useRatingGroupContext = useRatingGroupContext;