Skip to content
Open
Changes from all commits
Commits
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
25 changes: 22 additions & 3 deletions src/components/Router.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Router as ReactRouter } from 'react-router';
import { Router as ReactRouter, Route } from 'react-router';

import utils from './../utils';
import context from './../context';
Expand All @@ -15,6 +15,8 @@ export default class Router extends ReactRouter {
user: React.PropTypes.object
};

static propTypes = ReactRouter.propTypes;

static defaultProps = ReactRouter.defaultProps;

state = {
Expand Down Expand Up @@ -46,8 +48,10 @@ export default class Router extends ReactRouter {
super(...arguments);

if (this.props.routes) {
// The reason we wrap in a div is because we just need to have a root element.
this._mapMarkedRoutes(<div>{this.props.routes}</div>);
this._isPlainRoute(this.props.routes)
? this._mapMarkedPlainRoutes(this.props.routes)
// The reason we wrap in a div is because we just need to have a root element.
: this._mapMarkedRoutes(<div>{this.props.routes}</div>);
} else {
this._mapMarkedRoutes(this);
}
Expand All @@ -57,6 +61,21 @@ export default class Router extends ReactRouter {
context.setRouter(this);
}

_isPlainRoute(routeData) {
return (routeData.component)
|| (routeData.length && routeData[0] && routeData[0].component);
}

_mapMarkedPlainRoutes(routeData, index) {
if (routeData.length) {
return (<div>{routeData.map(this._mapMarkedPlainRoutes)}</div>);
}

return (
<Route key={index} {...routeData} />
);
}

_mapMarkedRoutes(routes) {
let markedRoutes = this.markedRoutes;

Expand Down