@digigov/form 2.0.0-6e3977bc → 2.0.0-750aec28

package/src/validators/index.ts

@@ -1,6 +1,4 @@
 import { MutableRefObject, useMemo } from 'react';
-import dayjs from 'dayjs';
-import customParseFormat from 'dayjs/plugin/customParseFormat';
 import * as yup from 'yup';
 import { AnyObjectSchema, StringSchema } from 'yup';
 import { RequiredArraySchema } from 'yup/lib/array';
@@ -13,6 +11,7 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 import {
   getYupObjectShape,
   AFM_VALIDATOR,
+  AMKA_VALIDATOR,
   FILE_MAX_SIZE_VALIDATOR,
   IBAN_VALIDATOR,
   OTP_VALIDATOR,
@@ -22,16 +21,15 @@ import {
   POSTALCODE_VALIDATOR,
   UUID4_VALIDATOR,
   IMAGE_DIMENSION_VALIDATOR,
+  DATE_VALIDATOR,
+  LATER_THAN_VALIDATOR,
+  EARLIER_THAN_VALIDATOR,
+  DATETIME_VALIDATOR,
+  LATER_THAN_DATETIME_VALIDATOR,
+  EARLIER_THAN_DATETIME_VALIDATOR,
 } from '@digigov/form/validators/utils';
 import { INT_VALIDATOR } from '@digigov/form/validators/utils/int';
 import { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';
-dayjs.extend(customParseFormat);
-
-const VALID_DATE_FORMATS = ['DD/MM/YYYY'];
-const DATE_CACHE = {};
-const getDate = (v) => {
-  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
-};
 
 export const getYUPTypeMap = (): Record<string, any> => {
   const yupTypeMap = {
@@ -47,8 +45,28 @@ export const getYUPTypeMap = (): Record<string, any> => {
         .nullable()
         .test(FILE_MAX_SIZE_VALIDATOR(field));
     },
-    string: yup.string,
-    boolean: yup.boolean,
+    string: (field): yup.StringSchema => {
+      if (field.trim) {
+        return yup.string().trim();
+      } else {
+        return yup.string();
+      }
+    },
+    boolean: (): yup.BooleanSchema<
+      boolean | null | undefined,
+      AnyObject,
+      boolean | null | undefined
+    > => {
+      return yup
+        .boolean()
+        .nullable()
+        .transform((value) => {
+          if (value === '' || typeof value === 'string') return null;
+          if (typeof value === 'boolean') return value;
+          if (value === 0 || value === 1) return Boolean(value);
+          return value;
+        });
+    },
     object: (
       field
     ):
@@ -100,24 +118,43 @@ export const getYUPTypeMap = (): Record<string, any> => {
     number: (): MixedSchema =>
       yup
         .mixed()
-        .transform((_, val) => (val !== '' ? Number(val) : null))
+        .transform((_, val) => (val !== '' ? Number(val) : undefined))
         .test(NUMBER_VALIDATOR()),
     int: (): MixedSchema =>
       yup
         .mixed()
-        .transform((_, val) => (val !== '' ? Number(val) : null))
+        .transform((_, val) => (val !== '' ? Number(val) : undefined))
         .test(NUMBER_VALIDATOR())
         .test(INT_VALIDATOR()),
-    email: (): yup.StringSchema => yup.string().email('form.error.email'),
-    afm: (): yup.StringSchema => yup.string().test(AFM_VALIDATOR),
-    uuid4: (): yup.StringSchema => yup.string().test(UUID4_VALIDATOR),
-    iban: (field): yup.StringSchema => yup.string().test(IBAN_VALIDATOR(field)),
-    otp: (field): yup.StringSchema => yup.string().test(OTP_VALIDATOR(field)),
+    email: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().email('form.error.email')
+        : yup.string().email('form.error.email'),
+    afm: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(AFM_VALIDATOR)
+        : yup.string().test(AFM_VALIDATOR),
+    amka: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(AMKA_VALIDATOR)
+        : yup.string().test(AMKA_VALIDATOR),
+    uuid4: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(UUID4_VALIDATOR)
+        : yup.string().test(UUID4_VALIDATOR),
+    iban: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(IBAN_VALIDATOR(field))
+        : yup.string().trim().test(IBAN_VALIDATOR(field)),
+    otp: (field): yup.StringSchema =>
+      yup.string().trim().test(OTP_VALIDATOR(field)),
     text: (field): yup.StringSchema => {
       if (field?.extra?.limit?.max || !!field?.extra?.limit?.min) {
-        return yup.string().test(TEXT_LIMIT_VALIDATOR(field));
+        return field.trim
+          ? yup.string().trim().test(TEXT_LIMIT_VALIDATOR(field))
+          : yup.string().test(TEXT_LIMIT_VALIDATOR(field));
       } else {
-        return yup.string();
+        return field.trim ? yup.string().trim() : yup.string();
       }
     },
     image: (field): MixedSchema => {
@@ -134,11 +171,17 @@ export const getYUPTypeMap = (): Record<string, any> => {
         .test(IMAGE_DIMENSION_VALIDATOR(field));
     },
     postal_code: (field): yup.StringSchema =>
-      yup.string().test(POSTALCODE_VALIDATOR(field)),
-    mobile_phone: (): yup.StringSchema =>
-      yup.string().test(MOBILE_PHONE_VALIDATOR),
+      field.trim
+        ? yup.string().trim().test(POSTALCODE_VALIDATOR(field))
+        : yup.string().test(POSTALCODE_VALIDATOR(field)),
+    mobile_phone: (field): yup.StringSchema =>
+      field.trim
+        ? yup.string().trim().test(MOBILE_PHONE_VALIDATOR)
+        : yup.string().test(MOBILE_PHONE_VALIDATOR),
     phone_number: (field): yup.StringSchema =>
-      yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
+      field.trim
+        ? yup.string().trim().test(PHONE_NUMBER_VALIDATOR(field))
+        : yup.string().test(PHONE_NUMBER_VALIDATOR(field)),
     'choice:multiple': (): yup.ArraySchema<
       yup.StringSchema<string | undefined, AnyObject, string | undefined>,
       AnyObject,
@@ -150,69 +193,32 @@ export const getYUPTypeMap = (): Record<string, any> => {
       AnyObject,
       string | null | undefined
     > => yup.string().nullable(),
-    date: (field) => {
-      let simpleDate = yup
-        .string()
-        .nullable(true)
-        .test('date', 'form.error.date.invalid', function (value) {
-          if (!value) return true;
-          const date = getDate(value);
-          return date.isValid();
-        });
-      const params = field.extra || {};
-      if (params.max) {
-        let maxDate;
-        if (params.max === 'now') {
-          const today = new Date();
-          maxDate = new Date(today);
-        } else {
-          maxDate = getDate(params.max).toDate();
-        }
-        const maxNextDate = new Date(maxDate);
-        maxNextDate.setDate(maxDate.getDate() + 1);
-        simpleDate = simpleDate.test({
-          name: 'earlier-than',
-          message: {
-            key: 'form.error.date.earlier_than',
-            context: {
-              maxDate: maxNextDate.toLocaleDateString(),
-            },
-          },
-          test: function (value) {
-            if (!value) return true;
-            const date = getDate(value);
-            const isValid = +date.toDate() < +maxDate;
-            return isValid;
-          },
-        });
+    date: (
+      field
+    ): yup.StringSchema<
+      string | null | undefined,
+      AnyObject,
+      string | null | undefined
+    > => {
+      let schema = yup.string().nullable();
+      if (field?.extra?.min) {
+        schema = schema.test(LATER_THAN_VALIDATOR(field));
       }
-      if (params.min) {
-        let minDate;
-        if (params.min === 'now') {
-          const today = new Date();
-          minDate = new Date(today);
-        } else {
-          minDate = getDate(params.min).toDate();
-        }
-        const minPreviousDate = new Date(minDate);
-        minPreviousDate.setDate(minDate.getDate() - 1);
-        simpleDate = simpleDate.test({
-          name: 'later-than',
-          message: {
-            key: 'form.error.date.later_than',
-            context: {
-              minDate: minPreviousDate.toLocaleDateString(),
-            },
-          },
-          test: function (value) {
-            if (!value) return true;
-            const date = getDate(value);
-            const isValid = +date.toDate() > +minDate;
-            return isValid;
-          },
-        });
+      if (field?.extra?.max) {
+        schema = schema.test(EARLIER_THAN_VALIDATOR(field));
+      } else {
+        schema = schema.test(DATE_VALIDATOR);
+      }
+      return schema;
+    },
+    datetime: (field): yup.StringSchema => {
+      if (field?.extra?.min) {
+        return yup.string().test(LATER_THAN_DATETIME_VALIDATOR(field));
+      }
+      if (field?.extra?.max) {
+        return yup.string().test(EARLIER_THAN_DATETIME_VALIDATOR(field));
       }
-      return simpleDate;
+      return yup.string().test(DATETIME_VALIDATOR);
     },
   };
   return yupTypeMap;

package/src/validators/utils/amka.ts

@@ -0,0 +1,39 @@
+function digitSum(number) {
+  const sum = number > 9 ? 1 : 0;
+  return sum + (number % 10);
+}
+
+export function validateAMKA(amka: string): boolean {
+  // Validate that the last digit is the correct check digit (created using the
+  // Luhn algorithm https://en.wikipedia.org/wiki/Luhn_algorithm).
+  amka = String(amka);
+  const checkDigitIndex = amka.length - 1;
+  let sum = 0;
+  amka
+    .substring(0, checkDigitIndex)
+    .split('')
+    .reverse()
+    .forEach(function (value, index) {
+      const weight = ((index + 1) % 2) + 1;
+      sum += digitSum(parseInt(value, 10) * weight);
+    });
+  const sumMod10 = sum % 10;
+  if (sumMod10 === 0) {
+    return amka.substring(checkDigitIndex) === '0';
+  } else {
+    return amka.substring(checkDigitIndex) === 10 - sumMod10 + '';
+  }
+}
+
+export const AMKA_VALIDATOR = {
+  name: 'amka-validator',
+  message: 'form.error.amka',
+  test: (value): boolean => {
+    if (!value) return true;
+    const AMKA_REGEX = /^[0-9]{11}$/;
+    if (!AMKA_REGEX.test(value) || value === '00000000000') {
+      return false;
+    }
+    return validateAMKA(value);
+  },
+};

package/src/validators/utils/date.ts

@@ -0,0 +1,107 @@
+import dayjs from 'dayjs';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import { FieldSpec } from '@digigov/form/types';
+import { ValidatorSchema } from '@digigov/form/validators/types';
+
+dayjs.extend(customParseFormat);
+
+const VALID_DATE_FORMATS = ['DD/MM/YYYY'];
+const DATE_CACHE = {};
+
+const getDate = (v: string) => {
+  return DATE_CACHE[v] ? DATE_CACHE[v] : dayjs(v, VALID_DATE_FORMATS, true);
+};
+
+// Function to check partial date completion
+const checkPartialDate = (value: string) => {
+  console.log("value.split('/')", value.split('/'));
+  const [day, month, year] = value.split('/');
+  if (day && !month && !year) {
+    return 'form.error.date.invalid_month_year';
+  }
+  if (!day && month && !year) {
+    return 'form.error.date.invalid_day_year';
+  }
+  if (!day && !month && year) {
+    return 'form.error.date.invalid_day_month';
+  }
+  if (day && month && !year) {
+    return 'form.error.date.invalid_year';
+  }
+  if (day && !month && year) {
+    return 'form.error.date.invalid_month';
+  }
+  if (!day && month && year) {
+    return 'form.error.date.invalid_day';
+  } else {
+    return 'form.error.date.invalid';
+  }
+};
+
+export const LATER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
+  let minDate;
+  const params = field.extra || {};
+  if (params.min === 'now') {
+    const today = new Date();
+    minDate = new Date(today);
+  } else {
+    minDate = getDate(params.min).toDate();
+  }
+  const minPreviousDate = new Date(minDate);
+  minPreviousDate.setDate(minDate.getDate() - 1);
+  return {
+    name: 'later-than',
+    message: {
+      key: 'form.error.date.later_than',
+      context: {
+        minDate: minPreviousDate.toLocaleDateString(),
+      },
+    },
+    test: function (value: string) {
+      if (!value) return true;
+      const date = getDate(value);
+      const isValid = +date.toDate() > +minDate;
+      return isValid;
+    },
+  };
+};
+
+export const EARLIER_THAN_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
+  let maxDate;
+  const params = field.extra || {};
+  if (params.max === 'now') {
+    const today = new Date();
+    maxDate = new Date(today);
+  } else {
+    maxDate = getDate(params.max).toDate();
+  }
+  const maxNextDate = new Date(maxDate);
+  maxNextDate.setDate(maxDate.getDate() + 1);
+  return {
+    name: 'earlier-than',
+    message: {
+      key: 'form.error.date.earlier_than',
+      context: {
+        maxDate: maxNextDate.toLocaleDateString(),
+      },
+    },
+    test: function (value: string) {
+      if (!value) return true;
+      const date = getDate(value);
+      const isValid = +date.toDate() < +maxDate;
+      return isValid;
+    },
+  };
+};
+
+export const DATE_VALIDATOR = {
+  name: 'date-validator',
+  message: (v): string => {
+    return checkPartialDate(v.value);
+  },
+  test: function (value: string) {
+    if (!value) return true;
+    const date = getDate(value);
+    return date.isValid();
+  },
+};

package/src/validators/utils/datetime.ts

@@ -0,0 +1,130 @@
+import dayjs from 'dayjs';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import { FieldSpec } from '@digigov/form/types';
+import { ValidatorSchema } from '@digigov/form/validators/types';
+
+dayjs.extend(customParseFormat);
+
+const VALID_DATETIME_FORMATS = ['DD/MM/YYYY HH:mm'];
+const DATETIME_CACHE = {};
+
+const getDateTime = (v: string) => {
+  return DATETIME_CACHE[v]
+    ? DATETIME_CACHE[v]
+    : dayjs(v, VALID_DATETIME_FORMATS, true);
+};
+
+// Function to check partial datetime completion
+const checkPartialDateTime = (value: string) => {
+  const [datePart, timePart] = value.split(' ');
+  const [day, month, year] = datePart.split('/');
+  const [hours, minutes] = timePart ? timePart.split(':') : [null, null];
+
+  // Check date part first
+  if (day && !month && !year) {
+    return 'form.error.datetime.invalid_month_year';
+  }
+  if (!day && month && !year) {
+    return 'form.error.datetime.invalid_day_year';
+  }
+  if (!day && !month && year) {
+    return 'form.error.datetime.invalid_day_month';
+  }
+  if (day && month && !year) {
+    return 'form.error.datetime.invalid_year';
+  }
+  if (day && !month && year) {
+    return 'form.error.datetime.invalid_month';
+  }
+  if (!day && month && year) {
+    return 'form.error.datetime.invalid_day';
+  }
+  // If date is complete, check time part
+  if (day && month && year) {
+    if (hours && !minutes) {
+      return 'form.error.datetime.invalid_minutes';
+    }
+    if (!hours && minutes) {
+      return 'form.error.datetime.invalid_hours';
+    }
+    if (!hours && !minutes) {
+      return 'form.error.datetime.invalid';
+    }
+    if (hours && minutes) {
+      const hoursNum = parseInt(hours);
+      const minutesNum = parseInt(minutes);
+      if (hoursNum < 0 || hoursNum > 23) {
+        return 'form.error.datetime.invalid_hours_range';
+      }
+      if (minutesNum < 0 || minutesNum > 59) {
+        return 'form.error.datetime.invalid_minutes_range';
+      }
+    }
+  }
+
+  return 'form.error.datetime.invalid';
+};
+
+export const LATER_THAN_DATETIME_VALIDATOR = (
+  field: FieldSpec
+): ValidatorSchema => {
+  let minDateTime;
+  const params = field.extra || {};
+  if (params.min === 'now') {
+    minDateTime = dayjs();
+  } else {
+    minDateTime = getDateTime(params.min);
+  }
+  return {
+    name: 'later-than-datetime',
+    message: {
+      key: 'form.error.datetime.later_than',
+      context: {
+        minDateTime: minDateTime.format('DD/MM/YYYY HH:mm'),
+      },
+    },
+    test: function (value: string) {
+      if (!value) return true;
+      const datetime = getDateTime(value);
+      return datetime.isValid() && datetime.isAfter(minDateTime);
+    },
+  };
+};
+
+export const EARLIER_THAN_DATETIME_VALIDATOR = (
+  field: FieldSpec
+): ValidatorSchema => {
+  let maxDateTime;
+  const params = field.extra || {};
+  if (params.max === 'now') {
+    maxDateTime = dayjs();
+  } else {
+    maxDateTime = getDateTime(params.max);
+  }
+  return {
+    name: 'earlier-than-datetime',
+    message: {
+      key: 'form.error.datetime.earlier_than',
+      context: {
+        maxDateTime: maxDateTime.format('DD/MM/YYYY HH:mm'),
+      },
+    },
+    test: function (value: string) {
+      if (!value) return true;
+      const datetime = getDateTime(value);
+      return datetime.isValid() && datetime.isBefore(maxDateTime);
+    },
+  };
+};
+
+export const DATETIME_VALIDATOR = {
+  name: 'datetime-validator',
+  message: (v): string => {
+    return checkPartialDateTime(v.value);
+  },
+  test: function (value: string) {
+    if (!value) return true;
+    const datetime = getDateTime(value);
+    return datetime.isValid();
+  },
+};

package/src/validators/utils/file.ts

@@ -6,15 +6,17 @@ const DEFAULT_FILE_MAX_SIZE = 10000000;
 export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
   name: 'file-max-size-validator',
   message: {
-    key: field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',
+    key:
+      field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',
     context: {
-      maxSizeToMb: (field?.extra?.limit.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
+      maxSizeToMb:
+        (field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
     },
   },
   test: (value: File[]): boolean => {
     if (value) {
       for (const file of value) {
-        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE
+        const maxSize = field?.extra?.limit?.maxSize || DEFAULT_FILE_MAX_SIZE;
         if (file.size > maxSize) {
           return false;
         }

package/src/validators/utils/index.ts

@@ -3,6 +3,7 @@ import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 
 export * from '@digigov/form/validators/utils/afm';
+export * from '@digigov/form/validators/utils/amka';
 export * from '@digigov/form/validators/utils/file';
 export * from '@digigov/form/validators/utils/iban';
 export * from '@digigov/form/validators/utils/otp';
@@ -11,6 +12,8 @@ export * from '@digigov/form/validators/utils/phone';
 export * from '@digigov/form/validators/utils/postal_code';
 export * from '@digigov/form/validators/utils/uuid4';
 export * from '@digigov/form/validators/utils/text_limit';
+export * from '@digigov/form/validators/utils/date';
+export * from '@digigov/form/validators/utils/datetime';
 
 export function getYupField(field: FieldSpec, yupTypeMap: Record<string, any>) {
   const yupField = yupTypeMap[field?.type || 'string'] || yupTypeMap['string'];

package/src/validators/utils/int.ts

@@ -13,7 +13,7 @@ export const INT_VALIDATOR = (): ValidatorSchema => {
     name: 'int-validator',
     message: 'form.error.positive_integer_number',
     test: (value: number): boolean => {
-      if (value === null) {
+      if (value === undefined) {
         return true;
       }
       return validateIntNumber(value);

package/src/validators/utils/number.ts

@@ -9,7 +9,7 @@ export const NUMBER_VALIDATOR = (): ValidatorSchema => {
     name: 'number-validator',
     message: 'form.error.number',
     test: (value: number): boolean => {
-      if (value === null) {
+      if (value === undefined) {
         return true;
       }
       return validateNumber(value);

package/src/validators/utils/phone.ts

@@ -138,7 +138,7 @@ function isNumberOfType(phoneNumber: string, country: string, type: string) {
 }
 export function validatePhoneNumber(
   phoneNumber: string,
-  countries: Array<string> = ['gr'],
+  countries: string[] = ['gr'],
   typeOfPhoneNumber?: PhoneNumberType
 ): boolean {
   if (!countries || countries.length === 0) {

package/src/validators/utils/postal_code.ts

@@ -4,7 +4,7 @@ import { ValidatorSchema } from '@digigov/form/validators/types';
 const CODE_REGEX = /^[12345678][0-9]{4}$/;
 export function validatePostalCode(
   number: string,
-  countries: Array<string>
+  countries: string[]
 ): boolean {
   if (!countries) {
     return false;

package/src/validators/utils/uuid4.ts

@@ -1,4 +1,5 @@
-const UUID4_PATTERN = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
+const UUID4_PATTERN =
+  /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
 
 export function validateUUID4(uuid4: string): boolean {
   if (uuid4.length !== 36) {

package/src/validators/validators.spec.ts

@@ -75,14 +75,14 @@ it('throws if given country is not supported', () => {
   );
 });
 
-it('validates  phone number type mobile with gr country code', () => {
+it('validates phone number type mobile with gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
 });
 
-it('validates  phone number with no type and gr country code', () => {
+it('validates phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
 });
 
-it('validates  phone number with no type and gr country code', () => {
+it('validates invalid phone number with no type and gr country code', () => {
   expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
 });

package/types.d.ts

@@ -2,9 +2,9 @@ import { UseFormReturn, UseFormProps } from 'react-hook-form';
 import { FieldComponentRegistry, FieldLabelProps, FieldSpec, FormData } from '@digigov/form/Field/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 export * from '@digigov/form/Field/types';
-export type FieldError = {
+export interface FieldError {
     message: string;
-};
+}
 export interface FieldsetSpec {
     key: string;
     fields: string[];

package/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/types.tsx"],
-  "sourcesContent": ["import { UseFormReturn, UseFormProps } from 'react-hook-form';\nimport {\n  FieldComponentRegistry,\n  FieldLabelProps,\n  FieldSpec,\n  FormData,\n} from '@digigov/form/Field/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nexport * from '@digigov/form/Field/types';\nexport type FieldError = {\n  message: string;\n};\n\nexport interface FieldsetSpec {\n  key: string;\n  fields: string[];\n  label?: FieldLabelProps;\n  body?: React.ReactNode;\n}\n\nexport interface FormContextProps {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  watch: UseFormReturn['watch'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  formState: UseFormReturn['formState'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  registerField: (field: FieldSpec) => void;\n  errors: UseFormReturn['formState']['errors'];\n  componentRegistry?: FieldComponentRegistry;\n  submit: () => Promise<void>;\n}\n\nexport interface FormBuilderProps {\n  fields?: FieldSpec[];\n  fieldsets?: FieldsetSpec[];\n  initial?: FormData;\n  onSubmit?: (data: FormData) => void | null | FieldError[];\n  mode?: UseFormProps['mode'];\n  reValidateMode?: UseFormProps['reValidateMode'];\n  criteriaMode?: UseFormProps['criteriaMode'];\n  children?: React.ReactNode;\n  shouldFocusError?: boolean;\n  auto?: boolean;\n  validatorRegistry?: Record<string, ValidatorSchema[]>;\n  componentRegistry?: FieldComponentRegistry;\n  grid?: boolean;\n  controlledFieldsOnly?: boolean;\n}\n\nexport interface FormBaseProps\n  extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  registerField: (field: FieldSpec) => void;\n  resolver: any;\n}\n"],
+  "sourcesContent": ["import { UseFormReturn, UseFormProps } from 'react-hook-form';\nimport {\n  FieldComponentRegistry,\n  FieldLabelProps,\n  FieldSpec,\n  FormData,\n} from '@digigov/form/Field/types';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nexport * from '@digigov/form/Field/types';\nexport interface FieldError {\n  message: string;\n}\n\nexport interface FieldsetSpec {\n  key: string;\n  fields: string[];\n  label?: FieldLabelProps;\n  body?: React.ReactNode;\n}\n\nexport interface FormContextProps {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  watch: UseFormReturn['watch'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  formState: UseFormReturn['formState'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  registerField: (field: FieldSpec) => void;\n  errors: UseFormReturn['formState']['errors'];\n  componentRegistry?: FieldComponentRegistry;\n  submit: () => Promise<void>;\n}\n\nexport interface FormBuilderProps {\n  fields?: FieldSpec[];\n  fieldsets?: FieldsetSpec[];\n  initial?: FormData;\n  onSubmit?: (data: FormData) => void | null | FieldError[];\n  mode?: UseFormProps['mode'];\n  reValidateMode?: UseFormProps['reValidateMode'];\n  criteriaMode?: UseFormProps['criteriaMode'];\n  children?: React.ReactNode;\n  shouldFocusError?: boolean;\n  auto?: boolean;\n  validatorRegistry?: Record<string, ValidatorSchema[]>;\n  componentRegistry?: FieldComponentRegistry;\n  grid?: boolean;\n  controlledFieldsOnly?: boolean;\n}\n\nexport interface FormBaseProps\n  extends Omit<FormBuilderProps, 'fields' | 'fieldsets' | 'auto'> {\n  fieldsetsMap?: Record<string, FieldsetSpec>;\n  fieldsMap: Record<string, FieldSpec>;\n  registerField: (field: FieldSpec) => void;\n  resolver: any;\n}\n"],
   "mappings": "AAQA,cAAc;",
   "names": []
 }

package/utils/index.js

@@ -34,7 +34,8 @@ const yupResolver = (schema, schemaOptions = {}, resolverOptions = {}) => async
       values,
       Object.assign({ abortEarly: false }, schemaOptions, { context })
     );
-    options.shouldUseNativeValidation && validateFieldsNatively({}, options);
+    if (options.shouldUseNativeValidation)
+      validateFieldsNatively({}, options);
     return {
       values: resolverOptions.rawValues ? values : result,
       errors: {}