@digigov/form 2.0.0-4be8f7cc → 2.0.0-6452adf3

package/src/internal.ts

@@ -1,34 +1,5 @@
-export { default as Field } from '@digigov/form/Field';
-export * from '@digigov/form/Field';
-export { default as FieldArray } from '@digigov/form/FieldArray';
-export * from '@digigov/form/FieldArray';
-export { default as FieldConditional } from '@digigov/form/Field/FieldConditional';
-export * from '@digigov/form/Field/FieldConditional';
-export { default as Fieldset } from '@digigov/form/Fieldset';
-export * from '@digigov/form/Fieldset';
-export { default as FormBuilder } from '@digigov/form/FormBuilder';
-export * from '@digigov/form/FormBuilder';
-export { Step } from '@digigov/form/Questions/Step';
-export * from '@digigov/form/Questions/Step';
-export { default as Questions } from '@digigov/form/Questions';
-export * from '@digigov/form/Questions';
-export { default as Checkboxes } from '@digigov/form/inputs/Checkboxes';
-export * from '@digigov/form/inputs/Checkboxes';
-export { default as DateInput } from '@digigov/form/inputs/DateInput';
-export * from '@digigov/form/inputs/DateInput';
-export { default as FileInput } from '@digigov/form/inputs/FileInput';
-export * from '@digigov/form/inputs/FileInput';
-export { default as Input } from '@digigov/form/inputs/Input';
-export * from '@digigov/form/inputs/Input';
-export { default as Label } from '@digigov/form/inputs/Label';
-export * from '@digigov/form/inputs/Label';
-export { default as Radio } from '@digigov/form/inputs/Radio';
-export * from '@digigov/form/inputs/Radio';
-export { default as Select } from '@digigov/form/inputs/Select';
+export { Field } from '@digigov/form/Field';
+export { Fieldset } from '@digigov/form/Fieldset';
 export * from '@digigov/form/FormContext';
-export * from '@digigov/form/inputs/Select';
-export * from '@digigov/form/inputs';
-export * from '@digigov/form/internal';
 export * from '@digigov/form/types';
-export * from '@digigov/form/utils';
 export * from '@digigov/form/validators';

package/src/lazy.js

@@ -4,6 +4,9 @@ export default {
   'FieldBaseContainer': lazy(() => import('@digigov/form/Field/FieldBaseContainer').then((module)=> ({default: module['FieldBaseContainer']}))),
   'FieldConditional': lazy(() => import('@digigov/form/Field/FieldConditional').then((module)=> ({default: module['FieldConditional']}))),
   'Field': lazy(() => import('@digigov/form/internal').then((module)=> ({default: module['Field']}))),
+  'ALTERNATIVE_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module)=> ({default: module['ALTERNATIVE_COMPONENTS']}))),
+  'CONTROLLED_FIELD_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module)=> ({default: module['CONTROLLED_FIELD_COMPONENTS']}))),
+  'FIELD_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module)=> ({default: module['FIELD_COMPONENTS']}))),
   'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module)=> ({default: module['FieldArray']}))),
   'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module)=> ({default: module['FieldObject']}))),
   'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module)=> ({default: module['FieldsetWithContext']}))),
@@ -11,19 +14,30 @@ export default {
   'FieldsetBody': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetBody']}))),
   'FieldsetCaption': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetCaption']}))),
   'FieldsetLabel': lazy(() => import('@digigov/form/Fieldset').then((module)=> ({default: module['FieldsetLabel']}))),
-  'FormBase': lazy(() => import('@digigov/form/FormBuilder/FormBuilder').then((module)=> ({default: module['FormBase']}))),
-  'FormBuilder': lazy(() => import('@digigov/form/FormBuilder/FormBuilder').then((module)=> ({default: module['FormBuilder']}))),
+  'ControlledFormBuilder': lazy(() => import('@digigov/form/FormBuilder').then((module)=> ({default: module['ControlledFormBuilder']}))),
+  'FormBase': lazy(() => import('@digigov/form/FormBuilder').then((module)=> ({default: module['FormBase']}))),
   'FormContext': lazy(() => import('@digigov/form/FormContext').then((module)=> ({default: module['FormContext']}))),
+  'Label': lazy(() => import('@digigov/form/inputs/Label').then((module)=> ({default: module['Label']}))),
+  'AutoCompleteInput': lazy(() => import('@digigov/form/inputs/AutoCompleteInput').then((module)=> ({default: module['AutoCompleteInput']}))),
   'Checkboxes': lazy(() => import('@digigov/form/inputs/Checkboxes').then((module)=> ({default: module['Checkboxes']}))),
   'DateInput': lazy(() => import('@digigov/form/inputs/DateInput').then((module)=> ({default: module['DateInput']}))),
   'FileInput': lazy(() => import('@digigov/form/inputs/FileInput').then((module)=> ({default: module['FileInput']}))),
+  'Image': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['Image']}))),
+  'ImageInput': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['ImageInput']}))),
   'Input': lazy(() => import('@digigov/form/inputs/Input').then((module)=> ({default: module['Input']}))),
-  'Label': lazy(() => import('@digigov/form/inputs/Label').then((module)=> ({default: module['Label']}))),
-  'Questions': lazy(() => import('@digigov/form/Questions/Questions').then((module)=> ({default: module['Questions']}))),
-  'Radio': lazy(() => import('@digigov/form/internal').then((module)=> ({default: module['Radio']}))),
+  'OtpInput': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['OtpInput']}))),
+  'Radio': lazy(() => import('@digigov/form/inputs').then((module)=> ({default: module['Radio']}))),
   'Select': lazy(() => import('@digigov/form/inputs/Select').then((module)=> ({default: module['Select']}))),
-  'Step': lazy(() => import('@digigov/form/Questions/Step/Step').then((module)=> ({default: module['Step']}))),
+  'INPUTS_FIELDS': lazy(() => import('@digigov/form/inputs/inputsScenarios').then((module)=> ({default: module['INPUTS_FIELDS']}))),
+  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['REMOVE_SPACES']}))),
+  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['RE_DIGIT']}))),
+  'ControlledRadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module)=> ({default: module['ControlledRadioButtonsGroup']}))),
+  'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module)=> ({default: module['RadioButtonsGroup']}))),
+  'AddObjects': lazy(() => import('@digigov/form/MultiplicityField/add-objects').then((module)=> ({default: module['AddObjects']}))),
+  'ListObject': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['ListObject']}))),
+  'Multiplicity': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['Multiplicity']}))),
   'ReviewStep': lazy(() => import('@digigov/form/Questions/Step/ReviewStep').then((module)=> ({default: module['ReviewStep']}))),
+  'Step': lazy(() => import('@digigov/form/Questions/Step/Step').then((module)=> ({default: module['Step']}))),
   'StepArrayReview': lazy(() => import('@digigov/form/Questions/Step/StepArrayReview').then((module)=> ({default: module['StepArrayReview']}))),
   'StepContext': lazy(() => import('@digigov/form/Questions/Step/StepContext').then((module)=> ({default: module['StepContext']}))),
   'StepDescription': lazy(() => import('@digigov/form/Questions/Step/StepDescription').then((module)=> ({default: module['StepDescription']}))),
@@ -33,18 +47,12 @@ export default {
   'StepTitle': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitle']}))),
   'StepTitleBase': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitleBase']}))),
   'StepTitleHeading': lazy(() => import('@digigov/form/Questions/Step/StepTitle').then((module)=> ({default: module['StepTitleHeading']}))),
-  'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module)=> ({default: module['RadioButtonsGroup']}))),
-  'ImageInput': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['ImageInput']}))),
-  'OtpInput': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['OtpInput']}))),
-  'AutoCompleteInput': lazy(() => import('@digigov/form/inputs/AutoCompleteInput').then((module)=> ({default: module['AutoCompleteInput']}))),
-  'Image': lazy(() => import('@digigov/form/inputs/ImageInput').then((module)=> ({default: module['Image']}))),
-  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['REMOVE_SPACES']}))),
-  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module)=> ({default: module['RE_DIGIT']}))),
-  'AddObjects': lazy(() => import('@digigov/form/MultiplicityField/add-objects').then((module)=> ({default: module['AddObjects']}))),
-  'ListObject': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['ListObject']}))),
-  'Multiplicity': lazy(() => import('@digigov/form/MultiplicityField').then((module)=> ({default: module['Multiplicity']}))),
+  'Questions': lazy(() => import('@digigov/form/Questions/Questions').then((module)=> ({default: module['Questions']}))),
   'QuestionsContext': lazy(() => import('@digigov/form/Questions/QuestionsContext').then((module)=> ({default: module['QuestionsContext']}))),
   'AFM_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/afm').then((module)=> ({default: module['AFM_VALIDATOR']}))),
+  'DATE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/date').then((module)=> ({default: module['DATE_VALIDATOR']}))),
+  'EARLIER_THAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/date').then((module)=> ({default: module['EARLIER_THAN_VALIDATOR']}))),
+  'LATER_THAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/date').then((module)=> ({default: module['LATER_THAN_VALIDATOR']}))),
   'FILE_MAX_SIZE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/file').then((module)=> ({default: module['FILE_MAX_SIZE_VALIDATOR']}))),
   'IBAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/iban').then((module)=> ({default: module['IBAN_VALIDATOR']}))),
   'IMAGE_DIMENSION_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/image').then((module)=> ({default: module['IMAGE_DIMENSION_VALIDATOR']}))),

package/src/locales/el.ts

@@ -0,0 +1,3 @@
+import el from '@digigov/ui/i18n/locales/el';
+
+export default el;

package/src/registry.js

@@ -4,13 +4,15 @@ import * as _digigov_form_Field_FieldBaseContainer from '@digigov/form/Field/Fie
 import * as _digigov_form_Field_FieldConditional from '@digigov/form/Field/FieldConditional';
 import * as _digigov_form_Field from '@digigov/form/Field';
 import * as _digigov_form_Field_types from '@digigov/form/Field/types';
+import * as _digigov_form_Field_utils_calculateField from '@digigov/form/Field/utils/calculateField';
+import * as _digigov_form_Field_utils_evaluateFieldWithConditions from '@digigov/form/Field/utils/evaluateFieldWithConditions';
 import * as _digigov_form_Field_utils from '@digigov/form/Field/utils';
+import * as _digigov_form_Field_utils_useField from '@digigov/form/Field/utils/useField';
 import * as _digigov_form_FieldArray from '@digigov/form/FieldArray';
 import * as _digigov_form_FieldObject from '@digigov/form/FieldObject';
 import * as _digigov_form_Fieldset_FieldsetWithContext from '@digigov/form/Fieldset/FieldsetWithContext';
 import * as _digigov_form_Fieldset from '@digigov/form/Fieldset';
 import * as _digigov_form_Fieldset_types from '@digigov/form/Fieldset/types';
-import * as _digigov_form_FormBuilder_FormBuilder from '@digigov/form/FormBuilder/FormBuilder';
 import * as _digigov_form_FormBuilder from '@digigov/form/FormBuilder';
 import * as _digigov_form_FormContext from '@digigov/form/FormContext';
 import * as _digigov_form from '@digigov/form';
@@ -21,13 +23,17 @@ import * as _digigov_form_inputs_FileInput from '@digigov/form/inputs/FileInput'
 import * as _digigov_form_inputs_ImageInput from '@digigov/form/inputs/ImageInput';
 import * as _digigov_form_inputs from '@digigov/form/inputs';
 import * as _digigov_form_inputs_Input from '@digigov/form/inputs/Input';
+import * as _digigov_form_inputs_Input_inputsInputScenarios from '@digigov/form/inputs/Input/inputsInputScenarios';
+import * as _digigov_form_inputs_inputsScenarios from '@digigov/form/inputs/inputsScenarios';
 import * as _digigov_form_inputs_Label from '@digigov/form/inputs/Label';
 import * as _digigov_form_inputs_OtpInput from '@digigov/form/inputs/OtpInput';
 import * as _digigov_form_inputs_Radio from '@digigov/form/inputs/Radio';
 import * as _digigov_form_inputs_Select from '@digigov/form/inputs/Select';
 import * as _digigov_form_internal from '@digigov/form/internal';
+import * as _digigov_form_locales_el from '@digigov/form/locales/el';
 import * as _digigov_form_MultiplicityField_add_objects from '@digigov/form/MultiplicityField/add-objects';
 import * as _digigov_form_MultiplicityField from '@digigov/form/MultiplicityField';
+import * as _digigov_form_MultiplicityField_types from '@digigov/form/MultiplicityField/types';
 import * as _digigov_form_Questions_getNextStep from '@digigov/form/Questions/getNextStep';
 import * as _digigov_form_Questions from '@digigov/form/Questions';
 import * as _digigov_form_Questions_Questions from '@digigov/form/Questions/Questions';
@@ -49,6 +55,7 @@ import * as _digigov_form_utils from '@digigov/form/utils';
 import * as _digigov_form_validators from '@digigov/form/validators';
 import * as _digigov_form_validators_types from '@digigov/form/validators/types';
 import * as _digigov_form_validators_utils_afm from '@digigov/form/validators/utils/afm';
+import * as _digigov_form_validators_utils_date from '@digigov/form/validators/utils/date';
 import * as _digigov_form_validators_utils_file from '@digigov/form/validators/utils/file';
 import * as _digigov_form_validators_utils_iban from '@digigov/form/validators/utils/iban';
 import * as _digigov_form_validators_utils_image from '@digigov/form/validators/utils/image';
@@ -85,13 +92,15 @@ export default {
   '@digigov/form/Field/FieldConditional': lazyImport(_digigov_form_Field_FieldConditional),
   '@digigov/form/Field': lazyImport(_digigov_form_Field),
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
+  '@digigov/form/Field/utils/calculateField': lazyImport(_digigov_form_Field_utils_calculateField),
+  '@digigov/form/Field/utils/evaluateFieldWithConditions': lazyImport(_digigov_form_Field_utils_evaluateFieldWithConditions),
   '@digigov/form/Field/utils': lazyImport(_digigov_form_Field_utils),
+  '@digigov/form/Field/utils/useField': lazyImport(_digigov_form_Field_utils_useField),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
   '@digigov/form/Fieldset': lazyImport(_digigov_form_Fieldset),
   '@digigov/form/Fieldset/types': lazyImport(_digigov_form_Fieldset_types),
-  '@digigov/form/FormBuilder/FormBuilder': lazyImport(_digigov_form_FormBuilder_FormBuilder),
   '@digigov/form/FormBuilder': lazyImport(_digigov_form_FormBuilder),
   '@digigov/form/FormContext': lazyImport(_digigov_form_FormContext),
   '@digigov/form': lazyImport(_digigov_form),
@@ -102,13 +111,17 @@ export default {
   '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
   '@digigov/form/inputs': lazyImport(_digigov_form_inputs),
   '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
+  '@digigov/form/inputs/Input/inputsInputScenarios': lazyImport(_digigov_form_inputs_Input_inputsInputScenarios),
+  '@digigov/form/inputs/inputsScenarios': lazyImport(_digigov_form_inputs_inputsScenarios),
   '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),
   '@digigov/form/inputs/OtpInput': lazyImport(_digigov_form_inputs_OtpInput),
   '@digigov/form/inputs/Radio': lazyImport(_digigov_form_inputs_Radio),
   '@digigov/form/inputs/Select': lazyImport(_digigov_form_inputs_Select),
   '@digigov/form/internal': lazyImport(_digigov_form_internal),
+  '@digigov/form/locales/el': lazyImport(_digigov_form_locales_el),
   '@digigov/form/MultiplicityField/add-objects': lazyImport(_digigov_form_MultiplicityField_add_objects),
   '@digigov/form/MultiplicityField': lazyImport(_digigov_form_MultiplicityField),
+  '@digigov/form/MultiplicityField/types': lazyImport(_digigov_form_MultiplicityField_types),
   '@digigov/form/Questions/getNextStep': lazyImport(_digigov_form_Questions_getNextStep),
   '@digigov/form/Questions': lazyImport(_digigov_form_Questions),
   '@digigov/form/Questions/Questions': lazyImport(_digigov_form_Questions_Questions),
@@ -130,6 +143,7 @@ export default {
   '@digigov/form/validators': lazyImport(_digigov_form_validators),
   '@digigov/form/validators/types': lazyImport(_digigov_form_validators_types),
   '@digigov/form/validators/utils/afm': lazyImport(_digigov_form_validators_utils_afm),
+  '@digigov/form/validators/utils/date': lazyImport(_digigov_form_validators_utils_date),
   '@digigov/form/validators/utils/file': lazyImport(_digigov_form_validators_utils_file),
   '@digigov/form/validators/utils/iban': lazyImport(_digigov_form_validators_utils_iban),
   '@digigov/form/validators/utils/image': lazyImport(_digigov_form_validators_utils_image),

package/src/types.tsx

@@ -1,70 +1,16 @@
 import { UseFormReturn, UseFormProps } from 'react-hook-form';
-import { FieldComponentRegistry } from '@digigov/form/Field/types';
+import {
+  FieldComponentRegistry,
+  FieldLabelProps,
+  FieldSpec,
+  FormData,
+} from '@digigov/form/Field/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
-import { GridProps } from '@digigov/ui/layouts/Grid';
-
+export * from '@digigov/form/Field/types';
 export type FieldError = {
   message: string;
 };
 
-export type FieldLabelProps = {
-  primary?: string;
-  secondary?: string;
-};
-
-export interface FieldCondition {
-  is: string | string[] | number | number[] | boolean | boolean[];
-  then?: Partial<FieldSpec>;
-  else?: Partial<FieldSpec>;
-}
-export interface FieldSpec {
-  key: string; // !TODO rename key to name;
-  type?:
-    | 'int'
-    | 'string'
-    | 'text'
-    | 'boolean'
-    | 'email'
-    | 'uuid4'
-    | 'choice:multiple'
-    | 'choice:single'
-    | 'mobile_phone'
-    | 'date'
-    | 'otp'
-    | 'afm'
-    | 'iban'
-    | 'file'
-    | 'image'
-    | 'postal_code'
-    | 'phone_number'
-    | 'array'
-    | 'object';
-  component?: any;
-  maxLength?: number;
-  condition?: Record<string, FieldCondition>;
-  controlled?: boolean;
-  label?: FieldLabelProps;
-  extra?: {
-    [key: string]: any;
-  };
-  editable?: boolean;
-  required?: boolean;
-  enabled?: boolean;
-  layout?: Record<
-    string,
-    | GridProps['xs']
-    | GridProps['sm']
-    | GridProps['md']
-    | GridProps['lg']
-    | GridProps['xl']
-  >;
-  validators?: ValidatorSchema[];
-  wrapper?: 'label' | 'fieldset';
-  maxWidth?: string;
-  maxHeight?: string;
-  width?: string;
-}
-
 export interface FieldsetSpec {
   key: string;
   fields: string[];
@@ -72,8 +18,6 @@ export interface FieldsetSpec {
   body?: React.ReactNode;
 }
 
-export type FormData = UseFormProps['defaultValues'];
-
 export interface FormContextProps {
   fieldsetsMap?: Record<string, FieldsetSpec>;
   fieldsMap: Record<string, FieldSpec>;
@@ -88,9 +32,11 @@ export interface FormContextProps {
   unregister: UseFormReturn['unregister'];
   formState: UseFormReturn['formState'];
   reset: UseFormReturn['reset'];
+  resetField: UseFormReturn['resetField'];
   registerField: (field: FieldSpec) => void;
   errors: UseFormReturn['formState']['errors'];
   componentRegistry?: FieldComponentRegistry;
+  submit: () => Promise<void>;
 }
 
 export interface FormBuilderProps {
@@ -107,6 +53,7 @@ export interface FormBuilderProps {
   validatorRegistry?: Record<string, ValidatorSchema[]>;
   componentRegistry?: FieldComponentRegistry;
   grid?: boolean;
+  controlledFieldsOnly?: boolean;
 }
 
 export interface FormBaseProps

package/src/utils.ts

@@ -38,41 +38,42 @@ const parseErrorSchema = (
   );
 };
 
-export const yupResolver = (
-  schema: any,
-  schemaOptions: any = {},
-  resolverOptions: any = {}
-) => async (values, context, options) => {
-  try {
-    if (schemaOptions.context && process.env.NODE_ENV === 'development') {
-      // eslint-disable-next-line no-console
-      console.warn(
-        "You should not used the yup options context. Please, use the 'useForm' context object instead"
+export const yupResolver =
+  (schema: any, schemaOptions: any = {}, resolverOptions: any = {}) =>
+  async (values, context, options) => {
+    try {
+      if (schemaOptions.context && process.env.NODE_ENV === 'development') {
+        // eslint-disable-next-line no-console
+        console.warn(
+          "You should not used the yup options context. Please, use the 'useForm' context object instead"
+        );
+      }
+
+      const result = await schema[
+        resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'
+      ](
+        values,
+        Object.assign({ abortEarly: false }, schemaOptions, { context })
       );
-    }
 
-    const result = await schema[
-      resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'
-    ](values, Object.assign({ abortEarly: false }, schemaOptions, { context }));
+      options.shouldUseNativeValidation && validateFieldsNatively({}, options);
 
-    options.shouldUseNativeValidation && validateFieldsNatively({}, options);
+      return {
+        values: resolverOptions.rawValues ? values : result,
+        errors: {},
+      };
+    } catch (e) {
+      if (!e.inner) {
+        throw e;
+      }
 
-    return {
-      values: resolverOptions.rawValues ? values : result,
-      errors: {},
-    };
-  } catch (e) {
-    if (!e.inner) {
-      throw e;
+      const parsed = parseErrorSchema(
+        e,
+        !options.shouldUseNativeValidation && options.criteriaMode === 'all'
+      );
+      return {
+        values: {},
+        errors: parsed,
+      };
     }
-
-    const parsed = parseErrorSchema(
-      e,
-      !options.shouldUseNativeValidation && options.criteriaMode === 'all'
-    );
-    return {
-      values: {},
-      errors: parsed,
-    };
-  }
-};
+  };

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';
@@ -22,16 +20,12 @@ import {
   POSTALCODE_VALIDATOR,
   UUID4_VALIDATOR,
   IMAGE_DIMENSION_VALIDATOR,
+  DATE_VALIDATOR,
+  LATER_THAN_VALIDATOR,
+  EARLIER_THAN_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 = {
@@ -97,6 +91,11 @@ export const getYUPTypeMap = (): Record<string, any> => {
         return yup.array().of(yup.string());
       }
     },
+    number: (): MixedSchema =>
+      yup
+        .mixed()
+        .transform((_, val) => (val !== '' ? Number(val) : null))
+        .test(NUMBER_VALIDATOR()),
     int: (): MixedSchema =>
       yup
         .mixed()
@@ -145,69 +144,15 @@ 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 => {
+      if (field?.extra?.min) {
+        return yup.string().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) {
+        return yup.string().test(EARLIER_THAN_VALIDATOR(field));
+      } else {
+        return yup.string().test(DATE_VALIDATOR);
       }
-      return simpleDate;
     },
   };
   return yupTypeMap;

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/file.ts

@@ -6,7 +6,7 @@ const DEFAULT_FILE_MAX_SIZE = 10000000;
 export const FILE_MAX_SIZE_VALIDATOR = (field: FieldSpec): ValidatorSchema => ({
   name: 'file-max-size-validator',
   message: {
-    key: 'form.error.file_size',
+    key: field.type === 'file' ? 'form.error.file_size' : 'form.error.image_size',
     context: {
       maxSizeToMb: (field?.extra?.limit.maxSize || DEFAULT_FILE_MAX_SIZE) / 1000000,
     },

package/src/validators/utils/index.ts

@@ -11,6 +11,7 @@ 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 function getYupField(field: FieldSpec, yupTypeMap: Record<string, any>) {
   const yupField = yupTypeMap[field?.type || 'string'] || yupTypeMap['string'];