status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-10 08:26:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix Android picker controlling

Browse Source 
Reviewed By: mkonicek

Differential Revision: D3261602

fb-gh-sync-id: da67d28420c5d855d672b481deeb92fa8b5d017c
fbshipit-source-id: da67d28420c5d855d672b481deeb92fa8b5d017c
This commit is contained in:
Ben Alpert 2016-05-07 15:51:22 -07:00 committed by Facebook Github Bot 3
parent 0fab691e6f
commit 0cd2904b23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Libraries/Components/Picker/PickerAndroid.android.js
View File

@ -52,7 +52,11 @@ var PickerAndroid = React.createClass({
}, },
getInitialState: function() { getInitialState: function() {
return this._stateFromProps(this.props); var state = this._stateFromProps(this.props);
return {
...state,
initialSelectedIndex: state.selectedIndex,
};
}, },
componentWillReceiveProps: function(nextProps) { componentWillReceiveProps: function(nextProps) {
@ -87,7 +91,7 @@ var PickerAndroid = React.createClass({
mode: this.props.mode, mode: this.props.mode,
onSelect: this._onChange, onSelect: this._onChange,
prompt: this.props.prompt, prompt: this.props.prompt,
selected: this.state.selectedIndex, selected: this.state.initialSelectedIndex,
testID: this.props.testID, testID: this.props.testID,
style: [styles.pickerAndroid, this.props.style], style: [styles.pickerAndroid, this.props.style],
}; };
@ -105,15 +109,24 @@ var PickerAndroid = React.createClass({
this.props.onValueChange(null, position); this.props.onValueChange(null, position);
} }
} }
this._lastNativePosition = event.nativeEvent.position;
this.forceUpdate();
},
componentDidMount: function() {
this._lastNativePosition = this.state.initialSelectedIndex;
},
componentDidUpdate: function() {
// The picker is a controlled component. This means we expect the // The picker is a controlled component. This means we expect the
// on*Change handlers to be in charge of updating our // on*Change handlers to be in charge of updating our
// `selectedValue` prop. That way they can also // `selectedValue` prop. That way they can also
// disallow/undo/mutate the selection of certain values. In other // disallow/undo/mutate the selection of certain values. In other
// words, the embedder of this component should be the source of // words, the embedder of this component should be the source of
// truth, not the native component. // truth, not the native component.
if (this.refs[REF_PICKER] && this.state.selectedIndex !== event.nativeEvent.position) { if (this.refs[REF_PICKER] && this.state.selectedIndex !== this._lastNativePosition) {
this.refs[REF_PICKER].setNativeProps({selected: this.state.selectedIndex}); this.refs[REF_PICKER].setNativeProps({selected: this.state.selectedIndex});
this._lastNativePosition = this.state.selectedIndex;
} }
}, },
}); });