only accepts exist value (#40)

Author: zombieJ

src/useForm.ts

@@ -431,7 +431,10 @@ export class FormStore {
     nameList?: NamePath[],
     options?: ValidateOptions,
   ) => {
-    const namePathList: InternalNamePath[] | undefined = nameList && nameList.map(getNamePath);
+    const provideNameList = !!nameList;
+    const namePathList: InternalNamePath[] | undefined = provideNameList
+      ? nameList.map(getNamePath)
+      : [];
 
     // Collect result in promise list
     const promiseList: Promise<{
@@ -440,13 +443,20 @@ export class FormStore {
     }>[] = [];
 
     this.getFieldEntities().forEach((field: FieldEntity) => {
+      // Add field if not provide `nameList`
+      if (!provideNameList) {
+        namePathList.push(field.getNamePath());
+      }
+
+      // Skip if without rule
       if (!field.props.rules || !field.props.rules.length) {
         return;
       }
 
       const fieldNamePath = field.getNamePath();
 
-      if (!namePathList || containsNamePath(namePathList, fieldNamePath)) {
+      // Add field validate rule in to promise list
+      if (!provideNameList || containsNamePath(namePathList, fieldNamePath)) {
         const promise = field.validateRules({
           validateMessages: {
             ...defaultValidateMessages,
@@ -485,15 +495,15 @@ export class FormStore {
       .then(
         (): Promise<Store | string[]> => {
           if (this.lastValidatePromise === summaryPromise) {
-            return Promise.resolve(this.store);
+            return Promise.resolve(this.getFieldsValue(namePathList));
           }
           return Promise.reject<string[]>([]);
         },
       )
       .catch((results: { name: InternalNamePath; errors: string[] }[]) => {
         const errorList = results.filter(result => result && result.errors.length);
         return Promise.reject({
-          values: this.store,
+          values: this.getFieldsValue(namePathList),
           errorFields: errorList,
           outOfDate: this.lastValidatePromise !== summaryPromise,
         });

tests/validate.test.js

@@ -271,5 +271,36 @@ describe('Form.Validate', () => {
     expect(form.getFieldValue('title')).toBe('1');
     expect(form.getFieldError('title')).toEqual(['Title should be 3+ characters']);
   });
+
+  it('validate only accept exist fields', async () => {
+    let form;
+    const onFinish = jest.fn();
+
+    const wrapper = mount(
+      <div>
+        <Form
+          onFinish={onFinish}
+          ref={instance => {
+            form = instance;
+          }}
+          initialValues={{ user: 'light', pass: 'bamboo' }}
+        >
+          <InfoField name="user">
+            <Input />
+          </InfoField>
+          <button type="submit">submit</button>
+        </Form>
+      </div>,
+    );
+
+    // Validate callback
+    expect(await form.validateFields(['user'])).toEqual({ user: 'light' });
+    expect(await form.validateFields()).toEqual({ user: 'light' });
+
+    // Submit callback
+    wrapper.find('button').simulate('submit');
+    await timeout();
+    expect(onFinish).toHaveBeenCalledWith({ user: 'light' });
+  });
 });
 /* eslint-enable no-template-curly-in-string */