From 7349efbbfab8bd9df50ab161830d770a720f1c6d Mon Sep 17 00:00:00 2001
From: Gildas Garcia <1122076+djhi@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:30:25 +0100
Subject: [PATCH 1/2] Ensure Form Inputs can Override the Injected props

---
 packages/ra-ui-materialui/src/form/FormInput.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/ra-ui-materialui/src/form/FormInput.tsx b/packages/ra-ui-materialui/src/form/FormInput.tsx
index 0bf585fb87c..a630199d261 100644
--- a/packages/ra-ui-materialui/src/form/FormInput.tsx
+++ b/packages/ra-ui-materialui/src/form/FormInput.tsx
@@ -29,7 +29,9 @@ const FormInput = <RecordType extends Record | Omit<Record, 'id'> = Record>(
 ) => {
     const { input, classes: classesOverride, ...rest } = props;
     const classes = useStyles(props);
-    const { id, ...inputProps } = input ? input.props : { id: undefined };
+    const { id, className, ...inputProps } = input
+        ? input.props
+        : { id: undefined, className: undefined };
     return input ? (
         <div
             className={classnames(
@@ -49,10 +51,11 @@ const FormInput = <RecordType extends Record | Omit<Record, 'id'> = Record>(
                             {
                                 [classes.input]: !input.props.fullWidth,
                             },
-                            input.props.className
+                            className
                         ),
                         id: input.props.id || input.props.source,
                         ...rest,
+                        ...inputProps,
                     })}
                 </Labeled>
             ) : (
@@ -61,10 +64,11 @@ const FormInput = <RecordType extends Record | Omit<Record, 'id'> = Record>(
                         {
                             [classes.input]: !input.props.fullWidth,
                         },
-                        input.props.className
+                        className
                     ),
                     id: input.props.id || input.props.source,
                     ...rest,
+                    ...inputProps,
                 })
             )}
         </div>

From 9b92ae1c244bdedbab93637498aea6996d811185 Mon Sep 17 00:00:00 2001
From: Gildas Garcia <1122076+djhi@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:30:35 +0100
Subject: [PATCH 2/2] Fix test warnings

---
 packages/ra-ui-materialui/src/form/SimpleForm.spec.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ra-ui-materialui/src/form/SimpleForm.spec.tsx b/packages/ra-ui-materialui/src/form/SimpleForm.spec.tsx
index 525235022de..cac8d39429a 100644
--- a/packages/ra-ui-materialui/src/form/SimpleForm.spec.tsx
+++ b/packages/ra-ui-materialui/src/form/SimpleForm.spec.tsx
@@ -59,7 +59,7 @@ describe('<SimpleForm />', () => {
             <SaveContextProvider value={saveContextValue}>
                 <SideEffectContextProvider value={sideEffects}>
                     <SimpleForm submitOnEnter={false} toolbar={<Toolbar />}>
-                        <div />
+                        <TextInput source="name" />
                     </SimpleForm>
                 </SideEffectContextProvider>
             </SaveContextProvider>
@@ -71,7 +71,7 @@ describe('<SimpleForm />', () => {
             <SaveContextProvider value={saveContextValue}>
                 <SideEffectContextProvider value={sideEffects}>
                     <SimpleForm submitOnEnter toolbar={<Toolbar />}>
-                        <div />
+                        <TextInput source="name" />
                     </SimpleForm>
                 </SideEffectContextProvider>
             </SaveContextProvider>