@ark-ui/solid 3.6.2 → 3.7.0

package/dist/cjs/index.js

@@ -838,14 +838,14 @@ const useFieldset = props => {
   const getRootProps = () => ({
     ...parts$2.root.attrs,
     disabled,
-    'data-disabled': dataAttr$1(disabled),
-    'data-invalid': dataAttr$1(invalid),
+    'data-disabled': dataAttr(disabled),
+    'data-invalid': dataAttr(invalid),
     'aria-describedby': labelIds.join(' ') || undefined
   });
   const getLegendProps = () => ({
     ...parts$2.legend.attrs,
-    'data-disabled': dataAttr$1(disabled),
-    'data-invalid': dataAttr$1(invalid)
+    'data-disabled': dataAttr(disabled),
+    'data-invalid': dataAttr(invalid)
   });
   const getHelperTextProps = () => ({
     id: helperTextId,
@@ -868,7 +868,7 @@ const useFieldset = props => {
     getErrorTextProps
   }));
 };
-const dataAttr$1 = condition => condition ? '' : undefined;
+const dataAttr = condition => condition ? '' : undefined;
 
 const FieldsetRoot = props => {
   const [useFieldsetProps, localProps] = createSplitProps()(props, ['id', 'disabled', 'invalid']);
@@ -918,6 +918,7 @@ const parts$1 = fieldAnatomy.build();
 const useField = props => {
   const fieldset = useFieldsetContext();
   const {
+    ids,
     disabled = Boolean(fieldset?.().disabled),
     invalid = false,
     readOnly = false,
@@ -927,25 +928,27 @@ const useField = props => {
   const [hasHelperText, setHasHelperText] = solidJs.createSignal(false);
   const id = props.id ?? solidJs.createUniqueId();
   let rootRef;
-  const errorTextId = `field::${id}::error-text`;
-  const helperTextId = `field::${id}::helper-text`;
-  const labelId = `field::${id}::label`;
+  const rootId = ids?.control ?? `field::${id}`;
+  const errorTextId = ids?.errorText ?? `field::${id}::error-text`;
+  const helperTextId = ids?.helperText ?? `field::${id}::helper-text`;
+  const labelId = ids?.label ?? `field::${id}::label`;
   solidJs.createEffect(() => {
     return;
   });
   const getRootProps = () => ({
     ...parts$1.root.attrs,
+    id: rootId,
     role: 'group',
-    'data-disabled': dataAttr(disabled),
-    'data-invalid': dataAttr(invalid),
-    'data-readonly': dataAttr(readOnly)
+    'data-disabled': domQuery.dataAttr(disabled),
+    'data-invalid': domQuery.dataAttr(invalid),
+    'data-readonly': domQuery.dataAttr(readOnly)
   });
   const getLabelProps = () => ({
     ...parts$1.label.attrs,
     id: labelId,
-    'data-disabled': dataAttr(disabled),
-    'data-invalid': dataAttr(invalid),
-    'data-readonly': dataAttr(readOnly),
+    'data-disabled': domQuery.dataAttr(disabled),
+    'data-invalid': domQuery.dataAttr(invalid),
+    'data-readonly': domQuery.dataAttr(readOnly),
     htmlFor: id
   });
   const labelIds = [];
@@ -953,9 +956,10 @@ const useField = props => {
   if (hasHelperText()) labelIds.push(helperTextId);
   const getControlProps = () => ({
     'aria-describedby': labelIds.join(' ') || undefined,
-    'aria-invalid': ariaAttr(invalid),
-    'aria-required': ariaAttr(required),
-    'aria-readonly': ariaAttr(readOnly),
+    'aria-invalid': domQuery.ariaAttr(invalid),
+    'data-invalid': domQuery.dataAttr(invalid),
+    'data-required': domQuery.dataAttr(required),
+    'data-readonly': domQuery.dataAttr(readOnly),
     id,
     required,
     disabled,
@@ -1006,11 +1010,9 @@ const useField = props => {
     getErrorTextProps
   }));
 };
-const dataAttr = condition => condition ? '' : undefined;
-const ariaAttr = condition => condition ? true : undefined;
 
 const FieldRoot = props => {
-  const [useFieldProps, localProps] = createSplitProps()(props, ['id', 'disabled', 'invalid', 'readOnly', 'required']);
+  const [useFieldProps, localProps] = createSplitProps()(props, ['id', 'ids', 'disabled', 'invalid', 'readOnly', 'required']);
   const field = useField(useFieldProps);
   const mergedProps = solid.mergeProps(() => field().getRootProps(), localProps);
   return web.createComponent(FieldProvider, {
@@ -3918,7 +3920,7 @@ const ProgressValueText = props => {
   const mergedProps = solid.mergeProps(() => api().getValueTextProps(), props);
   return web.createComponent(ark.span, web.mergeProps(mergedProps, {
     get children() {
-      return props.children || api().valueAsString;
+      return props.children || api().percentAsString;
     }
   }));
 };
@@ -4564,14 +4566,14 @@ const SelectPositioner = props => {
 
 const useSelect = props => {
   const [collectionOptions, selectProps] = createSplitProps()(props, ['isItemDisabled', 'itemToValue', 'itemToString', 'items']);
-  const collection = () => select__namespace.collection({
+  const collection = solidJs.createMemo(() => select__namespace.collection({
     ...collectionOptions
-  });
+  }));
   const locale = useLocaleContext();
   const environment = useEnvironmentContext();
   const id = solidJs.createUniqueId();
   const field = useFieldContext();
-  const context = solidJs.createMemo(() => ({
+  const initialContext = solidJs.createMemo(() => ({
     id,
     ids: {
       label: field?.().ids.label,
@@ -4589,10 +4591,18 @@ const useSelect = props => {
     'open.controlled': props.open !== undefined,
     ...selectProps
   }));
-  const [state, send] = solid.useMachine(select__namespace.machine(context()), {
+  const context = solidJs.createMemo(() => {
+    const [, restProps] = solidJs.splitProps(initialContext(), ['collection']);
+    return restProps;
+  });
+  const [state, send] = solid.useMachine(select__namespace.machine(initialContext()), {
     context
   });
-  return solidJs.createMemo(() => select__namespace.connect(state, send, solid.normalizeProps));
+  const api = solidJs.createMemo(() => select__namespace.connect(state, send, solid.normalizeProps));
+  solidJs.createEffect(() => {
+    api().setCollection(collection());
+  });
+  return api;
 };
 
 const SelectRoot = props => {