Skip to content

Add routeProps param to Location.toRoute() #7

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add routeProps param to Location.toRoute() #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions src/Location.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ export default class Location extends LocationCore {
return <Link {...linkProps}>{children}</Link>;
}

toRoute(renderOptions, exact = false, strict = false, sensitive = false) {
toRoute(renderOptions, exact = false, strict = false, sensitive = false, routeProps = {}) {
const { component, render, children, invalid } = renderOptions;
warning(component || render || children, 'Location.toRoute requires renderOptions argument, which must include either component, render or children property');
warning(invalid, 'Location.toRoute requires renderOptions argument, which must include an invalid property, indicating the component to render when the a matched location contains an invalid parameter');

const routeProps = {
const _routeProps = {
...routeProps,
path: this.path,
exact,
strict,
Expand All @@ -47,31 +48,31 @@ export default class Location extends LocationCore {
...props,
...tokens,
};
}
};

if (component) {
return <Route {...routeProps} render={props => {
const propsWithParams = getPropsWithParams(props)
return <Route {..._routeProps} render={props => {
const propsWithParams = getPropsWithParams(props);
if (propsWithParams === null) {
//schema validation error ocurred, render Invalid component
return React.createElement(invalid);
}
return React.createElement(component, propsWithParams);
}} />
} else if (render) {
return <Route {...routeProps} render={props => {
const propsWithParams = getPropsWithParams(props)
return <Route {..._routeProps} render={props => {
const propsWithParams = getPropsWithParams(props);
if (propsWithParams === null) {
//schema validation error ocurred, render Invalid component
return React.createElement(invalid);
}
return render(propsWithParams);
}} />
} else if (typeof children === "function") {
return <Route {...routeProps} children={props => {
return <Route {..._routeProps} children={props => {
const { match } = props;
if (match) {
const propsWithParams = getPropsWithParams(props)
const propsWithParams = getPropsWithParams(props);
if (propsWithParams === null) {
//schema validation error ocurred, render Invalid component
return React.createElement(invalid);
Expand All @@ -83,7 +84,7 @@ export default class Location extends LocationCore {
}} />
} else if (children && !isEmptyChildren(children)) {
warning(false, 'Location params are not passed as props to children arrays. Use a children function prop if needed.');
return <Route {...routeProps} children={children} />
return <Route {..._routeProps} children={children} />
}
}

Expand Down