From 006c29fcb06c8fc3c5f36ae93a8d4873a54ec92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lud=C4=9Bk=20Vep=C5=99ek?= <weprous@gmail.com>
Date: Thu, 4 Oct 2018 11:21:13 +0200
Subject: [PATCH] FIX: Select placeholder - selected attr

---
 .../InputGroup.stories.storyshot              | 10 +--
 src/Select/Select.stories.js                  |  2 +
 .../__snapshots__/Select.stories.storyshot    | 86 ++++++++++++++++---
 .../__snapshots__/Select.test.js.snap         |  2 -
 src/Select/index.js                           |  4 +-
 5 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/src/InputGroup/__snapshots__/InputGroup.stories.storyshot b/src/InputGroup/__snapshots__/InputGroup.stories.storyshot
index 44ff6b9896..206b8ba8e1 100644
--- a/src/InputGroup/__snapshots__/InputGroup.stories.storyshot
+++ b/src/InputGroup/__snapshots__/InputGroup.stories.storyshot
@@ -160,12 +160,10 @@ exports[`Storyshots InputGroup Date of birth 1`] = `
                       onBlur={[Function]}
                       onChange={[Function]}
                       onFocus={[Function]}
-                      value={undefined}
+                      value=""
                     >
                       <option
-                        disabled={true}
                         label="Month"
-                        selected={true}
                         value=""
                       >
                         Month
@@ -1196,7 +1194,7 @@ exports[`Storyshots InputGroup Phone number 1`] = `
                       onBlur={[Function]}
                       onChange={[Function]}
                       onFocus={[Function]}
-                      value={undefined}
+                      value=""
                     >
                       <option
                         disabled={undefined}
@@ -2061,7 +2059,7 @@ exports[`Storyshots InputGroup Playground 1`] = `
                       onBlur={[Function]}
                       onChange={[Function]}
                       onFocus={[Function]}
-                      value={undefined}
+                      value=""
                     >
                       <option
                         disabled={undefined}
@@ -2140,7 +2138,7 @@ exports[`Storyshots InputGroup Playground 1`] = `
                       onBlur={[Function]}
                       onChange={[Function]}
                       onFocus={[Function]}
-                      value={undefined}
+                      value=""
                     >
                       <option
                         disabled={undefined}
diff --git a/src/Select/Select.stories.js b/src/Select/Select.stories.js
index 6c333eebf5..6676486984 100644
--- a/src/Select/Select.stories.js
+++ b/src/Select/Select.stories.js
@@ -190,6 +190,8 @@ storiesOf("Select", module)
                   disabled={disabled}
                   label={text("Label")}
                   onChange={action("onChange")}
+                  onBlur={action("onBlur")}
+                  onFocus={action("onFocus")}
                   dataTest={dataTest}
                   value={value}
                 />
diff --git a/src/Select/__snapshots__/Select.stories.storyshot b/src/Select/__snapshots__/Select.stories.storyshot
index ac9533846f..08241edfa8 100644
--- a/src/Select/__snapshots__/Select.stories.storyshot
+++ b/src/Select/__snapshots__/Select.stories.storyshot
@@ -111,7 +111,7 @@ exports[`Storyshots Select Default 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
                   disabled={undefined}
@@ -573,15 +573,13 @@ exports[`Storyshots Select Playground 1`] = `
               <select
                 className="Select__StyledSelect-eyhbyk ghRKpg"
                 disabled={false}
-                onBlur={undefined}
+                onBlur={[Function]}
                 onChange={[Function]}
-                onFocus={undefined}
-                value={undefined}
+                onFocus={[Function]}
+                value=""
               >
                 <option
-                  disabled={true}
                   label="Select value from list"
-                  selected={true}
                   value=""
                 >
                   Select value from list
@@ -1043,6 +1041,68 @@ exports[`Storyshots Select Playground 1`] = `
                           </span>
                         </span>
                       </span>
+                      <span>
+                        <span>
+                          <br />
+                            
+                        </span>
+                        <span
+                          style={Object {}}
+                        >
+                          onBlur
+                        </span>
+                        <span>
+                          =
+                          <span
+                            style={Object {}}
+                          >
+                            <span>
+                              {
+                              <span
+                                style={
+                                  Object {
+                                    "color": "#170",
+                                  }
+                                }
+                              >
+                                onBlur()
+                              </span>
+                              }
+                            </span>
+                          </span>
+                        </span>
+                      </span>
+                      <span>
+                        <span>
+                          <br />
+                            
+                        </span>
+                        <span
+                          style={Object {}}
+                        >
+                          onFocus
+                        </span>
+                        <span>
+                          =
+                          <span
+                            style={Object {}}
+                          >
+                            <span>
+                              {
+                              <span
+                                style={
+                                  Object {
+                                    "color": "#170",
+                                  }
+                                }
+                              >
+                                onFocus()
+                              </span>
+                              }
+                            </span>
+                          </span>
+                        </span>
+                      </span>
                       <span>
                         <span>
                           <br />
@@ -1258,7 +1318,7 @@ exports[`Storyshots Select With CountryFlag prefix 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
                   disabled={undefined}
@@ -1798,7 +1858,7 @@ exports[`Storyshots Select With error message 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
                   disabled={undefined}
@@ -2346,7 +2406,7 @@ exports[`Storyshots Select With help message 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
                   disabled={undefined}
@@ -2891,12 +2951,10 @@ exports[`Storyshots Select With placeholder 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
-                  disabled={true}
                   label="Select value from list"
-                  selected={true}
                   value=""
                 >
                   Select value from list
@@ -3452,7 +3510,7 @@ exports[`Storyshots Select With prefix 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
                   disabled={undefined}
@@ -3992,7 +4050,7 @@ exports[`Storyshots Select With small size 1`] = `
                 onBlur={undefined}
                 onChange={[Function]}
                 onFocus={undefined}
-                value={undefined}
+                value=""
               >
                 <option
                   disabled={undefined}
diff --git a/src/Select/__tests__/__snapshots__/Select.test.js.snap b/src/Select/__tests__/__snapshots__/Select.test.js.snap
index 8b89aaa21d..674acc1f39 100644
--- a/src/Select/__tests__/__snapshots__/Select.test.js.snap
+++ b/src/Select/__tests__/__snapshots__/Select.test.js.snap
@@ -777,9 +777,7 @@ exports[`Select should match snapshot 1`] = `
       value="1"
     >
       <option
-        disabled={true}
         label="Default placeholder"
-        selected={true}
         value=""
       >
         Default placeholder
diff --git a/src/Select/index.js b/src/Select/index.js
index a548182ba7..0450d1f2a3 100644
--- a/src/Select/index.js
+++ b/src/Select/index.js
@@ -199,7 +199,7 @@ const Select = ({
           size={size}
           disabled={disabled}
           error={error}
-          value={value}
+          value={value || ""}
           prefix={prefix}
           onFocus={onFocus}
           onBlur={onBlur}
@@ -207,7 +207,7 @@ const Select = ({
           filled={filled}
         >
           {placeholder && (
-            <option label={placeholder} value="" selected disabled>
+            <option label={placeholder} value="">
               {placeholder}
             </option>
           )}