From ddbcdd0d552dca2885123d9e0c430edbc63fab8b Mon Sep 17 00:00:00 2001
From: tkqubo <tk.qubo@gmail.com>
Date: Mon, 19 Oct 2015 22:32:02 +0900
Subject: [PATCH 1/2] Make connect return correct type

---
 react-redux/react-redux-tests.tsx | 25 ++++++++++++++++++-------
 react-redux/react-redux.d.ts      |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index 9bd662295a..6dac834206 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -23,13 +23,13 @@ interface CounterState {
 declare var increment: Function;
 
 class Counter extends Component<any, any> {
-  render() {
-    return (
-      <button onClick={this.props.onIncrement}>
-        {this.props.value}
-      </button>
-    );
-  }
+    render() {
+        return (
+            <button onClick={this.props.onIncrement}>
+                {this.props.value}
+            </button>
+        );
+    }
 }
 
 function mapStateToProps(state: CounterState) {
@@ -242,3 +242,14 @@ connect(mapStateToProps2, actionCreators, mergeProps)(TodoApp);
 
 
 
+
+
+// Ensure return value of the connect()(TodoApp) is of the type TodoApp
+let WrappedTodoApp: typeof TodoApp = connect()(TodoApp);
+
+// connect()(SomeClass) has the same constructor as SomeClass itself
+class SomeClass {
+    constructor(public foo: string) { }
+    public bar: number;
+}
+let bar: number = new (connect()(SomeClass))("foo").bar;
diff --git a/react-redux/react-redux.d.ts b/react-redux/react-redux.d.ts
index f1ef5458e1..03af3e06d8 100644
--- a/react-redux/react-redux.d.ts
+++ b/react-redux/react-redux.d.ts
@@ -11,7 +11,7 @@ declare module "react-redux" {
   import { Store, Dispatch, ActionCreator } from 'redux';
 
   export interface ClassDecorator {
-    <TFunction extends Function>(target: TFunction): TFunction|void;
+    <TFunction extends Function>(target: TFunction): TFunction;
   }
 
   /**

From a513c4df6eb8505da8eef432891c8b69b73535d9 Mon Sep 17 00:00:00 2001
From: tkqubo <tk.qubo@gmail.com>
Date: Tue, 20 Oct 2015 20:40:32 +0900
Subject: [PATCH 2/2] make connect stricter

---
 react-redux/react-redux-tests.tsx | 33 ++++++++++++++++++++++++++-----
 react-redux/react-redux.d.ts      |  3 ++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index 6dac834206..abbacabef2 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -4,7 +4,7 @@
 /// <reference path="../react-router/react-router.d.ts" />
 /// <reference path="../object-assign/object-assign.d.ts" />
 
-import { Component } from 'react';
+import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as Router from 'react-router';
 import { Route, RouterState } from 'react-router';
@@ -244,12 +244,35 @@ connect(mapStateToProps2, actionCreators, mergeProps)(TodoApp);
 
 
 
-// Ensure return value of the connect()(TodoApp) is of the type TodoApp
-let WrappedTodoApp: typeof TodoApp = connect()(TodoApp);
+interface TestProp {
+    property1: number;
+    someOtherProperty?: string;
+}
+interface TestState {
+    isLoaded: boolean;
+    state1: number;
+}
+class TestComponent extends Component<TestProp, TestState> { }
+const WrappedTestComponent = connect()(TestComponent);
+
+// return value of the connect()(TestComponent) is of the type TestComponent
+let ATestComponent: typeof TestComponent = null;
+ATestComponent = TestComponent;
+ATestComponent = WrappedTestComponent;
+
+let anElement: ReactElement<TestProp>;
+<TestComponent property1={42} />;
+<WrappedTestComponent property1={42} />;
+<ATestComponent property1={42} />;
+
+class NonComponent {}
+// this doesn't compile
+//connect()(NonComponent);
 
 // connect()(SomeClass) has the same constructor as SomeClass itself
-class SomeClass {
-    constructor(public foo: string) { }
+class SomeClass extends Component<any, any> {
+    constructor(public foo: string) { super() }
     public bar: number;
 }
 let bar: number = new (connect()(SomeClass))("foo").bar;
+
diff --git a/react-redux/react-redux.d.ts b/react-redux/react-redux.d.ts
index 03af3e06d8..767b6b1097 100644
--- a/react-redux/react-redux.d.ts
+++ b/react-redux/react-redux.d.ts
@@ -10,8 +10,9 @@ declare module "react-redux" {
   import { Component } from 'react';
   import { Store, Dispatch, ActionCreator } from 'redux';
 
+  export class ElementClass extends Component<any, any> { }
   export interface ClassDecorator {
-    <TFunction extends Function>(target: TFunction): TFunction;
+    <T extends (typeof ElementClass)>(component: T): T
   }
 
   /**