Allow ancestors for watching fields + fix field array watch

witbybit · Oct 6, 2021 · 9a81f71 · 9a81f71
1 parent 0cc8aa4
commit 9a81f71
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/example/forms/SimpleFieldArray.tsx b/example/forms/SimpleFieldArray.tsx
@@ -38,7 +38,7 @@ function SimpleFieldArray(props) {
           fieldArrayName='items'
           colNames={['amount']}
           calculateFunc={values =>
-            values.items?.reduce((acc, val) => acc + (val?.amount ?? 0), 0)
+            values.reduce((acc, val) => acc + (val?.amount ?? 0), 0)
           }
         />
         <br/>

diff --git a/src/FormProvider.tsx b/src/FormProvider.tsx
@@ -194,9 +194,7 @@ export function useField<D = any, E = any>(props: IFieldProps<D>) {
             data,
             extraInfo,
             error: validate ? validate(data, otherParams) : undefined,
-            ancestors,
-            name,
-          })
+          } as Partial<IFieldAtomValue>)
         );
       },
       [otherParams, validate, ancestors, name, setAtomValue]

diff --git a/src/atoms.ts b/src/atoms.ts
@@ -198,7 +198,8 @@ export function getFieldArrayDataAndExtraInfo(
   const extraInfo: any = [];
   const errors: IFieldError[] = [];
   const fieldArrayAtom = fieldAtomFamily({
-    ...params,
+    ancestors: params.ancestors,
+    name: params.name,
     type: 'field-array',
     formId,
   });

diff --git a/src/types.ts b/src/types.ts
@@ -31,10 +31,14 @@ export interface FinalValues {
 }
 
 export interface IFieldWatchParams {
-  fieldNames: string[];
+  fieldNames: (
+    | string
+    | { ancestors?: { name: string; rowId: number }[]; name: string }
+  )[];
 }
 
 export interface IFieldArrayColWatchParams {
+  ancestors?: { name: string; rowId: number }[];
   fieldArrayName: string;
   fieldNames?: string[];
 }