From 12d470bab7ebfc0a04df29f5e47c93295d56fac9 Mon Sep 17 00:00:00 2001
From: Nemanja Milosavljevic <nemanjamilosavljevic@gmail.com>
Date: Sat, 21 Jul 2018 02:42:44 +0200
Subject: [PATCH] redux-form - Fix the broken type inheritance (#27256)

* Fix the broken FieldsArray type inheritance

* Fix the broken test and improve upon the implementation
---
 types/redux-form/lib/FieldArray.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index a6bd442fab..b1ddbc6aa6 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -11,13 +11,13 @@ interface BaseFieldArrayProps<P = {}> {
     rerenderOnEveryChange?: boolean;
 }
 
-export interface GenericFieldArray<Field, P = {}> extends Component<BaseFieldArrayProps<P> & P> {
+export interface GenericFieldArray<Field, P = {}> extends Component<BaseFieldArrayProps<P> & Partial<P>> {
     name: string;
     valid: boolean;
     getRenderedComponent(): Component<WrappedFieldArrayProps<Field> & P>;
 }
 
-export class FieldArray<P = {}> extends Component<BaseFieldArrayProps<P> & P> implements GenericFieldArray<any, P> {
+export class FieldArray<P = {}> extends Component<BaseFieldArrayProps<P> & Partial<P>> implements GenericFieldArray<any, P> {
     name: string;
     valid: boolean;
     getRenderedComponent(): Component<WrappedFieldArrayProps<any> & P>;