Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Navigator] add optional callbacks to routing functions #1308

Closed
wants to merge 5 commits into from
Closed

[Navigator] add optional callbacks to routing functions #1308

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4df6f10
add optional callbacks to routing functions
pwmckenna May 16, 2015
dacc937
Merge branch 'master' into callbacks
pwmckenna May 20, 2015
500aef1
add callback support to all other public methods
pwmckenna May 20, 2015
a8b57b7
fix _transitionTo arguments
pwmckenna May 26, 2015
9fa7776
Merge branch 'master' into callbacks
pwmckenna May 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions Libraries/CustomComponents/Navigator/Navigator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,11 +996,11 @@ var Navigator = React.createClass({
return destIndex;
},

_jumpN: function(n) {
_jumpN: function(n, cb) {
var destIndex = this._getDestIndexWithinBounds(n);
var requestTransitionAndResetUpdatingRange = () => {
this._enableScene(destIndex);
this._transitionTo(destIndex);
this._transitionTo(destIndex, null, null, cb);
this._resetUpdatingRange();
};
this.setState({
Expand All @@ -1009,24 +1009,24 @@ var Navigator = React.createClass({
}, requestTransitionAndResetUpdatingRange);
},

jumpTo: function(route) {
jumpTo: function(route, cb) {
var destIndex = this.state.routeStack.indexOf(route);
invariant(
destIndex !== -1,
'Cannot jump to route that is not in the route stack'
);
this._jumpN(destIndex - this.state.presentedIndex);
this._jumpN(destIndex - this.state.presentedIndex, cb);
},

jumpForward: function() {
this._jumpN(1);
jumpForward: function(cb) {
this._jumpN(1, cb);
},

jumpBack: function() {
this._jumpN(-1);
jumpBack: function(cb) {
this._jumpN(-1, cb);
},

push: function(route) {
push: function(route, cb) {
invariant(!!route, 'Must supply route to push');
var activeLength = this.state.presentedIndex + 1;
var activeStack = this.state.routeStack.slice(0, activeLength);
Expand All @@ -1040,7 +1040,12 @@ var Navigator = React.createClass({
]);
var requestTransitionAndResetUpdatingRange = () => {
this._enableScene(destIndex);
this._transitionTo(destIndex);
this._transitionTo(
destIndex,
null, // default velocity
null, // no spring jumping
cb
);
this._resetUpdatingRange();
};
this.setState({
Expand All @@ -1052,7 +1057,7 @@ var Navigator = React.createClass({
}, requestTransitionAndResetUpdatingRange);
},

_popN: function(n) {
_popN: function(n, cb) {
if (n === 0) {
return;
}
Expand All @@ -1068,12 +1073,13 @@ var Navigator = React.createClass({
null, // no spring jumping
() => {
this._cleanScenesPastIndex(popIndex);
if (cb) cb();
}
);
},

pop: function() {
this._popN(1);
pop: function(cb) {
this._popN(1, cb);
},

/**
Expand Down Expand Up @@ -1120,46 +1126,46 @@ var Navigator = React.createClass({
/**
* Replaces the current scene in the stack.
*/
replace: function(route) {
this.replaceAtIndex(route, this.state.presentedIndex);
replace: function(route, cb) {
this.replaceAtIndex(route, this.state.presentedIndex, cb);
},

/**
* Replace the current route's parent.
*/
replacePrevious: function(route) {
this.replaceAtIndex(route, this.state.presentedIndex - 1);
replacePrevious: function(route, cb) {
this.replaceAtIndex(route, this.state.presentedIndex - 1, cb);
},

popToTop: function() {
this.popToRoute(this.state.routeStack[0]);
popToTop: function(cb) {
this.popToRoute(this.state.routeStack[0], cb);
},

popToRoute: function(route) {
popToRoute: function(route, cb) {
var indexOfRoute = this.state.routeStack.indexOf(route);
invariant(
indexOfRoute !== -1,
'Calling popToRoute for a route that doesn\'t exist!'
);
var numToPop = this.state.presentedIndex - indexOfRoute;
this._popN(numToPop);
this._popN(numToPop, cb);
},

replacePreviousAndPop: function(route) {
replacePreviousAndPop: function(route, cb) {
if (this.state.routeStack.length < 2) {
return;
}
this.replacePrevious(route);
this.pop();
this.pop(cb);
},

resetTo: function(route) {
resetTo: function(route, cb) {
invariant(!!route, 'Must supply route to push');
this.replaceAtIndex(route, 0, () => {
// Do not use popToRoute here, because race conditions could prevent the
// route from existing at this time. Instead, just go to index 0
if (this.state.presentedIndex > 0) {
this._popN(this.state.presentedIndex);
this._popN(this.state.presentedIndex, cb);
}
});
},
Expand Down