diff --git a/Libraries/CustomComponents/Navigator/Navigator.js b/Libraries/CustomComponents/Navigator/Navigator.js index 84a077899..c855a94df 100644 --- a/Libraries/CustomComponents/Navigator/Navigator.js +++ b/Libraries/CustomComponents/Navigator/Navigator.js @@ -373,6 +373,12 @@ var Navigator = React.createClass({ }, _transitionTo: function(destIndex, velocity, jumpSpringTo, cb) { + if ( + destIndex === this.state.presentedIndex && + this.state.transitionQueue.length === 0 + ) { + return; + } if (this.state.transitionFromIndex !== null) { this.state.transitionQueue.push({ destIndex, @@ -381,9 +387,7 @@ var Navigator = React.createClass({ }); return; } - if (destIndex === this.state.presentedIndex) { - return; - } + this.state.transitionFromIndex = this.state.presentedIndex; this.state.presentedIndex = destIndex; this.state.transitionCb = cb;