Merge pull request #8911 from marmelab/Simplify-form-reset-on-record-change

Simplify form reset on record change, and forward supported props from `useAugmentedForm` to `useForm`

Author: djhi

packages/ra-core/src/form/index.ts

@@ -41,7 +41,6 @@ export * from './useFormGroup';
 export * from './useFormGroups';
 export * from './useFormGroupContext';
 export * from './useGetValidationErrorMessage';
-export * from './useInitializeFormWithRecord';
 export * from './useNotifyIsFormInvalid';
 export * from './useAugmentedForm';
 export * from './useInput';

packages/ra-core/src/form/useAugmentedForm.ts

@@ -38,21 +38,16 @@ import { sanitizeEmptyValues as sanitizeValues } from './sanitizeEmptyValues';
  */
 export const useAugmentedForm = (props: UseAugmentedFormProps) => {
     const {
-        context,
         criteriaMode = 'firstError',
         defaultValues,
-        delayError,
         formRootPathname,
-        mode,
         resolver,
         reValidateMode = 'onChange',
         onSubmit,
         sanitizeEmptyValues,
-        shouldFocusError,
-        shouldUnregister,
-        shouldUseNativeValidation,
         warnWhenUnsavedChanges,
         validate,
+        ...rest
     } = props;
     const record = useRecordContext(props);
     const saveContext = useSaveContext();
@@ -79,39 +74,15 @@ export const useAugmentedForm = (props: UseAugmentedFormProps) => {
         : undefined;
 
     const form = useForm({
-        context,
         criteriaMode,
-        defaultValues: defaultValuesIncludingRecord,
-        delayError,
-        mode,
+        values: defaultValuesIncludingRecord,
         reValidateMode,
         resolver: finalResolver,
-        shouldFocusError,
-        shouldUnregister,
-        shouldUseNativeValidation,
+        ...rest,
     });
 
     const formRef = useRef(form);
 
-    // initialize form with record
-    /* eslint-disable react-hooks/exhaustive-deps */
-    useEffect(() => {
-        if (!record) {
-            return;
-        }
-        const initialValues = getFormInitialValues(defaultValues, record);
-        form.reset(initialValues);
-    }, [
-        JSON.stringify({
-            defaultValues:
-                typeof defaultValues === 'function'
-                    ? 'function'
-                    : defaultValues,
-            record,
-        }),
-    ]);
-    /* eslint-enable react-hooks/exhaustive-deps */
-
     // notify on invalid form
     useNotifyIsFormInvalid(form.control);
 

packages/ra-core/src/form/useInitializeFormWithRecord.ts

@@ -1119,7 +1119,7 @@ describe('<AutocompleteInput />', () => {
                 <SimpleForm
                     mode="onBlur"
                     onSubmit={jest.fn()}
-                    defaultValues={{ role: 2 }}
+                    defaultValues={{ language: 'ang' }}
                 >
                     <AutocompleteInput
                         source="language"
@@ -1184,7 +1184,7 @@ describe('<AutocompleteInput />', () => {
                 <SimpleForm
                     mode="onBlur"
                     onSubmit={jest.fn()}
-                    defaultValues={{ role: 2 }}
+                    defaultValues={{ language: 'ang' }}
                 >
                     <AutocompleteInput
                         source="language"
@@ -1250,7 +1250,7 @@ describe('<AutocompleteInput />', () => {
                 <SimpleForm
                     mode="onBlur"
                     onSubmit={jest.fn()}
-                    defaultValues={{ role: 2 }}
+                    defaultValues={{ language: 'ang' }}
                 >
                     <AutocompleteInput
                         source="language"