From 87ece837db860adfa13a2bcda0ba3b4aa452f612 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 12 Oct 2020 12:53:12 +0200
Subject: [PATCH] Show empty option only when prop is passed

---
 .../SingleAutocompleteSelectFieldContent.tsx  |  4 +-
 .../__snapshots__/Stories.test.ts.snap        | 61 +++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx
index 98edcd956..0b3999b88 100644
--- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx
+++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx
@@ -190,7 +190,7 @@ const SingleAutocompleteSelectFieldContent: React.FC<SingleAutocompleteSelectFie
       >
         {choices.length > 0 || displayCustomValue ? (
           <>
-            {
+            {emptyOption && (
               <MenuItem
                 className={classes.menuItem}
                 component="div"
@@ -202,7 +202,7 @@ const SingleAutocompleteSelectFieldContent: React.FC<SingleAutocompleteSelectFie
                   <FormattedMessage defaultMessage="None" />
                 </Typography>
               </MenuItem>
-            }
+            )}
             {add && (
               <MenuItem
                 className={classes.menuItem}
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 06878b342..d69d9ca5c 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -8236,6 +8236,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-selected-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id MuiListItem-selected-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AF"
             role="menuitem"
             tabindex="-1"
           >
@@ -8245,6 +8247,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AX"
             role="menuitem"
             tabindex="-1"
           >
@@ -8254,6 +8258,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AL"
             role="menuitem"
             tabindex="-1"
           >
@@ -8263,6 +8269,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="DZ"
             role="menuitem"
             tabindex="-1"
           >
@@ -8272,6 +8280,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AS"
             role="menuitem"
             tabindex="-1"
           >
@@ -8281,6 +8291,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AD"
             role="menuitem"
             tabindex="-1"
           >
@@ -8290,6 +8302,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AO"
             role="menuitem"
             tabindex="-1"
           >
@@ -8299,6 +8313,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AI"
             role="menuitem"
             tabindex="-1"
           >
@@ -8308,6 +8324,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AQ"
             role="menuitem"
             tabindex="-1"
           >
@@ -8317,6 +8335,8 @@ exports[`Storyshots Generics / Select with autocomplete can load more 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AG"
             role="menuitem"
             tabindex="-1"
           >
@@ -8388,6 +8408,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-selected-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id MuiListItem-selected-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AF"
             role="menuitem"
             tabindex="-1"
           >
@@ -8397,6 +8419,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AX"
             role="menuitem"
             tabindex="-1"
           >
@@ -8406,6 +8430,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AL"
             role="menuitem"
             tabindex="-1"
           >
@@ -8415,6 +8441,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="DZ"
             role="menuitem"
             tabindex="-1"
           >
@@ -8424,6 +8452,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AS"
             role="menuitem"
             tabindex="-1"
           >
@@ -8433,6 +8463,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AD"
             role="menuitem"
             tabindex="-1"
           >
@@ -8442,6 +8474,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AO"
             role="menuitem"
             tabindex="-1"
           >
@@ -8451,6 +8485,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AI"
             role="menuitem"
             tabindex="-1"
           >
@@ -8460,6 +8496,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AQ"
             role="menuitem"
             tabindex="-1"
           >
@@ -8469,6 +8507,8 @@ exports[`Storyshots Generics / Select with autocomplete default 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AG"
             role="menuitem"
             tabindex="-1"
           >
@@ -8880,6 +8920,7 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option-add"
+            data-test-type="add"
             role="menuitem"
             tabindex="-1"
           >
@@ -8907,6 +8948,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-selected-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id MuiListItem-selected-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AF"
             role="menuitem"
             tabindex="-1"
           >
@@ -8916,6 +8959,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AX"
             role="menuitem"
             tabindex="-1"
           >
@@ -8925,6 +8970,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AL"
             role="menuitem"
             tabindex="-1"
           >
@@ -8934,6 +8981,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="DZ"
             role="menuitem"
             tabindex="-1"
           >
@@ -8943,6 +8992,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AS"
             role="menuitem"
             tabindex="-1"
           >
@@ -8952,6 +9003,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AD"
             role="menuitem"
             tabindex="-1"
           >
@@ -8961,6 +9014,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AO"
             role="menuitem"
             tabindex="-1"
           >
@@ -8970,6 +9025,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AI"
             role="menuitem"
             tabindex="-1"
           >
@@ -8979,6 +9036,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AQ"
             role="menuitem"
             tabindex="-1"
           >
@@ -8988,6 +9047,8 @@ exports[`Storyshots Generics / Select with autocomplete with add 1`] = `
             aria-disabled="false"
             class="MuiButtonBase-root-id MuiListItem-root-id MuiMenuItem-root-id SingleAutocompleteSelectFieldContent-menuItem-id MuiMenuItem-gutters-id MuiListItem-gutters-id MuiListItem-button-id"
             data-test="singleautocomplete-select-option"
+            data-test-type="option"
+            data-test-value="AG"
             role="menuitem"
             tabindex="-1"
           >