remix-validated-form 4.4.3 → 4.5.0-beta.0

package/.turbo/turbo-build.log

@@ -1,15 +1,18 @@
-$ vite build
-vite v2.9.5 building for production...
+$ vite build
+vite v2.9.5 building for production...
 transforming...
-✓ 321 modules transformed.
+✓ 319 modules transformed.
 rendering chunks...
-dist/remix-validated-form.cjs.js   43.88 KiB / gzip: 16.70 KiB
-dist/remix-validated-form.es.js   98.54 KiB / gzip: 23.35 KiB
-dist/remix-validated-form.umd.js   44.13 KiB / gzip: 16.84 KiB
-
-[vite:dts] Start generate declaration files...
-[vite:dts] Declaration files built in 1804ms.
-
+dist/remix-validated-form.cjs.js   45.13 KiB / gzip: 17.03 KiB
+dist/remix-validated-form.cjs.js.map 250.93 KiB
+dist/remix-validated-form.es.js   100.56 KiB / gzip: 23.71 KiB
+dist/remix-validated-form.es.js.map 258.79 KiB
+dist/remix-validated-form.umd.js   45.38 KiB / gzip: 17.15 KiB
+dist/remix-validated-form.umd.js.map 250.91 KiB
+
+[vite:dts] Start generate declaration files...
+[vite:dts] Declaration files built in 1725ms.
+
 No name was provided for external module 'react' in output.globals – guessing 'React'
 No name was provided for external module '@remix-run/react' in output.globals – guessing 'react'
 No name was provided for external module '@remix-run/server-runtime' in output.globals – guessing 'serverRuntime'

package/.turbo/turbo-dev.log

@@ -1,95 +0,0 @@
-$ tsc --module ESNext --outDir ./browser --watch
-c10:51:22 PM - Starting compilation in watch mode...
-
-
-10:51:23 PM - Found 0 errors. Watching for file changes.
-c10:58:01 PM - File change detected. Starting incremental compilation...
-
-src/internal/hooks.ts(149,23): error TS2304: Cannot find name 'formId'.
-src/internal/hooks.ts(151,41): error TS2304: Cannot find name 'defaultDefaultValues'.
-src/unreleased/formStateHooks.ts(18,3): error TS2724: '"../internal/hooks"' has no exported member named 'useSyncedDefaultValues'. Did you mean 'useFieldDefaultValue'?
-
-10:58:02 PM - Found 3 errors. Watching for file changes.
-c10:58:40 PM - File change detected. Starting incremental compilation...
-
-src/internal/hooks.ts(156,23): error TS2304: Cannot find name 'formId'.
-
-10:58:40 PM - Found 1 error. Watching for file changes.
-c10:59:28 PM - File change detected. Starting incremental compilation...
-
-
-10:59:28 PM - Found 0 errors. Watching for file changes.
-c11:00:16 PM - File change detected. Starting incremental compilation...
-
-src/internal/hooks.ts(160,4): error TS1005: ',' expected.
-src/internal/hooks.ts(161,1): error TS1128: Declaration or statement expected.
-
-11:00:16 PM - Found 2 errors. Watching for file changes.
-c11:01:07 PM - File change detected. Starting incremental compilation...
-
-
-11:01:07 PM - Found 0 errors. Watching for file changes.
-c11:01:30 PM - File change detected. Starting incremental compilation...
-
-
-11:01:30 PM - Found 0 errors. Watching for file changes.
-c11:01:50 PM - File change detected. Starting incremental compilation...
-
-
-11:01:50 PM - Found 0 errors. Watching for file changes.
-c11:02:06 PM - File change detected. Starting incremental compilation...
-
-
-11:02:06 PM - Found 0 errors. Watching for file changes.
-c11:04:31 PM - File change detected. Starting incremental compilation...
-
-
-11:04:31 PM - Found 0 errors. Watching for file changes.
-c11:05:28 PM - File change detected. Starting incremental compilation...
-
-
-11:05:28 PM - Found 0 errors. Watching for file changes.
-c11:05:52 PM - File change detected. Starting incremental compilation...
-
-
-11:05:52 PM - Found 0 errors. Watching for file changes.
-c11:06:11 PM - File change detected. Starting incremental compilation...
-
-
-11:06:11 PM - Found 0 errors. Watching for file changes.
-c11:06:33 PM - File change detected. Starting incremental compilation...
-
-
-11:06:33 PM - Found 0 errors. Watching for file changes.
-c11:06:48 PM - File change detected. Starting incremental compilation...
-
-
-11:06:48 PM - Found 0 errors. Watching for file changes.
-c11:08:57 PM - File change detected. Starting incremental compilation...
-
-src/internal/hooks.ts(114,25): error TS2304: Cannot find name 'useCorrectDefaultValues'.
-src/unreleased/formStateHooks.ts(19,3): error TS2305: Module '"../internal/hooks"' has no exported member 'useCorrectDefaultValues'.
-
-11:08:57 PM - Found 2 errors. Watching for file changes.
-c11:09:06 PM - File change detected. Starting incremental compilation...
-
-src/unreleased/formStateHooks.ts(19,3): error TS2305: Module '"../internal/hooks"' has no exported member 'useCorrectDefaultValues'.
-
-11:09:06 PM - Found 1 error. Watching for file changes.
-c11:09:19 PM - File change detected. Starting incremental compilation...
-
-src/unreleased/formStateHooks.ts(48,49): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'InternalFormContextValue'.
-  Type 'string' is not assignable to type 'InternalFormContextValue'.
-
-11:09:19 PM - Found 1 error. Watching for file changes.
-c11:09:34 PM - File change detected. Starting incremental compilation...
-
-src/unreleased/formStateHooks.ts(48,49): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'InternalFormContextValue'.
-  Type 'string' is not assignable to type 'InternalFormContextValue'.
-
-11:09:34 PM - Found 1 error. Watching for file changes.
-c11:09:38 PM - File change detected. Starting incremental compilation...
-
-
-11:09:38 PM - Found 0 errors. Watching for file changes.
-c11:11:35 PM - File change detected. Starting incremental compilat

package/browser/ValidatedForm.js

@@ -7,8 +7,9 @@ import { FORM_ID_FIELD } from "./internal/constants";
 import { InternalFormContext, } from "./internal/formContext";
 import { useDefaultValuesFromLoader, useErrorResponseForForm, useHasActiveFormSubmit, useSetFieldErrors, } from "./internal/hooks";
 import { useMultiValueMap } from "./internal/MultiValueMap";
-import { cleanupFormState } from "./internal/state/cleanup";
-import { useControlledFieldStore, useFormStore, } from "./internal/state/storeHooks";
+import { useControlledFieldStore } from "./internal/state/controlledFieldStore";
+import { useRootFormStore, } from "./internal/state/createFormStore";
+import { useFormStore } from "./internal/state/storeHooks";
 import { useSubmitComplete } from "./internal/submissionCallbacks";
 import { mergeRefs, useDeepEqualsMemo, useIsomorphicLayoutEffect as useLayoutEffect, } from "./internal/util";
 const getDataFromForm = (el) => new FormData(el);
@@ -114,16 +115,13 @@ export function ValidatedForm({ validator, onSubmit, children, fetcher, action,
     const setFieldErrors = useSetFieldErrors(formId);
     const setFieldError = useFormStore(formId, (state) => state.setFieldError);
     const reset = useFormStore(formId, (state) => state.reset);
-    const resetControlledFields = useControlledFieldStore(formId, (state) => state.reset);
+    const resetControlledFields = useControlledFieldStore((state) => state.reset);
     const startSubmit = useFormStore(formId, (state) => state.startSubmit);
     const endSubmit = useFormStore(formId, (state) => state.endSubmit);
     const syncFormProps = useFormStore(formId, (state) => state.syncFormProps);
-    const setHydrated = useFormStore(formId, (state) => state.setHydrated);
     const setFormElementInState = useFormStore(formId, (state) => state.setFormElement);
-    useEffect(() => {
-        setHydrated();
-        return () => cleanupFormState(formId);
-    }, [formId, setHydrated]);
+    const cleanupForm = useRootFormStore((state) => state.cleanupForm);
+    const registerForm = useRootFormStore((state) => state.registerForm);
     const customFocusHandlers = useMultiValueMap();
     const registerReceiveFocus = useCallback((fieldName, handler) => {
         customFocusHandlers().add(fieldName, handler);
@@ -131,6 +129,12 @@ export function ValidatedForm({ validator, onSubmit, children, fetcher, action,
             customFocusHandlers().remove(fieldName, handler);
         };
     }, [customFocusHandlers]);
+    // TODO: all these hooks running at startup cause extra, unnecessary renders
+    // There must be a nice way to avoid this.
+    useLayoutEffect(() => {
+        registerForm(formId);
+        return () => cleanupForm(formId);
+    }, [cleanupForm, formId, registerForm]);
     useLayoutEffect(() => {
         var _a;
         syncFormProps({
@@ -149,6 +153,9 @@ export function ValidatedForm({ validator, onSubmit, children, fetcher, action,
         backendDefaultValues,
         validator,
     ]);
+    useLayoutEffect(() => {
+        setFormElementInState(formRef.current);
+    }, [setFormElementInState]);
     useEffect(() => {
         var _a;
         setFieldErrors((_a = backendError === null || backendError === void 0 ? void 0 : backendError.fieldErrors) !== null && _a !== void 0 ? _a : {});
@@ -207,7 +214,7 @@ export function ValidatedForm({ validator, onSubmit, children, fetcher, action,
             clickedButtonRef.current = null;
         }
     };
-    return (_jsx(Form, { ref: mergeRefs([formRef, formRefProp, setFormElementInState]), ...rest, id: id, action: action, method: method, replace: replace, onSubmit: (e) => {
+    return (_jsx(Form, { ref: mergeRefs([formRef, formRefProp]), ...rest, id: id, action: action, method: method, replace: replace, onSubmit: (e) => {
             e.preventDefault();
             handleSubmit(e);
         }, onReset: (event) => {
@@ -215,6 +222,6 @@ export function ValidatedForm({ validator, onSubmit, children, fetcher, action,
             if (event.defaultPrevented)
                 return;
             reset();
-            resetControlledFields();
+            resetControlledFields(formId);
         }, children: _jsxs(InternalFormContext.Provider, { value: contextValue, children: [_jsx(FormResetter, { formRef: formRef, resetAfterSubmit: resetAfterSubmit }, void 0), subaction && (_jsx("input", { type: "hidden", value: subaction, name: "subaction" }, void 0)), id && _jsx("input", { type: "hidden", value: id, name: FORM_ID_FIELD }, void 0), children] }, void 0) }, void 0));
 }

package/browser/hooks.d.ts

@@ -64,4 +64,4 @@ export declare const useField: (name: string, options?: {
     formId?: string | undefined;
 } | undefined) => FieldProps;
 export declare const useControlField: <T>(name: string, formId?: string | undefined) => readonly [T, (value: T) => void];
-export declare const useUpdateControlledField: (formId?: string | undefined) => (fieldName: string, value: unknown) => void;
+export declare const useUpdateControlledField: (formId?: string | undefined) => (field: string, value: unknown) => void;

package/browser/internal/hooks.d.ts

@@ -1,7 +1,7 @@
 import { FieldErrors, ValidationErrorResponseData } from "..";
 import { InternalFormContextValue } from "./formContext";
 import { Hydratable } from "./hydratable";
-import { InternalFormId } from "./state/storeFamily";
+import { InternalFormId } from "./state/types";
 export declare const useInternalFormContext: (formId?: string | symbol | undefined, hookName?: string | undefined) => InternalFormContextValue;
 export declare function useErrorResponseForForm({ fetcher, subaction, formId, }: InternalFormContextValue): ValidationErrorResponseData | null;
 export declare const useFieldErrorsForForm: (context: InternalFormContextValue) => Hydratable<FieldErrors | undefined>;
@@ -20,7 +20,9 @@ export declare const useInternalHasBeenSubmitted: (formId: InternalFormId) => bo
 export declare const useValidateField: (formId: InternalFormId) => (fieldName: string) => Promise<string | null>;
 export declare const useValidate: (formId: InternalFormId) => () => Promise<void>;
 export declare const useRegisterReceiveFocus: (formId: InternalFormId) => (fieldName: string, handler: () => void) => () => void;
-export declare const useSyncedDefaultValues: (formId: InternalFormId) => {};
+export declare const useSyncedDefaultValues: (formId: InternalFormId) => {
+    [fieldName: string]: any;
+};
 export declare const useSetTouched: ({ formId }: InternalFormContextValue) => (field: string, touched: boolean) => void;
 export declare const useTouchedFields: (formId: InternalFormId) => import("..").TouchedFields;
 export declare const useFieldErrors: (formId: InternalFormId) => FieldErrors;

package/browser/internal/state/controlledFieldStore.d.ts

@@ -1,24 +1,26 @@
+import { InternalFormId } from "./types";
+export declare type FieldState = {
+    refCount: number;
+    value: unknown;
+    defaultValue?: unknown;
+    hydrated: boolean;
+    valueUpdatePromise: Promise<void> | undefined;
+    resolveValueUpdate: (() => void) | undefined;
+};
 export declare type ControlledFieldState = {
-    fields: {
-        [fieldName: string]: {
-            refCount: number;
-            value: unknown;
-            defaultValue?: unknown;
-            hydrated: boolean;
-            valueUpdatePromise: Promise<void> | undefined;
-            resolveValueUpdate: (() => void) | undefined;
-        } | undefined;
+    forms: {
+        [formId: InternalFormId]: {
+            [fieldName: string]: FieldState | undefined;
+        };
     };
-    register: (fieldName: string) => void;
-    unregister: (fieldName: string) => void;
-    setValue: (fieldName: string, value: unknown) => void;
-    hydrateWithDefault: (fieldName: string, defaultValue: unknown) => void;
-    awaitValueUpdate: (fieldName: string) => Promise<void>;
-    reset: () => void;
-};
-export declare const controlledFieldStore: {
-    (formId: import("./storeFamily").InternalFormId): import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<ControlledFieldState>, "setState"> & {
-        setState(nextStateOrUpdater: ControlledFieldState | Partial<ControlledFieldState> | ((state: import("immer/dist/internal").WritableDraft<ControlledFieldState>) => void), shouldReplace?: boolean | undefined): void;
-    }>;
-    remove(formId: import("./storeFamily").InternalFormId): void;
+    register: (formId: InternalFormId, fieldName: string) => void;
+    unregister: (formId: InternalFormId, fieldName: string) => void;
+    getField: (formId: InternalFormId, fieldName: string) => FieldState | undefined;
+    setValue: (formId: InternalFormId, fieldName: string, value: unknown) => void;
+    hydrateWithDefault: (formId: InternalFormId, fieldName: string, defaultValue: unknown) => void;
+    awaitValueUpdate: (formId: InternalFormId, fieldName: string) => Promise<void>;
+    reset: (formId: InternalFormId) => void;
 };
+export declare const useControlledFieldStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<ControlledFieldState>, "setState"> & {
+    setState(nextStateOrUpdater: ControlledFieldState | Partial<ControlledFieldState> | ((state: import("immer/dist/internal").WritableDraft<ControlledFieldState>) => void), shouldReplace?: boolean | undefined): void;
+}>;

package/browser/internal/state/controlledFieldStore.js

@@ -1,14 +1,16 @@
 import create from "zustand";
 import { immer } from "zustand/middleware/immer";
-import { storeFamily } from "./storeFamily";
-export const controlledFieldStore = storeFamily(() => create()(immer((set, get, api) => ({
-    fields: {},
-    register: (field) => set((state) => {
-        if (state.fields[field]) {
-            state.fields[field].refCount++;
+export const useControlledFieldStore = create()(immer((set, get) => ({
+    forms: {},
+    register: (formId, field) => set((state) => {
+        if (!state.forms[formId]) {
+            state.forms[formId] = {};
+        }
+        if (state.forms[formId][field]) {
+            state.forms[formId][field].refCount++;
         }
         else {
-            state.fields[field] = {
+            state.forms[formId][field] = {
                 refCount: 1,
                 value: undefined,
                 hydrated: false,
@@ -17,16 +19,23 @@ export const controlledFieldStore = storeFamily(() => create()(immer((set, get,
             };
         }
     }),
-    unregister: (field) => set((state) => {
-        const fieldState = state.fields[field];
+    unregister: (formId, field) => set((state) => {
+        var _a;
+        const formState = (_a = state.forms) === null || _a === void 0 ? void 0 : _a[formId];
+        const fieldState = formState === null || formState === void 0 ? void 0 : formState[field];
         if (!fieldState)
             return;
         fieldState.refCount--;
         if (fieldState.refCount === 0)
-            delete state.fields[field];
+            delete formState[field];
     }),
-    setValue: (field, value) => set((state) => {
-        const fieldState = state.fields[field];
+    getField: (formId, field) => {
+        var _a, _b;
+        return (_b = (_a = get().forms) === null || _a === void 0 ? void 0 : _a[formId]) === null || _b === void 0 ? void 0 : _b[field];
+    },
+    setValue: (formId, field, value) => set((state) => {
+        var _a, _b;
+        const fieldState = (_b = (_a = state.forms) === null || _a === void 0 ? void 0 : _a[formId]) === null || _b === void 0 ? void 0 : _b[field];
         if (!fieldState)
             return;
         fieldState.value = value;
@@ -35,23 +44,27 @@ export const controlledFieldStore = storeFamily(() => create()(immer((set, get,
         });
         fieldState.valueUpdatePromise = promise;
     }),
-    hydrateWithDefault: (field, defaultValue) => set((state) => {
-        const fieldState = state.fields[field];
+    hydrateWithDefault: (formId, field, defaultValue) => set((state) => {
+        var _a;
+        const fieldState = (_a = state.forms[formId]) === null || _a === void 0 ? void 0 : _a[field];
         if (!fieldState)
             return;
         fieldState.value = defaultValue;
         fieldState.defaultValue = defaultValue;
         fieldState.hydrated = true;
     }),
-    awaitValueUpdate: async (field) => {
+    awaitValueUpdate: async (formId, field) => {
         var _a;
-        await ((_a = get().fields[field]) === null || _a === void 0 ? void 0 : _a.valueUpdatePromise);
+        await ((_a = get().getField(formId, field)) === null || _a === void 0 ? void 0 : _a.valueUpdatePromise);
     },
-    reset: () => set((state) => {
-        Object.values(state.fields).forEach((field) => {
+    reset: (formId) => set((state) => {
+        const formState = state.forms[formId];
+        if (!formState)
+            return;
+        Object.values(formState).forEach((field) => {
             if (!field)
                 return;
             field.value = field.defaultValue;
         });
     }),
-}))));
+})));

package/browser/internal/state/controlledFields.d.ts

@@ -1,6 +1,6 @@
 import { InternalFormContextValue } from "../formContext";
-import { InternalFormId } from "./storeFamily";
+import { InternalFormId } from "./types";
 export declare const useControlledFieldValue: (context: InternalFormContextValue, field: string) => any;
 export declare const useControllableValue: (context: InternalFormContextValue, field: string) => readonly [any, (value: unknown) => void];
-export declare const useUpdateControllableValue: (formId: InternalFormId) => (fieldName: string, value: unknown) => void;
-export declare const useAwaitValue: (formId: InternalFormId) => (fieldName: string) => Promise<void>;
+export declare const useUpdateControllableValue: (formId: InternalFormId) => (field: string, value: unknown) => void;
+export declare const useAwaitValue: (formId: InternalFormId) => (field: string) => Promise<void>;

package/browser/internal/state/controlledFields.js

@@ -1,20 +1,19 @@
 import { useCallback, useEffect } from "react";
 import { useFieldDefaultValue } from "../hooks";
-import { controlledFieldStore } from "./controlledFieldStore";
-import { formStore } from "./createFormStore";
+import { useControlledFieldStore } from "./controlledFieldStore";
+import { useFormStore } from "./storeHooks";
 export const useControlledFieldValue = (context, field) => {
-    const useValueStore = controlledFieldStore(context.formId);
-    const value = useValueStore((state) => { var _a; return (_a = state.fields[field]) === null || _a === void 0 ? void 0 : _a.value; });
-    const useFormStore = formStore(context.formId);
-    const isFormHydrated = useFormStore((state) => state.isHydrated);
+    const value = useControlledFieldStore((state) => { var _a; return (_a = state.getField(context.formId, field)) === null || _a === void 0 ? void 0 : _a.value; });
+    const isFormHydrated = useFormStore(context.formId, (state) => state.isHydrated);
     const defaultValue = useFieldDefaultValue(field, context);
-    const isFieldHydrated = useValueStore((state) => { var _a, _b; return (_b = (_a = state.fields[field]) === null || _a === void 0 ? void 0 : _a.hydrated) !== null && _b !== void 0 ? _b : false; });
-    const hydrateWithDefault = useValueStore((state) => state.hydrateWithDefault);
+    const isFieldHydrated = useControlledFieldStore((state) => { var _a, _b; return (_b = (_a = state.getField(context.formId, field)) === null || _a === void 0 ? void 0 : _a.hydrated) !== null && _b !== void 0 ? _b : false; });
+    const hydrateWithDefault = useControlledFieldStore((state) => state.hydrateWithDefault);
     useEffect(() => {
         if (isFormHydrated && !isFieldHydrated) {
-            hydrateWithDefault(field, defaultValue);
+            hydrateWithDefault(context.formId, field, defaultValue);
         }
     }, [
+        context.formId,
         defaultValue,
         field,
         hydrateWithDefault,
@@ -24,27 +23,26 @@ export const useControlledFieldValue = (context, field) => {
     return isFieldHydrated ? value : defaultValue;
 };
 export const useControllableValue = (context, field) => {
-    const useValueStore = controlledFieldStore(context.formId);
-    const resolveUpdate = useValueStore((state) => { var _a; return (_a = state.fields[field]) === null || _a === void 0 ? void 0 : _a.resolveValueUpdate; });
+    const resolveUpdate = useControlledFieldStore((state) => { var _a; return (_a = state.getField(context.formId, field)) === null || _a === void 0 ? void 0 : _a.resolveValueUpdate; });
     useEffect(() => {
         resolveUpdate === null || resolveUpdate === void 0 ? void 0 : resolveUpdate();
     }, [resolveUpdate]);
-    const register = useValueStore((state) => state.register);
-    const unregister = useValueStore((state) => state.unregister);
+    const register = useControlledFieldStore((state) => state.register);
+    const unregister = useControlledFieldStore((state) => state.unregister);
     useEffect(() => {
-        register(field);
-        return () => unregister(field);
+        register(context.formId, field);
+        return () => unregister(context.formId, field);
     }, [context.formId, field, register, unregister]);
-    const setControlledFieldValue = useValueStore((state) => state.setValue);
-    const setValue = useCallback((value) => setControlledFieldValue(field, value), [field, setControlledFieldValue]);
+    const setControlledFieldValue = useControlledFieldStore((state) => state.setValue);
+    const setValue = useCallback((value) => setControlledFieldValue(context.formId, field, value), [context.formId, field, setControlledFieldValue]);
     const value = useControlledFieldValue(context, field);
     return [value, setValue];
 };
 export const useUpdateControllableValue = (formId) => {
-    const useValueStore = controlledFieldStore(formId);
-    return useValueStore((state) => state.setValue);
+    const setValue = useControlledFieldStore((state) => state.setValue);
+    return useCallback((field, value) => setValue(formId, field, value), [formId, setValue]);
 };
 export const useAwaitValue = (formId) => {
-    const useValueStore = controlledFieldStore(formId);
-    return useValueStore((state) => state.awaitValueUpdate);
+    const awaitValue = useControlledFieldStore((state) => state.awaitValueUpdate);
+    return useCallback((field) => awaitValue(formId, field), [awaitValue, formId]);
 };

package/browser/internal/state/createFormStore.d.ts

@@ -1,4 +1,6 @@
+import { WritableDraft } from "immer/dist/internal";
 import { FieldErrors, TouchedFields, Validator } from "../../validation/types";
+import { InternalFormId } from "./types";
 export declare type SyncedFormProps = {
     formId?: string;
     action?: string;
@@ -9,6 +11,14 @@ export declare type SyncedFormProps = {
     registerReceiveFocus: (fieldName: string, handler: () => void) => () => void;
     validator: Validator<unknown>;
 };
+export declare type FormStoreState = {
+    forms: {
+        [formId: InternalFormId]: FormState;
+    };
+    form: (formId: InternalFormId) => FormState;
+    registerForm: (formId: InternalFormId) => void;
+    cleanupForm: (formId: InternalFormId) => void;
+};
 export declare type FormState = {
     isHydrated: boolean;
     isSubmitting: boolean;
@@ -32,9 +42,6 @@ export declare type FormState = {
     validate: () => Promise<void>;
     resetFormElement: () => void;
 };
-export declare const formStore: {
-    (formId: import("./storeFamily").InternalFormId): import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<FormState>, "setState"> & {
-        setState(nextStateOrUpdater: FormState | Partial<FormState> | ((state: import("immer/dist/internal").WritableDraft<FormState>) => void), shouldReplace?: boolean | undefined): void;
-    }>;
-    remove(formId: import("./storeFamily").InternalFormId): void;
-};
+export declare const useRootFormStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<FormStoreState>, "setState"> & {
+    setState(nextStateOrUpdater: FormStoreState | Partial<FormStoreState> | ((state: WritableDraft<FormStoreState>) => void), shouldReplace?: boolean | undefined): void;
+}>;

package/browser/internal/state/createFormStore.js

@@ -1,9 +1,32 @@
 import invariant from "tiny-invariant";
 import create from "zustand";
 import { immer } from "zustand/middleware/immer";
-import { controlledFieldStore } from "./controlledFieldStore";
-import { storeFamily } from "./storeFamily";
-export const formStore = storeFamily((formId) => create()(immer((set, get, api) => ({
+import { useControlledFieldStore } from "./controlledFieldStore";
+const noOp = () => { };
+const defaultFormState = {
+    isHydrated: false,
+    isSubmitting: false,
+    hasBeenSubmitted: false,
+    touchedFields: {},
+    fieldErrors: {},
+    formElement: null,
+    isValid: () => true,
+    startSubmit: noOp,
+    endSubmit: noOp,
+    setTouched: noOp,
+    setFieldError: noOp,
+    setFieldErrors: noOp,
+    clearFieldError: noOp,
+    reset: () => noOp,
+    syncFormProps: noOp,
+    setHydrated: noOp,
+    setFormElement: noOp,
+    validateField: async () => null,
+    validate: async () => { },
+    resetFormElement: noOp,
+};
+const createFormState = (formId, set, get) => ({
+    // It's not "hydrated" until the form props are synced
     isHydrated: false,
     isSubmitting: false,
     hasBeenSubmitted: false,
@@ -37,6 +60,7 @@ export const formStore = storeFamily((formId) => create()(immer((set, get, api)
     }),
     syncFormProps: (props) => set((state) => {
         state.formProps = props;
+        state.isHydrated = true;
     }),
     setHydrated: () => set((state) => {
         state.isHydrated = true;
@@ -58,7 +82,7 @@ export const formStore = storeFamily((formId) => create()(immer((set, get, api)
         invariant(formElement, "Cannot find reference to form. This is probably a bug in remix-validated-form.");
         const validator = (_a = get().formProps) === null || _a === void 0 ? void 0 : _a.validator;
         invariant(validator, "Cannot validator. This is probably a bug in remix-validated-form.");
-        await ((_c = (_b = controlledFieldStore(formId).getState()).awaitValueUpdate) === null || _c === void 0 ? void 0 : _c.call(_b, field));
+        await ((_c = (_b = useControlledFieldStore.getState()).awaitValueUpdate) === null || _c === void 0 ? void 0 : _c.call(_b, formId, field));
         const { error } = await validator.validateField(new FormData(formElement), field);
         if (error) {
             get().setFieldError(field, error);
@@ -80,4 +104,23 @@ export const formStore = storeFamily((formId) => create()(immer((set, get, api)
             get().setFieldErrors(error.fieldErrors);
     },
     resetFormElement: () => { var _a; return (_a = get().formElement) === null || _a === void 0 ? void 0 : _a.reset(); },
-}))));
+});
+export const useRootFormStore = create()(immer((set, get) => ({
+    forms: {},
+    form: (formId) => {
+        var _a;
+        return (_a = get().forms[formId]) !== null && _a !== void 0 ? _a : defaultFormState;
+    },
+    cleanupForm: (formId) => {
+        set((state) => {
+            delete state.forms[formId];
+        });
+    },
+    registerForm: (formId) => {
+        if (get().forms[formId])
+            return;
+        set((state) => {
+            state.forms[formId] = createFormState(formId, (setter) => set((state) => setter(state.forms[formId])), () => get().forms[formId]);
+        });
+    },
+})));

package/browser/internal/state/storeHooks.d.ts

@@ -1,5 +1,3 @@
-import { ControlledFieldState } from "./controlledFieldStore";
 import { FormState } from "./createFormStore";
-import { InternalFormId } from "./storeFamily";
+import { InternalFormId } from "./types";
 export declare const useFormStore: <T>(formId: InternalFormId, selector: (state: FormState) => T) => T;
-export declare const useControlledFieldStore: <T>(formId: InternalFormId, selector: (state: ControlledFieldState) => T) => T;

package/browser/internal/state/storeHooks.js

@@ -1,10 +1,4 @@
-import { controlledFieldStore, } from "./controlledFieldStore";
-import { formStore } from "./createFormStore";
+import { useRootFormStore } from "./createFormStore";
 export const useFormStore = (formId, selector) => {
-    const useStore = formStore(formId);
-    return useStore(selector);
-};
-export const useControlledFieldStore = (formId, selector) => {
-    const useStore = controlledFieldStore(formId);
-    return useStore(selector);
+    return useRootFormStore((state) => selector(state.form(formId)));
 };

package/browser/internal/state/types.d.ts

@@ -0,0 +1 @@
+export declare type InternalFormId = string | symbol;

package/browser/internal/state/types.js

@@ -0,0 +1 @@
+export {};