@digigov/form 2.0.0-af1b5f33 → 2.0.0-b19b7fe2

package/registry/index.js

@@ -1,114 +1,128 @@
-import * as _digigov_form_Field_FieldBase from '@digigov/form/Field/FieldBase';
-import * as _digigov_form_Field_FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
-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 from '@digigov/form/Field/utils';
-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';
-import * as _digigov_form_inputs_AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';
-import * as _digigov_form_inputs_Checkboxes from '@digigov/form/inputs/Checkboxes';
-import * as _digigov_form_inputs_DateInput from '@digigov/form/inputs/DateInput';
-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_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_MultiplicityField_add_objects from '@digigov/form/MultiplicityField/add-objects';
-import * as _digigov_form_MultiplicityField from '@digigov/form/MultiplicityField';
-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';
-import * as _digigov_form_Questions_QuestionsContext from '@digigov/form/Questions/QuestionsContext';
-import * as _digigov_form_Questions_Step_getAddMoreFields from '@digigov/form/Questions/Step/getAddMoreFields';
-import * as _digigov_form_Questions_Step from '@digigov/form/Questions/Step';
-import * as _digigov_form_Questions_Step_ReviewStep from '@digigov/form/Questions/Step/ReviewStep';
-import * as _digigov_form_Questions_Step_Step from '@digigov/form/Questions/Step/Step';
-import * as _digigov_form_Questions_Step_StepArrayReview from '@digigov/form/Questions/Step/StepArrayReview';
-import * as _digigov_form_Questions_Step_StepContext from '@digigov/form/Questions/Step/StepContext';
-import * as _digigov_form_Questions_Step_StepDescription from '@digigov/form/Questions/Step/StepDescription';
-import * as _digigov_form_Questions_Step_StepForm from '@digigov/form/Questions/Step/StepForm';
-import * as _digigov_form_Questions_Step_StepQuote from '@digigov/form/Questions/Step/StepQuote';
-import * as _digigov_form_Questions_Step_StepTitle from '@digigov/form/Questions/Step/StepTitle';
-import * as _digigov_form_Questions_Step_types from '@digigov/form/Questions/Step/types';
-import * as _digigov_form_Questions_types from '@digigov/form/Questions/types';
-import * as _digigov_form_types from '@digigov/form/types';
-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_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';
-import * as _digigov_form_validators_utils from '@digigov/form/validators/utils';
-import * as _digigov_form_validators_utils_int from '@digigov/form/validators/utils/int';
-import * as _digigov_form_validators_utils_number from '@digigov/form/validators/utils/number';
-import * as _digigov_form_validators_utils_otp from '@digigov/form/validators/utils/otp';
-import * as _digigov_form_validators_utils_phone from '@digigov/form/validators/utils/phone';
-import * as _digigov_form_validators_utils_postal_code from '@digigov/form/validators/utils/postal_code';
-import * as _digigov_form_validators_utils_text_limit from '@digigov/form/validators/utils/text_limit';
-import * as _digigov_form_validators_utils_uuid4 from '@digigov/form/validators/utils/uuid4';
+
+import * as _digigov_form_FormContext from "@digigov/form/FormContext";
+import * as _digigov_form from "@digigov/form";
+import * as _digigov_form_internal from "@digigov/form/internal";
+import * as _digigov_form_types from "@digigov/form/types";
+import * as _digigov_form_utils from "@digigov/form/utils";
+import * as _digigov_form_Field_FieldBase from "@digigov/form/Field/FieldBase";
+import * as _digigov_form_Field_FieldBaseContainer from "@digigov/form/Field/FieldBaseContainer";
+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_FieldObject from "@digigov/form/FieldObject";
+import * as _digigov_form_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
+import * as _digigov_form_FieldArray from "@digigov/form/FieldArray";
+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 from "@digigov/form/FormBuilder";
+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_Questions from "@digigov/form/Questions/Questions";
+import * as _digigov_form_Questions_QuestionsContext from "@digigov/form/Questions/QuestionsContext";
+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_types from "@digigov/form/Questions/types";
+import * as _digigov_form_inputs from "@digigov/form/inputs";
+import * as _digigov_form_inputs_inputsScenarios from "@digigov/form/inputs/inputsScenarios";
+import * as _digigov_form_locales_el from "@digigov/form/locales/el";
+import * as _digigov_form_validators from "@digigov/form/validators";
+import * as _digigov_form_validators_types from "@digigov/form/validators/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_Questions_Step_ReviewStep from "@digigov/form/Questions/Step/ReviewStep";
+import * as _digigov_form_Questions_Step_Step from "@digigov/form/Questions/Step/Step";
+import * as _digigov_form_Questions_Step_StepArrayReview from "@digigov/form/Questions/Step/StepArrayReview";
+import * as _digigov_form_Questions_Step_StepContext from "@digigov/form/Questions/Step/StepContext";
+import * as _digigov_form_Questions_Step_StepDescription from "@digigov/form/Questions/Step/StepDescription";
+import * as _digigov_form_Questions_Step_StepForm from "@digigov/form/Questions/Step/StepForm";
+import * as _digigov_form_Questions_Step_StepQuote from "@digigov/form/Questions/Step/StepQuote";
+import * as _digigov_form_Questions_Step_StepTitle from "@digigov/form/Questions/Step/StepTitle";
+import * as _digigov_form_Questions_Step_getAddMoreFields from "@digigov/form/Questions/Step/getAddMoreFields";
+import * as _digigov_form_Questions_Step from "@digigov/form/Questions/Step";
+import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Step/types";
+import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
+import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
+import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
+import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
+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_Input from "@digigov/form/inputs/Input";
+import * as _digigov_form_inputs_Input_inputsInputScenarios from "@digigov/form/inputs/Input/inputsInputScenarios";
+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_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_datetime from "@digigov/form/validators/utils/datetime";
+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";
+import * as _digigov_form_validators_utils from "@digigov/form/validators/utils";
+import * as _digigov_form_validators_utils_int from "@digigov/form/validators/utils/int";
+import * as _digigov_form_validators_utils_number from "@digigov/form/validators/utils/number";
+import * as _digigov_form_validators_utils_otp from "@digigov/form/validators/utils/otp";
+import * as _digigov_form_validators_utils_phone from "@digigov/form/validators/utils/phone";
+import * as _digigov_form_validators_utils_postal_code from "@digigov/form/validators/utils/postal_code";
+import * as _digigov_form_validators_utils_text_limit from "@digigov/form/validators/utils/text_limit";
+import * as _digigov_form_validators_utils_uuid4 from "@digigov/form/validators/utils/uuid4";
 function lazyImport(pkgImport) {
-  // eslint-disable-next-line no-undef
-  return new Proxy({}, {
-    get: function get(_target, name) {
-      if (name === '__esModule' || name === 'default') {
-        return pkgImport["default"];
-      } else if (name === '*') {
-        return pkgImport;
-      } else {
-        return pkgImport[name];
-      }
+  return new Proxy(
+    {},
+    {
+      get: (_target, name) => {
+        if (name === '__esModule' || name === 'default') {
+          return pkgImport.default;
+        } else if(
+          name === '*'
+        ) {
+          return pkgImport;
+        } else {
+          return pkgImport[name];
+        }
+      },
     }
-  });
+  )
 }
 export default {
+  '@digigov/form/FormContext': lazyImport(_digigov_form_FormContext),
+  '@digigov/form': lazyImport(_digigov_form),
+  '@digigov/form/internal': lazyImport(_digigov_form_internal),
+  '@digigov/form/types': lazyImport(_digigov_form_types),
+  '@digigov/form/utils': lazyImport(_digigov_form_utils),
   '@digigov/form/Field/FieldBase': lazyImport(_digigov_form_Field_FieldBase),
   '@digigov/form/Field/FieldBaseContainer': lazyImport(_digigov_form_Field_FieldBaseContainer),
   '@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': lazyImport(_digigov_form_Field_utils),
-  '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
+  '@digigov/form/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
+  '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@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),
-  '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
-  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
-  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
-  '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
-  '@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/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/MultiplicityField/add-objects': lazyImport(_digigov_form_MultiplicityField_add_objects),
   '@digigov/form/MultiplicityField': lazyImport(_digigov_form_MultiplicityField),
-  '@digigov/form/Questions/getNextStep': lazyImport(_digigov_form_Questions_getNextStep),
-  '@digigov/form/Questions': lazyImport(_digigov_form_Questions),
+  '@digigov/form/MultiplicityField/types': lazyImport(_digigov_form_MultiplicityField_types),
   '@digigov/form/Questions/Questions': lazyImport(_digigov_form_Questions_Questions),
   '@digigov/form/Questions/QuestionsContext': lazyImport(_digigov_form_Questions_QuestionsContext),
-  '@digigov/form/Questions/Step/getAddMoreFields': lazyImport(_digigov_form_Questions_Step_getAddMoreFields),
-  '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
+  '@digigov/form/Questions/getNextStep': lazyImport(_digigov_form_Questions_getNextStep),
+  '@digigov/form/Questions': lazyImport(_digigov_form_Questions),
+  '@digigov/form/Questions/types': lazyImport(_digigov_form_Questions_types),
+  '@digigov/form/inputs': lazyImport(_digigov_form_inputs),
+  '@digigov/form/inputs/inputsScenarios': lazyImport(_digigov_form_inputs_inputsScenarios),
+  '@digigov/form/locales/el': lazyImport(_digigov_form_locales_el),
+  '@digigov/form/validators': lazyImport(_digigov_form_validators),
+  '@digigov/form/validators/types': lazyImport(_digigov_form_validators_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/Questions/Step/ReviewStep': lazyImport(_digigov_form_Questions_Step_ReviewStep),
   '@digigov/form/Questions/Step/Step': lazyImport(_digigov_form_Questions_Step_Step),
   '@digigov/form/Questions/Step/StepArrayReview': lazyImport(_digigov_form_Questions_Step_StepArrayReview),
@@ -117,13 +131,24 @@ export default {
   '@digigov/form/Questions/Step/StepForm': lazyImport(_digigov_form_Questions_Step_StepForm),
   '@digigov/form/Questions/Step/StepQuote': lazyImport(_digigov_form_Questions_Step_StepQuote),
   '@digigov/form/Questions/Step/StepTitle': lazyImport(_digigov_form_Questions_Step_StepTitle),
+  '@digigov/form/Questions/Step/getAddMoreFields': lazyImport(_digigov_form_Questions_Step_getAddMoreFields),
+  '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
   '@digigov/form/Questions/Step/types': lazyImport(_digigov_form_Questions_Step_types),
-  '@digigov/form/Questions/types': lazyImport(_digigov_form_Questions_types),
-  '@digigov/form/types': lazyImport(_digigov_form_types),
-  '@digigov/form/utils': lazyImport(_digigov_form_utils),
-  '@digigov/form/validators': lazyImport(_digigov_form_validators),
-  '@digigov/form/validators/types': lazyImport(_digigov_form_validators_types),
+  '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
+  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
+  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
+  '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
+  '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
+  '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
+  '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
+  '@digigov/form/inputs/Input/inputsInputScenarios': lazyImport(_digigov_form_inputs_Input_inputsInputScenarios),
+  '@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/validators/utils/afm': lazyImport(_digigov_form_validators_utils_afm),
+  '@digigov/form/validators/utils/date': lazyImport(_digigov_form_validators_utils_date),
+  '@digigov/form/validators/utils/datetime': lazyImport(_digigov_form_validators_utils_datetime),
   '@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),
@@ -135,4 +160,4 @@ export default {
   '@digigov/form/validators/utils/postal_code': lazyImport(_digigov_form_validators_utils_postal_code),
   '@digigov/form/validators/utils/text_limit': lazyImport(_digigov_form_validators_utils_text_limit),
   '@digigov/form/validators/utils/uuid4': lazyImport(_digigov_form_validators_utils_uuid4)
-};
+};

package/src/Field/FieldBase.tsx

@@ -41,6 +41,8 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
             return (
               <Component
                 {...field}
+                control={control}
+                ref={undefined}
                 defaultValue={defaultValue}
                 extra={extra}
                 error={!!error}
@@ -91,6 +93,7 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
           aria-describedby={error && `${name}-error`}
           required={required}
           disabled={editable === false}
+          ref={undefined}
           {...componentProps}
         />
       )}

package/src/Field/FieldBaseContainer.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 import { FieldContainerProps } from '@digigov/form/Field/types';
 import Label from '@digigov/form/inputs/Label';
-import ErrorMessage from '@digigov/react-core/ErrorMessage';
+import { ErrorMessage } from '@digigov/react-core/ErrorMessage';
 import FieldContainer from '@digigov/react-core/FieldContainer';
 import CoreFieldset from '@digigov/react-core/Fieldset';
 import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
-import Hint from '@digigov/react-core/Hint';
 import LabelContainer from '@digigov/react-core/LabelContainer';
 import { useTranslation } from '@digigov/ui/i18n';
+import { Hint } from '@digigov/ui/typography/Hint';
 
 export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
   name,
@@ -34,6 +34,7 @@ export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
             </ErrorMessage>
           )}
           {children}
+          {label && label.hint && <Hint size="sm">{label.hint}</Hint>}
         </CoreFieldset>
       </FieldContainer>
     );
@@ -48,6 +49,7 @@ export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
             </ErrorMessage>
           )}
           {children}
+          {label && label.hint && <Hint size="sm">{label.hint}</Hint>}
         </LabelContainer>
       </FieldContainer>
     );

package/src/Field/FieldConditional.tsx

@@ -5,7 +5,7 @@ import {
   ChildFieldMemoProps,
   FieldConditionalProps,
 } from '@digigov/form/Field/types';
-import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
+import { evaluateFieldWithConditions } from '@digigov/form/Field/utils/evaluateFieldWithConditions';
 
 const ChildFieldMemo = React.memo(
   function ChildField({
@@ -15,6 +15,7 @@ const ChildFieldMemo = React.memo(
     reset,
     register,
     error,
+    Field,
   }: ChildFieldMemoProps) {
     const newField = evaluateFieldWithConditions(
       field,
@@ -23,6 +24,7 @@ const ChildFieldMemo = React.memo(
     return (
       <FieldBase
         {...newField}
+        Field={Field}
         name={newField.key}
         reset={reset}
         control={control}
@@ -53,6 +55,7 @@ export const FieldConditional: React.FC<FieldConditionalProps> = ({
   register,
   reset,
   error,
+  Field,
 }) => {
   const dependencyKeys = Object.keys(field.condition);
   const dependencyValues = useWatch({
@@ -74,6 +77,7 @@ export const FieldConditional: React.FC<FieldConditionalProps> = ({
       register={register}
       reset={reset}
       error={error}
+      Field={Field}
     />
   );
 };

package/src/Field/index.tsx

@@ -6,12 +6,17 @@ import {
   CalculatedField,
   FieldProps,
 } from '@digigov/form/Field/types';
-import { useField, calculateField } from '@digigov/form/Field/utils';
+import {
+  FIELD_COMPONENTS,
+  ALTERNATIVE_COMPONENTS,
+} from '@digigov/form/Field/utils';
+import { calculateField } from '@digigov/form/Field/utils/calculateField';
+import { useField } from '@digigov/form/Field/utils/useField';
 import FieldArray from '@digigov/form/FieldArray';
 import Multiplicity from '@digigov/form/MultiplicityField';
-
 export const Field: React.FC<FieldProps> = ({
   name,
+  disabled,
   children,
   ...customField
 }) => {
@@ -30,7 +35,16 @@ export const Field: React.FC<FieldProps> = ({
     clearErrors,
   } = useField(name, customField?.type ? customField : null);
   const calculatedField: CalculatedField = useMemo(
-    () => calculateField(children, field, componentRegistry),
+    () =>
+      calculateField(
+        children,
+        field,
+        {
+          ...FIELD_COMPONENTS,
+          ...componentRegistry,
+        },
+        ALTERNATIVE_COMPONENTS
+      ),
     [field]
   );
 
@@ -42,6 +56,7 @@ export const Field: React.FC<FieldProps> = ({
         register={register}
         field={calculatedField as FieldWithCondition}
         error={error}
+        Field={Field}
       />
     );
   }
@@ -50,9 +65,15 @@ export const Field: React.FC<FieldProps> = ({
     return (
       <FieldArray
         control={control}
+        trigger={trigger}
         register={register}
+        clearErrors={clearErrors}
         error={error}
+        getValues={getValues}
+        setValue={setValue}
         formState={formState}
+        Field={Field}
+        reset={reset}
         {...calculatedField}
       />
     );
@@ -73,6 +94,7 @@ export const Field: React.FC<FieldProps> = ({
         setValue={setValue}
         getValues={getValues}
         unregister={unregister}
+        Field={Field}
         {...calculatedField}
       />
     );
@@ -81,10 +103,12 @@ export const Field: React.FC<FieldProps> = ({
     <FieldBase
       {...calculatedField}
       name={name}
+      disabled={disabled}
       control={control}
       register={register}
       reset={reset}
       error={error}
+      Field={Field}
     />
   );
 };

package/src/Field/types.tsx

@@ -1,11 +1,73 @@
 import React from 'react';
-import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldSpec } from '@digigov/form/types';
-import { FieldCondition, FormData } from '@digigov/form/types';
+import { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';
+import { ValidatorSchema } from '@digigov/form/validators/types';
+import { GridProps } from '@digigov/ui/layouts/Grid';
 
+export interface FieldLabelProps {
+  primary?: string;
+  secondary?: string;
+  hint?: string;
+}
+
+export interface FieldSpec {
+  key: string; // !TODO rename key to name;
+  type?:
+    | 'int'
+    | 'string'
+    | 'text'
+    | 'boolean'
+    | 'email'
+    | 'uuid4'
+    | 'choice:multiple'
+    | 'choice:single'
+    | 'mobile_phone'
+    | 'date'
+    | 'datetime'
+    | 'otp'
+    | 'afm'
+    | 'iban'
+    | 'file'
+    | 'image'
+    | 'postal_code'
+    | 'phone_number'
+    | 'array'
+    | 'object';
+  component?: any;
+  autoComplete?: string;
+  maxLength?: number;
+  condition?: Record<string, FieldCondition>;
+  controlled?: boolean;
+  label?: FieldLabelProps;
+  extra?: Record<string, any>;
+  editable?: boolean;
+  variant?: 'inline' | 'dialog';
+  required?: boolean;
+  enabled?: boolean;
+  disabled?: 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 FieldCondition {
+  is: string | string[] | number | number[] | boolean | boolean[];
+  then?: Partial<FieldSpec>;
+  else?: Partial<FieldSpec>;
+}
 export interface ChildFieldMemoProps extends FieldConditionalProps {
   dependencies: FormData;
 }
+export type FormData = UseFormProps['defaultValues'];
 
 export interface FieldWithCondition extends Omit<CalculatedField, 'condition'> {
   condition: Record<string, FieldCondition>;
@@ -17,14 +79,15 @@ export interface FieldConditionalProps {
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
   error?: ErrorOption;
+  Field: React.FC<FieldProps>;
 }
 
-export type FieldComponentItem = {
+export interface FieldComponentItem {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
   controlled?: boolean;
   wrapper?: FieldSpec['wrapper'];
-};
+}
 
 export interface FieldContainerProps {
   name?: FieldSpec['key'];
@@ -51,6 +114,7 @@ export interface ControlledFieldProps {
   error?: boolean;
   name?: string;
   disabled?: boolean;
+  Field: React.FC<FieldProps>;
 }
 
 export interface UncontrolledFieldProps {
@@ -61,6 +125,7 @@ export interface UncontrolledFieldProps {
   extra?: Record<string, never>;
   type?: string;
   disabled?: boolean;
+  Field: React.FC<FieldProps>;
 }
 
 export interface CalculatedField extends OmittedFieldSpec {
@@ -77,6 +142,7 @@ export interface FieldBaseProps extends CalculatedField {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
+  Field: React.FC<FieldProps>;
 }
 
 export interface FieldProps extends FieldSpec {

package/src/Field/utils/calculateField.ts

@@ -0,0 +1,49 @@
+import {
+  FieldProps,
+  FieldSpec,
+  FieldComponentRegistry,
+  CalculatedField,
+} from '@digigov/form/Field/types';
+
+export function calculateField(
+  children: FieldProps['children'],
+  field: FieldSpec,
+  fieldComponentRegistry: FieldComponentRegistry,
+  alternativeComponents: FieldComponentRegistry
+): CalculatedField {
+  const calculatedField = { ...field };
+  if (children) {
+    calculatedField.component = children;
+    calculatedField.controlled = true;
+  } else if (typeof field.component === 'function') {
+    // leave as is
+  } else if (!field.component && !field.type) {
+    calculatedField.component = fieldComponentRegistry.string.component;
+    calculatedField.controlled =
+      fieldComponentRegistry.string?.controlled || false;
+  } else if (
+    typeof field?.extra?.component === 'string' &&
+    alternativeComponents[field.extra.component]
+  ) {
+    calculatedField.controlled =
+      alternativeComponents[field.extra.component]?.controlled || false;
+    calculatedField.component =
+      alternativeComponents[field.extra.component].component;
+    calculatedField.wrapper =
+      alternativeComponents[field.extra.component].wrapper;
+  } else if (
+    !field.component &&
+    field.type &&
+    fieldComponentRegistry[field.type]
+  ) {
+    calculatedField.component = fieldComponentRegistry[field.type].component;
+    calculatedField.wrapper = fieldComponentRegistry[field.type].wrapper;
+    calculatedField.controlled =
+      fieldComponentRegistry[field.type]?.controlled || false;
+  } else {
+    calculatedField.component = fieldComponentRegistry.string.component;
+    calculatedField.controlled =
+      fieldComponentRegistry.string?.controlled || false;
+  }
+  return calculatedField as CalculatedField;
+}

package/src/Field/utils/evaluateFieldWithConditions.ts

@@ -0,0 +1,30 @@
+import { FieldWithCondition, CalculatedField } from '@digigov/form/Field/types';
+
+export function evaluateFieldWithConditions(
+  field: FieldWithCondition,
+  variables: FormData
+): CalculatedField {
+  const newField = { ...field };
+  if (variables) {
+    for (const key in variables) {
+      if (field.condition[key] && field.condition[key].is) {
+        const is = field.condition[key].is;
+        if (
+          is === variables[key] ||
+          (Array.isArray(variables[key]) && variables[key].includes(is))
+        ) {
+          const then = field.condition[key].then || {};
+          for (const attr in then) {
+            newField[attr] = then[attr];
+          }
+        }
+      } else if (field.condition[key]) {
+        const otherwise = field.condition[key].else || {};
+        for (const attr in otherwise) {
+          newField[attr] = otherwise[attr];
+        }
+      }
+    }
+  }
+  return newField;
+}