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

[ReactNative] revert 'unbreak navigation due to onItemRef removal'

Browse Source
This commit is contained in:
Kevin Gozali 2015-07-16 17:35:45 -07:00
parent 326a66ba07
commit 5ec60effea
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Libraries/CustomComponents/Navigator/Navigator.js
View File

@ -45,7 +45,6 @@ var View = require('View');
var clamp = require('clamp'); var clamp = require('clamp');
var flattenStyle = require('flattenStyle'); var flattenStyle = require('flattenStyle');
var guid = require('guid');
var invariant = require('invariant'); var invariant = require('invariant');
var rebound = require('rebound'); var rebound = require('rebound');
@ -1013,14 +1012,14 @@ var Navigator = React.createClass({
} }
}, },
_renderScene: function(route, i, key) { _renderScene: function(route, i) {
var disabledSceneStyle = null; var disabledSceneStyle = null;
if (i !== this.state.presentedIndex) { if (i !== this.state.presentedIndex) {
disabledSceneStyle = styles.disabledScene; disabledSceneStyle = styles.disabledScene;
} }
return ( return (
<View <View
key={key} key={'scene_' + i}
ref={'scene_' + i} ref={'scene_' + i}
onStartShouldSetResponderCapture={() => { onStartShouldSetResponderCapture={() => {
return (this.state.transitionFromIndex != null) || (this.state.transitionFromIndex != null); return (this.state.transitionFromIndex != null) || (this.state.transitionFromIndex != null);
@ -1053,7 +1052,7 @@ var Navigator = React.createClass({
index !== this.state.presentedIndex) { index !== this.state.presentedIndex) {
renderedScene = this._renderedSceneMap.get(route); renderedScene = this._renderedSceneMap.get(route);
} else { } else {
renderedScene = this._renderScene(route, index, guid()); renderedScene = this._renderScene(route, index);
} }
newRenderedSceneMap.set(route, renderedScene); newRenderedSceneMap.set(route, renderedScene);
return renderedScene; return renderedScene;