@digigov/form 2.0.0-2445d5cb → 2.0.0-254f7786

package/registry/index.js

@@ -1,44 +1,37 @@
+
+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_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_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_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_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";
 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_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";
@@ -47,13 +40,22 @@ import * as _digigov_form_Questions_Step_StepDescription from "@digigov/form/Que
 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_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_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_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_Radio from "@digigov/form/inputs/Radio";
+import * as _digigov_form_inputs_OtpInput from "@digigov/form/inputs/OtpInput";
+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_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";
@@ -70,87 +72,86 @@ function lazyImport(pkgImport) {
     {},
     {
       get: (_target, name) => {
-        if (name === "__esModule" || name === "default") {
+        if (name === '__esModule' || name === 'default') {
           return pkgImport.default;
-        } else if (name === "*") {
+        } else if(
+          name === '*'
+        ) {
           return pkgImport;
         } else {
           return pkgImport[name];
         }
-      }
+      },
     }
-  );
+  )
 }
-var registry_default = {
-  "@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/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": 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/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),
-  "@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/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),
-  "@digigov/form/Questions/Step/StepContext": lazyImport(_digigov_form_Questions_Step_StepContext),
-  "@digigov/form/Questions/Step/StepDescription": lazyImport(_digigov_form_Questions_Step_StepDescription),
-  "@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/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/validators/utils/afm": lazyImport(_digigov_form_validators_utils_afm),
-  "@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),
-  "@digigov/form/validators/utils": lazyImport(_digigov_form_validators_utils),
-  "@digigov/form/validators/utils/int": lazyImport(_digigov_form_validators_utils_int),
-  "@digigov/form/validators/utils/number": lazyImport(_digigov_form_validators_utils_number),
-  "@digigov/form/validators/utils/otp": lazyImport(_digigov_form_validators_utils_otp),
-  "@digigov/form/validators/utils/phone": lazyImport(_digigov_form_validators_utils_phone),
-  "@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)
-};
-export {
-  registry_default as default
+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/FieldObject': lazyImport(_digigov_form_FieldObject),
+  '@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': lazyImport(_digigov_form_FormBuilder),
+  '@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/Questions': lazyImport(_digigov_form_Questions_Questions),
+  '@digigov/form/Questions/QuestionsContext': lazyImport(_digigov_form_Questions_QuestionsContext),
+  '@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),
+  '@digigov/form/Questions/Step/StepContext': lazyImport(_digigov_form_Questions_Step_StepContext),
+  '@digigov/form/Questions/Step/StepDescription': lazyImport(_digigov_form_Questions_Step_StepDescription),
+  '@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/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/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/Radio': lazyImport(_digigov_form_inputs_Radio),
+  '@digigov/form/inputs/OtpInput': lazyImport(_digigov_form_inputs_OtpInput),
+  '@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/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),
+  '@digigov/form/validators/utils': lazyImport(_digigov_form_validators_utils),
+  '@digigov/form/validators/utils/int': lazyImport(_digigov_form_validators_utils_int),
+  '@digigov/form/validators/utils/number': lazyImport(_digigov_form_validators_utils_number),
+  '@digigov/form/validators/utils/otp': lazyImport(_digigov_form_validators_utils_otp),
+  '@digigov/form/validators/utils/phone': lazyImport(_digigov_form_validators_utils_phone),
+  '@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)
 };
-//# sourceMappingURL=registry.js.map

package/src/Field/FieldBase.tsx

@@ -41,6 +41,7 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
             return (
               <Component
                 {...field}
+                control={control}
                 ref={undefined}
                 defaultValue={defaultValue}
                 extra={extra}

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,

package/src/Field/FieldConditional.tsx

@@ -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

@@ -56,6 +56,7 @@ export const Field: React.FC<FieldProps> = ({
         register={register}
         field={calculatedField as FieldWithCondition}
         error={error}
+        Field={Field}
       />
     );
   }
@@ -67,6 +68,7 @@ export const Field: React.FC<FieldProps> = ({
         register={register}
         error={error}
         formState={formState}
+        Field={Field}
         {...calculatedField}
       />
     );
@@ -87,6 +89,7 @@ export const Field: React.FC<FieldProps> = ({
         setValue={setValue}
         getValues={getValues}
         unregister={unregister}
+        Field={Field}
         {...calculatedField}
       />
     );
@@ -100,7 +103,7 @@ export const Field: React.FC<FieldProps> = ({
       register={register}
       reset={reset}
       error={error}
-      fieldComponent={Field}
+      Field={Field}
     />
   );
 };

package/src/Field/types.tsx

@@ -3,10 +3,10 @@ import { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 import { GridProps } from '@digigov/ui/layouts/Grid';
 
-export type FieldLabelProps = {
+export interface FieldLabelProps {
   primary?: string;
   secondary?: string;
-};
+}
 
 export interface FieldSpec {
   key: string; // !TODO rename key to name;
@@ -31,13 +31,12 @@ export interface FieldSpec {
     | 'array'
     | 'object';
   component?: any;
+  autoComplete?: string;
   maxLength?: number;
   condition?: Record<string, FieldCondition>;
   controlled?: boolean;
   label?: FieldLabelProps;
-  extra?: {
-    [key: string]: any;
-  };
+  extra?: Record<string, any>;
   editable?: boolean;
   required?: boolean;
   enabled?: boolean;
@@ -77,14 +76,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'];
@@ -111,6 +111,7 @@ export interface ControlledFieldProps {
   error?: boolean;
   name?: string;
   disabled?: boolean;
+  Field: React.FC<FieldProps>;
 }
 
 export interface UncontrolledFieldProps {
@@ -121,6 +122,7 @@ export interface UncontrolledFieldProps {
   extra?: Record<string, never>;
   type?: string;
   disabled?: boolean;
+  Field: React.FC<FieldProps>;
 }
 
 export interface CalculatedField extends OmittedFieldSpec {
@@ -137,7 +139,7 @@ export interface FieldBaseProps extends CalculatedField {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
-  fieldComponent?: React.FC<FieldBaseProps>;
+  Field: React.FC<FieldProps>;
 }
 
 export interface FieldProps extends FieldSpec {

package/src/Field/utils/index.ts

@@ -6,7 +6,7 @@ import FileInput from '@digigov/form/inputs/FileInput';
 import ImageInput from '@digigov/form/inputs/ImageInput';
 import Input from '@digigov/form/inputs/Input';
 import OtpInput from '@digigov/form/inputs/OtpInput';
-import Radio from '@digigov/form/inputs/Radio';
+import Radio, { ControlledRadioButtonsGroup } from '@digigov/form/inputs/Radio';
 import Select from '@digigov/form/inputs/Select';
 
 export const FIELD_COMPONENTS: FieldComponentRegistry = {
@@ -57,3 +57,20 @@ export const ALTERNATIVE_COMPONENTS: FieldComponentRegistry = {
     wrapper: 'fieldset',
   },
 };
+
+export const CONTROLLED_FIELD_COMPONENTS: FieldComponentRegistry = {
+  ...FIELD_COMPONENTS,
+  'choice:single': {
+    wrapper: 'fieldset',
+    controlled: true,
+    component: ControlledRadioButtonsGroup,
+  },
+  text: {
+    component: Input,
+    controlled: true,
+  },
+  string: {
+    component: Input,
+    controlled: true,
+  },
+};

package/src/FieldArray/index.test.tsx

@@ -1,24 +1,25 @@
 import React from 'react';
 import { test, expect } from '@playwright/experimental-ct-react';
-import TestVariant from '@digigov/ui/utils/TestVariant'
 import { Default } from '@digigov/form/FieldArray/__stories__/Default';
 import { WithExactLength } from '@digigov/form/FieldArray/__stories__/WithExactLength';
+import TestVariant from '@digigov/ui/utils/TestVariant';
 
 test('renders the All FieldArray variants', async ({ mount, page }) => {
   await mount(
-    
-  <div>
-    <TestVariant title="Default">
-      <Default />
-    </TestVariant>
-    <TestVariant title="WithExactLength">
-      <WithExactLength />
-    </TestVariant>
-  </div>
-  )
+    <div>
+      <TestVariant title="Default">
+        <Default />
+      </TestVariant>
+      <TestVariant title="WithExactLength">
+        <WithExactLength />
+      </TestVariant>
+    </div>
+  );
   await page.evaluate(() => document.fonts.ready);
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  

package/src/FieldArray/index.tsx

@@ -1,18 +1,19 @@
 import React from 'react';
 import { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';
-import FieldContainer from '@digigov/form/Field/FieldBaseContainer';
+import { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';
 import { FieldProps } from '@digigov/form/Field/types';
-import FieldObject from '@digigov/form/FieldObject';
-import { FieldsetLabel } from '@digigov/form/Fieldset';
-import Fieldset from '@digigov/react-core/Fieldset';
+import { FieldObject } from '@digigov/form/FieldObject';
+import { FieldsetLabel, Fieldset } from '@digigov/form/Fieldset';
 import { Card } from '@digigov/ui/content/Card';
 import { Button } from '@digigov/ui/form/Button';
 import { Hint } from '@digigov/ui/typography/Hint';
+
 export interface FieldArrayProps extends FieldProps {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   formState: UseFormReturn['formState'];
   error?: ErrorOption;
+  Field: React.FC<FieldProps>;
 }
 export const FieldArray: React.FC<FieldArrayProps> = ({
   name,
@@ -22,6 +23,7 @@ export const FieldArray: React.FC<FieldArrayProps> = ({
   error,
   layout,
   label,
+  Field,
   ...customField
 }) => {
   const { fields, append, remove } = useFieldArray({
@@ -30,7 +32,7 @@ export const FieldArray: React.FC<FieldArrayProps> = ({
   });
 
   return (
-    <FieldContainer
+    <FieldBaseContainer
       label={label}
       layout={layout}
       error={
@@ -60,6 +62,7 @@ export const FieldArray: React.FC<FieldArrayProps> = ({
               register={register}
               control={control}
               {...customField.extra?.of}
+              Field={Field}
             />
             <Button
               name={`${name}-object-remove`}
@@ -84,7 +87,7 @@ export const FieldArray: React.FC<FieldArrayProps> = ({
       >
         {customField.extra?.label.object?.add}
       </Button>
-    </FieldContainer>
+    </FieldBaseContainer>
   );
 };
 

package/src/FieldObject/index.tsx

@@ -7,9 +7,9 @@ import {
   ALTERNATIVE_COMPONENTS,
 } from '@digigov/form/Field/utils';
 import { calculateField } from '@digigov/form/Field/utils/calculateField';
-import Fieldset, { FieldsetCaption } from '@digigov/form/Fieldset';
+import { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';
 import { FieldSpec } from '@digigov/form/types';
-import { FieldsetLegend } from '@digigov/react-core/FieldsetLegend';
+import { FieldsetLegend } from '@digigov/ui/form/FieldContainer';
 import { useTranslation } from '@digigov/ui/i18n';
 
 export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
@@ -18,6 +18,7 @@ export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
   reset: UseFormReturn['reset'];
   formState: UseFormReturn['formState'];
   error?: ErrorOption;
+  Field: React.FC<FieldProps>;
 }
 
 export const FieldObject: React.FC<FieldObjectProps> = ({
@@ -29,6 +30,7 @@ export const FieldObject: React.FC<FieldObjectProps> = ({
   reset,
   formState,
   error,
+  Field,
 }) => {
   const { t } = useTranslation();
 
@@ -50,6 +52,7 @@ export const FieldObject: React.FC<FieldObjectProps> = ({
           field={field}
           error={error && error[field.key]}
           formState={formState}
+          Field={Field}
         />
       ))}
     </Fieldset>
@@ -65,6 +68,7 @@ export interface FieldObjectItemProps {
   formState: UseFormReturn['formState'];
   error?: ErrorOption;
   children?: React.ReactNode;
+  Field: React.FC<FieldProps>;
 }
 
 const FieldObjectItem: React.FC<FieldObjectItemProps> = ({
@@ -76,6 +80,7 @@ const FieldObjectItem: React.FC<FieldObjectItemProps> = ({
   formState,
   reset,
   register,
+  Field,
 }) => {
   const calculatedField: CalculatedField = useMemo(
     () =>
@@ -88,6 +93,7 @@ const FieldObjectItem: React.FC<FieldObjectItemProps> = ({
     <FieldBase
       {...calculatedField}
       name={name}
+      Field={Field}
       control={control}
       reset={reset}
       register={register}

package/src/Fieldset/index.tsx

@@ -4,11 +4,11 @@ import {
   FieldsetCaptionProps,
   FieldsetBodyProps,
 } from '@digigov/form/Fieldset/types';
-import Fieldset from '@digigov/react-core/Fieldset';
-import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
-import Hint from '@digigov/react-core/Hint';
-import Grid from '@digigov/ui/layouts/Grid';
-import NormalText from '@digigov/ui/typography/NormalText';
+import { Fieldset } from '@digigov/react-core/Fieldset';
+import { FieldsetLegend } from '@digigov/ui/form/FieldContainer';
+import { Grid } from '@digigov/ui/layouts/Grid';
+import { Hint } from '@digigov/ui/typography/Hint';
+import { NormalText } from '@digigov/ui/typography/NormalText';
 
 export const FieldsetLabel: React.FC<FieldsetLabelProps> = ({
   children,