fix(Dropdown): use placeholder as default text (#3586)

* Fix #3581 * Update Dropdown.js * Update Dropdown-test.js
Semantic-Org · Jul 7, 2019 · 087593c · 087593c
1 parent f8e894c
commit 087593c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/modules/Dropdown/Dropdown.js b/src/modules/Dropdown/Dropdown.js
@@ -1193,9 +1193,8 @@ export default class Dropdown extends Component {
       search && searchQuery && 'filtered',
     )
     let _text = placeholder
-    if (searchQuery) {
-      _text = null
-    } else if (text) {
+
+    if (text) {
       _text = text
     } else if (open && !multiple) {
       _text = _.get(this.getSelectedItem(), 'text')

diff --git a/test/specs/modules/Dropdown/Dropdown-test.js b/test/specs/modules/Dropdown/Dropdown-test.js
@@ -1154,6 +1154,13 @@ describe('Dropdown', () => {
   })
 
   describe('text', () => {
+    it('defaults to "placeholder"', () => {
+      const placeholder = faker.hacker.phrase()
+
+      wrapperMount(<Dropdown options={options} placeholder={placeholder} />)
+        .find('div.text')
+        .should.contain.text(placeholder)
+    })
     it('sets the display text', () => {
       const text = faker.hacker.phrase()