From c43678fed8e152afcdff541e5be240ed4b6a331d Mon Sep 17 00:00:00 2001
From: Robert Sargant <robert@sargant.com>
Date: Thu, 7 Feb 2019 09:32:36 +0000
Subject: [PATCH 1/3] Fix for Field definition in TypeScript 3.2+

---
 types/redux-form/lib/Field.d.ts       | 2 +-
 types/redux-form/redux-form-tests.tsx | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 87a8947717..194a322408 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -61,7 +61,7 @@ export type GenericFieldHTMLAttributes =
     SelectHTMLAttributes<HTMLSelectElement> |
     TextareaHTMLAttributes<HTMLTextAreaElement>;
 
-export class Field<P = GenericFieldHTMLAttributes | BaseFieldProps> extends Component<BaseFieldProps<P> & P> {
+export class Field<P extends GenericFieldHTMLAttributes | BaseFieldProps = GenericFieldHTMLAttributes | BaseFieldProps> extends Component<P> {
     dirty: boolean;
     name: string;
     pristine: boolean;
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 25f395884c..c41b688f41 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -287,6 +287,12 @@ const Test = reduxForm<TestFormData>({
                                 component="select"
                             />
 
+                            <Field
+                                name="field4"
+                                component={ MyField }
+                                foo="bar"
+                            />
+
                             <FieldCustom
                                 name="field4"
                                 component={ MyField }

From 342f714478546065d1a8a68398efbe8f61bf00e6 Mon Sep 17 00:00:00 2001
From: Robert Sargant <robert@sargant.com>
Date: Thu, 7 Feb 2019 09:38:19 +0000
Subject: [PATCH 2/3] Bump TS version to 3.3

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

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 6915032138..e165866b49 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -13,7 +13,7 @@
 //                 Kamil Wojcik <https://github.com/smifun>
 //                 Mohamed Shaaban <https://github.com/mshaaban088>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
+// TypeScript Version: 3.3
 import {
   ComponentClass,
   StatelessComponent,

From 32a4039140aa835b73b1faccd454cf4a00ebff6a Mon Sep 17 00:00:00 2001
From: Robert Sargant <robert@sargant.com>
Date: Thu, 14 Feb 2019 22:18:50 +0000
Subject: [PATCH 3/3] Revert "Bump TS version to 3.3"

This reverts commit 342f714478546065d1a8a68398efbe8f61bf00e6.
---
 types/redux-form/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index e165866b49..6915032138 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -13,7 +13,7 @@
 //                 Kamil Wojcik <https://github.com/smifun>
 //                 Mohamed Shaaban <https://github.com/mshaaban088>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.3
+// TypeScript Version: 3.0
 import {
   ComponentClass,
   StatelessComponent,