@worldcoin/mini-apps-ui-kit-react 1.0.0-canary.2 → 1.0.0-canary.21

package/dist/node_modules/.pnpm/@radix-ui_react-form@0.1.1_@types_react-dom@18.3.5_@types_react@18.3.18__@types_react@18.3.18_z32yjmfa36dn2egycaeb5u52lm/node_modules/@radix-ui/react-form/dist/index.js

@@ -1,95 +1,119 @@
 "use client";
-import * as r from "react";
-import { composeEventHandlers as T } from "../../../../../@radix-ui_primitive@1.1.1/node_modules/@radix-ui/primitive/dist/index.js";
-import { useComposedRefs as q } from "../../../../../@radix-ui_react-compose-refs@1.1.1_@types_react@18.3.18_react@18.3.1/node_modules/@radix-ui/react-compose-refs/dist/index.js";
-import { createContextScope as me } from "../../../../../@radix-ui_react-context@1.1.1_@types_react@18.3.18_react@18.3.1/node_modules/@radix-ui/react-context/dist/index.js";
-import { useId as G } from "../../../../../@radix-ui_react-id@1.1.0_@types_react@18.3.18_react@18.3.1/node_modules/@radix-ui/react-id/dist/index.js";
-import { Label as ue } from "../../../../../@radix-ui_react-label@2.1.1_@types_react-dom@18.3.5_@types_react@18.3.18__@types_react@18.3.1_qr7n7ocfbwauilv6obluyms2qy/node_modules/@radix-ui/react-label/dist/index.js";
-import { Primitive as P } from "../../../../../@radix-ui_react-primitive@2.0.1_@types_react-dom@18.3.5_@types_react@18.3.18__@types_react@18_sspjpiczol7qxzbuuyfihuep4u/node_modules/@radix-ui/react-primitive/dist/index.js";
-import { jsx as C, Fragment as fe } from "react/jsx-runtime";
-var [H, we] = me("Form"), K = "Form", [ve, V] = H(K), [he, X] = H(K), Z = r.forwardRef(
-  (e, t) => {
-    const { __scopeForm: o, onClearServerErrors: i = () => {
-    }, ...a } = e, l = r.useRef(null), f = q(t, l), [d, v] = r.useState({}), m = r.useCallback(
-      (s) => d[s],
-      [d]
-    ), p = r.useCallback(
-      (s, u) => v((c) => ({
-        ...c,
-        [s]: { ...c[s] ?? {}, ...u }
+import * as React from "react";
+import { composeEventHandlers } from "../../../../../@radix-ui_primitive@1.1.1/node_modules/@radix-ui/primitive/dist/index.js";
+import { useComposedRefs } from "../../../../../@radix-ui_react-compose-refs@1.1.1_@types_react@18.3.18_react@18.3.1/node_modules/@radix-ui/react-compose-refs/dist/index.js";
+import { createContextScope } from "../../../../../@radix-ui_react-context@1.1.1_@types_react@18.3.18_react@18.3.1/node_modules/@radix-ui/react-context/dist/index.js";
+import { useId } from "../../../../../@radix-ui_react-id@1.1.0_@types_react@18.3.18_react@18.3.1/node_modules/@radix-ui/react-id/dist/index.js";
+import { Label } from "../../../../../@radix-ui_react-label@2.1.1_@types_react-dom@18.3.5_@types_react@18.3.18__@types_react@18.3.1_qr7n7ocfbwauilv6obluyms2qy/node_modules/@radix-ui/react-label/dist/index.js";
+import { Primitive } from "../../../../../@radix-ui_react-primitive@2.0.1_@types_react-dom@18.3.5_@types_react@18.3.18__@types_react@18_sspjpiczol7qxzbuuyfihuep4u/node_modules/@radix-ui/react-primitive/dist/index.js";
+import { jsx, Fragment } from "react/jsx-runtime";
+var [createFormContext, createFormScope] = createContextScope("Form");
+var FORM_NAME = "Form";
+var [ValidationProvider, useValidationContext] = createFormContext(FORM_NAME);
+var [AriaDescriptionProvider, useAriaDescriptionContext] = createFormContext(FORM_NAME);
+var Form = React.forwardRef(
+  (props, forwardedRef) => {
+    const { __scopeForm, onClearServerErrors = () => {
+    }, ...rootProps } = props;
+    const formRef = React.useRef(null);
+    const composedFormRef = useComposedRefs(forwardedRef, formRef);
+    const [validityMap, setValidityMap] = React.useState({});
+    const getFieldValidity = React.useCallback(
+      (fieldName) => validityMap[fieldName],
+      [validityMap]
+    );
+    const handleFieldValidityChange = React.useCallback(
+      (fieldName, validity) => setValidityMap((prevValidityMap) => ({
+        ...prevValidityMap,
+        [fieldName]: { ...prevValidityMap[fieldName] ?? {}, ...validity }
       })),
       []
-    ), _ = r.useCallback((s) => {
-      v((u) => ({ ...u, [s]: void 0 })), n((u) => ({ ...u, [s]: {} }));
-    }, []), [F, E] = r.useState({}), b = r.useCallback(
-      (s) => F[s] ?? [],
-      [F]
-    ), M = r.useCallback((s, u) => {
-      E((c) => ({
-        ...c,
-        [s]: [...c[s] ?? [], u]
+    );
+    const handleFieldValiditionClear = React.useCallback((fieldName) => {
+      setValidityMap((prevValidityMap) => ({ ...prevValidityMap, [fieldName]: void 0 }));
+      setCustomErrorsMap((prevCustomErrorsMap) => ({ ...prevCustomErrorsMap, [fieldName]: {} }));
+    }, []);
+    const [customMatcherEntriesMap, setCustomMatcherEntriesMap] = React.useState({});
+    const getFieldCustomMatcherEntries = React.useCallback(
+      (fieldName) => customMatcherEntriesMap[fieldName] ?? [],
+      [customMatcherEntriesMap]
+    );
+    const handleFieldCustomMatcherAdd = React.useCallback((fieldName, matcherEntry) => {
+      setCustomMatcherEntriesMap((prevCustomMatcherEntriesMap) => ({
+        ...prevCustomMatcherEntriesMap,
+        [fieldName]: [...prevCustomMatcherEntriesMap[fieldName] ?? [], matcherEntry]
       }));
-    }, []), g = r.useCallback((s, u) => {
-      E((c) => ({
-        ...c,
-        [s]: (c[s] ?? []).filter(
-          (y) => y.id !== u
+    }, []);
+    const handleFieldCustomMatcherRemove = React.useCallback((fieldName, matcherEntryId) => {
+      setCustomMatcherEntriesMap((prevCustomMatcherEntriesMap) => ({
+        ...prevCustomMatcherEntriesMap,
+        [fieldName]: (prevCustomMatcherEntriesMap[fieldName] ?? []).filter(
+          (matcherEntry) => matcherEntry.id !== matcherEntryId
         )
       }));
-    }, []), [A, n] = r.useState({}), h = r.useCallback(
-      (s) => A[s] ?? {},
-      [A]
-    ), I = r.useCallback((s, u) => {
-      n((c) => ({
-        ...c,
-        [s]: { ...c[s] ?? {}, ...u }
+    }, []);
+    const [customErrorsMap, setCustomErrorsMap] = React.useState({});
+    const getFieldCustomErrors = React.useCallback(
+      (fieldName) => customErrorsMap[fieldName] ?? {},
+      [customErrorsMap]
+    );
+    const handleFieldCustomErrorsChange = React.useCallback((fieldName, customErrors) => {
+      setCustomErrorsMap((prevCustomErrorsMap) => ({
+        ...prevCustomErrorsMap,
+        [fieldName]: { ...prevCustomErrorsMap[fieldName] ?? {}, ...customErrors }
       }));
-    }, []), [R, S] = r.useState({}), B = r.useCallback((s, u) => {
-      S((c) => {
-        const y = new Set(c[s]).add(u);
-        return { ...c, [s]: y };
+    }, []);
+    const [messageIdsMap, setMessageIdsMap] = React.useState({});
+    const handleFieldMessageIdAdd = React.useCallback((fieldName, id) => {
+      setMessageIdsMap((prevMessageIdsMap) => {
+        const fieldDescriptionIds = new Set(prevMessageIdsMap[fieldName]).add(id);
+        return { ...prevMessageIdsMap, [fieldName]: fieldDescriptionIds };
       });
-    }, []), D = r.useCallback((s, u) => {
-      S((c) => {
-        const y = new Set(c[s]);
-        return y.delete(u), { ...c, [s]: y };
+    }, []);
+    const handleFieldMessageIdRemove = React.useCallback((fieldName, id) => {
+      setMessageIdsMap((prevMessageIdsMap) => {
+        const fieldDescriptionIds = new Set(prevMessageIdsMap[fieldName]);
+        fieldDescriptionIds.delete(id);
+        return { ...prevMessageIdsMap, [fieldName]: fieldDescriptionIds };
       });
-    }, []), k = r.useCallback(
-      (s) => Array.from(R[s] ?? []).join(" ") || void 0,
-      [R]
+    }, []);
+    const getFieldDescription = React.useCallback(
+      (fieldName) => Array.from(messageIdsMap[fieldName] ?? []).join(" ") || void 0,
+      [messageIdsMap]
     );
-    return /* @__PURE__ */ C(
-      ve,
+    return /* @__PURE__ */ jsx(
+      ValidationProvider,
       {
-        scope: o,
-        getFieldValidity: m,
-        onFieldValidityChange: p,
-        getFieldCustomMatcherEntries: b,
-        onFieldCustomMatcherEntryAdd: M,
-        onFieldCustomMatcherEntryRemove: g,
-        getFieldCustomErrors: h,
-        onFieldCustomErrorsChange: I,
-        onFieldValiditionClear: _,
-        children: /* @__PURE__ */ C(
-          he,
+        scope: __scopeForm,
+        getFieldValidity,
+        onFieldValidityChange: handleFieldValidityChange,
+        getFieldCustomMatcherEntries,
+        onFieldCustomMatcherEntryAdd: handleFieldCustomMatcherAdd,
+        onFieldCustomMatcherEntryRemove: handleFieldCustomMatcherRemove,
+        getFieldCustomErrors,
+        onFieldCustomErrorsChange: handleFieldCustomErrorsChange,
+        onFieldValiditionClear: handleFieldValiditionClear,
+        children: /* @__PURE__ */ jsx(
+          AriaDescriptionProvider,
           {
-            scope: o,
-            onFieldMessageIdAdd: B,
-            onFieldMessageIdRemove: D,
-            getFieldDescription: k,
-            children: /* @__PURE__ */ C(
-              P.form,
+            scope: __scopeForm,
+            onFieldMessageIdAdd: handleFieldMessageIdAdd,
+            onFieldMessageIdRemove: handleFieldMessageIdRemove,
+            getFieldDescription,
+            children: /* @__PURE__ */ jsx(
+              Primitive.form,
               {
-                ...a,
-                ref: f,
-                onInvalid: T(e.onInvalid, (s) => {
-                  const u = ne(s.currentTarget);
-                  u === s.target && u.focus(), s.preventDefault();
+                ...rootProps,
+                ref: composedFormRef,
+                onInvalid: composeEventHandlers(props.onInvalid, (event) => {
+                  const firstInvalidControl = getFirstInvalidControl(event.currentTarget);
+                  if (firstInvalidControl === event.target) firstInvalidControl.focus();
+                  event.preventDefault();
                 }),
-                onSubmit: T(e.onSubmit, i, {
-                  checkForDefaultPrevented: !1
+                onSubmit: composeEventHandlers(props.onSubmit, onClearServerErrors, {
+                  checkForDefaultPrevented: false
                 }),
-                onReset: T(e.onReset, i)
+                onReset: composeEventHandlers(props.onReset, onClearServerErrors)
               }
             )
           }
@@ -98,115 +122,164 @@ var [H, we] = me("Form"), K = "Form", [ve, V] = H(K), [he, X] = H(K), Z = r.forw
     );
   }
 );
-Z.displayName = K;
-var Y = "FormField", [Ce, N] = H(Y), $ = r.forwardRef(
-  (e, t) => {
-    const { __scopeForm: o, name: i, serverInvalid: a = !1, ...l } = e, d = V(Y, o).getFieldValidity(i), v = G();
-    return /* @__PURE__ */ C(Ce, { scope: o, id: v, name: i, serverInvalid: a, children: /* @__PURE__ */ C(
-      P.div,
+Form.displayName = FORM_NAME;
+var FIELD_NAME = "FormField";
+var [FormFieldProvider, useFormFieldContext] = createFormContext(FIELD_NAME);
+var FormField = React.forwardRef(
+  (props, forwardedRef) => {
+    const { __scopeForm, name, serverInvalid = false, ...fieldProps } = props;
+    const validationContext = useValidationContext(FIELD_NAME, __scopeForm);
+    const validity = validationContext.getFieldValidity(name);
+    const id = useId();
+    return /* @__PURE__ */ jsx(FormFieldProvider, { scope: __scopeForm, id, name, serverInvalid, children: /* @__PURE__ */ jsx(
+      Primitive.div,
       {
-        "data-valid": J(d, a),
-        "data-invalid": Q(d, a),
-        ...l,
-        ref: t
+        "data-valid": getValidAttribute(validity, serverInvalid),
+        "data-invalid": getInvalidAttribute(validity, serverInvalid),
+        ...fieldProps,
+        ref: forwardedRef
       }
     ) });
   }
 );
-$.displayName = Y;
-var j = "FormLabel", Fe = r.forwardRef(
-  (e, t) => {
-    const { __scopeForm: o, ...i } = e, a = V(j, o), l = N(j, o), f = i.htmlFor || l.id, d = a.getFieldValidity(l.name);
-    return /* @__PURE__ */ C(
-      ue,
+FormField.displayName = FIELD_NAME;
+var LABEL_NAME = "FormLabel";
+var FormLabel = React.forwardRef(
+  (props, forwardedRef) => {
+    const { __scopeForm, ...labelProps } = props;
+    const validationContext = useValidationContext(LABEL_NAME, __scopeForm);
+    const fieldContext = useFormFieldContext(LABEL_NAME, __scopeForm);
+    const htmlFor = labelProps.htmlFor || fieldContext.id;
+    const validity = validationContext.getFieldValidity(fieldContext.name);
+    return /* @__PURE__ */ jsx(
+      Label,
       {
-        "data-valid": J(d, l.serverInvalid),
-        "data-invalid": Q(d, l.serverInvalid),
-        ...i,
-        ref: t,
-        htmlFor: f
+        "data-valid": getValidAttribute(validity, fieldContext.serverInvalid),
+        "data-invalid": getInvalidAttribute(validity, fieldContext.serverInvalid),
+        ...labelProps,
+        ref: forwardedRef,
+        htmlFor
       }
     );
   }
 );
-Fe.displayName = j;
-var w = "FormControl", ee = r.forwardRef(
-  (e, t) => {
-    const { __scopeForm: o, ...i } = e, a = V(w, o), l = N(w, o), f = X(w, o), d = r.useRef(null), v = q(t, d), m = i.name || l.name, p = i.id || l.id, _ = a.getFieldCustomMatcherEntries(m), { onFieldValidityChange: F, onFieldCustomErrorsChange: E, onFieldValiditionClear: b } = a, M = r.useCallback(
-      async (n) => {
-        if (se(n.validity)) {
-          const c = O(n.validity);
-          F(m, c);
+FormLabel.displayName = LABEL_NAME;
+var CONTROL_NAME = "FormControl";
+var FormControl = React.forwardRef(
+  (props, forwardedRef) => {
+    const { __scopeForm, ...controlProps } = props;
+    const validationContext = useValidationContext(CONTROL_NAME, __scopeForm);
+    const fieldContext = useFormFieldContext(CONTROL_NAME, __scopeForm);
+    const ariaDescriptionContext = useAriaDescriptionContext(CONTROL_NAME, __scopeForm);
+    const ref = React.useRef(null);
+    const composedRef = useComposedRefs(forwardedRef, ref);
+    const name = controlProps.name || fieldContext.name;
+    const id = controlProps.id || fieldContext.id;
+    const customMatcherEntries = validationContext.getFieldCustomMatcherEntries(name);
+    const { onFieldValidityChange, onFieldCustomErrorsChange, onFieldValiditionClear } = validationContext;
+    const updateControlValidity = React.useCallback(
+      async (control) => {
+        if (hasBuiltInError(control.validity)) {
+          const controlValidity2 = validityStateToObject(control.validity);
+          onFieldValidityChange(name, controlValidity2);
           return;
         }
-        const h = n.form ? new FormData(n.form) : new FormData(), I = [n.value, h], R = [], S = [];
-        _.forEach((c) => {
-          _e(c, I) ? S.push(c) : Ae(c) && R.push(c);
+        const formData = control.form ? new FormData(control.form) : new FormData();
+        const matcherArgs = [control.value, formData];
+        const syncCustomMatcherEntries = [];
+        const ayncCustomMatcherEntries = [];
+        customMatcherEntries.forEach((customMatcherEntry) => {
+          if (isAsyncCustomMatcherEntry(customMatcherEntry, matcherArgs)) {
+            ayncCustomMatcherEntries.push(customMatcherEntry);
+          } else if (isSyncCustomMatcherEntry(customMatcherEntry)) {
+            syncCustomMatcherEntries.push(customMatcherEntry);
+          }
+        });
+        const syncCustomErrors = syncCustomMatcherEntries.map(({ id: id2, match }) => {
+          return [id2, match(...matcherArgs)];
         });
-        const B = R.map(({ id: c, match: y }) => [c, y(...I)]), D = Object.fromEntries(B), k = Object.values(D).some(Boolean), s = k;
-        n.setCustomValidity(s ? x : "");
-        const u = O(n.validity);
-        if (F(m, u), E(m, D), !k && S.length > 0) {
-          const c = S.map(
-            ({ id: ce, match: le }) => le(...I).then((de) => [ce, de])
-          ), y = await Promise.all(c), W = Object.fromEntries(y), ae = Object.values(W).some(Boolean);
-          n.setCustomValidity(ae ? x : "");
-          const ie = O(n.validity);
-          F(m, ie), E(m, W);
+        const syncCustomErrorsById = Object.fromEntries(syncCustomErrors);
+        const hasSyncCustomErrors = Object.values(syncCustomErrorsById).some(Boolean);
+        const hasCustomError = hasSyncCustomErrors;
+        control.setCustomValidity(hasCustomError ? DEFAULT_INVALID_MESSAGE : "");
+        const controlValidity = validityStateToObject(control.validity);
+        onFieldValidityChange(name, controlValidity);
+        onFieldCustomErrorsChange(name, syncCustomErrorsById);
+        if (!hasSyncCustomErrors && ayncCustomMatcherEntries.length > 0) {
+          const promisedCustomErrors = ayncCustomMatcherEntries.map(
+            ({ id: id2, match }) => match(...matcherArgs).then((matches) => [id2, matches])
+          );
+          const asyncCustomErrors = await Promise.all(promisedCustomErrors);
+          const asyncCustomErrorsById = Object.fromEntries(asyncCustomErrors);
+          const hasAsyncCustomErrors = Object.values(asyncCustomErrorsById).some(Boolean);
+          const hasCustomError2 = hasAsyncCustomErrors;
+          control.setCustomValidity(hasCustomError2 ? DEFAULT_INVALID_MESSAGE : "");
+          const controlValidity2 = validityStateToObject(control.validity);
+          onFieldValidityChange(name, controlValidity2);
+          onFieldCustomErrorsChange(name, asyncCustomErrorsById);
         }
       },
-      [_, m, E, F]
+      [customMatcherEntries, name, onFieldCustomErrorsChange, onFieldValidityChange]
     );
-    r.useEffect(() => {
-      const n = d.current;
-      if (n) {
-        const h = () => M(n);
-        return n.addEventListener("change", h), () => n.removeEventListener("change", h);
+    React.useEffect(() => {
+      const control = ref.current;
+      if (control) {
+        const handleChange = () => updateControlValidity(control);
+        control.addEventListener("change", handleChange);
+        return () => control.removeEventListener("change", handleChange);
+      }
+    }, [updateControlValidity]);
+    const resetControlValidity = React.useCallback(() => {
+      const control = ref.current;
+      if (control) {
+        control.setCustomValidity("");
+        onFieldValiditionClear(name);
+      }
+    }, [name, onFieldValiditionClear]);
+    React.useEffect(() => {
+      var _a;
+      const form = (_a = ref.current) == null ? void 0 : _a.form;
+      if (form) {
+        form.addEventListener("reset", resetControlValidity);
+        return () => form.removeEventListener("reset", resetControlValidity);
       }
-    }, [M]);
-    const g = r.useCallback(() => {
-      const n = d.current;
-      n && (n.setCustomValidity(""), b(m));
-    }, [m, b]);
-    r.useEffect(() => {
-      var h;
-      const n = (h = d.current) == null ? void 0 : h.form;
-      if (n)
-        return n.addEventListener("reset", g), () => n.removeEventListener("reset", g);
-    }, [g]), r.useEffect(() => {
-      const n = d.current, h = n == null ? void 0 : n.closest("form");
-      if (h && l.serverInvalid) {
-        const I = ne(h);
-        I === n && I.focus();
+    }, [resetControlValidity]);
+    React.useEffect(() => {
+      const control = ref.current;
+      const form = control == null ? void 0 : control.closest("form");
+      if (form && fieldContext.serverInvalid) {
+        const firstInvalidControl = getFirstInvalidControl(form);
+        if (firstInvalidControl === control) firstInvalidControl.focus();
       }
-    }, [l.serverInvalid]);
-    const A = a.getFieldValidity(m);
-    return /* @__PURE__ */ C(
-      P.input,
+    }, [fieldContext.serverInvalid]);
+    const validity = validationContext.getFieldValidity(name);
+    return /* @__PURE__ */ jsx(
+      Primitive.input,
       {
-        "data-valid": J(A, l.serverInvalid),
-        "data-invalid": Q(A, l.serverInvalid),
-        "aria-invalid": l.serverInvalid ? !0 : void 0,
-        "aria-describedby": f.getFieldDescription(m),
+        "data-valid": getValidAttribute(validity, fieldContext.serverInvalid),
+        "data-invalid": getInvalidAttribute(validity, fieldContext.serverInvalid),
+        "aria-invalid": fieldContext.serverInvalid ? true : void 0,
+        "aria-describedby": ariaDescriptionContext.getFieldDescription(name),
         title: "",
-        ...i,
-        ref: v,
-        id: p,
-        name: m,
-        onInvalid: T(e.onInvalid, (n) => {
-          const h = n.currentTarget;
-          M(h);
+        ...controlProps,
+        ref: composedRef,
+        id,
+        name,
+        onInvalid: composeEventHandlers(props.onInvalid, (event) => {
+          const control = event.currentTarget;
+          updateControlValidity(control);
         }),
-        onChange: T(e.onChange, (n) => {
-          g();
+        onChange: composeEventHandlers(props.onChange, (event) => {
+          resetControlValidity();
         })
       }
     );
   }
 );
-ee.displayName = w;
-var x = "This value is not valid", Ee = {
-  badInput: x,
+FormControl.displayName = CONTROL_NAME;
+var DEFAULT_INVALID_MESSAGE = "This value is not valid";
+var DEFAULT_BUILT_IN_MESSAGES = {
+  badInput: DEFAULT_INVALID_MESSAGE,
   patternMismatch: "This value does not match the required pattern",
   rangeOverflow: "This value is too large",
   rangeUnderflow: "This value is too small",
@@ -216,101 +289,159 @@ var x = "This value is not valid", Ee = {
   typeMismatch: "This value does not match the required type",
   valid: void 0,
   valueMissing: "This value is missing"
-}, L = "FormMessage", te = r.forwardRef(
-  (e, t) => {
-    const { match: o, name: i, ...a } = e, l = N(L, e.__scopeForm), f = i ?? l.name;
-    return o === void 0 ? /* @__PURE__ */ C(z, { ...a, ref: t, name: f, children: e.children || x }) : typeof o == "function" ? /* @__PURE__ */ C(ge, { match: o, ...a, ref: t, name: f }) : /* @__PURE__ */ C(ye, { match: o, ...a, ref: t, name: f });
+};
+var MESSAGE_NAME = "FormMessage";
+var FormMessage = React.forwardRef(
+  (props, forwardedRef) => {
+    const { match, name: nameProp, ...messageProps } = props;
+    const fieldContext = useFormFieldContext(MESSAGE_NAME, props.__scopeForm);
+    const name = nameProp ?? fieldContext.name;
+    if (match === void 0) {
+      return /* @__PURE__ */ jsx(FormMessageImpl, { ...messageProps, ref: forwardedRef, name, children: props.children || DEFAULT_INVALID_MESSAGE });
+    } else if (typeof match === "function") {
+      return /* @__PURE__ */ jsx(FormCustomMessage, { match, ...messageProps, ref: forwardedRef, name });
+    } else {
+      return /* @__PURE__ */ jsx(FormBuiltInMessage, { match, ...messageProps, ref: forwardedRef, name });
+    }
   }
 );
-te.displayName = L;
-var ye = r.forwardRef(
-  (e, t) => {
-    const { match: o, forceMatch: i = !1, name: a, children: l, ...f } = e, v = V(L, f.__scopeForm).getFieldValidity(a);
-    return i || (v == null ? void 0 : v[o]) ? /* @__PURE__ */ C(z, { ref: t, ...f, name: a, children: l ?? Ee[o] }) : null;
+FormMessage.displayName = MESSAGE_NAME;
+var FormBuiltInMessage = React.forwardRef(
+  (props, forwardedRef) => {
+    const { match, forceMatch = false, name, children, ...messageProps } = props;
+    const validationContext = useValidationContext(MESSAGE_NAME, messageProps.__scopeForm);
+    const validity = validationContext.getFieldValidity(name);
+    const matches = forceMatch || (validity == null ? void 0 : validity[match]);
+    if (matches) {
+      return /* @__PURE__ */ jsx(FormMessageImpl, { ref: forwardedRef, ...messageProps, name, children: children ?? DEFAULT_BUILT_IN_MESSAGES[match] });
+    }
+    return null;
   }
-), ge = r.forwardRef(
-  (e, t) => {
-    const { match: o, forceMatch: i = !1, name: a, id: l, children: f, ...d } = e, v = V(L, d.__scopeForm), m = r.useRef(null), p = q(t, m), _ = G(), F = l ?? _, E = r.useMemo(() => ({ id: F, match: o }), [F, o]), { onFieldCustomMatcherEntryAdd: b, onFieldCustomMatcherEntryRemove: M } = v;
-    r.useEffect(() => (b(a, E), () => M(a, E.id)), [E, a, b, M]);
-    const g = v.getFieldValidity(a), n = v.getFieldCustomErrors(a)[F];
-    return i || g && !se(g) && n ? /* @__PURE__ */ C(z, { id: F, ref: p, ...d, name: a, children: f ?? x }) : null;
+);
+var FormCustomMessage = React.forwardRef(
+  (props, forwardedRef) => {
+    const { match, forceMatch = false, name, id: idProp, children, ...messageProps } = props;
+    const validationContext = useValidationContext(MESSAGE_NAME, messageProps.__scopeForm);
+    const ref = React.useRef(null);
+    const composedRef = useComposedRefs(forwardedRef, ref);
+    const _id = useId();
+    const id = idProp ?? _id;
+    const customMatcherEntry = React.useMemo(() => ({ id, match }), [id, match]);
+    const { onFieldCustomMatcherEntryAdd, onFieldCustomMatcherEntryRemove } = validationContext;
+    React.useEffect(() => {
+      onFieldCustomMatcherEntryAdd(name, customMatcherEntry);
+      return () => onFieldCustomMatcherEntryRemove(name, customMatcherEntry.id);
+    }, [customMatcherEntry, name, onFieldCustomMatcherEntryAdd, onFieldCustomMatcherEntryRemove]);
+    const validity = validationContext.getFieldValidity(name);
+    const customErrors = validationContext.getFieldCustomErrors(name);
+    const hasMatchingCustomError = customErrors[id];
+    const matches = forceMatch || validity && !hasBuiltInError(validity) && hasMatchingCustomError;
+    if (matches) {
+      return /* @__PURE__ */ jsx(FormMessageImpl, { id, ref: composedRef, ...messageProps, name, children: children ?? DEFAULT_INVALID_MESSAGE });
+    }
+    return null;
   }
-), z = r.forwardRef(
-  (e, t) => {
-    const { __scopeForm: o, id: i, name: a, ...l } = e, f = X(L, o), d = G(), v = i ?? d, { onFieldMessageIdAdd: m, onFieldMessageIdRemove: p } = f;
-    return r.useEffect(() => (m(a, v), () => p(a, v)), [a, v, m, p]), /* @__PURE__ */ C(P.span, { id: v, ...l, ref: t });
+);
+var FormMessageImpl = React.forwardRef(
+  (props, forwardedRef) => {
+    const { __scopeForm, id: idProp, name, ...messageProps } = props;
+    const ariaDescriptionContext = useAriaDescriptionContext(MESSAGE_NAME, __scopeForm);
+    const _id = useId();
+    const id = idProp ?? _id;
+    const { onFieldMessageIdAdd, onFieldMessageIdRemove } = ariaDescriptionContext;
+    React.useEffect(() => {
+      onFieldMessageIdAdd(name, id);
+      return () => onFieldMessageIdRemove(name, id);
+    }, [name, id, onFieldMessageIdAdd, onFieldMessageIdRemove]);
+    return /* @__PURE__ */ jsx(Primitive.span, { id, ...messageProps, ref: forwardedRef });
   }
-), U = "FormValidityState", oe = (e) => {
-  const { __scopeForm: t, name: o, children: i } = e, a = V(U, t), l = N(U, t), f = o ?? l.name, d = a.getFieldValidity(f);
-  return /* @__PURE__ */ C(fe, { children: i(d) });
+);
+var VALIDITY_STATE_NAME = "FormValidityState";
+var FormValidityState = (props) => {
+  const { __scopeForm, name: nameProp, children } = props;
+  const validationContext = useValidationContext(VALIDITY_STATE_NAME, __scopeForm);
+  const fieldContext = useFormFieldContext(VALIDITY_STATE_NAME, __scopeForm);
+  const name = nameProp ?? fieldContext.name;
+  const validity = validationContext.getFieldValidity(name);
+  return /* @__PURE__ */ jsx(Fragment, { children: children(validity) });
 };
-oe.displayName = U;
-var pe = "FormSubmit", re = r.forwardRef(
-  (e, t) => {
-    const { __scopeForm: o, ...i } = e;
-    return /* @__PURE__ */ C(P.button, { type: "submit", ...i, ref: t });
+FormValidityState.displayName = VALIDITY_STATE_NAME;
+var SUBMIT_NAME = "FormSubmit";
+var FormSubmit = React.forwardRef(
+  (props, forwardedRef) => {
+    const { __scopeForm, ...submitProps } = props;
+    return /* @__PURE__ */ jsx(Primitive.button, { type: "submit", ...submitProps, ref: forwardedRef });
   }
 );
-re.displayName = pe;
-function O(e) {
-  const t = {};
-  for (const o in e)
-    t[o] = e[o];
-  return t;
+FormSubmit.displayName = SUBMIT_NAME;
+function validityStateToObject(validity) {
+  const object = {};
+  for (const key in validity) {
+    object[key] = validity[key];
+  }
+  return object;
 }
-function Me(e) {
-  return e instanceof HTMLElement;
+function isHTMLElement(element) {
+  return element instanceof HTMLElement;
 }
-function Ie(e) {
-  return "validity" in e;
+function isFormControl(element) {
+  return "validity" in element;
 }
-function be(e) {
-  return Ie(e) && (e.validity.valid === !1 || e.getAttribute("aria-invalid") === "true");
+function isInvalid(control) {
+  return isFormControl(control) && (control.validity.valid === false || control.getAttribute("aria-invalid") === "true");
 }
-function ne(e) {
-  const t = e.elements, [o] = Array.from(t).filter(Me).filter(be);
-  return o;
+function getFirstInvalidControl(form) {
+  const elements = form.elements;
+  const [firstInvalidControl] = Array.from(elements).filter(isHTMLElement).filter(isInvalid);
+  return firstInvalidControl;
 }
-function _e(e, t) {
-  return e.match.constructor.name === "AsyncFunction" || Se(e.match, t);
+function isAsyncCustomMatcherEntry(entry, args) {
+  return entry.match.constructor.name === "AsyncFunction" || returnsPromise(entry.match, args);
 }
-function Ae(e) {
-  return e.match.constructor.name === "Function";
+function isSyncCustomMatcherEntry(entry) {
+  return entry.match.constructor.name === "Function";
 }
-function Se(e, t) {
-  return e(...t) instanceof Promise;
+function returnsPromise(func, args) {
+  return func(...args) instanceof Promise;
 }
-function se(e) {
-  let t = !1;
-  for (const o in e) {
-    const i = o;
-    if (i !== "valid" && i !== "customError" && e[i]) {
-      t = !0;
+function hasBuiltInError(validity) {
+  let error = false;
+  for (const validityKey in validity) {
+    const key = validityKey;
+    if (key !== "valid" && key !== "customError" && validity[key]) {
+      error = true;
       break;
     }
   }
-  return t;
+  return error;
 }
-function J(e, t) {
-  if ((e == null ? void 0 : e.valid) === !0 && !t) return !0;
+function getValidAttribute(validity, serverInvalid) {
+  if ((validity == null ? void 0 : validity.valid) === true && !serverInvalid) return true;
+  return void 0;
 }
-function Q(e, t) {
-  if ((e == null ? void 0 : e.valid) === !1 || t) return !0;
+function getInvalidAttribute(validity, serverInvalid) {
+  if ((validity == null ? void 0 : validity.valid) === false || serverInvalid) return true;
+  return void 0;
 }
-var Ne = Z, Be = $, Oe = ee, je = te, Ue = oe, qe = re;
+var Root = Form;
+var Field = FormField;
+var Control = FormControl;
+var Message = FormMessage;
+var ValidityState = FormValidityState;
+var Submit = FormSubmit;
 export {
-  Oe as Control,
-  Be as Field,
-  Z as Form,
-  ee as FormControl,
-  $ as FormField,
-  Fe as FormLabel,
-  te as FormMessage,
-  re as FormSubmit,
-  oe as FormValidityState,
-  je as Message,
-  Ne as Root,
-  qe as Submit,
-  Ue as ValidityState,
-  we as createFormScope
+  Control,
+  Field,
+  Form,
+  FormControl,
+  FormField,
+  FormLabel,
+  FormMessage,
+  FormSubmit,
+  FormValidityState,
+  Message,
+  Root,
+  Submit,
+  ValidityState,
+  createFormScope
 };