Speed up ArrayInput

examples/simple/package.json

@@ -25,7 +25,7 @@
         "react": "^18.3.1",
         "react-admin": "^5.12.0",
         "react-dom": "^18.3.1",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.65.0",
         "react-router": "^6.28.1",
         "react-router-dom": "^6.28.1"
     },

packages/ra-core/package.json

@@ -43,7 +43,7 @@
         "jscodeshift": "^0.15.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.65.0",
         "react-router": "^6.28.1",
         "react-router-dom": "^6.28.1",
         "rimraf": "^3.0.2",
@@ -54,7 +54,7 @@
     "peerDependencies": {
         "react": "^18.0.0 || ^19.0.0",
         "react-dom": "^18.0.0 || ^19.0.0",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.65.0",
         "react-router": "^6.28.1 || ^7.1.1",
         "react-router-dom": "^6.28.1 || ^7.1.1"
     },

packages/ra-core/src/core/SourceContext.tsx

@@ -33,6 +33,7 @@ export type SourceContextValue = {
 export const SourceContext = createContext<SourceContextValue | undefined>(
     undefined
 );
+SourceContext.displayName = 'SourceContext';
 
 const defaultContextValue = {
     getSource: (source: string) => source,

packages/ra-core/src/form/FilterLiveForm.tsx

@@ -79,8 +79,7 @@ export const FilterLiveForm = (props: FilterLiveFormProps) => {
         resolver: finalResolver,
         ...rest,
     });
-    const { handleSubmit, getValues, reset, watch, formState } = formContext;
-    const { isValid } = formState;
+    const { handleSubmit, getValues, reset, trigger, watch } = formContext;
 
     const hasJustBeenModifiedByUser = React.useRef(false);
 
@@ -103,17 +102,15 @@ export const FilterLiveForm = (props: FilterLiveFormProps) => {
     }, [JSON.stringify(filterValues), getValues, reset]);
 
     const onSubmit = (values: any): void => {
-        // Do not call setFilters if the form is invalid
-        if (!isValid) {
-            return;
-        }
         setFilters(mergeObjNotArray(filterValues, values));
     };
     const debouncedOnSubmit = useDebouncedEvent(onSubmit, debounce || 0);
 
     // Submit the form on values change
     useEffect(() => {
-        const { unsubscribe } = watch((values, { name }) => {
+        const { unsubscribe } = watch(async (values, { name }) => {
+            // Trigger validation manually
+            if (!(await trigger())) return;
             // Check that the name is present to avoid setting filters when
             // watch was triggered by a reset
             if (name) {
@@ -129,7 +126,7 @@ export const FilterLiveForm = (props: FilterLiveFormProps) => {
             }
         });
         return () => unsubscribe();
-    }, [watch, debouncedOnSubmit]);
+    }, [watch, debouncedOnSubmit, trigger]);
 
     const sourceContext = React.useMemo<SourceContextValue>(
         () => ({

packages/ra-core/src/form/groups/FormGroupsContext.tsx

@@ -3,6 +3,7 @@ import { createContext } from 'react';
 export const FormGroupsContext = createContext<
     FormGroupsContextValue | undefined
 >(undefined);
+FormGroupsContext.displayName = 'FormGroupsContext';
 
 export type FormGroupSubscriber = () => void;
 

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

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import {
     FieldValues,
     UseFieldArrayReturn,
@@ -36,12 +36,21 @@ export const useApplyInputDefaultValues = ({
     const finalSource = useWrappedSource(source);
 
     const record = useRecordContext(inputProps);
-    const { getValues, resetField, formState, reset } = useFormContext();
+    const { getValues, resetField, reset, subscribe } = useFormContext();
     const recordValue = get(record, finalSource);
     const formValue = get(getValues(), finalSource);
-    const { dirtyFields } = formState;
-    const isDirty = Object.keys(dirtyFields).includes(finalSource);
+    const isDirty = useRef<boolean | undefined>(undefined);
 
+    useEffect(() => {
+        return subscribe({
+            formState: { dirtyFields: true },
+            callback: ({ dirtyFields }) => {
+                isDirty.current = Object.keys(dirtyFields ?? {}).includes(
+                    finalSource
+                );
+            },
+        });
+    }, [finalSource, subscribe]);
     useEffect(() => {
         if (
             defaultValue == null ||
@@ -52,7 +61,7 @@ export const useApplyInputDefaultValues = ({
             // We check strictly for undefined to avoid setting default value
             // when the field is null
             recordValue !== undefined ||
-            isDirty
+            isDirty.current === true
         ) {
             return;
         }

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

@@ -76,20 +76,24 @@ export const useAugmentedForm = <RecordType = any>(
 
     const form = useForm({
         criteriaMode,
-        values: defaultValuesIncludingRecord,
+        defaultValues: defaultValuesIncludingRecord,
         reValidateMode,
         resolver: finalResolver,
         ...rest,
     });
 
     const formRef = useRef(form);
+    const { reset } = form;
+
+    useEffect(() => {
+        reset(defaultValuesIncludingRecord);
+    }, [defaultValuesIncludingRecord, reset]);
 
     // notify on invalid form
     useNotifyIsFormInvalid(form.control, !disableInvalidFormNotification);
 
     const recordFromLocation = useRecordFromLocation();
     const recordFromLocationApplied = useRef(false);
-    const { reset } = form;
     useEffect(() => {
         if (recordFromLocation && !recordFromLocationApplied.current) {
             reset(merge({}, defaultValuesIncludingRecord, recordFromLocation), {

packages/ra-core/src/form/useInput.stories.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { useForm, FormProvider, useFieldArray } from 'react-hook-form';
 import { CoreAdminContext } from '../core';
 import { Form } from './Form';
 import { InputProps, useInput } from './useInput';
@@ -7,12 +8,15 @@ export default {
     title: 'ra-core/form/useInput',
 };
 
-const Input = (props: InputProps) => {
+const Input = (props: InputProps & { log?: boolean }) => {
+    const { label, log } = props;
     const { id, field, fieldState } = useInput(props);
-
+    if (log) {
+        console.log(`Input ${id} rendered:`);
+    }
     return (
         <label htmlFor={id}>
-            {id}: <input id={id} {...field} />
+            {label ?? id}: <input id={id} {...field} />
             {fieldState.error && <span>{fieldState.error.message}</span>}
         </label>
     );
@@ -86,3 +90,38 @@ DefaultValue.argTypes = {
         control: { type: 'select' },
     },
 };
+
+export const Large = () => {
+    const [submittedData, setSubmittedData] = React.useState<any>();
+    const fields = Array.from({ length: 15 }).map((_, index) => (
+        <Input
+            key={index}
+            source={`field${index + 1}`}
+            label={`field${index + 1}`}
+        />
+    ));
+    return (
+        <CoreAdminContext>
+            <Form
+                onSubmit={data => setSubmittedData(data)}
+                record={Array.from({ length: 15 }).reduce((acc, _, index) => {
+                    acc[`field${index + 1}`] = `value${index + 1}`;
+                    return acc;
+                }, {})}
+            >
+                <div
+                    style={{
+                        display: 'flex',
+                        flexDirection: 'column',
+                        gap: '1em',
+                        marginBottom: '1em',
+                    }}
+                >
+                    {fields}
+                </div>
+                <button type="submit">Submit</button>
+            </Form>
+            <pre>{JSON.stringify(submittedData, null, 2)}</pre>
+        </CoreAdminContext>
+    );
+};

packages/ra-input-rich-text/package.json

@@ -57,7 +57,7 @@
         "ra-ui-materialui": "^5.12.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.65.0",
         "rimraf": "^3.0.2",
         "tippy.js": "^6.3.7",
         "typescript": "^5.1.3"

packages/ra-ui-materialui/package.json

@@ -47,7 +47,7 @@
         "ra-language-english": "^5.12.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.65.0",
         "react-is": "^18.2.0 || ^19.0.0",
         "react-router": "^6.28.1",
         "react-router-dom": "^6.28.1",

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

@@ -173,6 +173,44 @@ export const ReadOnly = () => (
     </TestMemoryRouter>
 );
 
+export const DefaultValues = () => (
+    <TestMemoryRouter initialEntries={['/books/1']}>
+        <Admin dataProvider={dataProvider}>
+            <Resource
+                name="books"
+                edit={() => {
+                    return (
+                        <Edit
+                            mutationMode="pessimistic"
+                            mutationOptions={{
+                                onSuccess: data => {
+                                    console.log(data);
+                                },
+                            }}
+                        >
+                            <SimpleForm>
+                                <TextInput source="title" />
+                                <ArrayInput source="authors">
+                                    <SimpleFormIterator>
+                                        <TextInput
+                                            source="name"
+                                            defaultValue="John Doe"
+                                        />
+                                        <TextInput
+                                            source="role"
+                                            defaultValue="Author"
+                                        />
+                                    </SimpleFormIterator>
+                                </ArrayInput>
+                            </SimpleForm>
+                        </Edit>
+                    );
+                }}
+            />
+        </Admin>
+    </TestMemoryRouter>
+);
+
 const BookEditWithAutocomplete = () => {
     return (
         <Edit

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

@@ -17,7 +17,9 @@ import {
     type ComponentsOverrides,
     useThemeProps,
 } from '@mui/material';
-import { LinearProgress } from '../../layout';
+import get from 'lodash/get';
+
+import { LinearProgress } from '../../layout/LinearProgress';
 import { InputHelperText } from '../InputHelperText';
 import { sanitizeInputRestProps } from '../sanitizeInputRestProps';
 import { Labeled } from '../../Labeled';
@@ -85,8 +87,18 @@ export const ArrayInput = (inProps: ArrayInputProps) => {
 
     const parentSourceContext = useSourceContext();
     const finalSource = parentSourceContext.getSource(arraySource);
-    const { getFieldState, formState } = useFormContext();
-    const { error } = getFieldState(finalSource, formState);
+    const { subscribe } = useFormContext();
+
+    const [error, setError] = React.useState<any>();
+    React.useEffect(() => {
+        return subscribe({
+            formState: { errors: true },
+            callback: ({ errors }) => {
+                const error = get(errors ?? {}, finalSource);
+                setError(error);
+            },
+        });
+    }, [finalSource, subscribe]);
     const renderHelperText = helperText !== false || !!error;
 
     if (isPending) {

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

@@ -5,6 +5,7 @@ import { Edit } from '../../detail';
 import { SimpleForm } from '../../form';
 import { ArrayInput } from './ArrayInput';
 import { SimpleFormIterator } from './SimpleFormIterator';
+import { NumberInput } from '../NumberInput';
 import { TextInput } from '../TextInput';
 import { AdminContext } from '../../AdminContext';
 import { defaultTheme } from '../../theme/defaultTheme';
@@ -14,6 +15,7 @@ import {
     testDataProvider,
     useSimpleFormIteratorItem,
 } from 'ra-core';
+import { AutocompleteInput } from '../AutocompleteInput';
 
 export default { title: 'ra-ui-materialui/input/SimpleFormIterator' };
 
@@ -286,3 +288,43 @@ export const WithFormDataConsumer = () => (
         </ResourceContextProvider>
     </AdminContext>
 );
+
+const largeDataProvider = {
+    getOne: async () => ({
+        data: {
+            id: 1,
+            name: 'Book 1',
+            authors: Array.from({ length: 100 }, (_, i) => ({
+                id: i + 1,
+                first_name: `Author ${i + 1}`,
+                last_name: `LastName ${i + 1}`,
+                age: 30 + (i % 20),
+            })),
+        },
+    }),
+} as any;
+
+export const Large = () => (
+    <AdminContext dataProvider={largeDataProvider} defaultTheme="light">
+        <Edit resource="books" id="1">
+            <SimpleForm>
+                <TextInput source="name" />
+                <ArrayInput source="authors">
+                    <SimpleFormIterator inline>
+                        <TextInput source="first_name" helperText={false} />
+                        <TextInput source="last_name" helperText={false} />
+                        <NumberInput source="age" helperText={false} />
+                        <AutocompleteInput
+                            source="status"
+                            choices={[
+                                { id: 'active', name: 'Active' },
+                                { id: 'inactive', name: 'Inactive' },
+                            ]}
+                            helperText={false}
+                        />
+                    </SimpleFormIterator>
+                </ArrayInput>
+            </SimpleForm>
+        </Edit>
+    </AdminContext>
+);