Skip to content

added the notion of router hierarchy #82

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

Closed
wants to merge 14 commits into from
Closed

added the notion of router hierarchy #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e16edfc
added the notion of router hierarchy
Sep 15, 2014
06dab84
fixed a raise situation on load
Sep 15, 2014
a954365
fixed a bug with multiple parent routers
Sep 16, 2014
cd547fe
refactored the previous fix to reduce if statements
Sep 16, 2014
71d98ef
mergend from andreypopp
Sep 16, 2014
372c703
added tests and fixed a bug
Sep 16, 2014
91d57f9
added the notion of router hierarchy
Sep 15, 2014
9aa223f
Fix middle-click and meta+click (new tab) on <Link>. Fixes #83.
STRML Sep 16, 2014
20c6e22
0.20.2
STRML Sep 16, 2014
f9a1ece
Add note about zuul tests for contributors.
STRML Sep 16, 2014
6cdee8b
Simplify arities of setPath/navigate(). Fixes #81.
STRML Sep 16, 2014
05cca06
0.20.3
STRML Sep 16, 2014
bb45cf7
Update CHANGELOG
STRML Sep 16, 2014
50d9b66
Merge branch 'parent_routers' of github.com:MarkNijhof/react-router-c…
Sep 16, 2014
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
22 changes: 19 additions & 3 deletions lib/RouterMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,25 @@ var RouterMixin = {
},

childContextTypes: {
router: React.PropTypes.any
router: React.PropTypes.any,
routers: React.PropTypes.any
},

getChildContext: function() {
var routers = this.context.routers || []
if (routers.indexOf(this) === -1) {
routers.unshift(this)
}

return {
router: this
router: this,
routers: routers
};
},

contextTypes: {
router: React.PropTypes.any
router: React.PropTypes.any,
routers: React.PropTypes.any
},

getInitialState: function() {
Expand Down Expand Up @@ -133,6 +141,14 @@ var RouterMixin = {
* @param {Callback} cb
*/
navigate: function(path, navigation, cb) {
var levels = path.split('../');
if (levels.length > 1) {
var newPath = "/" + levels[levels.length-1];
var gotoContext = levels.length-1;
this.context.routers[gotoContext].navigate(newPath, navigation, cb);
return;
}

path = join(this.state.prefix, path);
this.getEnvironment().setPath(path, navigation, cb);
},
Expand Down
153 changes: 152 additions & 1 deletion tests/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ describe('Routing with async components', function() {
});

beforeEach(function() {
mainWasInLoadingState = false;
mainWasInLoadingState = false;
aboutWasInLoadingState = false;

mainSeenPendingUpdate = false;
Expand Down Expand Up @@ -553,6 +553,33 @@ describe('Contextual routers', function() {

if (!historyAPI) return;

var SubSubCat = React.createClass({

render: function() {
return div(null,
Router.Locations({ref: 'router', contextual: true},
Router.Location({
path: '/',
handler: function(props) { return div(null, 'subcat/subsubcat/root') }
}),
Router.Location({
path: '/back_to_parent',
ref: 'link',
handler: function(props) {
return Router.Link({href: '../'}, 'subcat/subsubcat/back_to_parent')
}
}),
Router.Location({
path: '/back_to_root',
ref: 'link',
handler: function(props) {
return Router.Link({href: '../../__zuul'}, 'subcat/subsubcat/back_to_root')
}
})
));
}
});

var SubCat = React.createClass({

render: function() {
Expand All @@ -575,6 +602,18 @@ describe('Contextual routers', function() {
handler: function(props) {
return Router.Link({global: true, href: '/__zuul'}, 'subcat/escape')
}
}),
Router.Location({
path: '/back_to_parent',
ref: 'link',
handler: function(props) {
return Router.Link({href: '../__zuul'}, 'subcat/back_to_parent')
}
}),
Router.Location({
path: '/subsubcat/*',
handler: SubSubCat,
ref: 'subsubcat'
})
));
}
Expand Down Expand Up @@ -652,6 +691,42 @@ describe('Contextual routers', function() {
});
});
});

it('does navigate to root context from nested', function(done) {
assertRendered('mainpage');
router.navigate('/__zuul/subcat/back_to_parent', function() {
assertRendered('subcat/back_to_parent');
clickOn(router.refs.subcat.refs.router.refs.link);
delay(function() {
assertRendered('mainpage');
done();
});
});
});

it('does navigate to nested context from double nested', function(done) {
assertRendered('mainpage');
router.navigate('/__zuul/subcat/subsubcat/back_to_parent', function() {
assertRendered('subcat/subsubcat/back_to_parent');
clickOn(router.refs.subcat.refs.router.refs.subsubcat.refs.router.refs.link);
delay(function() {
assertRendered('subcat/root');
done();
});
});
});

it('does navigate to root context from double nested', function(done) {
assertRendered('mainpage');
router.navigate('/__zuul/subcat/subsubcat/back_to_root', function() {
assertRendered('subcat/subsubcat/back_to_root');
clickOn(router.refs.subcat.refs.router.refs.subsubcat.refs.router.refs.link);
delay(function() {
assertRendered('mainpage');
done();
});
});
});
});

describe('Multiple active routers', function() {
Expand Down Expand Up @@ -833,6 +908,33 @@ describe('Hash routing', function() {

describe('Contextual Hash routers', function() {

var SubSubCat = React.createClass({

render: function() {
return div(null,
Router.Locations({ref: 'router', contextual: true},
Router.Location({
path: '/',
handler: function(props) { return div(null, 'subcat/subsubcat/root') }
}),
Router.Location({
path: '/back_to_parent',
ref: 'link',
handler: function(props) {
return Router.Link({href: '../'}, 'subcat/subsubcat/back_to_parent')
}
}),
Router.Location({
path: '/back_to_root',
ref: 'link',
handler: function(props) {
return Router.Link({href: '../../'}, 'subcat/subsubcat/back_to_root')
}
})
));
}
});

var SubCat = React.createClass({

render: function() {
Expand All @@ -848,6 +950,18 @@ describe('Contextual Hash routers', function() {
handler: function(props) {
return Router.Link({globalHash: true, href: '/'}, 'subcat/escape');
}
}),
Router.Location({
path: '/back_to_parent',
ref: 'link',
handler: function(props) {
return Router.Link({href: '../'}, 'subcat/back_to_parent')
}
}),
Router.Location({
path: '/subsubcat/*',
handler: SubSubCat,
ref: 'subsubcat'
})
));
}
Expand Down Expand Up @@ -889,6 +1003,43 @@ describe('Contextual Hash routers', function() {
});
});


it('does navigate to root context from nested', function(done) {
assertRendered('mainpage');
router.navigate('/subcat/back_to_parent', function() {
assertRendered('subcat/back_to_parent');
clickOn(router.refs.subcat.refs.router.refs.link);
delay(function() {
assertRendered('mainpage');
done();
});
});
});

it('does navigate to nested context from double nested', function(done) {
assertRendered('mainpage');
router.navigate('/subcat/subsubcat/back_to_parent', function() {
assertRendered('subcat/subsubcat/back_to_parent');
clickOn(router.refs.subcat.refs.router.refs.subsubcat.refs.router.refs.link);
delay(function() {
assertRendered('subcat/root');
done();
});
});
});

it('does navigate to root context from double nested', function(done) {
assertRendered('mainpage');
router.navigate('/subcat/subsubcat/back_to_root', function() {
assertRendered('subcat/subsubcat/back_to_root');
clickOn(router.refs.subcat.refs.router.refs.subsubcat.refs.router.refs.link);
delay(function() {
assertRendered('mainpage');
done();
});
});
});

});

});