From 3a6f18fa234bc242bd21fe1c9d284f9c3a9fbea0 Mon Sep 17 00:00:00 2001
From: JulienM <julienm@marmelab.com>
Date: Tue, 28 Jan 2020 11:36:17 +0100
Subject: [PATCH 1/2] Display null label in NullableBooleanInput

---
 docs/Inputs.md                                |  21 ++++++++++++++++++
 .../img/nullable-boolean-input-null-label.png | Bin 0 -> 2050 bytes
 .../src/input/NullableBooleanInput.tsx        |  18 ++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 docs/img/nullable-boolean-input-null-label.png

diff --git a/docs/Inputs.md b/docs/Inputs.md
index 47a5c33ac6d..36bdd9ca214 100644
--- a/docs/Inputs.md
+++ b/docs/Inputs.md
@@ -384,6 +384,27 @@ import { NullableBooleanInput } from 'react-admin';
 
 ![NullableBooleanInput](./img/nullable-boolean-input.png)
 
+`<NullableBooleanInput />` doesn't display the empty option by default. If you want to customize its label and display it, you can use the `displayNull` prop.
+
+```jsx
+import { NullableBooleanInput } from 'react-admin';
+
+<NullableBooleanInput 
+    label="Commentable"
+    source="commentable"
+    displayNull
+/>
+```
+
+```jsx
+import englishMessages from 'ra-language-english';
+
+englishMessages.ra.boolean.null = 'Null label';
+```
+
+![NullableBooleanInput](./img/nullable-boolean-input-null-label.png)
+
+
 `<BooleanInput>` and `<NullableBooleanInput>` also accepts the [common input props](./Inputs.md#common-input-props).
 
 ## `<CheckboxGroupInput>`
diff --git a/docs/img/nullable-boolean-input-null-label.png b/docs/img/nullable-boolean-input-null-label.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cc1c78098ac5be5fa2cb4d932999bc6a0be39ad
GIT binary patch
literal 2050
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
RvVOP)AZ(oBbyk6Q{sALe*s1^k

literal 0
HcmV?d00001

diff --git a/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx b/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx
index 4866b207f0c..c5b6c63ef43 100644
--- a/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx
+++ b/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx
@@ -40,6 +40,7 @@ const NullableBooleanInput: FunctionComponent<
     onChange,
     onFocus,
     options,
+    displayNull,
     parse = getBooleanFromString,
     resource,
     source,
@@ -65,6 +66,21 @@ const NullableBooleanInput: FunctionComponent<
         source,
         validate,
     });
+
+    const enhancedOptions = displayNull
+        ? {
+              ...options,
+              SelectProps: {
+                  ...(options && options.SelectProps),
+                  displayEmpty: true,
+              },
+              InputLabelProps: {
+                  ...(options && options.InputLabelProps),
+                  shrink: true,
+              },
+          }
+        : { ...options };
+
     return (
         <TextField
             id={id}
@@ -89,7 +105,7 @@ const NullableBooleanInput: FunctionComponent<
             }
             className={classnames(classes.input, className)}
             variant={variant}
-            {...options}
+            {...enhancedOptions}
             {...sanitizeRestProps(rest)}
         >
             <MenuItem value="">{translate('ra.boolean.null')}</MenuItem>

From 0b75ae7ab4b1aea93449948df63584658ddc00c5 Mon Sep 17 00:00:00 2001
From: JulienM <julienm@marmelab.com>
Date: Tue, 28 Jan 2020 18:14:43 +0100
Subject: [PATCH 2/2] options precede on displayNull

---
 .../ra-ui-materialui/src/input/NullableBooleanInput.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx b/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx
index c5b6c63ef43..e5b4cc2b8a0 100644
--- a/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx
+++ b/packages/ra-ui-materialui/src/input/NullableBooleanInput.tsx
@@ -71,15 +71,15 @@ const NullableBooleanInput: FunctionComponent<
         ? {
               ...options,
               SelectProps: {
-                  ...(options && options.SelectProps),
                   displayEmpty: true,
+                  ...(options && options.SelectProps),
               },
               InputLabelProps: {
-                  ...(options && options.InputLabelProps),
                   shrink: true,
+                  ...(options && options.InputLabelProps),
               },
           }
-        : { ...options };
+        : options;
 
     return (
         <TextField