[Issue 157] move onConfirm to be after state

Let the state be set with updated value then trigger `onConfirm`
alphagov · Aug 29, 2017 · ad7fc95 · ad7fc95
1 parent cb8a7c0
commit ad7fc95
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/dist/accessible-autocomplete.min.js b/dist/accessible-autocomplete.min.js
diff --git a/dist/accessible-autocomplete.min.js.map b/dist/accessible-autocomplete.min.js.map
diff --git a/dist/lib/accessible-autocomplete.preact.min.js b/dist/lib/accessible-autocomplete.preact.min.js
diff --git a/dist/lib/accessible-autocomplete.preact.min.js.map b/dist/lib/accessible-autocomplete.preact.min.js.map
diff --git a/dist/lib/accessible-autocomplete.react.min.js b/dist/lib/accessible-autocomplete.react.min.js
diff --git a/dist/lib/accessible-autocomplete.react.min.js.map b/dist/lib/accessible-autocomplete.react.min.js.map
diff --git a/src/autocomplete.js b/src/autocomplete.js
@@ -158,19 +158,21 @@ export default class Autocomplete extends Component {
 
   handleComponentBlur (newState) {
     const { options, query, selected } = this.state
-    let newQuery
+    let newQuery, setStateCallback
+
     if (this.props.confirmOnBlur) {
       newQuery = newState.query || query
-      this.props.onConfirm(options[selected])
+      setStateCallback = this.props.onConfirm(options[selected])
     } else {
       newQuery = query
+      setStateCallback = () => {}
     }
     this.setState({
       focused: null,
       menuOpen: newState.menuOpen || false,
       query: newQuery,
       selected: null
-    })
+    }, setStateCallback)
   }
 
   handleOptionBlur (event, index) {
@@ -266,13 +268,12 @@ export default class Autocomplete extends Component {
   handleOptionClick (event, index) {
     const selectedOption = this.state.options[index]
     const newQuery = this.templateInputValue(selectedOption)
-    this.props.onConfirm(selectedOption)
     this.setState({
       focused: -1,
       menuOpen: false,
       query: newQuery,
       selected: -1
-    })
+    }, this.props.onConfirm(selectedOption))
   }
 
   handleOptionMouseDown (event) {