Merge pull request DefinitelyTyped#32854 from sargant/fix-redux-form-…

…field-definition [redux-form] - Fix for failing Field definition in TypeScript 3.2+
catlan · Feb 14, 2019 · b429791 · b429791
2 parents fe74af5 + 32a4039
commit b429791
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -290,6 +290,12 @@ const Test = reduxForm<TestFormData>({
                                 component="select"
                             />
 
+                            <Field
+                                name="field4"
+                                component={ MyField }
+                                foo="bar"
+                            />
+
                             <FieldCustom
                                 name="field4"
                                 component={ MyField }