@digigov/form 2.0.0-4be8f7cc → 2.0.0-555d1027

package/registry/index.js

@@ -1,114 +1,130 @@
-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_ErrorGroup from "@digigov/form/Field/ErrorGroup";
+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_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
+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 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_Checkboxes from "@digigov/form/inputs/Checkboxes";
+import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
+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_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_amka from "@digigov/form/validators/utils/amka";
+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/ErrorGroup': lazyImport(_digigov_form_Field_ErrorGroup),
   '@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/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
   '@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),
-  '@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 +133,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/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
+  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
+  '@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/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/amka': lazyImport(_digigov_form_validators_utils_amka),
+  '@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 +162,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/ErrorGroup.tsx

@@ -0,0 +1,84 @@
+import React, { createContext, useEffect, useState } from 'react';
+import { ErrorOption } from 'react-hook-form';
+import { FieldLabelProps } from '@digigov/form/Field/types';
+import { List, ListItem } from '@digigov/ui/content/List';
+import { ErrorSummary } from '@digigov/ui/feedback/ErrorSummary';
+import { useTranslation } from '@digigov/ui/i18n';
+import { Link } from '@digigov/ui/navigation/Link';
+import { Heading } from '@digigov/ui/typography/Heading';
+import { Base } from '@digigov/ui/utils/Base';
+import { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';
+interface ErrorGroupContextType {
+  setError: (
+    name?: string,
+    label?: FieldLabelProps,
+    error?: ErrorOption
+  ) => void;
+}
+export const ErrorGroupContext = createContext<ErrorGroupContextType | null>(
+  null
+);
+
+export interface ErrorGroupProps {
+  children: React.ReactNode;
+  screenSize?: Breakpoints | undefined;
+  fieldOrder?: any[];
+}
+
+export const ErrorGroup: React.FC<ErrorGroupProps> = ({
+  children,
+  screenSize,
+  fieldOrder,
+}) => {
+  const [errors, setErrors] = useState<ErrorOption>({});
+  const { t } = useTranslation();
+  const setError = (name, label, error) => {
+    if (errors[name] !== error && errors[name]?.message !== error?.message) {
+      if (!error?.message) {
+        const updatedErrors = { ...errors };
+        delete updatedErrors[name];
+        setErrors(updatedErrors);
+      } else {
+        setErrors({
+          ...errors,
+          [name]: {
+            ...error,
+            label: label.primary,
+          },
+        });
+      }
+    }
+  };
+
+  useEffect(() => {
+    setErrors({});
+  }, [screenSize]);
+  return (
+    <ErrorGroupContext.Provider value={{ setError }}>
+      {Object.keys(errors).length !== 0 && (
+        <ErrorSummary variant="error-group">
+          <Heading size="sm">
+            Τα παρακάτω πεδία της φόρμας ειναι λάθος.{' '}
+          </Heading>
+          <List listStyle="bullet">
+            {(fieldOrder || Object.keys(errors).reverse())
+              .filter((fieldName) => errors[fieldName])
+              .map((fieldName, index) => {
+                return (
+                  <ListItem key={index} id={`${fieldName}-error`}>
+                    <Base as="b">{t(errors[fieldName]?.label)}:</Base>{' '}
+                    <Link href={`#${fieldName}`}>
+                      {t(errors[fieldName]?.message)}
+                    </Link>
+                  </ListItem>
+                );
+              })}
+          </List>
+        </ErrorSummary>
+      )}
+      {children}
+    </ErrorGroupContext.Provider>
+  );
+};
+
+export default ErrorGroup;

package/src/Field/FieldBase.tsx

@@ -1,38 +1,50 @@
-import React from 'react';
+import React, { useContext, useEffect } from 'react';
 import { Controller } from 'react-hook-form';
+import { ErrorGroupContext } from '@digigov/form/Field/ErrorGroup';
 import FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
 import { FieldBaseProps } from '@digigov/form/Field/types';
 
-export const FieldBase: React.FC<FieldBaseProps> = (props) => {
-  const {
-    required,
-    name,
-    component: Component,
-    wrapper,
-    control,
-    type,
-    controlled = false,
-    enabled = true,
-    editable,
-    defaultValue,
-    label,
-    extra = {},
-    layout,
-    error,
-    register,
-    ...componentProps
-  } = props;
+export const FieldBase: React.FC<FieldBaseProps> = ({
+  required,
+  name,
+  component: Component,
+  wrapper,
+  control,
+  type,
+  controlled = false,
+  enabled = true,
+  editable,
+  defaultValue,
+  label,
+  extra = {},
+  layout,
+  error,
+  register,
+  ...componentProps
+}) => {
+  const errorGroupContext = useContext(ErrorGroupContext);
+
+  useEffect(() => {
+    if (errorGroupContext) {
+      errorGroupContext.setError(name, label, error);
+    }
+  }, [error, name, errorGroupContext?.setError]);
+
   if (!enabled) {
     return null;
   }
+
   if (controlled) {
     return (
       <FieldBaseContainer
         label={label}
         layout={layout}
-        error={error}
+        register={register}
+        error={errorGroupContext ? undefined : error}
+        hasError={!!error}
         wrapper={wrapper}
         name={name}
+        controlled={controlled}
       >
         <Controller
           control={control}
@@ -41,8 +53,9 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
             return (
               <Component
                 {...field}
+                control={control}
                 ref={undefined}
-                defaultValue={defaultValue}
+                defaultValue={defaultValue ?? field.value}
                 extra={extra}
                 error={!!error}
                 type={type}
@@ -63,7 +76,9 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
     <FieldBaseContainer
       label={label}
       layout={layout}
-      error={error}
+      register={register}
+      error={errorGroupContext ? undefined : error}
+      hasError={!!error}
       wrapper={wrapper}
       name={name}
     >
@@ -78,6 +93,7 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
           aria-describedby={error && `${name}-error`}
           required={required}
           disabled={editable === false}
+          defaultValue={defaultValue}
           {...componentProps}
         />
       ) : (
@@ -88,6 +104,7 @@ export const FieldBase: React.FC<FieldBaseProps> = (props) => {
           error={!!error}
           extra={extra}
           type={type}
+          defaultValue={defaultValue}
           aria-required={!!required}
           aria-describedby={error && `${name}-error`}
           required={required}

package/src/Field/FieldBaseContainer.tsx

@@ -1,21 +1,25 @@
 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 Fieldset 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,
+  register,
   wrapper,
   label,
   children,
   error,
+  hasError,
   layout,
+  controlled,
+  labelSize = 'sm',
 }) => {
   const { t } = useTranslation();
   const errorMessage = error?.message.key
@@ -24,9 +28,17 @@ export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
   const errorContext = error?.message.context || {};
   if (wrapper === 'fieldset') {
     return (
-      <FieldContainer error={!!error} {...layout}>
-        <CoreFieldset>
-          <FieldsetLegend size="sm">{label && label.primary}</FieldsetLegend>
+      <FieldContainer error={hasError} {...layout}>
+        <Fieldset
+          className="outline-none"
+          {...(controlled && {
+            tabIndex: -1,
+            ...(register(name || '') as any),
+          })}
+        >
+          <FieldsetLegend size={labelSize}>
+            {label && label.primary}
+          </FieldsetLegend>
           {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}
           {error && (
             <ErrorMessage id={`${name}-error`}>
@@ -34,12 +46,13 @@ export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
             </ErrorMessage>
           )}
           {children}
-        </CoreFieldset>
+          {label && label.hint && <Hint size="sm">{label.hint}</Hint>}
+        </Fieldset>
       </FieldContainer>
     );
   } else {
     return (
-      <FieldContainer error={!!error} {...layout}>
+      <FieldContainer error={hasError} {...layout}>
         <LabelContainer>
           {label && <Label label={label} />}
           {error && (
@@ -48,6 +61,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({
@@ -13,8 +13,10 @@ const ChildFieldMemo = React.memo(
     field,
     control,
     reset,
+    resetField,
     register,
     error,
+    Field,
   }: ChildFieldMemoProps) {
     const newField = evaluateFieldWithConditions(
       field,
@@ -23,8 +25,10 @@ const ChildFieldMemo = React.memo(
     return (
       <FieldBase
         {...newField}
+        Field={Field}
         name={newField.key}
         reset={reset}
+        resetField={resetField}
         control={control}
         register={register}
         error={error}
@@ -52,7 +56,9 @@ export const FieldConditional: React.FC<FieldConditionalProps> = ({
   field,
   register,
   reset,
+  resetField,
   error,
+  Field,
 }) => {
   const dependencyKeys = Object.keys(field.condition);
   const dependencyValues = useWatch({
@@ -73,7 +79,9 @@ export const FieldConditional: React.FC<FieldConditionalProps> = ({
       control={control}
       register={register}
       reset={reset}
+      resetField={resetField}
       error={error}
+      Field={Field}
     />
   );
 };