formstand 0.4.0 → 0.5.0

package/dist/index.d.cts

@@ -85,7 +85,7 @@ type SubmitResult<TOutput> = Readonly<{
     kind: "error";
     error: unknown;
 }>;
-type ArrayItemOf<T> = T extends readonly (infer U)[] ? U : never;
+type ArrayItemOf$1<T> = T extends readonly (infer U)[] ? U : never;
 type ErrorPath<TValues> = FieldPath<TValues> | "";
 type ResetOptions = Readonly<{
     keepErrors?: boolean;
@@ -129,9 +129,9 @@ type Form<TSchema extends z.ZodType> = Readonly<{
     validateFieldAsync: (path: ErrorPath<z.input<TSchema>>) => Promise<FieldValidationResult>;
     validateFieldsAsync: (paths: readonly FieldPath<z.input<TSchema>>[]) => Promise<boolean>;
     submit: (onValid: SubmitHandler<TSchema>, onInvalid?: InvalidSubmitHandler, options?: SubmitOptions) => Promise<SubmitResult<z.output<TSchema>>>;
-    arrayPush: <P extends FieldPath<z.input<TSchema>>>(path: P, item: ArrayItemOf<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
+    arrayPush: <P extends FieldPath<z.input<TSchema>>>(path: P, item: ArrayItemOf$1<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
     arrayRemove: (path: FieldPath<z.input<TSchema>>, index: number) => void;
-    arrayInsert: <P extends FieldPath<z.input<TSchema>>>(path: P, index: number, item: ArrayItemOf<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
+    arrayInsert: <P extends FieldPath<z.input<TSchema>>>(path: P, index: number, item: ArrayItemOf$1<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
     arrayMove: (path: FieldPath<z.input<TSchema>>, from: number, to: number) => void;
     arraySwap: (path: FieldPath<z.input<TSchema>>, a: number, b: number) => void;
     handleSubmit: (onValid: SubmitHandler<TSchema>, onInvalid?: InvalidSubmitHandler, options?: SubmitOptions) => (event?: {
@@ -288,7 +288,12 @@ type UseFieldArrayReturn<TItem> = Readonly<{
     move: (from: number, to: number) => void;
     swap: (a: number, b: number) => void;
 }>;
-declare const useFieldArray: <TItem = unknown>(form: FieldArrayFormApi, pathArg: string | ((state: FormState<unknown>) => string)) => UseFieldArrayReturn<TItem>;
+type ArrayItemOf<T> = [NonNullable<T>] extends [readonly (infer U)[]] ? U : never;
+declare function useFieldArray<TSchema extends z.ZodType>(form: Form<TSchema>, pathSelector: (state: FormState<z.input<TSchema>>) => string): UseFieldArrayReturn<unknown>;
+declare function useFieldArray<TItem = unknown>(form: FieldArrayFormApi & {
+    readonly schema?: undefined;
+}, path: string | ((state: FormState<unknown>) => string)): UseFieldArrayReturn<TItem>;
+declare function useFieldArray<TSchema extends z.ZodType, P extends FieldPath<z.input<TSchema>>>(form: Form<TSchema>, path: P): UseFieldArrayReturn<ArrayItemOf<FieldValue<z.input<TSchema>, P>>>;
 
 type TextInputProps = Readonly<{
     name: string;

package/dist/index.d.ts

@@ -85,7 +85,7 @@ type SubmitResult<TOutput> = Readonly<{
     kind: "error";
     error: unknown;
 }>;
-type ArrayItemOf<T> = T extends readonly (infer U)[] ? U : never;
+type ArrayItemOf$1<T> = T extends readonly (infer U)[] ? U : never;
 type ErrorPath<TValues> = FieldPath<TValues> | "";
 type ResetOptions = Readonly<{
     keepErrors?: boolean;
@@ -129,9 +129,9 @@ type Form<TSchema extends z.ZodType> = Readonly<{
     validateFieldAsync: (path: ErrorPath<z.input<TSchema>>) => Promise<FieldValidationResult>;
     validateFieldsAsync: (paths: readonly FieldPath<z.input<TSchema>>[]) => Promise<boolean>;
     submit: (onValid: SubmitHandler<TSchema>, onInvalid?: InvalidSubmitHandler, options?: SubmitOptions) => Promise<SubmitResult<z.output<TSchema>>>;
-    arrayPush: <P extends FieldPath<z.input<TSchema>>>(path: P, item: ArrayItemOf<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
+    arrayPush: <P extends FieldPath<z.input<TSchema>>>(path: P, item: ArrayItemOf$1<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
     arrayRemove: (path: FieldPath<z.input<TSchema>>, index: number) => void;
-    arrayInsert: <P extends FieldPath<z.input<TSchema>>>(path: P, index: number, item: ArrayItemOf<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
+    arrayInsert: <P extends FieldPath<z.input<TSchema>>>(path: P, index: number, item: ArrayItemOf$1<NonNullable<FieldValue<z.input<TSchema>, P>>>) => void;
     arrayMove: (path: FieldPath<z.input<TSchema>>, from: number, to: number) => void;
     arraySwap: (path: FieldPath<z.input<TSchema>>, a: number, b: number) => void;
     handleSubmit: (onValid: SubmitHandler<TSchema>, onInvalid?: InvalidSubmitHandler, options?: SubmitOptions) => (event?: {
@@ -288,7 +288,12 @@ type UseFieldArrayReturn<TItem> = Readonly<{
     move: (from: number, to: number) => void;
     swap: (a: number, b: number) => void;
 }>;
-declare const useFieldArray: <TItem = unknown>(form: FieldArrayFormApi, pathArg: string | ((state: FormState<unknown>) => string)) => UseFieldArrayReturn<TItem>;
+type ArrayItemOf<T> = [NonNullable<T>] extends [readonly (infer U)[]] ? U : never;
+declare function useFieldArray<TSchema extends z.ZodType>(form: Form<TSchema>, pathSelector: (state: FormState<z.input<TSchema>>) => string): UseFieldArrayReturn<unknown>;
+declare function useFieldArray<TItem = unknown>(form: FieldArrayFormApi & {
+    readonly schema?: undefined;
+}, path: string | ((state: FormState<unknown>) => string)): UseFieldArrayReturn<TItem>;
+declare function useFieldArray<TSchema extends z.ZodType, P extends FieldPath<z.input<TSchema>>>(form: Form<TSchema>, path: P): UseFieldArrayReturn<ArrayItemOf<FieldValue<z.input<TSchema>, P>>>;
 
 type TextInputProps = Readonly<{
     name: string;

package/dist/index.js

@@ -272,6 +272,7 @@ var dirtyPathsOf = (values, initial, prefix) => {
   return [prefix];
 };
 var FORM_SEQ_KEY = "__form__";
+var SUBMIT_SEQ_KEY = "__submit__";
 var stringArraysEqual = (a, b) => a === b || a.length === b.length && a.every((v, i) => v === b[i]);
 var reuseErrorRefs = (next, prev) => {
   if (next === prev) return prev;
@@ -464,19 +465,18 @@ var createForm = (schema, options) => {
     };
   };
   const sequences = /* @__PURE__ */ new Map();
-  const seqRef = { current: 0 };
-  const nextSeq = (key) => {
-    seqRef.current += 1;
-    sequences.set(key, seqRef.current);
-    return seqRef.current;
+  const claimPass = (key) => {
+    const pass = Symbol(key);
+    sequences.set(key, pass);
+    return pass;
   };
   const validateAsyncOnForm = async () => {
-    const seq = nextSeq(FORM_SEQ_KEY);
+    const pass = claimPass(FORM_SEQ_KEY);
     const valuesAtStart = store.getState().values;
     store.setState((state) => ({ ...state, isValidatingForm: true }));
     const result = await validateAsync(schema, valuesAtStart);
     const live = store.getState();
-    const stillOwns = sequences.get(FORM_SEQ_KEY) === seq;
+    const stillOwns = sequences.get(FORM_SEQ_KEY) === pass;
     if (!stillOwns || live.values !== valuesAtStart) {
       if (stillOwns) {
         store.setState((state) => ({ ...state, isValidatingForm: false }));
@@ -499,7 +499,7 @@ var createForm = (schema, options) => {
       const result2 = await validateAsyncOnForm();
       return result2.kind === "valid";
     }
-    const seqs = new Map(paths.map((p) => [p, nextSeq(p)]));
+    const passes = new Map(paths.map((p) => [p, claimPass(p)]));
     const valuesAtStart = store.getState().values;
     store.setState((state) => ({
       ...state,
@@ -514,7 +514,9 @@ var createForm = (schema, options) => {
       (k) => !inScopeOfAny(k, paths)
     );
     const live = store.getState();
-    const stillCurrent = paths.filter((p) => sequences.get(p) === seqs.get(p));
+    const stillCurrent = paths.filter(
+      (p) => sequences.get(p) === passes.get(p)
+    );
     if (live.values !== valuesAtStart) {
       if (stillCurrent.length > 0) {
         store.setState((state) => ({
@@ -555,7 +557,7 @@ var createForm = (schema, options) => {
         result.kind === "invalid" ? result.errors : emptyErrors
       );
     }
-    const seq = nextSeq(path);
+    const pass = claimPass(path);
     const valuesAtStart = store.getState().values;
     store.setState((state) => ({
       ...state,
@@ -563,7 +565,7 @@ var createForm = (schema, options) => {
     }));
     const scoped = await scopedFieldErrorsAsync(path, valuesAtStart);
     const live = store.getState();
-    const stillOwns = sequences.get(path) === seq;
+    const stillOwns = sequences.get(path) === pass;
     if (!stillOwns || live.values !== valuesAtStart) {
       if (stillOwns) {
         store.setState((state) => ({
@@ -642,11 +644,12 @@ var createForm = (schema, options) => {
       submitCount: state.submitCount + 1
     }));
     try {
+      const pass = claimPass(SUBMIT_SEQ_KEY);
       const valuesAtStart = store.getState().values;
       const result = await validateAsync(schema, valuesAtStart);
-      const staleValues = store.getState().values !== valuesAtStart;
+      const stale = sequences.get(SUBMIT_SEQ_KEY) !== pass || store.getState().values !== valuesAtStart;
       if (result.kind === "invalid") {
-        if (!staleValues) {
+        if (!stale) {
           store.setState((state) => {
             const committed = commitFullPass(state, result.errors);
             return {
@@ -664,11 +667,11 @@ var createForm = (schema, options) => {
             };
           });
         }
-        const merged = staleValues ? result.errors : store.getState().errors;
+        const merged = stale ? result.errors : store.getState().errors;
         onInvalid?.(merged);
         return { kind: "invalid", errors: merged };
       }
-      if (!staleValues) {
+      if (!stale) {
         store.setState((state) => ({
           ...state,
           ...commitFullPass(state, emptyErrors)
@@ -921,7 +924,13 @@ var createForm = (schema, options) => {
         errors: reuseErrorRefs(
           mergeErrorChannels(schemaErrors, serverErrors),
           snap.errors ?? emptyErrors
-        )
+        ),
+        // In-flight state is owned by live passes, never by snapshots: a
+        // snapshotted flag has no pass left to clear it (the pass that set
+        // it cleared its ORIGINAL entry when it settled), so restoring one
+        // would stick it forever.
+        isValidating: emptyBools,
+        isValidatingForm: false
       };
     })
   });
@@ -1077,7 +1086,10 @@ function useField(form, pathArg, options) {
     [form, path]
   );
   const setError = useCallback(
-    (errors) => form.setError(path, errors),
+    // Normalize the string shorthand HERE, before forwarding: custom
+    // FieldFormApi implementations written against the pre-0.4 surface are
+    // typed for readonly string[] and must never receive a bare string.
+    (errors) => form.setError(path, typeof errors === "string" ? [errors] : errors),
     [form, path]
   );
   const clearError = useCallback(
@@ -1346,9 +1358,14 @@ var focusableControls = (scope) => [
 ].filter(
   (el) => !el.matches(':disabled, [type="hidden"]') && el.closest("dialog:not([open])") === null
 );
+var holdsFocus = (el) => {
+  const rootNode = el.getRootNode();
+  const active = rootNode instanceof Document || rootNode instanceof ShadowRoot ? rootNode.activeElement : document.activeElement;
+  return active === el;
+};
 var focusFirstOf = (candidates) => candidates.some((el) => {
   el.focus();
-  return document.activeElement === el;
+  return holdsFocus(el);
 });
 var nameMatchesAny = (el, paths) => {
   const name = el.getAttribute("name");
@@ -1368,11 +1385,10 @@ var focusFirstError = (errors, root) => {
   const candidates = fieldMatches.length > 0 ? fieldMatches : rootFallbackApplies ? controls : [];
   return focusFirstOf(candidates);
 };
-var focusField = (path, root) => focusFirstOf(
-  focusableControls(root ?? document).filter(
-    (el) => nameMatchesAny(el, [path])
-  )
-);
+var focusField = (path, root) => {
+  const controls = focusableControls(root ?? document);
+  return path === "" ? (root !== void 0 || document.querySelectorAll("form").length <= 1) && focusFirstOf(controls) : focusFirstOf(controls.filter((el) => nameMatchesAny(el, [path])));
+};
 var EMPTY_ID_STATE = { items: [], ids: [], counter: 0 };
 var EMPTY_ITEMS = [];
 var reconcileIds = (prev, nextItems) => {
@@ -1411,7 +1427,7 @@ var reconcileIds = (prev, nextItems) => {
     counter: prev.counter + Math.max(0, unmatched - leftover.length)
   };
 };
-var useFieldArray = (form, pathArg) => {
+function useFieldArray(form, pathArg) {
   const path = useStore(
     form.store,
     (state) => typeof pathArg === "function" ? pathArg(state) : pathArg
@@ -1476,7 +1492,7 @@ var useFieldArray = (form, pathArg) => {
     }),
     [fields, items, error, push, remove, insert, move, swap]
   );
-};
+}
 
 export { CheckboxField, NumberField, SelectField, TextField, checkboxProps, createForm, createFormContext, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, isAsyncRequiredError, numberInputProps, numberToInputText, parseNumberText, parsePath, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useIsDirty, useIsSubmitting, useIsValid, useSubmitCount, validateAsync, validateSync };
 //# sourceMappingURL=index.js.map