Fix null value support in inputs

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

@@ -10,12 +10,6 @@ export default function getFormInitialValues(
         getValues(defaultValues, record),
         record
     );
-    // replace null values by empty string to avoid controlled/ uncontrolled input warning
-    Object.keys(finalInitialValues).forEach(key => {
-        if (finalInitialValues[key] === null) {
-            finalInitialValues[key] = '';
-        }
-    });
     return finalInitialValues;
 }
 

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

@@ -13,13 +13,19 @@ export const useApplyInputDefaultValues = (
 ) => {
     const { defaultValue, source } = props;
     const record = useRecordContext(props);
-    const { getValues, resetField } = useFormContext();
+    const {
+        getValues,
+        resetField,
+        getFieldState,
+        formState,
+    } = useFormContext();
     const recordValue = get(record, source);
     const formValue = get(getValues(), source);
+    const { isDirty } = getFieldState(source, formState);
 
     useEffect(() => {
         if (defaultValue == null) return;
-        if (formValue == null && recordValue == null) {
+        if (formValue == null && recordValue == null && !isDirty) {
             // special case for ArrayInput: since we use get(record, source),
             // if source is like foo.23.bar, this effect will run.
             // but we only want to set the default value for the subfield bar