From 80e8f33c97bd091c99880042c5e36773de4db4ad Mon Sep 17 00:00:00 2001
From: Paulo Viana <paulo9mv@yahoo.com.br>
Date: Sat, 20 Feb 2021 15:50:30 -0400
Subject: [PATCH 1/5] feat: add disable options to SelectArrayInput

commit 8d8e3f753c04c3456ab495f41c0bbec70da9c3a5
Author: Paulo Viana <paulo9mv@yahoo.com.br>
Date:   Sat Feb 20 15:45:13 2021 -0400

    feat: add documentation

commit fce13066a861cc26c8eced4f9ea1a0c1c5fbaf97
Author: Paulo Viana <paulo9mv@yahoo.com.br>
Date:   Sat Feb 20 13:28:33 2021 -0400

    feat: add disableValue prop to useChoices

commit 0db4dba9290e603f85b9fe58c7c6d374b72010e8
Author: Paulo Viana <paulo9mv@yahoo.com.br>
Date:   Sat Feb 20 11:21:00 2021 -0400

    feat: add disabled selectArrayInput unit test

commit 1c1f7a8c62a8597712c8f0ba8d977bffd26d3ffd
Author: Paulo Viana <paulo9mv@yahoo.com.br>
Date:   Fri Feb 19 08:33:51 2021 -0400

    feat: remove optionDisable

commit 03a88a8c83c2fe8f4404d645925ac4c8442ba647
Author: Paulo Viana <paulo9mv@yahoo.com.br>
Date:   Fri Feb 19 08:31:48 2021 -0400

    feat: add disabled option to menuItem

commit ab59e7263ada0efa317a348aae1aed20224676f8
Author: Paulo Viana <paulo9mv@yahoo.com.br>
Date:   Thu Feb 18 23:31:31 2021 -0400

    feat: add disabled choices to selectArrayInput
---
 docs/Inputs.md                                | 22 ++++++++++++++++++
 examples/demo/src/segments/data.ts            |  6 ++++-
 examples/demo/src/visitors/SegmentsInput.tsx  |  1 +
 packages/ra-core/src/form/useChoices.ts       |  7 ++++++
 .../src/input/SelectArrayInput.spec.tsx       | 23 +++++++++++++++++++
 .../src/input/SelectArrayInput.tsx            | 10 ++++++--
 6 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/docs/Inputs.md b/docs/Inputs.md
index e9b620929e2..5cabaeef84c 100644
--- a/docs/Inputs.md
+++ b/docs/Inputs.md
@@ -1338,6 +1338,28 @@ const choices = [
 ];
 ```
 
+You can set disabled values by setting the `disabled` property of one item: 
+
+```jsx
+const choices = [
+    { _id: 123, full_name: 'Leo Tolstoi', sex: 'M' },
+    { _id: 456, full_name: 'Jane Austen', sex: 'F' },
+    { _id: 1, full_name: 'System Administrator', sex: 'F', disabled: true },
+];
+<SelectArrayInput source="author_id" choices={choices} optionText="full_name" optionValue="_id" />
+```
+
+You can use a custom field name by setting `disableValue` prop: 
+
+```jsx
+const choices = [
+    { _id: 123, full_name: 'Leo Tolstoi', sex: 'M' },
+    { _id: 456, full_name: 'Jane Austen', sex: 'F' },
+    { _id: 987, full_name: 'Jack Harden', sex: 'M', not_available: true },
+];
+<SelectArrayInput source="contact_id" choices={choices} optionText="full_name" optionValue="_id" disableValue="not_available" />
+```
+
 Lastly, use the `options` attribute if you want to override any of the `<Select>` attributes:
 
 {% raw %}
diff --git a/examples/demo/src/segments/data.ts b/examples/demo/src/segments/data.ts
index 9678754c482..c3da3fc9d71 100644
--- a/examples/demo/src/segments/data.ts
+++ b/examples/demo/src/segments/data.ts
@@ -4,5 +4,9 @@ export default [
     { id: 'ordered_once', name: 'resources.segments.data.ordered_once' },
     { id: 'regular', name: 'resources.segments.data.regular' },
     { id: 'returns', name: 'resources.segments.data.returns' },
-    { id: 'reviewer', name: 'resources.segments.data.reviewer' },
+    {
+        id: 'reviewer',
+        name: 'resources.segments.data.reviewer',
+        disabled: true,
+    },
 ];
diff --git a/examples/demo/src/visitors/SegmentsInput.tsx b/examples/demo/src/visitors/SegmentsInput.tsx
index 6d1d9535d30..6b097caf0b9 100644
--- a/examples/demo/src/visitors/SegmentsInput.tsx
+++ b/examples/demo/src/visitors/SegmentsInput.tsx
@@ -17,6 +17,7 @@ const SegmentsInput: FC<Props> = ({ addField, ...rest }) => {
             choices={segments.map(segment => ({
                 id: segment.id,
                 name: translate(segment.name),
+                disabled: segment.disabled,
             }))}
         />
     );
diff --git a/packages/ra-core/src/form/useChoices.ts b/packages/ra-core/src/form/useChoices.ts
index 51259d003d6..3db7303986c 100644
--- a/packages/ra-core/src/form/useChoices.ts
+++ b/packages/ra-core/src/form/useChoices.ts
@@ -29,6 +29,7 @@ export interface ChoicesProps {
 export interface UseChoicesOptions {
     optionValue?: string;
     optionText?: OptionTextElement | OptionText | string;
+    disableValue?: string;
     translateChoice?: boolean;
 }
 
@@ -46,6 +47,7 @@ export interface UseChoicesOptions {
 const useChoices = ({
     optionText = 'name',
     optionValue = 'id',
+    disableValue = 'disabled',
     translateChoice = true,
 }: UseChoicesOptions) => {
     const translate = useTranslate();
@@ -73,9 +75,14 @@ const useChoices = ({
         optionValue,
     ]);
 
+    const getDisableValue = useCallback(choice => get(choice, disableValue), [
+        optionValue,
+    ]);
+
     return {
         getChoiceText,
         getChoiceValue,
+        getDisableValue,
     };
 };
 
diff --git a/packages/ra-ui-materialui/src/input/SelectArrayInput.spec.tsx b/packages/ra-ui-materialui/src/input/SelectArrayInput.spec.tsx
index ebea1064592..29a79343737 100644
--- a/packages/ra-ui-materialui/src/input/SelectArrayInput.spec.tsx
+++ b/packages/ra-ui-materialui/src/input/SelectArrayInput.spec.tsx
@@ -171,6 +171,29 @@ describe('<SelectArrayInput />', () => {
         expect(queryByText('Programming')).not.toBeNull();
     });
 
+    it('should render disable choices marked so', () => {
+        const { getByRole, getByText } = render(
+            <Form
+                onSubmit={jest.fn()}
+                render={() => (
+                    <SelectArrayInput
+                        {...defaultProps}
+                        choices={[
+                            { id: 'ang', name: 'Angular' },
+                            { id: 'rea', name: 'React', disabled: true },
+                        ]}
+                    />
+                )}
+            />
+        );
+        const select = getByRole('button');
+        fireEvent.mouseDown(select);
+        const option1 = getByText('Angular');
+        expect(option1.getAttribute('aria-disabled')).toEqual('false');
+
+        const option2 = getByText('React');
+        expect(option2.getAttribute('aria-disabled')).toEqual('true');
+    });
     it('should translate the choices', () => {
         const { getByRole, queryByText } = render(
             <TestTranslationProvider translate={x => `**${x}**`}>
diff --git a/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx b/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
index aab4272f2f3..da561832d3f 100644
--- a/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
+++ b/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
@@ -41,6 +41,7 @@ const sanitizeRestProps = ({
     crudGetMInputWithOptionsPropsatching,
     crudGetOInputWithOptionsPropsne,
     defaultValue,
+    disableValue,
     filter,
     filterToQuery,
     formClassName,
@@ -143,6 +144,7 @@ const SelectArrayInput: FunctionComponent<SelectArrayInputProps> = props => {
         choices = [],
         classes: classesOverride,
         className,
+        disableValue,
         format,
         helperText,
         label,
@@ -173,9 +175,10 @@ const SelectArrayInput: FunctionComponent<SelectArrayInputProps> = props => {
         }
     }, []);
 
-    const { getChoiceText, getChoiceValue } = useChoices({
+    const { getChoiceText, getChoiceValue, getDisableValue } = useChoices({
         optionText,
         optionValue,
+        disableValue,
         translateChoice,
     });
     const {
@@ -204,12 +207,13 @@ const SelectArrayInput: FunctionComponent<SelectArrayInputProps> = props => {
                 <MenuItem
                     key={getChoiceValue(choice)}
                     value={getChoiceValue(choice)}
+                    disabled={getDisableValue(choice)}
                 >
                     {renderMenuItemOption(choice)}
                 </MenuItem>
             ) : null;
         },
-        [getChoiceValue, renderMenuItemOption]
+        [getChoiceValue, getDisableValue, renderMenuItemOption]
     );
 
     if (loading) {
@@ -311,6 +315,7 @@ SelectArrayInput.propTypes = {
         PropTypes.element,
     ]).isRequired,
     optionValue: PropTypes.string.isRequired,
+    disableValue: PropTypes.string,
     resource: PropTypes.string,
     source: PropTypes.string,
     translateChoice: PropTypes.bool,
@@ -320,6 +325,7 @@ SelectArrayInput.defaultProps = {
     options: {},
     optionText: 'name',
     optionValue: 'id',
+    disableValue: 'disabled',
     translateChoice: true,
 };
 

From e2af216a46e13e091ef1328991c7473d97bbb359 Mon Sep 17 00:00:00 2001
From: Paulo Viana <paulo9mv@yahoo.com.br>
Date: Sat, 20 Feb 2021 16:42:23 -0400
Subject: [PATCH 2/5] add disable value to callback

---
 packages/ra-core/src/form/useChoices.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ra-core/src/form/useChoices.ts b/packages/ra-core/src/form/useChoices.ts
index 3db7303986c..d54115bd1c4 100644
--- a/packages/ra-core/src/form/useChoices.ts
+++ b/packages/ra-core/src/form/useChoices.ts
@@ -76,7 +76,7 @@ const useChoices = ({
     ]);
 
     const getDisableValue = useCallback(choice => get(choice, disableValue), [
-        optionValue,
+        disableValue,
     ]);
 
     return {

From a48c68d2f7ec6e376d9fab6c687903a5bbad672b Mon Sep 17 00:00:00 2001
From: Paulo Viana <paulo9mv@yahoo.com.br>
Date: Mon, 22 Feb 2021 08:19:42 -0400
Subject: [PATCH 3/5] Update docs/Inputs.md

Co-authored-by: Gildas Garcia <1122076+djhi@users.noreply.github.com>
---
 docs/Inputs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Inputs.md b/docs/Inputs.md
index 5cabaeef84c..810b7fbccda 100644
--- a/docs/Inputs.md
+++ b/docs/Inputs.md
@@ -1338,7 +1338,7 @@ const choices = [
 ];
 ```
 
-You can set disabled values by setting the `disabled` property of one item: 
+You can render any item as disabled by setting its `disabled` property to `true`: 
 
 ```jsx
 const choices = [

From 6f847ff0d8bb0503944f81fa8dc3286bbb822d00 Mon Sep 17 00:00:00 2001
From: Paulo Viana <paulo9mv@yahoo.com.br>
Date: Mon, 22 Feb 2021 08:19:51 -0400
Subject: [PATCH 4/5] Update docs/Inputs.md

Co-authored-by: Gildas Garcia <1122076+djhi@users.noreply.github.com>
---
 docs/Inputs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Inputs.md b/docs/Inputs.md
index 810b7fbccda..ac4e8afb4db 100644
--- a/docs/Inputs.md
+++ b/docs/Inputs.md
@@ -1349,7 +1349,7 @@ const choices = [
 <SelectArrayInput source="author_id" choices={choices} optionText="full_name" optionValue="_id" />
 ```
 
-You can use a custom field name by setting `disableValue` prop: 
+You can use a custom field name by setting the `disableValue` prop: 
 
 ```jsx
 const choices = [

From 2d551024b9a4086a795f6aa30291364c90522f20 Mon Sep 17 00:00:00 2001
From: Paulo Viana <paulo9mv@yahoo.com.br>
Date: Wed, 24 Feb 2021 10:29:12 -0400
Subject: [PATCH 5/5] feat: remove disabled from examples

---
 examples/demo/src/segments/data.ts           | 6 +-----
 examples/demo/src/visitors/SegmentsInput.tsx | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/examples/demo/src/segments/data.ts b/examples/demo/src/segments/data.ts
index c3da3fc9d71..9678754c482 100644
--- a/examples/demo/src/segments/data.ts
+++ b/examples/demo/src/segments/data.ts
@@ -4,9 +4,5 @@ export default [
     { id: 'ordered_once', name: 'resources.segments.data.ordered_once' },
     { id: 'regular', name: 'resources.segments.data.regular' },
     { id: 'returns', name: 'resources.segments.data.returns' },
-    {
-        id: 'reviewer',
-        name: 'resources.segments.data.reviewer',
-        disabled: true,
-    },
+    { id: 'reviewer', name: 'resources.segments.data.reviewer' },
 ];
diff --git a/examples/demo/src/visitors/SegmentsInput.tsx b/examples/demo/src/visitors/SegmentsInput.tsx
index 6b097caf0b9..6d1d9535d30 100644
--- a/examples/demo/src/visitors/SegmentsInput.tsx
+++ b/examples/demo/src/visitors/SegmentsInput.tsx
@@ -17,7 +17,6 @@ const SegmentsInput: FC<Props> = ({ addField, ...rest }) => {
             choices={segments.map(segment => ({
                 id: segment.id,
                 name: translate(segment.name),
-                disabled: segment.disabled,
             }))}
         />
     );