Merge pull request #8204 from marmelab/fix-simpleforminterator

Fix `SimpleFormIterator` defaultValues when adding a record

Author: slax57

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

@@ -8,6 +8,7 @@ import {
     ReactNode,
     useCallback,
     useMemo,
+    useRef,
 } from 'react';
 import { styled, SxProps } from '@mui/material';
 import clsx from 'clsx';
@@ -49,6 +50,7 @@ export const SimpleFormIterator = (props: SimpleFormIteratorProps) => {
     } = props;
     const { append, fields, move, remove } = useArrayInput(props);
     const record = useRecordContext(props);
+    const initialDefaultValue = useRef({});
 
     const removeField = useCallback(
         (index: number) => {
@@ -57,10 +59,18 @@ export const SimpleFormIterator = (props: SimpleFormIteratorProps) => {
         [remove]
     );
 
+    if (fields.length > 0) {
+        const { id, ...rest } = fields[0];
+        initialDefaultValue.current = rest;
+        for (const k in initialDefaultValue.current)
+            initialDefaultValue.current[k] = '';
+    }
+
     const addField = useCallback(
         (item: any = undefined) => {
             let defaultValue = item;
             if (item == null) {
+                defaultValue = initialDefaultValue.current;
                 if (
                     Children.count(children) === 1 &&
                     React.isValidElement(Children.only(children)) &&
@@ -73,11 +83,13 @@ export const SimpleFormIterator = (props: SimpleFormIteratorProps) => {
                 } else {
                     // ArrayInput used for an array of objects
                     // (e.g. authors: [{ firstName: 'John', lastName: 'Doe' }, { firstName: 'Jane', lastName: 'Doe' }])
-                    defaultValue = {} as Record<string, unknown>;
+                    defaultValue =
+                        defaultValue || ({} as Record<string, unknown>);
                     Children.forEach(children, input => {
                         if (
                             React.isValidElement(input) &&
-                            input.type !== FormDataConsumer
+                            input.type !== FormDataConsumer &&
+                            input.props.source
                         ) {
                             defaultValue[input.props.source] =
                                 input.props.defaultValue ?? '';