From 0789cf44727b1a06c388828f17cd81746d142c25 Mon Sep 17 00:00:00 2001
From: Patrik Olsson <patrik.m.olsson@gmail.com>
Date: Thu, 19 Oct 2017 21:09:00 +0200
Subject: [PATCH] fix(Dropdown): make deburr opt-in, and deburr input

---
 .../Usage/DropdownExampleDeburrSearch.js      | 24 ++++++++
 .../Examples/modules/Dropdown/Usage/index.js  |  5 ++
 src/modules/Dropdown/Dropdown.d.ts            |  3 +
 src/modules/Dropdown/Dropdown.js              | 14 ++++-
 test/specs/modules/Dropdown/Dropdown-test.js  | 55 +++++++++++++++++--
 5 files changed, 92 insertions(+), 9 deletions(-)
 create mode 100644 docs/app/Examples/modules/Dropdown/Usage/DropdownExampleDeburrSearch.js

diff --git a/docs/app/Examples/modules/Dropdown/Usage/DropdownExampleDeburrSearch.js b/docs/app/Examples/modules/Dropdown/Usage/DropdownExampleDeburrSearch.js
new file mode 100644
index 0000000000..650c575767
--- /dev/null
+++ b/docs/app/Examples/modules/Dropdown/Usage/DropdownExampleDeburrSearch.js
@@ -0,0 +1,24 @@
+import React from 'react'
+import { Dropdown } from 'semantic-ui-react'
+
+const options = [
+  { key: 'a', value: 'a', text: 'Café with accent' },
+  { key: 'b', value: 'b', text: 'Cafe without accent' },
+  { key: 'c', value: 'c', text: 'Déjà vu' },
+  { key: 'd', value: 'd', text: 'Deja vu' },
+  { key: 'e', value: 'e', text: 'Scandinavian å ä æ ø ö' },
+  { key: 'f', value: 'f', text: 'Scandinavian a a ae o o' },
+]
+
+const DropdownExampleSearchSelection = () => (
+  <Dropdown
+    placeholder='Try to search for "Deja vu"'
+    fluid
+    search
+    selection
+    deburr
+    options={options}
+  />
+)
+
+export default DropdownExampleSearchSelection
diff --git a/docs/app/Examples/modules/Dropdown/Usage/index.js b/docs/app/Examples/modules/Dropdown/Usage/index.js
index 58f85e4b70..fd70099a5b 100644
--- a/docs/app/Examples/modules/Dropdown/Usage/index.js
+++ b/docs/app/Examples/modules/Dropdown/Usage/index.js
@@ -100,6 +100,11 @@ const DropdownUsageExamples = () => (
         selection.
       </Message>
     </ComponentExample>
+    <ComponentExample
+      title='Search Deburr'
+      description='A dropdown allows the search to ignore diacritics.'
+      examplePath='modules/Dropdown/Usage/DropdownExampleDeburrSearch'
+    />
     <ComponentExample
       title='Upward'
       description='A dropdown can open its menu upward.'
diff --git a/src/modules/Dropdown/Dropdown.d.ts b/src/modules/Dropdown/Dropdown.d.ts
index 8a1d86aab0..9eb342955c 100644
--- a/src/modules/Dropdown/Dropdown.d.ts
+++ b/src/modules/Dropdown/Dropdown.d.ts
@@ -50,6 +50,9 @@ export interface DropdownProps {
   /** A compact dropdown has no minimum width. */
   compact?: boolean;
 
+  /** Whether or not the dropdown should strip diacritics in options and input search */
+  deburr?: boolean;
+
   /** Initial value of open. */
   defaultOpen?: boolean;
 
diff --git a/src/modules/Dropdown/Dropdown.js b/src/modules/Dropdown/Dropdown.js
index dfb55c1a94..958a42d4e8 100644
--- a/src/modules/Dropdown/Dropdown.js
+++ b/src/modules/Dropdown/Dropdown.js
@@ -90,6 +90,9 @@ export default class Dropdown extends Component {
     /** A compact dropdown has no minimum width. */
     compact: PropTypes.bool,
 
+    /** Whether or not the dropdown should strip diacritics in options and input search */
+    deburr: PropTypes.bool,
+
     /** Initial value of open. */
     defaultOpen: PropTypes.bool,
 
@@ -354,6 +357,7 @@ export default class Dropdown extends Component {
     additionLabel: 'Add ',
     additionPosition: 'top',
     closeOnBlur: true,
+    deburr: false,
     icon: 'dropdown',
     minCharacters: 1,
     noResultsMessage: 'No results found.',
@@ -787,7 +791,7 @@ export default class Dropdown extends Component {
   // There are times when we need to calculate the options based on a value
   // that hasn't yet been persisted to state.
   getMenuOptions = (value = this.state.value, options = this.props.options) => {
-    const { multiple, search, allowAdditions, additionPosition, additionLabel } = this.props
+    const { multiple, search, allowAdditions, additionPosition, additionLabel, deburr } = this.props
     const { searchQuery } = this.state
 
     let filteredOptions = options
@@ -802,9 +806,13 @@ export default class Dropdown extends Component {
       if (_.isFunction(search)) {
         filteredOptions = search(filteredOptions, searchQuery)
       } else {
-        const re = new RegExp(_.escapeRegExp(searchQuery), 'i')
         // remove diacritics on search
-        filteredOptions = _.filter(filteredOptions, opt => re.test(_.deburr(opt.text)))
+        const strippedQuery = deburr ? _.deburr(searchQuery) : searchQuery
+
+        const re = new RegExp(_.escapeRegExp(strippedQuery), 'i')
+
+        filteredOptions = _.filter(filteredOptions, opt =>
+          re.test(deburr ? _.deburr(opt.text) : opt.text))
       }
     }
 
diff --git a/test/specs/modules/Dropdown/Dropdown-test.js b/test/specs/modules/Dropdown/Dropdown-test.js
index bdf3cb9b90..ae1ad2fd00 100644
--- a/test/specs/modules/Dropdown/Dropdown-test.js
+++ b/test/specs/modules/Dropdown/Dropdown-test.js
@@ -658,22 +658,65 @@ describe('Dropdown', () => {
         .find('.selected')
         .should.contain.text('a2')
     })
-    it('filter after diacritics', () => {
+    it('filters diacritics on options when using deburr prop', () => {
+      const inputText = 'floresti'
+      const textToFind = 'FLOREŞTI'
+
+      const opts = [
+        { text: textToFind, value: '1' },
+        { text: `ŞANŢU ${textToFind}`, value: '2' },
+        { text: `${textToFind} Alba`, value: '3' },
+      ]
+
+      // search for 'floresti'
+      wrapperMount(<Dropdown options={opts} search deburr selection />)
+        .simulate('click')
+        .find('input.search')
+        .simulate('change', { target: { value: inputText } })
+
+      wrapper
+        .find('.selected')
+        .should.contain.text(textToFind)
+    })
+    it('filters diacritics on input when using deburr prop', () => {
+      const inputText = 'FLORÉŞTI'
+      const textToFind = 'FLORESTI'
+
+      const opts = [
+        { text: textToFind, value: '1' },
+        { text: `SANTU ${textToFind}`, value: '2' },
+        { text: `${textToFind} Alba`, value: '3' },
+      ]
+
+      // search for 'floresti'
+      wrapperMount(<Dropdown options={opts} search deburr selection />)
+        .simulate('click')
+        .find('input.search')
+        .simulate('change', { target: { value: inputText } })
+
+      wrapper
+        .find('.selected')
+        .should.contain.text(textToFind)
+    })
+    it('should not filter diacritics when deburr is not set', () => {
+      const inputText = 'FLORÉŞTI'
+      const textToFind = 'FLORESTI'
+
       const opts = [
-        { text: 'FLOREŞTI', value: '1' },
-        { text: 'ŞANŢU FLOREŞTI', value: '2' },
-        { text: 'FLOREŞTI Alba', value: '3' },
+        { text: textToFind, value: '1' },
+        { text: `SANTU ${textToFind}`, value: '2' },
+        { text: `${textToFind} Alba`, value: '3' },
       ]
 
       // search for 'floresti'
       wrapperMount(<Dropdown options={opts} search selection />)
         .simulate('click')
         .find('input.search')
-        .simulate('change', { target: { value: 'floresti' } })
+        .simulate('change', { target: { value: inputText } })
 
       wrapper
         .find('.selected')
-        .should.contain.text('FLOREŞTI')
+        .should.not.contain.text(textToFind)
     })
     it('still works after encountering "no results"', () => {
       const opts = [