formstand 0.11.0 → 0.13.0

package/dist/index.d.cts

@@ -255,10 +255,17 @@ type UseFieldReturn<TValue> = Readonly<{
     validateAsync: () => Promise<FieldValidationResult>;
     onBlur: () => void;
 }>;
+declare const inferredCallsOnly$2: unique symbol;
+interface InferredTypeArg$2 {
+    readonly [inferredCallsOnly$2]: typeof inferredCallsOnly$2;
+}
 declare function useField<TSchema extends z.ZodType>(form: FieldFormApi & Readonly<{
     schema: TSchema;
     store: ReadonlyStore$2<FormState<z.input<TSchema>>>;
 }>, pathSelector: (state: FormState<z.input<TSchema>>) => string, options?: UseFieldOptions): UseFieldReturn<unknown>;
+declare function useField<TValue = InferredTypeArg$2>(form: FieldFormApi & Readonly<{
+    schema: z.ZodType;
+}>, path: TValue extends InferredTypeArg$2 ? never : "Remove the explicit type argument: a schema-typed form infers the value type from the path", options?: UseFieldOptions): UseFieldReturn<TValue>;
 declare function useField<TValue = unknown>(form: FieldFormApi & {
     readonly schema?: undefined;
 }, path: FieldPathArg<unknown>, options?: UseFieldOptions): UseFieldReturn<TValue>;
@@ -269,10 +276,17 @@ type CommonKeys<V> = keyof V;
 type AllKeys<V> = V extends unknown ? keyof V : never;
 type VariantKeys<V> = Exclude<AllKeys<V>, CommonKeys<V>> & string;
 type UnionValueAt<TValues, P extends string> = P extends keyof TValues ? NonNullable<TValues[P]> : P extends `${infer Head}.${infer Tail}` ? Head extends keyof TValues ? UnionValueAt<NonNullable<TValues[Head]>, Tail> : never : never;
-declare function useVariantField<TSchema extends z.ZodType, P extends string, TField extends VariantKeys<UnionValueAt<z.input<TSchema>, P>>, D extends PathDepth = DefaultPathDepth>(form: Form<TSchema, D>, unionPath: P, field: TField): UseFieldReturn<VariantFieldValue<UnionValueAt<z.input<TSchema>, P>, TField> | undefined>;
+declare const inferredCallsOnly$1: unique symbol;
+interface InferredTypeArg$1 {
+    readonly [inferredCallsOnly$1]: typeof inferredCallsOnly$1;
+}
+declare function useVariantField<TValue = InferredTypeArg$1>(form: FieldFormApi & Readonly<{
+    schema: z.ZodType;
+}>, unionPath: TValue extends InferredTypeArg$1 ? never : "Remove the explicit type argument: a schema-typed form infers the variant value from the union path and field", field: string): UseFieldReturn<TValue | undefined>;
 declare function useVariantField<TValue = unknown>(form: FieldFormApi & {
     readonly schema?: undefined;
 }, unionPath: string, field: string): UseFieldReturn<TValue | undefined>;
+declare function useVariantField<TSchema extends z.ZodType, P extends string, TField extends VariantKeys<UnionValueAt<z.input<TSchema>, P>>, D extends PathDepth = DefaultPathDepth>(form: Form<TSchema, D>, unionPath: P, field: TField): UseFieldReturn<VariantFieldValue<UnionValueAt<z.input<TSchema>, P>, TField> | undefined>;
 
 type ReadonlyStore$1<T> = Pick<StoreApi<T>, "getState" | "getInitialState" | "subscribe">;
 type FieldArrayFormApi = Readonly<{
@@ -282,6 +296,7 @@ type FieldArrayFormApi = Readonly<{
     arrayInsert(path: string, index: number, item: unknown): void;
     arrayMove(path: string, from: number, to: number): void;
     arraySwap(path: string, a: number, b: number): void;
+    validateField?(path: string): FieldValidationResult;
 }>;
 type FieldArrayEntry<TItem> = Readonly<{
     id: string;
@@ -299,10 +314,17 @@ type UseFieldArrayReturn<TItem> = Readonly<{
     swap: (a: number, b: number) => void;
 }>;
 type ArrayItemOf<T> = [NonNullable<T>] extends [readonly (infer U)[]] ? U : never;
+declare const inferredCallsOnly: unique symbol;
+interface InferredTypeArg {
+    readonly [inferredCallsOnly]: typeof inferredCallsOnly;
+}
 declare function useFieldArray<TSchema extends z.ZodType>(form: FieldArrayFormApi & Readonly<{
     schema: TSchema;
     store: ReadonlyStore$1<FormState<z.input<TSchema>>>;
 }>, pathSelector: (state: FormState<z.input<TSchema>>) => string): UseFieldArrayReturn<unknown>;
+declare function useFieldArray<TItem = InferredTypeArg>(form: FieldArrayFormApi & Readonly<{
+    schema: z.ZodType;
+}>, path: TItem extends InferredTypeArg ? never : "Remove the explicit type argument: a schema-typed form infers the item type from the path"): UseFieldArrayReturn<TItem>;
 declare function useFieldArray<TItem = unknown>(form: FieldArrayFormApi & {
     readonly schema?: undefined;
 }, path: FieldPathArg<unknown>): UseFieldArrayReturn<TItem>;
@@ -355,6 +377,11 @@ declare function useFormSelectorShallow<U>(form: FormStateApi & {
     readonly schema?: undefined;
 }, selector: (state: FormState<unknown>) => U): U;
 
+declare function useFormValues<TSchema extends z.ZodType, D extends PathDepth = DefaultPathDepth>(form: Form<TSchema, D>): z.input<TSchema>;
+declare function useFormValues(form: FormStateApi & {
+    readonly schema?: undefined;
+}): unknown;
+
 declare const useFormError: (form: FormStateApi) => readonly string[] | undefined;
 
 declare function useIsDirty(form: FormStateApi & {
@@ -497,4 +524,4 @@ declare const dateInputProps: <T extends Date | null | undefined>(field: UseFiel
 declare const checkboxProps: <T extends boolean | null | undefined>(field: UseFieldReturn<T>) => CheckboxProps;
 declare const selectProps: <T extends string | null | undefined>(field: UseFieldReturn<T>) => SelectProps;
 
-export { type BoolMap, type BoundUseField, type BoundUseFieldArray, type BoundUseFlag, type BoundUseSelector, CheckboxField, type CheckboxFieldProps, type CheckboxProps, type CreateFormOptions, DateField, type DateFieldProps, type DateInputProps, type DefaultPathDepth, type ErrorMap, type FieldArrayEntry, type FieldArrayFormApi, type FieldFormApi, type FieldPath, type FieldPathArg, type FieldRef, type FieldSnapshot, type FieldValidationResult, type FieldValue, type FieldsValidationResult, type Form, type FormContextApi, type FormHooks, type FormProviderProps, type FormState, type FormStateApi, type InvalidSubmitHandler, NumberField, type NumberFieldProps, type NumberInputBinding, type NumberInputProps, type ParsedDateText, type ParsedNumberText, type PathDepth, type PathSegment, type PathsOf, type PersistHandle, type PersistOptions, type PersistStorage, type ReadonlyStoreApi, type ResetOptions, SelectField, type SelectFieldOption, type SelectFieldProps, type SelectProps, type SettledFieldValidationResult, type SettledFieldsValidationResult, type SettledValidationResult, type SubmitHandler, type SubmitOptions, type SubmitResult, TextField, type TextFieldProps, type TextInputProps, type UseFieldArrayReturn, type UseFieldOptions, type UseFieldReturn, type ValidationMode, type ValidationResult, type ValidationTrigger, checkboxProps, createForm, createFormContext, createFormHooks, dateInputProps, dateToInputText, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, hasFieldError, isAsyncRequiredError, numberInputProps, numberToInputText, parseDateText, parseNumberText, parsePath, persistForm, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useIsDirty, useIsSubmitting, useIsValid, useNumberInput, useSubmitCount, useVariantField, validateAsync, validateSync };
+export { type BoolMap, type BoundUseField, type BoundUseFieldArray, type BoundUseFlag, type BoundUseSelector, CheckboxField, type CheckboxFieldProps, type CheckboxProps, type CreateFormOptions, DateField, type DateFieldProps, type DateInputProps, type DefaultPathDepth, type ErrorMap, type FieldArrayEntry, type FieldArrayFormApi, type FieldFormApi, type FieldPath, type FieldPathArg, type FieldRef, type FieldSnapshot, type FieldValidationResult, type FieldValue, type FieldsValidationResult, type Form, type FormContextApi, type FormHooks, type FormProviderProps, type FormState, type FormStateApi, type InvalidSubmitHandler, NumberField, type NumberFieldProps, type NumberInputBinding, type NumberInputProps, type ParsedDateText, type ParsedNumberText, type PathDepth, type PathSegment, type PathsOf, type PersistHandle, type PersistOptions, type PersistStorage, type ReadonlyStoreApi, type ResetOptions, SelectField, type SelectFieldOption, type SelectFieldProps, type SelectProps, type SettledFieldValidationResult, type SettledFieldsValidationResult, type SettledValidationResult, type SubmitHandler, type SubmitOptions, type SubmitResult, TextField, type TextFieldProps, type TextInputProps, type UseFieldArrayReturn, type UseFieldOptions, type UseFieldReturn, type ValidationMode, type ValidationResult, type ValidationTrigger, checkboxProps, createForm, createFormContext, createFormHooks, dateInputProps, dateToInputText, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, hasFieldError, isAsyncRequiredError, numberInputProps, numberToInputText, parseDateText, parseNumberText, parsePath, persistForm, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useFormValues, useIsDirty, useIsSubmitting, useIsValid, useNumberInput, useSubmitCount, useVariantField, validateAsync, validateSync };

package/dist/index.d.ts

@@ -255,10 +255,17 @@ type UseFieldReturn<TValue> = Readonly<{
     validateAsync: () => Promise<FieldValidationResult>;
     onBlur: () => void;
 }>;
+declare const inferredCallsOnly$2: unique symbol;
+interface InferredTypeArg$2 {
+    readonly [inferredCallsOnly$2]: typeof inferredCallsOnly$2;
+}
 declare function useField<TSchema extends z.ZodType>(form: FieldFormApi & Readonly<{
     schema: TSchema;
     store: ReadonlyStore$2<FormState<z.input<TSchema>>>;
 }>, pathSelector: (state: FormState<z.input<TSchema>>) => string, options?: UseFieldOptions): UseFieldReturn<unknown>;
+declare function useField<TValue = InferredTypeArg$2>(form: FieldFormApi & Readonly<{
+    schema: z.ZodType;
+}>, path: TValue extends InferredTypeArg$2 ? never : "Remove the explicit type argument: a schema-typed form infers the value type from the path", options?: UseFieldOptions): UseFieldReturn<TValue>;
 declare function useField<TValue = unknown>(form: FieldFormApi & {
     readonly schema?: undefined;
 }, path: FieldPathArg<unknown>, options?: UseFieldOptions): UseFieldReturn<TValue>;
@@ -269,10 +276,17 @@ type CommonKeys<V> = keyof V;
 type AllKeys<V> = V extends unknown ? keyof V : never;
 type VariantKeys<V> = Exclude<AllKeys<V>, CommonKeys<V>> & string;
 type UnionValueAt<TValues, P extends string> = P extends keyof TValues ? NonNullable<TValues[P]> : P extends `${infer Head}.${infer Tail}` ? Head extends keyof TValues ? UnionValueAt<NonNullable<TValues[Head]>, Tail> : never : never;
-declare function useVariantField<TSchema extends z.ZodType, P extends string, TField extends VariantKeys<UnionValueAt<z.input<TSchema>, P>>, D extends PathDepth = DefaultPathDepth>(form: Form<TSchema, D>, unionPath: P, field: TField): UseFieldReturn<VariantFieldValue<UnionValueAt<z.input<TSchema>, P>, TField> | undefined>;
+declare const inferredCallsOnly$1: unique symbol;
+interface InferredTypeArg$1 {
+    readonly [inferredCallsOnly$1]: typeof inferredCallsOnly$1;
+}
+declare function useVariantField<TValue = InferredTypeArg$1>(form: FieldFormApi & Readonly<{
+    schema: z.ZodType;
+}>, unionPath: TValue extends InferredTypeArg$1 ? never : "Remove the explicit type argument: a schema-typed form infers the variant value from the union path and field", field: string): UseFieldReturn<TValue | undefined>;
 declare function useVariantField<TValue = unknown>(form: FieldFormApi & {
     readonly schema?: undefined;
 }, unionPath: string, field: string): UseFieldReturn<TValue | undefined>;
+declare function useVariantField<TSchema extends z.ZodType, P extends string, TField extends VariantKeys<UnionValueAt<z.input<TSchema>, P>>, D extends PathDepth = DefaultPathDepth>(form: Form<TSchema, D>, unionPath: P, field: TField): UseFieldReturn<VariantFieldValue<UnionValueAt<z.input<TSchema>, P>, TField> | undefined>;
 
 type ReadonlyStore$1<T> = Pick<StoreApi<T>, "getState" | "getInitialState" | "subscribe">;
 type FieldArrayFormApi = Readonly<{
@@ -282,6 +296,7 @@ type FieldArrayFormApi = Readonly<{
     arrayInsert(path: string, index: number, item: unknown): void;
     arrayMove(path: string, from: number, to: number): void;
     arraySwap(path: string, a: number, b: number): void;
+    validateField?(path: string): FieldValidationResult;
 }>;
 type FieldArrayEntry<TItem> = Readonly<{
     id: string;
@@ -299,10 +314,17 @@ type UseFieldArrayReturn<TItem> = Readonly<{
     swap: (a: number, b: number) => void;
 }>;
 type ArrayItemOf<T> = [NonNullable<T>] extends [readonly (infer U)[]] ? U : never;
+declare const inferredCallsOnly: unique symbol;
+interface InferredTypeArg {
+    readonly [inferredCallsOnly]: typeof inferredCallsOnly;
+}
 declare function useFieldArray<TSchema extends z.ZodType>(form: FieldArrayFormApi & Readonly<{
     schema: TSchema;
     store: ReadonlyStore$1<FormState<z.input<TSchema>>>;
 }>, pathSelector: (state: FormState<z.input<TSchema>>) => string): UseFieldArrayReturn<unknown>;
+declare function useFieldArray<TItem = InferredTypeArg>(form: FieldArrayFormApi & Readonly<{
+    schema: z.ZodType;
+}>, path: TItem extends InferredTypeArg ? never : "Remove the explicit type argument: a schema-typed form infers the item type from the path"): UseFieldArrayReturn<TItem>;
 declare function useFieldArray<TItem = unknown>(form: FieldArrayFormApi & {
     readonly schema?: undefined;
 }, path: FieldPathArg<unknown>): UseFieldArrayReturn<TItem>;
@@ -355,6 +377,11 @@ declare function useFormSelectorShallow<U>(form: FormStateApi & {
     readonly schema?: undefined;
 }, selector: (state: FormState<unknown>) => U): U;
 
+declare function useFormValues<TSchema extends z.ZodType, D extends PathDepth = DefaultPathDepth>(form: Form<TSchema, D>): z.input<TSchema>;
+declare function useFormValues(form: FormStateApi & {
+    readonly schema?: undefined;
+}): unknown;
+
 declare const useFormError: (form: FormStateApi) => readonly string[] | undefined;
 
 declare function useIsDirty(form: FormStateApi & {
@@ -497,4 +524,4 @@ declare const dateInputProps: <T extends Date | null | undefined>(field: UseFiel
 declare const checkboxProps: <T extends boolean | null | undefined>(field: UseFieldReturn<T>) => CheckboxProps;
 declare const selectProps: <T extends string | null | undefined>(field: UseFieldReturn<T>) => SelectProps;
 
-export { type BoolMap, type BoundUseField, type BoundUseFieldArray, type BoundUseFlag, type BoundUseSelector, CheckboxField, type CheckboxFieldProps, type CheckboxProps, type CreateFormOptions, DateField, type DateFieldProps, type DateInputProps, type DefaultPathDepth, type ErrorMap, type FieldArrayEntry, type FieldArrayFormApi, type FieldFormApi, type FieldPath, type FieldPathArg, type FieldRef, type FieldSnapshot, type FieldValidationResult, type FieldValue, type FieldsValidationResult, type Form, type FormContextApi, type FormHooks, type FormProviderProps, type FormState, type FormStateApi, type InvalidSubmitHandler, NumberField, type NumberFieldProps, type NumberInputBinding, type NumberInputProps, type ParsedDateText, type ParsedNumberText, type PathDepth, type PathSegment, type PathsOf, type PersistHandle, type PersistOptions, type PersistStorage, type ReadonlyStoreApi, type ResetOptions, SelectField, type SelectFieldOption, type SelectFieldProps, type SelectProps, type SettledFieldValidationResult, type SettledFieldsValidationResult, type SettledValidationResult, type SubmitHandler, type SubmitOptions, type SubmitResult, TextField, type TextFieldProps, type TextInputProps, type UseFieldArrayReturn, type UseFieldOptions, type UseFieldReturn, type ValidationMode, type ValidationResult, type ValidationTrigger, checkboxProps, createForm, createFormContext, createFormHooks, dateInputProps, dateToInputText, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, hasFieldError, isAsyncRequiredError, numberInputProps, numberToInputText, parseDateText, parseNumberText, parsePath, persistForm, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useIsDirty, useIsSubmitting, useIsValid, useNumberInput, useSubmitCount, useVariantField, validateAsync, validateSync };
+export { type BoolMap, type BoundUseField, type BoundUseFieldArray, type BoundUseFlag, type BoundUseSelector, CheckboxField, type CheckboxFieldProps, type CheckboxProps, type CreateFormOptions, DateField, type DateFieldProps, type DateInputProps, type DefaultPathDepth, type ErrorMap, type FieldArrayEntry, type FieldArrayFormApi, type FieldFormApi, type FieldPath, type FieldPathArg, type FieldRef, type FieldSnapshot, type FieldValidationResult, type FieldValue, type FieldsValidationResult, type Form, type FormContextApi, type FormHooks, type FormProviderProps, type FormState, type FormStateApi, type InvalidSubmitHandler, NumberField, type NumberFieldProps, type NumberInputBinding, type NumberInputProps, type ParsedDateText, type ParsedNumberText, type PathDepth, type PathSegment, type PathsOf, type PersistHandle, type PersistOptions, type PersistStorage, type ReadonlyStoreApi, type ResetOptions, SelectField, type SelectFieldOption, type SelectFieldProps, type SelectProps, type SettledFieldValidationResult, type SettledFieldsValidationResult, type SettledValidationResult, type SubmitHandler, type SubmitOptions, type SubmitResult, TextField, type TextFieldProps, type TextInputProps, type UseFieldArrayReturn, type UseFieldOptions, type UseFieldReturn, type ValidationMode, type ValidationResult, type ValidationTrigger, checkboxProps, createForm, createFormContext, createFormHooks, dateInputProps, dateToInputText, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, hasFieldError, isAsyncRequiredError, numberInputProps, numberToInputText, parseDateText, parseNumberText, parsePath, persistForm, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useFormValues, useIsDirty, useIsSubmitting, useIsValid, useNumberInput, useSubmitCount, useVariantField, validateAsync, validateSync };

package/dist/index.js

@@ -179,6 +179,14 @@ var slotAtPath = (obj, path) => {
   );
   return walked.ok ? { exists: true, value: walked.current } : { exists: false };
 };
+var hasOwnSlot = (obj, path) => parsePath(path).reduce(
+  (acc, segment) => {
+    const container = acc.current;
+    const owns = Array.isArray(container) ? typeof segment === "number" && segment < container.length : isPlainRecord(container) && Object.hasOwn(container, String(segment));
+    return !acc.ok || !owns ? { ok: false, current: void 0 } : { ok: true, current: readSegment(container, segment) };
+  },
+  { ok: true, current: obj }
+).ok;
 var writeIntoArray = (arr, index, rest, value) => {
   const length = Math.max(arr.length, index + 1);
   return Array.from(
@@ -881,6 +889,10 @@ var createForm = (schema, options) => {
       });
     },
     setValue: (path, value) => {
+      const currentValues = store.getState().values;
+      if (Object.is(getAtPath(currentValues, path), value) && (value !== void 0 || hasOwnSlot(currentValues, path))) {
+        return;
+      }
       clearArrayOpsUnder(store, path);
       store.setState((state) => ({
         ...state,
@@ -1278,8 +1290,10 @@ function useField(form, pathArg, options) {
   }, [form, path, debounceMs]);
   const setValue = useCallback(
     (value) => {
+      const before = form.store.getState();
       form.setValue(path, value);
       const state = form.store.getState();
+      if (state === before) return;
       if (shouldValidateOn(
         "change",
         state.mode,
@@ -1473,25 +1487,52 @@ function useFieldArray(form, pathArg) {
   const items = slice.items;
   const error = slice.error;
   const ids = deriveIds(form.store, path, items).ids;
+  const revalidate = useCallback(() => {
+    const state = form.store.getState();
+    if (shouldValidateOn(
+      "change",
+      state.mode,
+      state.reValidateMode,
+      state.submitCount > 0,
+      state.touched[path] ?? false
+    )) {
+      form.validateField?.(path);
+    }
+  }, [form, path]);
   const push = useCallback(
-    (item) => form.arrayPush(path, item),
-    [form, path]
+    (item) => {
+      form.arrayPush(path, item);
+      revalidate();
+    },
+    [form, path, revalidate]
   );
   const remove = useCallback(
-    (index) => form.arrayRemove(path, index),
-    [form, path]
+    (index) => {
+      form.arrayRemove(path, index);
+      revalidate();
+    },
+    [form, path, revalidate]
   );
   const insert = useCallback(
-    (index, item) => form.arrayInsert(path, index, item),
-    [form, path]
+    (index, item) => {
+      form.arrayInsert(path, index, item);
+      revalidate();
+    },
+    [form, path, revalidate]
   );
   const move = useCallback(
-    (from, to) => form.arrayMove(path, from, to),
-    [form, path]
+    (from, to) => {
+      form.arrayMove(path, from, to);
+      revalidate();
+    },
+    [form, path, revalidate]
   );
   const swap = useCallback(
-    (a, b) => form.arraySwap(path, a, b),
-    [form, path]
+    (a, b) => {
+      form.arraySwap(path, a, b);
+      revalidate();
+    },
+    [form, path, revalidate]
   );
   const fields = useMemo(
     () => items.map((value, index) => ({
@@ -1580,6 +1621,9 @@ var createFormHooks = (form, name) => {
     [`use${prefix}SubmitCount`]: useBoundSubmitCount
   };
 };
+function useFormValues(form) {
+  return useStore(form.store, (state) => state.values);
+}
 
 // src/react/inputProps.ts
 var hasFieldError = (error) => error !== void 0 && error.length > 0;
@@ -1932,7 +1976,10 @@ var nameMatchesAny = (el, paths) => {
   const name = el.getAttribute("name");
   return name !== null && paths.some((p) => isPathOrChild(name, p));
 };
-var cssQuoted = (value) => `"${value.replace(/[\\"]/g, (ch) => `\\${ch}`)}"`;
+var cssQuoted = (value) => `"${value.replace(/[\\"]/g, (ch) => `\\${ch}`).replace(
+  /[\x00-\x1f\x7f]/g,
+  (ch) => `\\${ch.codePointAt(0).toString(16)} `
+)}"`;
 var idMatches = (scope, path) => path === "" ? [] : [...scope.querySelectorAll(`[id=${cssQuoted(path)}]`)];
 var inDomOrder = (els) => [...els].sort(
   (a, b) => a === b ? 0 : (a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0 ? -1 : 1
@@ -1940,8 +1987,9 @@ var inDomOrder = (els) => [...els].sort(
 var pathCandidates = (scope, paths) => {
   const controls = namedControls(scope);
   const named = controls.filter((el) => nameMatchesAny(el, paths));
+  const focusableControls = controls.filter(isFocusCandidate);
   const unnamedPaths = paths.filter(
-    (p) => !controls.some((el) => nameMatchesAny(el, [p]))
+    (p) => !focusableControls.some((el) => nameMatchesAny(el, [p]))
   );
   const byId = unnamedPaths.flatMap((p) => idMatches(scope, p));
   return inDomOrder([.../* @__PURE__ */ new Set([...named, ...byId])]);
@@ -1965,6 +2013,6 @@ var focusField = (path, root) => {
   return path === "" ? (root !== void 0 || document.querySelectorAll("form").length <= 1) && focusFirstOf(namedControls(scope).filter(isFocusCandidate)) : focusFirstOf(pathCandidates(scope, [path]).filter(isFocusCandidate));
 };
 
-export { CheckboxField, DateField, NumberField, SelectField, TextField, checkboxProps, createForm, createFormContext, createFormHooks, dateInputProps, dateToInputText, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, hasFieldError, isAsyncRequiredError, numberInputProps, numberToInputText, parseDateText, parseNumberText, parsePath, persistForm, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useIsDirty, useIsSubmitting, useIsValid, useNumberInput, useSubmitCount, useVariantField, validateAsync, validateSync };
+export { CheckboxField, DateField, NumberField, SelectField, TextField, checkboxProps, createForm, createFormContext, createFormHooks, dateInputProps, dateToInputText, emptyValueForSchema, flattenIssues, focusField, focusFirstError, getAtPath, hasFieldError, isAsyncRequiredError, numberInputProps, numberToInputText, parseDateText, parseNumberText, parsePath, persistForm, selectProps, setAtPath, shouldValidateOn, textInputProps, useField, useFieldArray, useForm, useFormError, useFormSelector, useFormSelectorShallow, useFormValues, useIsDirty, useIsSubmitting, useIsValid, useNumberInput, useSubmitCount, useVariantField, validateAsync, validateSync };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map