kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-03-26 10:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix react router static router context bug (#29626)

Browse Source 
* Fix bug with StaticRouterContext

* Add tests for react-router
This commit is contained in:
Andre Rocha
2018-10-10 18:40:36 -04:00
committed by John Reilly
parent ca831d1902
commit e27e8744f3
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
types/react-router/index.d.ts vendored
View File

@@ -88,7 +88,7 @@ export interface RouterProps {
}
export class Router extends React.Component<RouterProps, any> { }
export interface StaticRouterContext {
export interface StaticRouterContext extends StaticContext {
url?: string;
action?: 'PUSH' | 'REPLACE';
location?: object;

28
types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
View File

@@ -1,10 +1,8 @@
import * as React from 'react';
import * as express from 'express';
import { renderToString } from 'react-dom/server';
import { StaticRouter, Route } from 'react-router-dom';
import { StaticRouterContext } from 'react-router';
interface StaticContext extends StaticRouterContext {
statusCode?: number;
}
import { StaticContext, StaticRouterContext } from 'react-router';
interface RouteStatusProps {
statusCode: number;
@@ -12,9 +10,9 @@ interface RouteStatusProps {
const RouteStatus: React.SFC<RouteStatusProps> = (props) => (
<Route
render={({ staticContext }) => {
render={({ staticContext }: {staticContext?: StaticContext}) => {
if (staticContext) {
(staticContext as StaticContext).statusCode = props.statusCode;
staticContext.statusCode = props.statusCode;
}
return (
@@ -37,7 +35,7 @@ const PrintContext: React.SFC<PrintContextProps> = (props) => (
);
class StaticRouterExample extends React.Component {
staticContext: StaticContext = {};
staticContext: StaticRouterContext = {};
render() {
return (
@@ -53,4 +51,18 @@ class StaticRouterExample extends React.Component {
}
}
const app = express();
app.get('*', (req, res) => {
const staticContext: StaticRouterContext = {};
const html = renderToString(
<StaticRouter location={req.url} context={staticContext}>
(includes the RouteStatus component below e.g. for 404 errors)
</StaticRouter>
);
res.status(staticContext.statusCode || 200).send(html);
});
export default StaticRouterExample;