Fix multiple reset issue

Author: djhi

packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.stories.tsx

@@ -12,7 +12,6 @@ import {
     Resource,
     testI18nProvider,
     TestMemoryRouter,
-    useCreatePath,
     useSourceContext,
 } from 'ra-core';
 import { Button, InputAdornment, Stack } from '@mui/material';
@@ -970,10 +969,8 @@ const BookCreateReset = () => {
 };
 
 export const Reset = () => {
-    const createPath = useCreatePath();
-    const initialEntrie = createPath({ resource: 'books', type: 'create' });
     return (
-        <TestMemoryRouter initialEntries={[initialEntrie]}>
+        <TestMemoryRouter initialEntries={['/books/create']}>
             <Admin dataProvider={dataProvider}>
                 <Resource name="books" create={BookCreateReset} />
             </Admin>

packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.spec.tsx

@@ -456,16 +456,24 @@ describe('<SimpleFormIterator />', () => {
             expect(inputElements.length).toBe(1);
         });
 
-        expect(
-            screen
-                .queryAllByLabelText('Email')
-                .map(inputElement => (inputElement as HTMLInputElement).value)
-        ).toEqual(['']);
-        expect(
-            screen
-                .queryAllByLabelText('Name')
-                .map(inputElement => (inputElement as HTMLInputElement).value)
-        ).toEqual(['']);
+        await waitFor(() => {
+            expect(
+                screen
+                    .queryAllByLabelText('Email')
+                    .map(
+                        inputElement => (inputElement as HTMLInputElement).value
+                    )
+            ).toEqual(['']);
+        });
+        await waitFor(() => {
+            expect(
+                screen
+                    .queryAllByLabelText('Name')
+                    .map(
+                        inputElement => (inputElement as HTMLInputElement).value
+                    )
+            ).toEqual(['']);
+        });
 
         expect(screen.queryAllByLabelText('ra.action.remove').length).toBe(1);
     });

packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.stories.tsx

@@ -9,6 +9,11 @@ import { TextInput } from '../TextInput';
 import { AdminContext } from '../../AdminContext';
 import { defaultTheme } from '../../theme/defaultTheme';
 import { useSimpleFormIteratorItem } from './useSimpleFormIteratorItem';
+import {
+    FormDataConsumer,
+    ResourceContextProvider,
+    testDataProvider,
+} from 'ra-core';
 
 export default { title: 'ra-ui-materialui/input/SimpleFormIterator' };
 
@@ -231,3 +236,51 @@ export const UseSimpleFormIteratorItem = () => (
         </SimpleFormIterator>
     </Wrapper>
 );
+
+export const DefaultValue = () => (
+    <AdminContext dataProvider={testDataProvider()} defaultTheme="light">
+        <ResourceContextProvider value="posts">
+            <SimpleForm
+                defaultValues={{
+                    emails: [{ email: '[email protected]', name: 'test' }],
+                }}
+            >
+                <ArrayInput source="emails">
+                    <SimpleFormIterator>
+                        <TextInput source="email" label="Email" />
+                        <TextInput source="name" label="Name" />
+                    </SimpleFormIterator>
+                </ArrayInput>
+            </SimpleForm>
+        </ResourceContextProvider>
+    </AdminContext>
+);
+
+export const DefaultValueWithFormDataConsumer = () => (
+    <AdminContext dataProvider={testDataProvider()} defaultTheme="light">
+        <ResourceContextProvider value="posts">
+            <SimpleForm
+                defaultValues={{
+                    emails: [{ email: '[email protected]', name: 'test' }],
+                }}
+            >
+                <ArrayInput source="emails">
+                    <SimpleFormIterator>
+                        <FormDataConsumer>
+                            {() => (
+                                <>
+                                    <TextInput
+                                        source="email"
+                                        label="Email"
+                                        defaultValue="[email protected]"
+                                    />
+                                    <TextInput source="name" label="Name" />
+                                </>
+                            )}
+                        </FormDataConsumer>
+                    </SimpleFormIterator>
+                </ArrayInput>
+            </SimpleForm>
+        </ResourceContextProvider>
+    </AdminContext>
+);

packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx

@@ -66,7 +66,7 @@ export const SimpleFormIterator = (inProps: SimpleFormIteratorProps) => {
 
     const [confirmIsOpen, setConfirmIsOpen] = useState<boolean>(false);
     const { append, fields, move, remove, replace } = useArrayInput(props);
-    const { resetField, trigger, getValues } = useFormContext();
+    const { trigger, getValues } = useFormContext();
     const translate = useTranslate();
     const record = useRecordContext(props);
     const initialDefaultValue = useRef({});
@@ -105,7 +105,7 @@ export const SimpleFormIterator = (inProps: SimpleFormIteratorProps) => {
                     !Children.only(children).props.source &&
                     // Make sure it's not a FormDataConsumer
                     // @ts-ignore
-                    !Children.only(children).type !== FormDataConsumer
+                    Children.only(children).type !== FormDataConsumer
                 ) {
                     // ArrayInput used for an array of scalar values
                     // (e.g. tags: ['foo', 'bar'])
@@ -128,10 +128,8 @@ export const SimpleFormIterator = (inProps: SimpleFormIteratorProps) => {
                 }
             }
             append(defaultValue);
-            // Make sure the newly added inputs are not considered dirty by react-hook-form
-            resetField(`${finalSource}.${fields.length}`, { defaultValue });
         },
-        [append, children, resetField, finalSource, fields.length]
+        [append, children]
     );
 
     const handleReorder = useCallback(