fix: form onValues second params values (#582)

* fix: form onValues second params values

close ant-design/ant-design#41053

* test: improve list case

* fix: review

* fix: list nest list

* test: add list case

* fix: up

Author: elevensky

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';
@@ -644,7 +645,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={!!listContext}
+      {...restProps}
+      fieldContext={fieldContext}
+    />
+  );
 }
 
 export default WrapperField;

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;

tests/list.test.tsx

@@ -628,6 +628,51 @@ describe('Form.List', () => {
     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>
+          {fields.map(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={() => {
+              operation.remove(1);
+            }}
+          />
+        </div>
+      ),
+      {
+        onValuesChange,
+        initialValues: {
+          list: [{ first: 'light' }],
+        },
+      },
+    );
+    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' }] });
+  });
+
   describe('isFieldTouched edge case', () => {
     it('virtual object', () => {
       const formRef = React.createRef<FormInstance>();