isFieldsTouched support second arg

Author: zombieJ

README.md

@@ -122,7 +122,7 @@ class Demo extends React.Component {
 | getFieldsValue    | Get list of field values by name path list | (nameList?: [NamePath](#namepath)[]) => any                                |
 | getFieldError     | Get field errors by name path              | (name: [NamePath](#namepath)) => string[]                                  |
 | getFieldsError    | Get list of field errors by name path list | (nameList?: [NamePath](#namepath)[]) => FieldError[]                       |
-| isFieldsTouched   | Check if list of fields are touched        | (nameList?: [NamePath](#namepath)[]) => boolean                            |
+| isFieldsTouched   | Check if list of fields are touched        | (nameList?: [NamePath](#namepath)[], allTouched?: boolean) => boolean      |
 | isFieldTouched    | Check if a field is touched                | (name: [NamePath](#namepath)) => boolean                                   |
 | isFieldValidating | Check if a field is validating             | (name: [NamePath](#namepath)) => boolean                                   |
 | resetFields       | Reset fields status                        | (fields?: [NamePath](#namepath)[]) => void                                 |

src/interface.ts

@@ -142,13 +142,17 @@ export interface InternalHooks {
   setValidateMessages: (validateMessages: ValidateMessages) => void;
 }
 
+export type IsFieldsTouched =
+  | ((allFieldsTouched?: boolean) => boolean)
+  | ((nameList: NamePath[], allFieldsTouched?: boolean) => boolean);
+
 export interface FormInstance {
   // Origin Form API
   getFieldValue: (name: NamePath) => StoreValue;
   getFieldsValue: (nameList?: NamePath[]) => Store;
   getFieldError: (name: NamePath) => string[];
   getFieldsError: (nameList?: NamePath[]) => FieldError[];
-  isFieldsTouched: (nameList?: NamePath[]) => boolean;
+  isFieldsTouched: IsFieldsTouched;
   isFieldTouched: (name: NamePath) => boolean;
   isFieldValidating: (name: NamePath) => boolean;
   isFieldsValidating: (nameList: NamePath[]) => boolean;

src/useForm.ts

@@ -172,13 +172,27 @@ export class FormStore {
     return [];
   };
 
-  private isFieldsTouched = (nameList?: NamePath[]) => {
-    let namePathList: InternalNamePath[] | null = null;
-    if (nameList) {
-      namePathList = nameList.map(getNamePath);
+  private isFieldsTouched = (...args) => {
+    const [arg0, arg1] = args;
+    let namePathList: InternalNamePath[] | null;
+    let isAllFieldsTouched = false;
+
+    if (args.length === 0) {
+      namePathList = null;
+    } else if (args.length === 1) {
+      if (Array.isArray(arg0)) {
+        namePathList = arg0.map(getNamePath);
+        isAllFieldsTouched = false;
+      } else {
+        namePathList = null;
+        isAllFieldsTouched = arg0;
+      }
+    } else {
+      namePathList = arg0.map(getNamePath);
+      isAllFieldsTouched = arg1;
     }
 
-    return this.getFieldEntities().some((field: FieldEntity) => {
+    const testTouched = (field: FieldEntity) => {
       // Not provide `nameList` will check all the fields
       if (!namePathList) {
         return field.isFieldTouched();
@@ -189,7 +203,11 @@ export class FormStore {
         return field.isFieldTouched();
       }
       return false;
-    });
+    };
+
+    return isAllFieldsTouched
+      ? this.getFieldEntities().every(testTouched)
+      : this.getFieldEntities().some(testTouched);
   };
 
   private isFieldTouched = (name: NamePath) => this.isFieldsTouched([name]);

tests/index.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import Form, { Field, useForm } from '../src';
+import Form, { Field } from '../src';
 import InfoField, { Input } from './common/InfoField';
 import { changeValue, getField, matchError } from './common';
 import timeout from './common/timeout';
@@ -76,6 +76,8 @@ describe('Basic', () => {
     await changeValue(getField(wrapper, 0), 'Bamboo');
     expect(form.isFieldsTouched()).toBeTruthy();
     expect(form.isFieldsTouched(['username', 'password'])).toBeTruthy();
+    expect(form.isFieldsTouched(true)).toBeFalsy();
+    expect(form.isFieldsTouched(['username', 'password'], true)).toBeFalsy();
   });
 
   describe('reset form', () => {