From add545a9dbae84385ebe8b76c98a6fb68bc23bb4 Mon Sep 17 00:00:00 2001
From: Natrim <natrim@users.noreply.github.com>
Date: Mon, 2 Sep 2019 08:40:59 +0200
Subject: [PATCH] SimpleForm/TabbedForm - deprecate defaultValue

and add initialValues to proptypes
---
 UPGRADE.md                                    | 27 +++++++++++++++++
 docs/CreateEdit.md                            | 22 +++++++-------
 .../ra-ui-materialui/src/form/SimpleForm.js   | 17 ++++++-----
 .../ra-ui-materialui/src/form/TabbedForm.js   | 17 ++++++-----
 .../src/form/getFormInitialValues.js          | 30 +++++++++++++++++++
 packages/ra-ui-materialui/src/form/index.js   |  2 ++
 6 files changed, 89 insertions(+), 26 deletions(-)
 create mode 100644 packages/ra-ui-materialui/src/form/getFormInitialValues.js

diff --git a/UPGRADE.md b/UPGRADE.md
index ffbb87cfd34..51117dabb34 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -883,6 +883,33 @@ const PostFilter = props =>
     </Filter>;
 ```
 
+## Form prop `defaultValue` was renamed to `initialValues`
+
+```diff
+// for SimpleForm
+const PostEdit = props =>
+    <Edit {...props}>
+        <SimpleForm
+-           defaultValue={{ stock: 0 }}
++           initialValues={{ stock: 0 }}
+        >
+            // ...
+        </SimpleForm>
+    </Edit>;
+// for TabbedForm
+const PostEdit = props =>
+    <Edit {...props}>
+        <TabbedForm
+-           defaultValue={{ stock: 0 }}
++           initialValues={{ stock: 0 }}
+        >
+            <FormTab label="Identity>
+                // ...
+            </FormTab>
+        </TabbedForm>
+    </Edit>;
+```
+
 ## Complete rewrite of the AutocompleteInput component
 
 We rewrote the `<AutocompleteInput>` component from scratch using [`downshift`](https://github.com/downshift-js/downshift), while the previous version was based on [react-autosuggest](http://react-autosuggest.js.org/). The new `<AutocompleteInput>` component is more robust and more future-proof, and its API didn't change.
diff --git a/docs/CreateEdit.md b/docs/CreateEdit.md
index 391de3a28c9..5181ccc371d 100644
--- a/docs/CreateEdit.md
+++ b/docs/CreateEdit.md
@@ -358,7 +358,7 @@ to change this behaviour you can pass `false` for the `submitOnEnter` property,
 
 Here are all the props accepted by the `<SimpleForm>` component:
 
-* [`defaultValue`](#default-values)
+* [`initialValues`](#default-values)
 * [`validate`](#validation)
 * [`submitOnEnter`](#submit-on-enter)
 * [`redirect`](#redirection-after-submission)
@@ -391,7 +391,7 @@ to change this behaviour you can pass `false` for the `submitOnEnter` property.
 
 Here are all the props accepted by the `<TabbedForm>` component:
 
-* [`defaultValue`](#default-values)
+* [`initialValues`](#default-values)
 * [`validate`](#validation)
 * [`submitOnEnter`](#submit-on-enter)
 * [`redirect`](#redirection-after-submission)
@@ -467,17 +467,19 @@ export const PostEdit = (props) => (
 
 ## Default Values
 
-To define default values, you can add a `defaultValue` prop to form components (`<SimpleForm>`, `<Tabbedform>`, etc.), or add a `defaultValue` to individual input components. Let's see each of these options.
+To define default values, you can add a `initialValues` prop to form components (`<SimpleForm>`, `<Tabbedform>`, etc.), or add a `defaultValue` to individual input components. Let's see each of these options.
+
+**Note**: on RA v2 the `initialValues` used to be named `defaultValue`
 
 ### Global Default Value
 
-The value of the form `defaultValue` prop can be an object, or a function returning an object, specifying default values for the created record. For instance:
+The value of the form `initialValues` prop is an object, or a function returning an object, specifying default values for the created record. For instance:
 
 ```jsx
 const postDefaultValue = { created_at: new Date(), nb_views: 0 };
 export const PostCreate = (props) => (
     <Create {...props}>
-        <SimpleForm defaultValue={postDefaultValue}>
+        <SimpleForm initialValues={postDefaultValue}>
             <TextInput source="title" />
             <RichTextInput source="body" />
             <NumberInput source="nb_views" />
@@ -486,11 +488,11 @@ export const PostCreate = (props) => (
 );
 ```
 
-**Tip**: You can include properties in the form `defaultValue` that are not listed as input components, like the `created_at` property in the previous example.
+**Tip**: You can include properties in the form `initialValues` that are not listed as input components, like the `created_at` property in the previous example.
 
 ### Per Input Default Value
 
-Alternatively, you can specify a `defaultValue` prop directly in `<Input>` components. Just like for form-level default values, an input-level default value can be a scalar, or a function returning a scalar.  React-admin will merge the input default values with the form default value (input > form):
+Alternatively, you can specify a `defaultValue` prop directly in `<Input>` components. Default value can be a scalar, or a function returning a scalar.  React-admin will merge the input default values with the form default value (input > form):
 
 ```jsx
 export const PostCreate = (props) => (
@@ -630,7 +632,7 @@ const validateStock = [required(), number(), minValue(0)];
 
 export const ProductEdit = ({ ...props }) => (
     <Edit {...props}>
-        <SimpleForm defaultValue={{ stock: 0 }}>
+        <SimpleForm initialValues={{ stock: 0 }}>
             ...
             {/* do this */}
             <NumberInput source="stock" validate={validateStock} />
@@ -914,7 +916,7 @@ export const UserCreate = ({ permissions, ...props }) =>
     <Create {...props}>
         <SimpleForm
             toolbar={<UserCreateToolbar permissions={permissions} />}
-            defaultValue={{ role: 'user' }}
+            initialValues={{ role: 'user' }}
         >
             <TextInput source="name" validate={[required()]} />
             {permissions === 'admin' &&
@@ -932,7 +934,7 @@ This also works inside an `Edition` view with a `TabbedForm`, and you can hide a
 ```jsx
 export const UserEdit = ({ permissions, ...props }) =>
     <Edit title={<UserTitle />} {...props}>
-        <TabbedForm defaultValue={{ role: 'user' }}>
+        <TabbedForm initialValues={{ role: 'user' }}>
             <FormTab label="user.form.summary">
                 {permissions === 'admin' && <TextInput disabled source="id" />}
                 <TextInput source="name" validate={required()} />
diff --git a/packages/ra-ui-materialui/src/form/SimpleForm.js b/packages/ra-ui-materialui/src/form/SimpleForm.js
index 59ffdd77f9b..1580f36cdd4 100644
--- a/packages/ra-ui-materialui/src/form/SimpleForm.js
+++ b/packages/ra-ui-materialui/src/form/SimpleForm.js
@@ -6,11 +6,12 @@ import { useSelector } from 'react-redux';
 import classnames from 'classnames';
 import { useTranslate, useInitializeFormWithRecord } from 'ra-core';
 
+import getFormInitialValues from './getFormInitialValues';
 import FormInput from './FormInput';
 import Toolbar from './Toolbar';
 import CardContentInner from '../layout/CardContentInner';
 
-const SimpleForm = ({ initialValues, ...props }) => {
+const SimpleForm = ({ initialValues, defaultValue, ...props }) => {
     let redirect = useRef(props.redirect);
     // We don't use state here for two reasons:
     // 1. There no way to execute code only after the state has been updated
@@ -27,15 +28,14 @@ const SimpleForm = ({ initialValues, ...props }) => {
         props.save(values, finalRedirect);
     };
 
-    const finalInitialValues = {
-        ...initialValues,
-        ...props.record,
-    };
-
     return (
         <Form
             key={props.version}
-            initialValues={finalInitialValues}
+            initialValues={getFormInitialValues(
+                initialValues,
+                defaultValue,
+                props.record
+            )}
             onSubmit={submit}
             mutators={{ ...arrayMutators }}
             keepDirtyOnReinitialize
@@ -134,7 +134,8 @@ SimpleFormView.propTypes = {
     basePath: PropTypes.string,
     children: PropTypes.node,
     className: PropTypes.string,
-    defaultValue: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
+    defaultValue: PropTypes.oneOfType([PropTypes.object, PropTypes.func]), // @deprecated
+    initialValues: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
     handleSubmit: PropTypes.func, // passed by react-final-form
     invalid: PropTypes.bool,
     pristine: PropTypes.bool,
diff --git a/packages/ra-ui-materialui/src/form/TabbedForm.js b/packages/ra-ui-materialui/src/form/TabbedForm.js
index 7e73435dce7..15c366d5483 100644
--- a/packages/ra-ui-materialui/src/form/TabbedForm.js
+++ b/packages/ra-ui-materialui/src/form/TabbedForm.js
@@ -9,6 +9,7 @@ import Divider from '@material-ui/core/Divider';
 import { makeStyles } from '@material-ui/core/styles';
 import { useTranslate, useInitializeFormWithRecord } from 'ra-core';
 
+import getFormInitialValues from './getFormInitialValues';
 import Toolbar from './Toolbar';
 import TabbedFormTabs from './TabbedFormTabs';
 
@@ -21,7 +22,7 @@ const useStyles = makeStyles(theme => ({
     },
 }));
 
-const TabbedForm = ({ initialValues, ...props }) => {
+const TabbedForm = ({ initialValues, defaultValue, ...props }) => {
     let redirect = useRef(props.redirect);
     // We don't use state here for two reasons:
     // 1. There no way to execute code only after the state has been updated
@@ -39,15 +40,14 @@ const TabbedForm = ({ initialValues, ...props }) => {
         props.save(values, finalRedirect);
     };
 
-    const finalInitialValues = {
-        ...initialValues,
-        ...props.record,
-    };
-
     return (
         <Form
             key={props.version}
-            initialValues={finalInitialValues}
+            initialValues={getFormInitialValues(
+                initialValues,
+                defaultValue,
+                props.record
+            )}
             onSubmit={submit}
             mutators={{ ...arrayMutators }}
             setRedirect={setRedirect}
@@ -185,7 +185,8 @@ TabbedFormView.propTypes = {
     children: PropTypes.node,
     className: PropTypes.string,
     classes: PropTypes.object,
-    defaultValue: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
+    defaultValue: PropTypes.oneOfType([PropTypes.object, PropTypes.func]), // @deprecated
+    initialValues: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
     handleSubmit: PropTypes.func, // passed by react-final-form
     invalid: PropTypes.bool,
     location: PropTypes.object,
diff --git a/packages/ra-ui-materialui/src/form/getFormInitialValues.js b/packages/ra-ui-materialui/src/form/getFormInitialValues.js
new file mode 100644
index 00000000000..86be4438f2b
--- /dev/null
+++ b/packages/ra-ui-materialui/src/form/getFormInitialValues.js
@@ -0,0 +1,30 @@
+export default function getFormInitialValues(
+    initialValues,
+    defaultValue,
+    record
+) {
+    let finalInitialValues = {
+        ...initialValues,
+        ...record,
+    };
+
+    if (typeof defaultValue !== 'undefined') {
+        console.warn(
+            '"defaultValue" is deprecated, please use "initialValues" instead'
+        );
+    }
+
+    if (typeof defaultValue === 'object') {
+        finalInitialValues = {
+            ...defaultValue,
+            ...finalInitialValues,
+        };
+    } else if (typeof defaultValue === 'function') {
+        finalInitialValues = {
+            ...defaultValue(record),
+            ...finalInitialValues,
+        };
+    }
+
+    return finalInitialValues;
+}
diff --git a/packages/ra-ui-materialui/src/form/index.js b/packages/ra-ui-materialui/src/form/index.js
index 644524a059f..c22de4460d8 100644
--- a/packages/ra-ui-materialui/src/form/index.js
+++ b/packages/ra-ui-materialui/src/form/index.js
@@ -5,6 +5,7 @@ import SimpleFormIterator from './SimpleFormIterator';
 import TabbedForm from './TabbedForm';
 import TabbedFormTabs from './TabbedFormTabs';
 import Toolbar from './Toolbar';
+import getFormInitialValues from './getFormInitialValues';
 
 export {
     FormInput,
@@ -14,4 +15,5 @@ export {
     TabbedForm,
     TabbedFormTabs,
     Toolbar,
+    getFormInitialValues,
 };