From bce7ddb5c555725e7b3a23d9042d194fca86e82b Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 11 May 2017 16:30:56 -0700
Subject: [PATCH] Add tests and update lib tests file

---
 .../jsx/tsxGenericAttributesType1.tsx          | 18 ++++++++++++++++++
 .../jsx/tsxGenericAttributesType2.tsx          | 10 ++++++++++
 .../jsx/tsxGenericAttributesType3.tsx          | 17 +++++++++++++++++
 .../jsx/tsxGenericAttributesType4.tsx          | 18 ++++++++++++++++++
 tests/lib/react.d.ts                           |  2 +-
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx

diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx
new file mode 100644
index 00000000000..e6b7fc18ef7
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType1.tsx
@@ -0,0 +1,18 @@
+// @filename: file.tsx
+// @jsx: preserve
+// @noLib: true
+// @libFiles: react.d.ts,lib.d.ts
+
+import React = require('react');
+
+const decorator = function <T>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
+    return (props) => <Component {...props}></Component>
+};
+
+const decorator2 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
+    return (props) => <Component {...props} x={2} ></Component>
+};
+
+const decorator3 = function <T extends { x: number }, U extends { x: number } >(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
+    return (props) => <Component x={2} {...props} ></Component>
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx
new file mode 100644
index 00000000000..48acd55546f
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType2.tsx
@@ -0,0 +1,10 @@
+// @filename: file.tsx
+// @jsx: preserve
+// @noLib: true
+// @libFiles: react.d.ts,lib.d.ts
+
+import React = require('react');
+
+const decorator4 = function <T extends { x: number }>(Component: React.StatelessComponent<T>): React.StatelessComponent<T> {
+    return (props) => <Component {...props} y={"blah"} ></Component>
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx
new file mode 100644
index 00000000000..b683c5e7970
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType3.tsx
@@ -0,0 +1,17 @@
+// @filename: file.tsx
+// @jsx: preserve
+// @noLib: true
+// @libFiles: react.d.ts,lib.d.ts
+
+import React = require('react');
+
+class B1<T extends { x: string } = { x:string } > extends React.Component<T, {}> {
+    render() {
+        return <div>hi</div>; 
+    }
+}
+class B<U> extends React.Component<U, {}> {
+    render() {
+        return <B1 {...this.props} x="hi" />;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx b/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx
new file mode 100644
index 00000000000..b207f2b4398
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxGenericAttributesType4.tsx
@@ -0,0 +1,18 @@
+// @filename: file.tsx
+// @jsx: preserve
+// @noLib: true
+// @libFiles: react.d.ts,lib.d.ts
+
+import React = require('react');
+
+class B1<T extends { x: string }> extends React.Component<T, {}> {
+    render() {
+        return <div>hi</div>; 
+    }
+}
+class B<U> extends React.Component<U, {}> {
+    render() {
+        // Should be an ok but as of 2.3.3 this will be an error as we will instantiate B1.props to be empty object
+        return <B1 {...this.props} x="hi" />;
+    }
+}
\ No newline at end of file
diff --git a/tests/lib/react.d.ts b/tests/lib/react.d.ts
index 1d7b787b999..7f03899eb6c 100644
--- a/tests/lib/react.d.ts
+++ b/tests/lib/react.d.ts
@@ -197,7 +197,7 @@ declare namespace __React {
 
     type SFC<P> = StatelessComponent<P>;
     interface StatelessComponent<P> {
-        (props: P, context?: any): ReactElement<any>;
+        (props: P & { children?: ReactNode }, context?: any): ReactElement<any>;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         defaultProps?: P;