status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ReactNative] Navigator de-contextualize popToRoute

This commit is contained in:
Eric Vicenti 2015-05-22 11:56:04 -07:00
parent 62c556c785
commit 5bad316678
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,14 +340,13 @@ var Navigator = React.createClass({
getCurrentRoutes: this.getCurrentRoutes,
// `route` is injected by NavigatorStaticContextContainer
// Contextual nav actions
// Contextual nav action
pop: this.requestPop,
popToRoute: this.requestPopTo,
// Legacy, imperitive nav actions. Will transition these to contextual actions
jumpBack: this.jumpBack,
jumpForward: this.jumpForward,
jumpTo: this.jumpTo,
popToRoute: this.popToRoute,
push: this.push,
replace: this.replace,
replaceAtIndex: this.replaceAtIndex,
@ -410,8 +409,6 @@ var Navigator = React.createClass({
switch (action) {
case 'pop':
return this._handlePop(arg1);
case 'popTo':
return this._handlePopTo(arg1);
case 'push':
return this._handlePush(arg1);
default:
@ -440,23 +437,6 @@ var Navigator = React.createClass({
return true;
},
_handlePopTo: function(destRoute) {
if (destRoute) {
var hasRoute = this.state.routeStack.indexOf(destRoute) !== -1;
if (hasRoute) {
this.popToRoute(destRoute);
return true;
} else {
return false;
}
}
if (this.state.presentedIndex === 0) {
return false;
}
this.pop();
return true;
},
_handlePush: function(route) {
this.push(route);
return true;
@ -1155,17 +1135,13 @@ var Navigator = React.createClass({
this.popToRoute(this.state.routeStack[0]);
},
_getNumToPopForRoute: function(route) {
popToRoute: function(route) {
var indexOfRoute = this.state.routeStack.indexOf(route);
invariant(
indexOfRoute !== -1,
'Calling pop to route for a route that doesn\'t exist!'
'Calling popToRoute for a route that doesn\'t exist!'
);
return this.state.presentedIndex - indexOfRoute;
},
popToRoute: function(route) {
var numToPop = this._getNumToPopForRoute(route);
var numToPop = this.state.presentedIndex - indexOfRoute;
this._popN(numToPop);
},