Merge upstream/master

Author: bfink13

lib/Autocomplete.js

@@ -13,12 +13,18 @@ let Autocomplete = React.createClass({
     renderItem: React.PropTypes.func.isRequired,
     menuStyle: React.PropTypes.object,
     inputProps: React.PropTypes.object,
-    labelText: React.PropTypes.string
+    labelText: React.PropTypes.string,
+    wrapperProps: React.PropTypes.object,
+    wrapperStyle: React.PropTypes.object
   },
 
   getDefaultProps () {
     return {
       value: '',
+      wrapperProps: {},
+      wrapperStyle: {
+        display: 'inline-block'
+      },
       inputProps: {},
       labelText: '',
       onChange () {},
@@ -81,9 +87,18 @@ let Autocomplete = React.createClass({
     if (this.keyDownHandlers[event.key])
       this.keyDownHandlers[event.key].call(this, event)
     else {
+      const { selectionStart, value } = event.target
+      if (value === this.state.value)
+        // Nothing changed, no need to do anything. This also prevents
+        // our workaround below from nuking user-made selections
+        return
       this.setState({
         highlightedIndex: null,
         isOpen: true
+      }, () => {
+        // Restore caret position before autocompletion process
+        // to work around a setSelectionRange bug in IE (#80)
+        this.refs.input.selectionStart = selectionStart
       })
     }
   },
@@ -297,8 +312,8 @@ let Autocomplete = React.createClass({
       })
     }
 
-    return ( 
-      <div style={{display: 'inline-block'}}>
+    return (
+      <div style={{...this.props.wrapperStyle}} {...this.props.wrapperProps}>
         <input
           {...this.props.inputProps}
           role="combobox"