@ark-ui/solid 1.0.0 → 1.1.0

package/cjs/index.js

@@ -14,6 +14,7 @@ var combobox = require('@zag-js/combobox');
 var datePicker = require('@zag-js/date-picker');
 var dialog = require('@zag-js/dialog');
 var editable = require('@zag-js/editable');
+var fileUpload = require('@zag-js/file-upload');
 var hoverCard = require('@zag-js/hover-card');
 var menu = require('@zag-js/menu');
 var numberInput = require('@zag-js/number-input');
@@ -59,6 +60,7 @@ var combobox__namespace = /*#__PURE__*/_interopNamespaceDefault(combobox);
 var datePicker__namespace = /*#__PURE__*/_interopNamespaceDefault(datePicker);
 var dialog__namespace = /*#__PURE__*/_interopNamespaceDefault(dialog);
 var editable__namespace = /*#__PURE__*/_interopNamespaceDefault(editable);
+var fileUpload__namespace = /*#__PURE__*/_interopNamespaceDefault(fileUpload);
 var hoverCard__namespace = /*#__PURE__*/_interopNamespaceDefault(hoverCard);
 var menu__namespace = /*#__PURE__*/_interopNamespaceDefault(menu);
 var numberInput__namespace = /*#__PURE__*/_interopNamespaceDefault(numberInput);
@@ -533,7 +535,7 @@ const [EnvironmentProvider, useEnvironmentContext] = createContext({
   strict: false
 });
 
-const _tmpl$$b = /*#__PURE__*/web.template(`<span hidden>`);
+const _tmpl$$c = /*#__PURE__*/web.template(`<span hidden>`);
 const Environment$1 = props => {
   // eslint-disable-next-line prefer-const
   let spanRef = undefined;
@@ -544,7 +546,7 @@ const Environment$1 = props => {
     },
     get children() {
       return [web.memo(() => props.children), web.memo(() => web.memo(() => !!!props.value)() && (() => {
-        const _el$ = _tmpl$$b();
+        const _el$ = _tmpl$$c();
         const _ref$ = spanRef;
         typeof _ref$ === "function" ? web.use(_ref$, _el$) : spanRef = _el$;
         return _el$;
@@ -839,12 +841,12 @@ const Checkbox$1 = props => {
   });
 };
 
-const _tmpl$$a = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$b = /*#__PURE__*/web.template(`<input>`);
 const CheckboxControl = props => {
   const api = useCheckboxContext();
   const mergedProps = solid.mergeProps(() => api().controlProps, props);
   return [web.createComponent(ark.div, mergedProps), (() => {
-    const _el$ = _tmpl$$a();
+    const _el$ = _tmpl$$b();
     web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
     return _el$;
   })()];
@@ -888,10 +890,10 @@ const useColorPicker = props => {
   return solidJs.createMemo(() => colorPicker__namespace.connect(state, send, solid.normalizeProps));
 };
 
-const _tmpl$$9 = /*#__PURE__*/web.template(`<input>`);
+const _tmpl$$a = /*#__PURE__*/web.template(`<input>`);
 const ColorPicker$1 = props => {
   const [presenceProps, colorPickerProps] = splitPresenceProps(props);
-  const [useColorPickerProps, localProps] = createSplitProps()(colorPickerProps, ['autoFocus', 'dir', 'disabled', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'name', 'name', 'onFocusOutside', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'onValueChangeEnd', 'open', 'positioning', 'readOnly', 'value']);
+  const [useColorPickerProps, localProps] = createSplitProps()(colorPickerProps, ['closeOnSelect', 'dir', 'disabled', 'format', 'getRootNode', 'id', 'ids', 'initialFocusEl', 'name', 'name', 'onFocusOutside', 'onFormatChange', 'onInteractOutside', 'onOpenChange', 'onPointerDownOutside', 'onValueChange', 'onValueChangeEnd', 'open', 'positioning', 'readOnly', 'value']);
   const api = useColorPicker(useColorPickerProps);
   const apiPresence = usePresence(solid.mergeProps(presenceProps, () => ({
     present: api().isOpen
@@ -911,7 +913,7 @@ const ColorPicker$1 = props => {
           }));
         }
       }), (() => {
-        const _el$ = _tmpl$$9();
+        const _el$ = _tmpl$$a();
         web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
         return _el$;
       })()];
@@ -1014,6 +1016,32 @@ const ColorPickerEyeDropperTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
+const ColorPickerFormatSelect = props => {
+  const api = useColorPickerContext();
+  const mergedProps = solid.mergeProps(() => api().formatSelectProps, props);
+  return web.createComponent(ark.select, web.mergeProps(mergedProps, {
+    get children() {
+      return web.createComponent(solidJs.Index, {
+        each: ['rgba', 'hsla', 'hsba'],
+        children: format => web.createComponent(ark.option, {
+          get value() {
+            return format();
+          },
+          get children() {
+            return format();
+          }
+        })
+      });
+    }
+  }));
+};
+
+const ColorPickerFormatTrigger = props => {
+  const api = useColorPickerContext();
+  const mergedProps = solid.mergeProps(() => api().formatTriggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
+};
+
 const ColorPickerLabel = props => {
   const api = useColorPickerContext();
   const mergedProps = solid.mergeProps(() => api().labelProps, props);
@@ -1034,11 +1062,21 @@ const ColorPickerPositioner = props => {
   });
 };
 
+const [ColorPickerSwatchProvider, useColorPickerSwatchContext] = createContext({
+  hookName: 'useColorPickerSwatchContext',
+  providerName: '<ColorPickerSwatchProvider />'
+});
+
 const ColorPickerSwatch = props => {
-  const [colorSwatchProps, localProps] = createSplitProps()(props, ['respectAlpha', 'value']);
+  const [swatchProps, localProps] = createSplitProps()(props, ['respectAlpha', 'value']);
   const api = useColorPickerContext();
-  const mergedProps = solid.mergeProps(() => api().getSwatchProps(colorSwatchProps), localProps);
-  return web.createComponent(ark.div, mergedProps);
+  const mergedProps = solid.mergeProps(() => api().getSwatchProps(swatchProps), localProps);
+  return web.createComponent(ColorPickerSwatchProvider, {
+    value: swatchProps,
+    get children() {
+      return web.createComponent(ark.div, mergedProps);
+    }
+  });
 };
 
 const ColorPickerSwatchGroup = props => {
@@ -1047,8 +1085,15 @@ const ColorPickerSwatchGroup = props => {
   return web.createComponent(ark.div, mergedProps);
 };
 
+const ColorPickerSwatchIndicator = props => {
+  const api = useColorPickerContext();
+  const swatchProps = useColorPickerSwatchContext();
+  const mergedProps = solid.mergeProps(() => api().getSwatchIndicatorProps(swatchProps), props);
+  return web.createComponent(ark.div, mergedProps);
+};
+
 const ColorPickerSwatchTrigger = props => {
-  const [triggerProps, localProps] = createSplitProps()(props, ['value']);
+  const [triggerProps, localProps] = createSplitProps()(props, ['value', 'disabled']);
   const api = useColorPickerContext();
   const mergedProps = solid.mergeProps(() => api().getSwatchTriggerProps(triggerProps), localProps);
   return web.createComponent(ark.button, mergedProps);
@@ -1108,10 +1153,13 @@ const ColorPicker = Object.assign(ColorPicker$1, {
   Content: ColorPickerContent,
   Control: ColorPickerControl,
   EyeDropperTrigger: ColorPickerEyeDropperTrigger,
+  FormatTrigger: ColorPickerFormatTrigger,
+  FormatSelect: ColorPickerFormatSelect,
   Label: ColorPickerLabel,
   Positioner: ColorPickerPositioner,
   Swatch: ColorPickerSwatch,
   SwatchGroup: ColorPickerSwatchGroup,
+  SwatchIndicator: ColorPickerSwatchIndicator,
   SwatchTrigger: ColorPickerSwatchTrigger,
   TransparencyGrid: ColorPickerTransparencyGrid,
   Trigger: ColorPickerTrigger,
@@ -1376,14 +1424,14 @@ const DatePickerLabel = props => {
   return web.createComponent(ark.label, mergedProps);
 };
 
-const _tmpl$$8 = /*#__PURE__*/web.template(`<option>`);
+const _tmpl$$9 = /*#__PURE__*/web.template(`<option>`);
 const DatePickerMonthSelect = props => {
   const api = useDatePickerContext();
   const mergedProps = solid.mergeProps(() => api().monthSelectProps, props);
   return web.createComponent(ark.select, web.mergeProps(mergedProps, {
     get children() {
       return api().getMonths().map(month => (() => {
-        const _el$ = _tmpl$$8();
+        const _el$ = _tmpl$$9();
         web.insert(_el$, () => month.label);
         web.effect(() => _el$.value = month.value);
         return _el$;
@@ -1566,7 +1614,7 @@ const DatePickerViewTrigger = props => {
   return web.createComponent(ark.button, mergedProps);
 };
 
-const _tmpl$$7 = /*#__PURE__*/web.template(`<option>`);
+const _tmpl$$8 = /*#__PURE__*/web.template(`<option>`);
 const DatePickerYearSelect = props => {
   const api = useDatePickerContext();
   const mergedProps = solid.mergeProps(() => api().yearSelectProps, props);
@@ -1576,7 +1624,7 @@ const DatePickerYearSelect = props => {
         from: 1_000,
         to: 4_000
       }).map(year => (() => {
-        const _el$ = _tmpl$$7();
+        const _el$ = _tmpl$$8();
         _el$.value = year;
         web.insert(_el$, year);
         return _el$;
@@ -1646,10 +1694,15 @@ const Dialog$1 = props => {
   return web.createComponent(DialogProvider, {
     value: api,
     get children() {
-      return web.createComponent(PresenceProvider, {
-        value: apiPresence,
+      return web.createComponent(PresencePropsProvider, {
+        value: presenceProps,
         get children() {
-          return getChildren();
+          return web.createComponent(PresenceProvider, {
+            value: apiPresence,
+            get children() {
+              return getChildren();
+            }
+          });
         }
       });
     }
@@ -1658,8 +1711,11 @@ const Dialog$1 = props => {
 
 const DialogBackdrop = props => {
   const api = useDialogContext();
-  const presenceApi = usePresenceContext();
-  const mergedProps = solid.mergeProps(() => api().backdropProps, props);
+  const presenceProps = usePresencePropsContext();
+  const presenceApi = usePresence(solid.mergeProps(presenceProps, () => ({
+    present: api().isOpen
+  })));
+  const mergedProps = solid.mergeProps(() => api().backdropProps, () => presenceApi().presenceProps, props);
   return web.createComponent(solidJs.Show, {
     get when() {
       return !presenceApi().isUnmounted;
@@ -1672,7 +1728,7 @@ const DialogBackdrop = props => {
 
 const DialogCloseTrigger = props => {
   const dialog = useDialogContext();
-  const mergedProps = solid.mergeProps(() => dialog().triggerProps, props);
+  const mergedProps = solid.mergeProps(() => dialog().closeTriggerProps, props);
   return web.createComponent(ark.button, mergedProps);
 };
 
@@ -1833,6 +1889,157 @@ const Editable = Object.assign(Editable$1, {
   SubmitTrigger: EditableSubmitTrigger
 });
 
+const [FileUploadProvider, useFileUploadContext] = createContext({
+  hookName: 'useFileUploadContext',
+  providerName: '<FileUploadProvider />'
+});
+
+const useFileUpload = props => {
+  const getRootNode = useEnvironmentContext();
+  const context = solid.mergeProps({
+    id: solidJs.createUniqueId(),
+    getRootNode
+  }, props);
+  const [state, send] = solid.useMachine(fileUpload__namespace.machine(context), {
+    context
+  });
+  return solidJs.createMemo(() => fileUpload__namespace.connect(state, send, solid.normalizeProps));
+};
+
+const FileUpload$1 = props => {
+  const [fileUploadProps, localProps] = createSplitProps()(props, ['accept', 'allowDrop', 'dir', 'disabled', 'files', 'getRootNode', 'id', 'isValidFile', 'locale', 'maxFiles', 'maxFileSize', 'minFileSize', 'name', 'onFilesChange']);
+  const api = useFileUpload(fileUploadProps);
+  const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
+  return web.createComponent(FileUploadProvider, {
+    value: api,
+    get children() {
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
+    }
+  });
+};
+
+const _tmpl$$7 = /*#__PURE__*/web.template(`<input>`);
+const FileUploadDropzone = props => {
+  const api = useFileUploadContext();
+  const mergedProps = solid.mergeProps(() => api().dropzoneProps, props);
+  return [web.createComponent(ark.div, mergedProps), (() => {
+    const _el$ = _tmpl$$7();
+    web.spread(_el$, web.mergeProps(() => api().hiddenInputProps), false, false);
+    return _el$;
+  })()];
+};
+
+const [FileUploadItemProvider, useFileUploadItemContext] = createContext({
+  hookName: 'useFileUploadItemContext',
+  providerName: '<FileUploadItemProvider />'
+});
+
+const FileUploadItem = props => {
+  const [itemProps, localProps] = createSplitProps()(props, ['file']);
+  const api = useFileUploadContext();
+  const mergedProps = solid.mergeProps(() => api().getItemProps(itemProps), localProps);
+  const getChildren = () => runIfFn(localProps.children);
+  return web.createComponent(FileUploadItemProvider, {
+    value: itemProps,
+    get children() {
+      return web.createComponent(ark.li, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
+    }
+  });
+};
+
+const FileUploadItemDeleteTrigger = props => {
+  const api = useFileUploadContext();
+  const item = useFileUploadItemContext();
+  const mergedProps = solid.mergeProps(() => api().getItemDeleteTriggerProps(item), props);
+  return web.createComponent(ark.button, mergedProps);
+};
+
+const FileUploadItemGroup = props => {
+  const api = useFileUploadContext();
+  const mergedProps = solid.mergeProps(() => api().itemGroupProps, props);
+  const getChildren = () => runIfFn(props.children, () => api().files);
+  return web.createComponent(ark.ul, web.mergeProps(mergedProps, {
+    get children() {
+      return getChildren();
+    }
+  }));
+};
+
+const FileUploadItemName = props => {
+  const api = useFileUploadContext();
+  const item = useFileUploadItemContext();
+  const mergedProps = solid.mergeProps(() => api().getItemNameProps(item), props);
+  const getChildren = solidJs.children(() => props.children);
+  return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+    get children() {
+      return getChildren() || item.file.name;
+    }
+  }));
+};
+
+const FileUploadItemPreview = 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 FileUploadItemSizeText = props => {
+  const api = useFileUploadContext();
+  const item = useFileUploadItemContext();
+  const mergedProps = solid.mergeProps(() => api().getItemSizeTextProps(item), props);
+  const getChildren = solidJs.children(() => props.children);
+  return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+    get children() {
+      return getChildren() || api().getFileSize(item.file);
+    }
+  }));
+};
+
+const FileUploadLabel = props => {
+  const api = useFileUploadContext();
+  const mergedProps = solid.mergeProps(() => api().labelProps, props);
+  return web.createComponent(ark.label, mergedProps);
+};
+
+const FileUploadTrigger = props => {
+  const api = useFileUploadContext();
+  const mergedProps = solid.mergeProps(() => api().triggerProps, props);
+  return web.createComponent(ark.button, mergedProps);
+};
+
+const FileUpload = Object.assign(FileUpload$1, {
+  Root: FileUpload$1,
+  Dropzone: FileUploadDropzone,
+  Label: FileUploadLabel,
+  Trigger: FileUploadTrigger,
+  ItemGroup: FileUploadItemGroup,
+  Item: FileUploadItem,
+  ItemName: FileUploadItemName,
+  ItemPreview: FileUploadItemPreview,
+  ItemSizeText: FileUploadItemSizeText,
+  ItemDeleteTrigger: FileUploadItemDeleteTrigger
+});
+
 const [HoverCardProvider, useHoverCardContext] = createContext({
   hookName: 'useHoverCardContext',
   providerName: '<HoverCardProvider />'
@@ -2088,8 +2295,13 @@ const MenuSeparator = props => {
 };
 
 const MenuTrigger = props => {
-  const menu = useMenuContext();
-  const mergedProps = solid.mergeProps(() => menu?.().triggerProps, props);
+  const api = useMenuContext();
+  const presenceApi = usePresenceContext();
+  const mergedProps = solid.mergeProps(() => api().triggerProps, () => ({
+    'aria-controls': presenceApi().isUnmounted && null
+  }), props);
+
+  // @ts-expect-error we want aria-controls to be null to remove them if the popover if lazy mounted
   return web.createComponent(ark.button, mergedProps);
 };
 
@@ -2136,10 +2348,15 @@ const NumberInput$1 = props => {
   const [useNumberInputProps, localProps] = createSplitProps()(props, ['allowMouseWheel', 'allowOverflow', 'clampValueOnBlur', 'dir', 'disabled', 'focusInputOnChange', 'form', 'formatOptions', 'getRootNode', 'id', 'ids', 'inputMode', 'invalid', 'locale', 'max', 'min', 'name', 'onFocusChange', 'onValueChange', 'onValueInvalid', 'pattern', 'readOnly', 'spinOnPress', 'step', 'translations', 'value']);
   const api = useNumberInput(useNumberInputProps);
   const mergedProps = solid.mergeProps(() => api().rootProps, localProps);
+  const getChildren = () => runIfFn(localProps.children, api);
   return web.createComponent(NumberInputProvider, {
     value: api,
     get children() {
-      return web.createComponent(ark.div, mergedProps);
+      return web.createComponent(ark.div, web.mergeProps(mergedProps, {
+        get children() {
+          return getChildren();
+        }
+      }));
     }
   });
 };
@@ -3334,18 +3551,13 @@ const [ToastProvider, useToastContext] = createContext({
 });
 
 const createToaster = props => {
-  const {
-    placement,
-    ...rest
-  } = props;
   const service = toast__namespace.group.machine({
     id: '1',
-    placement,
-    ...rest
+    ...props
   }).start();
   const [state, send] = solid.useActor(service);
   const api = solidJs.createMemo(() => toast__namespace.group.connect(state, send, solid.normalizeProps));
-  const Toaster = props => {
+  const Toaster = toasterProps => {
     const getRootNode = useEnvironmentContext();
     solidJs.createEffect(() => {
       service.setContext({
@@ -3354,13 +3566,13 @@ const createToaster = props => {
       solidJs.onCleanup(() => service.stop());
     });
     const mergedProps = solid.mergeProps(() => api().getGroupProps({
-      placement
-    }), props);
+      placement: props.placement
+    }), toasterProps);
     return web.createComponent(ark.ol, web.mergeProps(mergedProps, {
       get children() {
         return web.createComponent(solidJs.Index, {
           get each() {
-            return api().toastsByPlacement[placement];
+            return api().toastsByPlacement[props.placement];
           },
           children: toast => web.createComponent(ToastProviderFactory, {
             get service() {
@@ -3375,11 +3587,9 @@ const createToaster = props => {
 };
 const ToastProviderFactory = props => {
   const [state, send] = solid.useActor(props.service);
-  const api = toast__namespace.connect(state, send, solid.normalizeProps);
+  const api = solidJs.createMemo(() => toast__namespace.connect(state, send, solid.normalizeProps));
   return web.createComponent(ToastProvider, {
-    get value() {
-      return solidJs.createMemo(() => api);
-    },
+    value: api,
     get children() {
       return state.context.render?.(api);
     }
@@ -3583,14 +3793,18 @@ exports.ColorPickerChannelSliderTrack = ColorPickerChannelSliderTrack;
 exports.ColorPickerContent = ColorPickerContent;
 exports.ColorPickerControl = ColorPickerControl;
 exports.ColorPickerEyeDropperTrigger = ColorPickerEyeDropperTrigger;
+exports.ColorPickerFormatSelect = ColorPickerFormatSelect;
+exports.ColorPickerFormatTrigger = ColorPickerFormatTrigger;
 exports.ColorPickerLabel = ColorPickerLabel;
 exports.ColorPickerPositioner = ColorPickerPositioner;
 exports.ColorPickerSwatch = ColorPickerSwatch;
 exports.ColorPickerSwatchGroup = ColorPickerSwatchGroup;
+exports.ColorPickerSwatchIndicator = ColorPickerSwatchIndicator;
 exports.ColorPickerSwatchTrigger = ColorPickerSwatchTrigger;
 exports.ColorPickerTransparencyGrid = ColorPickerTransparencyGrid;
 exports.ColorPickerTrigger = ColorPickerTrigger;
 exports.ColorPickerValueText = ColorPickerValueText;
+exports.ColorPickerView = ColorPickerView;
 exports.Combobox = Combobox;
 exports.ComboboxClearTrigger = ComboboxClearTrigger;
 exports.ComboboxContent = ComboboxContent;
@@ -3645,6 +3859,16 @@ exports.EditableLabel = EditableLabel;
 exports.EditablePreview = EditablePreview;
 exports.EditableSubmitTrigger = EditableSubmitTrigger;
 exports.Environment = Environment;
+exports.FileUpload = FileUpload;
+exports.FileUploadDropzone = FileUploadDropzone;
+exports.FileUploadItem = FileUploadItem;
+exports.FileUploadItemDeleteTrigger = FileUploadItemDeleteTrigger;
+exports.FileUploadItemGroup = FileUploadItemGroup;
+exports.FileUploadItemName = FileUploadItemName;
+exports.FileUploadItemPreview = FileUploadItemPreview;
+exports.FileUploadItemSizeText = FileUploadItemSizeText;
+exports.FileUploadLabel = FileUploadLabel;
+exports.FileUploadTrigger = FileUploadTrigger;
 exports.HoverCard = HoverCard;
 exports.HoverCardArrow = HoverCardArrow;
 exports.HoverCardArrowTip = HoverCardArrowTip;
@@ -3784,6 +4008,7 @@ exports.useDatePickerViewContext = useDatePickerViewContext;
 exports.useDialogContext = useDialogContext;
 exports.useEditableContext = useEditableContext;
 exports.useEnvironmentContext = useEnvironmentContext;
+exports.useFileUploadContext = useFileUploadContext;
 exports.useHoverCardContext = useHoverCardContext;
 exports.useMenuContext = useMenuContext;
 exports.useNumberInputContext = useNumberInputContext;