Merge 80afa67 into 7bd75b5

Author: kiner-tang

src/Field.tsx

@@ -133,7 +133,7 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F
    */
   private dirty: boolean = false;
 
-  private validatePromise: Promise<string[]> | null = null;
+  private validatePromise: Promise<string[]> | null;
 
   private prevValidating: boolean;
 
@@ -475,6 +475,7 @@ class Field extends React.Component<InternalFieldProps, FieldState> implements F
       errors: this.errors,
       warnings: this.warnings,
       name: this.getNamePath(),
+      validated: this.validatePromise === null,
     };
 
     return meta;

src/interface.ts

@@ -13,6 +13,7 @@ export interface Meta {
   errors: string[];
   warnings: string[];
   name: InternalNamePath;
+  validated: boolean;
 }
 
 export interface InternalFieldData extends Meta {

tests/context.test.tsx

@@ -44,6 +44,26 @@ describe('Form.Context', () => {
             touched: true,
             validating: false,
             value: 'Light',
+            validated: false,
+          },
+        ],
+        forms: {
+          form1: expect.objectContaining({}),
+        },
+      }),
+    );
+    expect(onFormChange).toHaveBeenCalledWith(
+      'form1',
+      expect.objectContaining({
+        changedFields: [
+          {
+            errors: [],
+            warnings: [],
+            name: ['username'],
+            touched: true,
+            validating: false,
+            value: 'Light',
+            validated: true,
           },
         ],
         forms: {

tests/index.test.tsx

@@ -655,7 +655,14 @@ describe('Form.Basic', () => {
 
     expect(
       form.current?.getFieldsValue(null, meta => {
-        expect(Object.keys(meta)).toEqual(['touched', 'validating', 'errors', 'warnings', 'name']);
+        expect(Object.keys(meta)).toEqual([
+          'touched',
+          'validating',
+          'errors',
+          'warnings',
+          'name',
+          'validated',
+        ]);
         return false;
       }),
     ).toEqual({});

tests/validate.test.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import Form, { Field, useForm } from '../src';
@@ -750,4 +750,48 @@ describe('Form.Validate', () => {
     await changeValue(wrapper, '');
     matchError(wrapper, true);
   });
+  it('validated status should be true when trigger validate', async () => {
+    const validateTrigger = jest.fn();
+    const validateNoTrigger = jest.fn();
+    const App = ({ trigger = true }) => {
+      const ref = React.useRef(null);
+      useEffect(() => {
+        if (!trigger) return;
+        ref.current!.validateFields();
+      }, [trigger]);
+      return (
+        <div>
+          <Form ref={ref}>
+            <InfoField
+              initialValue="[email protected]"
+              name="email"
+              onMetaChange={meta => {
+                if (trigger) {
+                  validateTrigger(meta.validated);
+                } else {
+                  validateNoTrigger(meta.validated);
+                }
+              }}
+              rules={[
+                {
+                  type: 'email',
+                  message: 'Please input your e-mail',
+                },
+                {
+                  required: true,
+                  message: 'Please input your value',
+                },
+              ]}
+            />
+          </Form>
+        </div>
+      );
+    };
+    const wrapper = mount(<App trigger={false} />);
+    await timeout();
+    expect(validateNoTrigger).not.toHaveBeenCalled();
+    wrapper.setProps({ trigger: true });
+    await timeout();
+    expect(validateTrigger).toBeCalledWith(true);
+  });
 });