From 51e7287c86e23281e6f45efa68becd574032cea2 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Thu, 29 Jun 2017 13:31:52 +0200
Subject: [PATCH 1/3] React.SFC<...> | React.ComponentClass<...> =>
 React.ComponentType<...>

---
 types/react-router-config/index.d.ts | 2 +-
 types/react-router/index.d.ts        | 4 ++--
 types/rrc/index.d.ts                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 8497b0d4b8..7644b8f062 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -14,7 +14,7 @@ export interface RouteConfigComponentProps<T> extends RouteComponentProps<T> {
 
 export interface RouteConfig {
     location?: Location;
-    component?: React.SFC<RouteConfigComponentProps<any> | void> | React.ComponentClass<RouteConfigComponentProps<any> | void>;
+    component?: React.ComponentType<RouteConfigComponentProps<any> | void>;
     path?: string;
     exact?: boolean;
     strict?: boolean;
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 72afa50e3b..2f38251db8 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -64,7 +64,7 @@ export interface RouteComponentProps<P> {
 
 export interface RouteProps {
   location?: H.Location;
-  component?: React.SFC<RouteComponentProps<any> | undefined> | React.ComponentClass<RouteComponentProps<any> | undefined>;
+  component?: React.ComponentType<RouteComponentProps<any> | undefined>;
   render?: ((props: RouteComponentProps<any>) => React.ReactNode);
   children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
   path?: string;
@@ -99,4 +99,4 @@ export interface match<P> {
 }
 
 export function matchPath<P>(pathname: string, props: RouteProps): match<P> | null;
-export function withRouter<P>(component: React.SFC<RouteComponentProps<any> & P> | React.ComponentClass<RouteComponentProps<any> & P>): React.ComponentClass<P>;
+export function withRouter<P>(component: React.ComponentType<RouteComponentProps<any> & P>): React.ComponentClass<P>;
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index 6a56baf3fc..891ceeaa64 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -22,7 +22,7 @@ export interface WithScrollOptions {
     alignToTop?: boolean;
 }
 
-export type ComponentConstructor<Props> = React.ComponentClass<Props> | React.SFC<Props>;
+export type ComponentConstructor<Props> = React.ComponentType<Props>;
 
 export function withScroll(component: ComponentConstructor<RouteComponentProps<any> | undefined>, options?: WithScrollOptions)
     : ComponentConstructor<RouteComponentProps<any> | undefined>;

From 552051f56f4e46da801297a8631447f97aaade0c Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Thu, 29 Jun 2017 13:54:42 +0200
Subject: [PATCH 2/3] Default props should be {}, not undefined or void

---
 types/react-router-config/index.d.ts                          | 2 +-
 types/react-router/index.d.ts                                 | 2 +-
 .../PreventingTransitions.tsx                                 | 2 +-
 types/rrc/index.d.ts                                          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 7644b8f062..2040a8a721 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -14,7 +14,7 @@ export interface RouteConfigComponentProps<T> extends RouteComponentProps<T> {
 
 export interface RouteConfig {
     location?: Location;
-    component?: React.ComponentType<RouteConfigComponentProps<any> | void>;
+    component?: React.ComponentType<RouteConfigComponentProps<any> | {}>;
     path?: string;
     exact?: boolean;
     strict?: boolean;
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 2f38251db8..cfd0b20c66 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -64,7 +64,7 @@ export interface RouteComponentProps<P> {
 
 export interface RouteProps {
   location?: H.Location;
-  component?: React.ComponentType<RouteComponentProps<any> | undefined>;
+  component?: React.ComponentType<RouteComponentProps<any> | {}>;
   render?: ((props: RouteComponentProps<any>) => React.ReactNode);
   children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
   path?: string;
diff --git a/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx b/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
index bd5d76ae2b..9f1858c89f 100644
--- a/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
+++ b/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
@@ -22,7 +22,7 @@ const PreventingTransitionsExample = () => (
   </Router>
 );
 
-class Form extends React.Component<undefined, {isBlocking: boolean}> {
+class Form extends React.Component<{}, {isBlocking: boolean}> {
   state = {
     isBlocking: false
   };
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index 891ceeaa64..f4ef84e568 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -24,8 +24,8 @@ export interface WithScrollOptions {
 
 export type ComponentConstructor<Props> = React.ComponentType<Props>;
 
-export function withScroll(component: ComponentConstructor<RouteComponentProps<any> | undefined>, options?: WithScrollOptions)
-    : ComponentConstructor<RouteComponentProps<any> | undefined>;
+export function withScroll(component: ComponentConstructor<RouteComponentProps<any> | {}>, options?: WithScrollOptions)
+    : ComponentConstructor<RouteComponentProps<any> | {}>;
 
 export type RouteConfiguration = RouteProps & { inject?: { [key: string]: any } };
 

From 5addbe9b7270c558b5ef26d4bfd84b3df08e4427 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Thu, 29 Jun 2017 13:55:50 +0200
Subject: [PATCH 3/3] React.ComponentType<P> => React.ComponentType<P = {}>

---
 types/react/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 577959ae7b..de21376a94 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -35,7 +35,7 @@ declare namespace React {
     // ----------------------------------------------------------------------
 
     type ReactType = string | ComponentType<any>;
-    type ComponentType<P> = ComponentClass<P> | StatelessComponent<P>;
+    type ComponentType<P = {}> = ComponentClass<P> | StatelessComponent<P>;
 
     type Key = string | number;
     type Ref<T> = string | ((instance: T | null) => any);