wip: move onInputValueChange to setState function

downshift-js · Oct 17, 2017 · c7d998f · c7d998f
1 parent 5c0540a
commit c7d998f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/downshift.js b/src/downshift.js
@@ -271,13 +271,6 @@ class Downshift extends Component {
     let onChangeArg
     const onStateChangeArg = {}
 
-    if (stateToSet.hasOwnProperty('inputValue')) {
-      this.props.onInputValueChange(
-        stateToSet.inputValue,
-        this.getStateAndHelpers(),
-      )
-    }
-
     return this.setState(
       state => {
         state = this.getState(state)
@@ -297,6 +290,14 @@ class Downshift extends Component {
           onChangeArg = stateToSet.selectedItem
         }
         stateToSet.type = stateToSet.type || Downshift.stateChangeTypes.unknown
+
+        if (stateToSet.hasOwnProperty('inputValue')) {
+          this.props.onInputValueChange(stateToSet.inputValue, {
+            ...this.getStateAndHelpers(),
+            ...stateToSet,
+          })
+        }
+
         Object.keys(stateToSet).forEach(key => {
           // onStateChangeArg should only have the state that is
           // actually changing

diff --git a/stories/examples/input-bug.js b/stories/examples/input-bug.js
@@ -16,11 +16,14 @@ export default class InputBug extends React.Component {
           }}
           inputValue={this.state.inputValue}
         >
-          {({getInputProps}) => (
-            <div>
-              <input {...getInputProps()} />
-            </div>
-          )}
+          {({getInputProps}) => {
+            console.log(getInputProps().value)
+            return (
+              <div>
+                <input {...getInputProps()} />
+              </div>
+            )
+          }}
         </Downshift>
       </div>
     )