Skip to content

fix(react-hook-form): initialize useFieldArray via reset on first data load #7494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepshekhardas wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −20
Open

fix(react-hook-form): initialize useFieldArray via reset on first data load #7494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions packages/react-hook-form/src/useForm/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export const useForm = <
watch,
setValue,
getValues,
reset,
handleSubmit: handleSubmitReactHookForm,
setError,
formState: { dirtyFields },
Expand Down Expand Up @@ -253,39 +254,28 @@ export const useForm = <
});
};

// On query load, attempt a first sync after registration effects run.
// On query load, reset the form with server data natively.
// This ensures useFieldArray and other RHF internals are properly initialized.
const initialLoadRef = React.useRef(true);
useEffect(() => {
const data = query?.data?.data;
if (!data) {
queryDataRef.current = undefined;
syncedFieldsRef.current = new Set();
mountedFieldsRef.current = new Set();
initialLoadRef.current = true;
return;
}

let isActive = true;

const applyQueryValues = () => {
if (!isActive) return;

applyValuesToFields(getRegisteredFields(), data, false);
};

queryDataRef.current = data;
syncedFieldsRef.current = new Set();
mountedFieldsRef.current = getMountedFields();

// defer until after field registration effects
if (typeof queueMicrotask === "function") {
queueMicrotask(applyQueryValues);
} else {
Promise.resolve().then(applyQueryValues);
if (initialLoadRef.current) {
initialLoadRef.current = false;
syncedFieldsRef.current = new Set();
reset(data as unknown as TVariables, { keepDirtyValues: true });
}

return () => {
isActive = false;
};
}, [query?.data, setValue, getValues]);
}, [query?.data, reset, getValues]);

// Re-sync when new fields register; do not override user edits.
useEffect(() => {
Expand Down