From 9fed30e8d28239a7d8567521c09046519a402d41 Mon Sep 17 00:00:00 2001
From: elevensky <yh3417@gmail.com>
Date: Wed, 5 Apr 2023 18:22:14 +0800
Subject: [PATCH 1/6] fix: form onValues second params values

close https://github.com/ant-design/ant-design/issues/41053
---
 src/Field.tsx      | 7 ++++++-
 src/List.tsx       | 1 +
 src/ListContext.ts | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Field.tsx b/src/Field.tsx
index 60d72a2c..65189966 100644
--- a/src/Field.tsx
+++ b/src/Field.tsx
@@ -18,6 +18,7 @@ import type {
   RuleError,
 } from './interface';
 import FieldContext, { HOOK_MARK } from './FieldContext';
+import ListContext from './ListContext';
 import { toArray } from './utils/typeUtil';
 import { validateRules } from './utils/validateUtil';
 import {
@@ -625,7 +626,7 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F
 
 function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>) {
   const fieldContext = React.useContext(FieldContext);
-
+  const listContext = React.useContext(ListContext);
   const namePath = name !== undefined ? getNamePath(name) : undefined;
 
   let key: string = 'keep';
@@ -633,6 +634,10 @@ function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>)
     key = `_${(namePath || []).join('_')}`;
   }
 
+  if (restProps.isListField === undefined && !restProps.isList && listContext) {
+    restProps.isListField = listContext.inList;
+  }
+
   // Warning if it's a directly list field.
   // We can still support multiple level field preserve.
   if (
diff --git a/src/List.tsx b/src/List.tsx
index 64db2e20..95f59f3c 100644
--- a/src/List.tsx
+++ b/src/List.tsx
@@ -64,6 +64,7 @@ const List: React.FunctionComponent<ListProps> = ({
         const pathName = namePath[len];
         return [keyManager.keys[pathName], namePath.slice(len + 1)];
       },
+      inList: true,
     }),
     [prefixName],
   );
diff --git a/src/ListContext.ts b/src/ListContext.ts
index cb5d0791..d5ef8f8c 100644
--- a/src/ListContext.ts
+++ b/src/ListContext.ts
@@ -3,6 +3,7 @@ import type { InternalNamePath } from './interface';
 
 export interface ListContextProps {
   getKey: (namePath: InternalNamePath) => [React.Key, InternalNamePath];
+  inList: boolean;
 }
 
 const ListContext = React.createContext<ListContextProps | null>(null);

From c89c7d256d85d2b39d6b15792a673f8664ba7cea Mon Sep 17 00:00:00 2001
From: elevensky <yh3417@gmail.com>
Date: Wed, 12 Apr 2023 17:20:54 +0800
Subject: [PATCH 2/6] test: improve list case

---
 tests/list.test.tsx | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tests/list.test.tsx b/tests/list.test.tsx
index 06a66132..66150188 100644
--- a/tests/list.test.tsx
+++ b/tests/list.test.tsx
@@ -604,10 +604,21 @@ describe('Form.List', () => {
       (fields, operation) => (
         <div>
           {fields.map(field => (
-            <Field {...field} key={field.key} name={[field.name, 'first']}>
-              <Input />
-            </Field>
+            <div key={field.key}>
+              <Field name={[field.name, 'first']}>
+                <Input />
+              </Field>
+              <Field name={[field.name, 'second']}>
+                <Input />
+              </Field>
+            </div>
           ))}
+          <button
+            type="button"
+            onClick={() => {
+              operation.add();
+            }}
+          />
           <button
             type="button"
             onClick={() => {
@@ -619,12 +630,12 @@ describe('Form.List', () => {
       {
         onValuesChange,
         initialValues: {
-          list: [{ first: 'light' }, { first: 'bamboo' }],
+          list: [{ first: 'light' }],
         },
       },
     );
-
-    wrapper.find('button').simulate('click');
+    wrapper.find('button').first().simulate('click');
+    wrapper.find('button').last().simulate('click');
     expect(onValuesChange).toHaveBeenCalledWith(expect.anything(), { list: [{ first: 'light' }] });
   });
 

From d1d5e2f01ce6f75ee858ee3512d46e947b9e275d Mon Sep 17 00:00:00 2001
From: elevensky <yh3417@gmail.com>
Date: Wed, 12 Apr 2023 19:20:53 +0800
Subject: [PATCH 3/6] fix: review

---
 src/Field.tsx      | 15 ++++++++++-----
 src/List.tsx       |  1 -
 src/ListContext.ts |  1 -
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Field.tsx b/src/Field.tsx
index 65189966..7a5eb868 100644
--- a/src/Field.tsx
+++ b/src/Field.tsx
@@ -627,6 +627,7 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F
 function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>) {
   const fieldContext = React.useContext(FieldContext);
   const listContext = React.useContext(ListContext);
+  const mergedIsListField = restProps.isListField || (!restProps.isList && !!listContext);
   const namePath = name !== undefined ? getNamePath(name) : undefined;
 
   let key: string = 'keep';
@@ -634,10 +635,6 @@ function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>)
     key = `_${(namePath || []).join('_')}`;
   }
 
-  if (restProps.isListField === undefined && !restProps.isList && listContext) {
-    restProps.isListField = listContext.inList;
-  }
-
   // Warning if it's a directly list field.
   // We can still support multiple level field preserve.
   if (
@@ -649,7 +646,15 @@ function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>)
     warning(false, '`preserve` should not apply on Form.List fields.');
   }
 
-  return <Field key={key} name={namePath} {...restProps} fieldContext={fieldContext} />;
+  return (
+    <Field
+      key={key}
+      name={namePath}
+      isListField={mergedIsListField}
+      {...restProps}
+      fieldContext={fieldContext}
+    />
+  );
 }
 
 export default WrapperField;
diff --git a/src/List.tsx b/src/List.tsx
index 95f59f3c..64db2e20 100644
--- a/src/List.tsx
+++ b/src/List.tsx
@@ -64,7 +64,6 @@ const List: React.FunctionComponent<ListProps> = ({
         const pathName = namePath[len];
         return [keyManager.keys[pathName], namePath.slice(len + 1)];
       },
-      inList: true,
     }),
     [prefixName],
   );
diff --git a/src/ListContext.ts b/src/ListContext.ts
index d5ef8f8c..cb5d0791 100644
--- a/src/ListContext.ts
+++ b/src/ListContext.ts
@@ -3,7 +3,6 @@ import type { InternalNamePath } from './interface';
 
 export interface ListContextProps {
   getKey: (namePath: InternalNamePath) => [React.Key, InternalNamePath];
-  inList: boolean;
 }
 
 const ListContext = React.createContext<ListContextProps | null>(null);

From 7b72c038ef1901db9fc0140a378060614c07700f Mon Sep 17 00:00:00 2001
From: elevensky <yh3417@gmail.com>
Date: Wed, 19 Apr 2023 20:40:40 +0800
Subject: [PATCH 4/6] fix: list nest list

---
 src/Field.tsx | 3 +--
 src/List.tsx  | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Field.tsx b/src/Field.tsx
index 7a5eb868..928767ae 100644
--- a/src/Field.tsx
+++ b/src/Field.tsx
@@ -627,7 +627,6 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F
 function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>) {
   const fieldContext = React.useContext(FieldContext);
   const listContext = React.useContext(ListContext);
-  const mergedIsListField = restProps.isListField || (!restProps.isList && !!listContext);
   const namePath = name !== undefined ? getNamePath(name) : undefined;
 
   let key: string = 'keep';
@@ -650,7 +649,7 @@ function WrapperField<Values = any>({ name, ...restProps }: FieldProps<Values>)
     <Field
       key={key}
       name={namePath}
-      isListField={mergedIsListField}
+      isListField={!!listContext}
       {...restProps}
       fieldContext={fieldContext}
     />
diff --git a/src/List.tsx b/src/List.tsx
index 64db2e20..839e8908 100644
--- a/src/List.tsx
+++ b/src/List.tsx
@@ -43,6 +43,7 @@ const List: React.FunctionComponent<ListProps> = ({
   isListField,
 }) => {
   const context = React.useContext(FieldContext);
+  const wrapperListContext = React.useContext(ListContext);
   const keyRef = React.useRef({
     keys: [],
     id: 0,
@@ -91,7 +92,7 @@ const List: React.FunctionComponent<ListProps> = ({
           validateTrigger={validateTrigger}
           initialValue={initialValue}
           isList
-          isListField={isListField}
+          isListField={isListField ?? !!wrapperListContext}
         >
           {({ value = [], onChange }, meta) => {
             const { getFieldValue } = context;

From ccce8b463ca63c5205554e2e08d74368a5f5e68f Mon Sep 17 00:00:00 2001
From: elevensky <yh3417@gmail.com>
Date: Thu, 20 Apr 2023 13:57:43 +0800
Subject: [PATCH 5/6] test: add list case

---
 tests/list.test.tsx | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/list.test.tsx b/tests/list.test.tsx
index 66150188..d6cd61f4 100644
--- a/tests/list.test.tsx
+++ b/tests/list.test.tsx
@@ -600,6 +600,37 @@ describe('Form.List', () => {
   it('Nest list remove should trigger correct onValuesChange', () => {
     const onValuesChange = jest.fn();
 
+    const [wrapper] = generateForm(
+      (fields, operation) => (
+        <div>
+          {fields.map(field => (
+            <Field {...field} key={field.key} name={[field.name, 'first']}>
+              <Input />
+            </Field>
+          ))}
+          <button
+            type="button"
+            onClick={() => {
+              operation.remove(1);
+            }}
+          />
+        </div>
+      ),
+      {
+        onValuesChange,
+        initialValues: {
+          list: [{ first: 'light' }, { first: 'bamboo' }],
+        },
+      },
+    );
+
+    wrapper.find('button').simulate('click');
+    expect(onValuesChange).toHaveBeenCalledWith(expect.anything(), { list: [{ first: 'light' }] });
+  });
+
+  it('Nest list remove should trigger correct onValuesChange when no spread field props', () => {
+    const onValuesChange = jest.fn();
+
     const [wrapper] = generateForm(
       (fields, operation) => (
         <div>

From 45e167657e7239d1319f12b9bc92e16014e9c45e Mon Sep 17 00:00:00 2001
From: elevensky <yh3417@gmail.com>
Date: Sun, 23 Apr 2023 19:42:35 +0800
Subject: [PATCH 6/6] fix: up

---
 tests/list.test.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/list.test.tsx b/tests/list.test.tsx
index d6cd61f4..c808f046 100644
--- a/tests/list.test.tsx
+++ b/tests/list.test.tsx
@@ -666,6 +666,9 @@ describe('Form.List', () => {
       },
     );
     wrapper.find('button').first().simulate('click');
+    expect(onValuesChange).toHaveBeenCalledWith(expect.anything(), {
+      list: [{ first: 'light' }, undefined],
+    });
     wrapper.find('button').last().simulate('click');
     expect(onValuesChange).toHaveBeenCalledWith(expect.anything(), { list: [{ first: 'light' }] });
   });