@digigov/form 2.0.0-a402a664 → 2.0.0-aa380ec7

package/src/inputs/Input/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useWatch } from 'react-hook-form';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
 import { TextArea } from '@digigov/ui/form/TextArea';
 import { TextInput } from '@digigov/ui/form/TextInput';
 import { useTranslation } from '@digigov/ui/i18n';
@@ -30,87 +30,88 @@ export interface InputProps
   Field?: UncontrolledFieldProps['Field'];
 }
 
-export const Input: React.ExoticComponent<InputProps> = React.forwardRef(
-  function WrappedInput({ name, control, type, extra, ...props }, ref: never) {
-    delete props['Field'];
-    // eslint-disable-next-line prefer-const
-    let { multiline = false, rows, limit } = extra || {};
-    const { className } = extra || {};
-    // if enforced to multiline use true. Derive from type otherwise.
-    multiline = multiline === true || type === 'text';
-    // use explicit rows value if set. Derive from multiline otherwise.
-    rows = rows || (multiline ? 4 : 1);
-    // translate dilosi type to HTML Input type
-    const fieldType = TYPES_MAP[type || 'text'] || 'text';
-    const { t } = useTranslation();
-    const currentValue: string | '' = useWatch({ control, name });
+export const Input = React.forwardRef<
+  HTMLInputElement | HTMLTextAreaElement,
+  InputProps
+>(function WrappedInput({ name, control, type, extra, ...props }, ref) {
+  delete props['Field'];
+  // eslint-disable-next-line prefer-const
+  let { multiline = false, rows, limit } = extra || {};
+  const { className } = extra || {};
+  // if enforced to multiline use true. Derive from type otherwise.
+  multiline = multiline === true || type === 'text';
+  // use explicit rows value if set. Derive from multiline otherwise.
+  rows = rows || (multiline ? 4 : 1);
+  // translate dilosi type to HTML Input type
+  const fieldType = TYPES_MAP[type || 'text'] || 'text';
+  const { t } = useTranslation();
+  const currentValue: string | '' = useWatch({ control, name });
 
-    const getRemainingChars = (currentValue, limit) => {
-      if (currentValue) {
-        return limit?.max - currentValue.length;
-      }
-      return limit?.max;
-    };
+  const getRemainingChars = (currentValue, limit) => {
+    if (currentValue) {
+      return limit?.max - currentValue.length;
+    }
+    return limit?.max;
+  };
 
-    const constructRemainingText = (currentValue, limit) => {
-      const remainingChars = getRemainingChars(currentValue, limit);
-      let remainingText =
-        Math.abs(remainingChars) === 1
-          ? t('form.info.text.character')
-          : t('form.info.text.characters');
-      remainingText +=
-        remainingChars > 0
-          ? ` ${t('form.info.text.remaining')}.`
-          : ` ${t('form.info.text.too_many')}.`;
-      return remainingText;
-    };
+  const constructRemainingText = (currentValue, limit) => {
+    const remainingChars = getRemainingChars(currentValue, limit);
+    let remainingText =
+      Math.abs(remainingChars) === 1
+        ? t('form.info.text.character')
+        : t('form.info.text.characters');
+    remainingText +=
+      remainingChars > 0
+        ? ` ${t('form.info.text.remaining')}.`
+        : ` ${t('form.info.text.too_many')}.`;
+    return remainingText;
+  };
 
-    if (multiline === true) {
-      return (
-        <>
-          <TextArea
-            name={name}
-            className={className}
-            rows={rows}
-            ref={ref}
-            id={name}
-            {...{
-              ...props,
-              reset: undefined,
-              required: undefined,
-              type: fieldType,
-            }}
-          />
-          {limit?.max && (
-            <Hint display={'flex'}>
-              {t('form.info.text.you_have')}
-              <Hint fontWeight="bold">
-                &nbsp;{`${Math.abs(getRemainingChars(currentValue, limit))}`}
-                &nbsp;
-              </Hint>
-              {constructRemainingText(currentValue, limit)}
-            </Hint>
-          )}
-        </>
-      );
-    } else {
-      return (
-        <TextInput
+  if (multiline === true) {
+    return (
+      <>
+        <TextArea
           name={name}
-          id={name}
-          type={fieldType}
-          data-type={type}
           className={className}
-          ref={ref}
+          rows={rows}
+          ref={ref as React.RefObject<HTMLTextAreaElement>}
+          id={name}
           {...{
             ...props,
             reset: undefined,
             required: undefined,
+            type: fieldType,
           }}
         />
-      );
-    }
+        {limit?.max && (
+          <Hint display={'flex'}>
+            {t('form.info.text.you_have')}
+            <Hint fontWeight="bold">
+              &nbsp;{`${Math.abs(getRemainingChars(currentValue, limit))}`}
+              &nbsp;
+            </Hint>
+            {constructRemainingText(currentValue, limit)}
+          </Hint>
+        )}
+      </>
+    );
+  } else {
+    return (
+      <TextInput
+        name={name}
+        id={name}
+        type={fieldType}
+        data-type={type}
+        className={className}
+        ref={ref as React.RefObject<HTMLInputElement>}
+        {...{
+          ...props,
+          reset: undefined,
+          required: undefined,
+        }}
+      />
+    );
   }
-);
+});
 
 export default Input;

package/src/inputs/Label/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FieldLabelProps } from '@digigov/form/types';
+import type { FieldLabelProps } from '@digigov/form/types';
 import { LabelTitle } from '@digigov/ui/form/LabelContainer';
 import { useTranslation } from '@digigov/ui/i18n';
 import { Hint } from '@digigov/ui/typography/Hint';

package/src/inputs/OtpInput/index.tsx

@@ -120,40 +120,49 @@ export function useOtp(onChange, maxLength) {
   };
 }
 
-const SingleCharacterInputPart = ({ ...props }) => {
-  return <SingleCharacterInput {...props} />;
-};
+const SingleCharacterInputPart = React.forwardRef<
+  HTMLInputElement,
+  Record<string, any>
+>(({ ...props }, ref) => {
+  return <SingleCharacterInput {...props} ref={ref} />;
+});
+SingleCharacterInputPart.displayName = 'SingleCharacterInputPart';
 
-export const OtpInput = ({ name, maxLength = 6, ...props }) => {
-  const otp = useOtp(props.onChange, maxLength);
-  return (
-    <SingleCharacterInputs>
-      {otp.otpValues.map((digit, idx) => (
-        <SingleCharacterInputPart
-          name={`${name}-${idx}`}
-          id={`${name}-${idx}`}
-          type="text"
-          key={idx}
-          autoComplete="one-time-code"
-          pattern="\d{1}"
-          maxLength={maxLength}
-          value={digit}
-          disabled={props.disabled}
-          aria-required={props['aria-required']}
-          onChange={(e) => otp.handleOtpChange(e, idx)}
-          onInput={(e) => {
-            if (e.target.value === digit) {
-              otp.handleOtpChange(e, idx);
-            }
-          }}
-          onKeyDown={(e) => otp.handleKeyDown(e, idx)}
-          onFocus={otp.handleFocus}
-          onPaste={otp.handlePaste}
-          error={!digit ? props.error : false}
-        />
-      ))}
-    </SingleCharacterInputs>
-  );
-};
+export const OtpInput = React.forwardRef<HTMLInputElement, Record<string, any>>(
+  ({ name, maxLength = 6, ...props }, ref) => {
+    const otp = useOtp(props.onChange, maxLength);
+    return (
+      <SingleCharacterInputs>
+        {otp.otpValues.map((digit, idx) => (
+          <SingleCharacterInputPart
+            ref={idx === 0 ? ref : null}
+            name={`${name}-${idx}`}
+            id={`${name}-${idx}`}
+            type="text"
+            key={idx}
+            autoComplete="one-time-code"
+            pattern="\d{1}"
+            maxLength={maxLength}
+            value={digit}
+            disabled={props.disabled}
+            aria-required={props['aria-required']}
+            onChange={(e) => otp.handleOtpChange(e, idx)}
+            onInput={(e) => {
+              if (e.target.value === digit) {
+                otp.handleOtpChange(e, idx);
+              }
+            }}
+            onKeyDown={(e) => otp.handleKeyDown(e, idx)}
+            onFocus={otp.handleFocus}
+            onPaste={otp.handlePaste}
+            error={!digit ? props.error : false}
+          />
+        ))}
+      </SingleCharacterInputs>
+    );
+  }
+);
+
+OtpInput.displayName = 'OtpInput';
 
 export default OtpInput;

package/src/inputs/Radio/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useWatch } from 'react-hook-form';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
-import { FieldOptionProps } from '@digigov/form/inputs/Label';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { FieldOptionProps } from '@digigov/form/inputs/Label';
 import {
   RadioContainer,
   RadioItem,
@@ -78,32 +78,40 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
     </RadioContainer>
   );
 };
-export const ControlledRadioButtonsGroup: React.FC<
+export const ControlledRadioButtonsGroup = React.forwardRef<
+  HTMLInputElement,
   RadioButtonsGroupProps & { onChange: (e: any) => void; value: any }
-> = ({
-  name,
-  extra: { options, className },
-  disabled,
-  onChange,
-  value,
-  Field,
-  ...props
-}) => {
+>(function ControlledRadioButtonsGroup(
+  {
+    name,
+    extra: { options, className },
+    disabled,
+    onChange,
+    value,
+    Field,
+    ...props
+  },
+  ref
+) {
   const currentValue: string | undefined = value;
   const { t } = useTranslation();
   return (
     <RadioContainer className={className} id={name}>
       {options.map(
-        ({
-          label,
-          value: v,
-          show,
-          disabled: optionDisabled,
-          selected,
-          ...option
-        }) => (
+        (
+          {
+            label,
+            value: v,
+            show,
+            disabled: optionDisabled,
+            selected,
+            ...option
+          },
+          index
+        ) => (
           <React.Fragment key={`${name}.${v}`}>
             <RadioItem
+              ref={index === 0 ? ref : undefined}
               onChange={(e) => {
                 console.log(e);
                 onChange(e);
@@ -139,6 +147,6 @@ export const ControlledRadioButtonsGroup: React.FC<
       )}
     </RadioContainer>
   );
-};
+});
 
 export default RadioButtonsGroup;

package/src/inputs/Select/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
-import { FieldOptionProps } from '@digigov/form/inputs/Label';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { FieldOptionProps } from '@digigov/form/inputs/Label';
 import {
   SelectContainer,
   SelectOption,

package/src/{Field/utils/index.ts → inputs/registry.ts}

@@ -1,4 +1,4 @@
-import { FieldComponentRegistry } from '@digigov/form/Field/types';
+import { type FieldComponentItem } from '@digigov/form/Field/types';
 import AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';
 import Checkboxes from '@digigov/form/inputs/Checkboxes';
 import DateInput from '@digigov/form/inputs/DateInput';
@@ -10,6 +10,8 @@ import OtpInput from '@digigov/form/inputs/OtpInput';
 import Radio, { ControlledRadioButtonsGroup } from '@digigov/form/inputs/Radio';
 import Select from '@digigov/form/inputs/Select';
 
+export type FieldComponentRegistry = Record<string, FieldComponentItem>;
+
 export const FIELD_COMPONENTS: FieldComponentRegistry = {
   text: {
     component: Input,

package/src/lazy.js

@@ -9,10 +9,7 @@ export default {
   'FieldBase': lazy(() => import('@digigov/form/Field/FieldBase').then((module) => ({ default: module['FieldBase'] }))),
   'FieldBaseContainer': lazy(() => import('@digigov/form/Field/FieldBaseContainer').then((module) => ({ default: module['FieldBaseContainer'] }))),
   'FieldConditional': lazy(() => import('@digigov/form/Field/FieldConditional').then((module) => ({ default: module['FieldConditional'] }))),
-  'FormDialog': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['FormDialog'] }))),
-  'ArrayItemModal': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemModal'] }))),
-  'ArrayItemHeader': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemHeader'] }))),
-  'ArrayItemDisplay': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemDisplay'] }))),
+  'BaseFieldArray': lazy(() => import('@digigov/form/FieldArray/BaseFieldArray').then((module) => ({ default: module['BaseFieldArray'] }))),
   'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module) => ({ default: module['FieldArray'] }))),
   'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module) => ({ default: module['FieldsetWithContext'] }))),
@@ -45,17 +42,18 @@ export default {
   'Input': lazy(() => import('@digigov/form/inputs/Input').then((module) => ({ default: module['Input'] }))),
   'Radio': lazy(() => import('@digigov/form/inputs').then((module) => ({ default: module['Radio'] }))),
   'Select': lazy(() => import('@digigov/form/inputs/Select').then((module) => ({ default: module['Select'] }))),
-  'INPUTS_FIELDS': lazy(() => import('@digigov/form/inputs/inputsScenarios').then((module) => ({ default: module['INPUTS_FIELDS'] }))),
-  'FIELD_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module) => ({ default: module['FIELD_COMPONENTS'] }))),
-  'ALTERNATIVE_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module) => ({ default: module['ALTERNATIVE_COMPONENTS'] }))),
-  'CONTROLLED_FIELD_COMPONENTS': lazy(() => import('@digigov/form/Field/utils').then((module) => ({ default: module['CONTROLLED_FIELD_COMPONENTS'] }))),
+  'FIELD_COMPONENTS': lazy(() => import('@digigov/form/inputs/registry').then((module) => ({ default: module['FIELD_COMPONENTS'] }))),
+  'ALTERNATIVE_COMPONENTS': lazy(() => import('@digigov/form/inputs/registry').then((module) => ({ default: module['ALTERNATIVE_COMPONENTS'] }))),
+  'CONTROLLED_FIELD_COMPONENTS': lazy(() => import('@digigov/form/inputs/registry').then((module) => ({ default: module['CONTROLLED_FIELD_COMPONENTS'] }))),
+  'ArrayEditModal': lazy(() => import('@digigov/form/FieldArray/FormDialog/ArrayEditModal').then((module) => ({ default: module['ArrayEditModal'] }))),
+  'FormDialog': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['FormDialog'] }))),
   'AutoCompleteInput': lazy(() => import('@digigov/form/inputs/AutoCompleteInput').then((module) => ({ default: module['AutoCompleteInput'] }))),
   'DateTimeInput': lazy(() => import('@digigov/form/inputs/DateTimeInput').then((module) => ({ default: module['DateTimeInput'] }))),
   'Image': lazy(() => import('@digigov/form/inputs/ImageInput').then((module) => ({ default: module['Image'] }))),
-  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module) => ({ default: module['RE_DIGIT'] }))),
-  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module) => ({ default: module['REMOVE_SPACES'] }))),
   'RadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module) => ({ default: module['RadioButtonsGroup'] }))),
   'ControlledRadioButtonsGroup': lazy(() => import('@digigov/form/inputs/Radio').then((module) => ({ default: module['ControlledRadioButtonsGroup'] }))),
+  'RE_DIGIT': lazy(() => import('@digigov/form/inputs/OtpInput').then((module) => ({ default: module['RE_DIGIT'] }))),
+  'REMOVE_SPACES': lazy(() => import('@digigov/form/inputs/OtpInput').then((module) => ({ default: module['REMOVE_SPACES'] }))),
   'AFM_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['AFM_VALIDATOR'] }))),
   'AMKA_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['AMKA_VALIDATOR'] }))),
   'LATER_THAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['LATER_THAN_VALIDATOR'] }))),
@@ -64,6 +62,7 @@ export default {
   'LATER_THAN_DATETIME_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['LATER_THAN_DATETIME_VALIDATOR'] }))),
   'EARLIER_THAN_DATETIME_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['EARLIER_THAN_DATETIME_VALIDATOR'] }))),
   'DATETIME_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['DATETIME_VALIDATOR'] }))),
+  'EMAIL_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/email').then((module) => ({ default: module['EMAIL_VALIDATOR'] }))),
   'FILE_MAX_SIZE_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['FILE_MAX_SIZE_VALIDATOR'] }))),
   'IBAN_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['IBAN_VALIDATOR'] }))),
   'IMAGE_DIMENSION_VALIDATOR': lazy(() => import('@digigov/form/validators/utils').then((module) => ({ default: module['IMAGE_DIMENSION_VALIDATOR'] }))),
@@ -74,5 +73,9 @@ export default {
   'UUID4_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/uuid4').then((module) => ({ default: module['UUID4_VALIDATOR'] }))),
   'TEXT_LIMIT_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/text_limit').then((module) => ({ default: module['TEXT_LIMIT_VALIDATOR'] }))),
   'INT_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/int').then((module) => ({ default: module['INT_VALIDATOR'] }))),
-  'NUMBER_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/number').then((module) => ({ default: module['NUMBER_VALIDATOR'] })))
+  'NUMBER_VALIDATOR': lazy(() => import('@digigov/form/validators/utils/number').then((module) => ({ default: module['NUMBER_VALIDATOR'] }))),
+  'ArrayContainerDisplay': lazy(() => import('@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayContainerDisplay').then((module) => ({ default: module['ArrayContainerDisplay'] }))),
+  'ArrayItemDisplay': lazy(() => import('@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemDisplay').then((module) => ({ default: module['ArrayItemDisplay'] }))),
+  'ArrayItemHeader': lazy(() => import('@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemHeader').then((module) => ({ default: module['ArrayItemHeader'] }))),
+  'ArrayDisplay': lazy(() => import('@digigov/form/FieldArray/FormDialog/ArrayDisplay').then((module) => ({ default: module['ArrayDisplay'] })))
 };

package/src/registry.js

@@ -10,7 +10,7 @@ import * as _digigov_form_Field_FieldBaseContainer from "@digigov/form/Field/Fie
 import * as _digigov_form_Field_FieldConditional from "@digigov/form/Field/FieldConditional";
 import * as _digigov_form_Field from "@digigov/form/Field";
 import * as _digigov_form_Field_types from "@digigov/form/Field/types";
-import * as _digigov_form_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
+import * as _digigov_form_FieldArray_BaseFieldArray from "@digigov/form/FieldArray/BaseFieldArray";
 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";
@@ -25,15 +25,17 @@ import * as _digigov_form_Questions_QuestionsContext from "@digigov/form/Questio
 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_hooks_useFieldFocusManager from "@digigov/form/hooks/useFieldFocusManager";
+import * as _digigov_form_hooks_utils from "@digigov/form/hooks/utils";
 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_inputs_registry from "@digigov/form/inputs/registry";
 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_resolveField from "@digigov/form/Field/utils/resolveField";
 import * as _digigov_form_Field_utils_useField from "@digigov/form/Field/utils/useField";
+import * as _digigov_form_FieldArray_FormDialog_ArrayEditModal from "@digigov/form/FieldArray/FormDialog/ArrayEditModal";
+import * as _digigov_form_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
 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";
@@ -45,21 +47,22 @@ import * as _digigov_form_Questions_Step_StepTitle from "@digigov/form/Questions
 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_Checkboxes from "@digigov/form/inputs/Checkboxes";
 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_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
-import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
+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_ImageInput from "@digigov/form/inputs/ImageInput";
+import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
 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_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_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_email from "@digigov/form/validators/utils/email";
 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";
@@ -71,6 +74,10 @@ import * as _digigov_form_validators_utils_phone from "@digigov/form/validators/
 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_FieldArray_FormDialog_ArrayDisplay_ArrayContainerDisplay from "@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayContainerDisplay";
+import * as _digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemDisplay from "@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemDisplay";
+import * as _digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemHeader from "@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemHeader";
+import * as _digigov_form_FieldArray_FormDialog_ArrayDisplay from "@digigov/form/FieldArray/FormDialog/ArrayDisplay";
 function lazyImport(pkgImport) {
   return new Proxy(
     {},
@@ -101,7 +108,7 @@ export default {
   '@digigov/form/Field/FieldConditional': lazyImport(_digigov_form_Field_FieldConditional),
   '@digigov/form/Field': lazyImport(_digigov_form_Field),
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
-  '@digigov/form/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
+  '@digigov/form/FieldArray/BaseFieldArray': lazyImport(_digigov_form_FieldArray_BaseFieldArray),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
   '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
@@ -116,15 +123,17 @@ export default {
   '@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/hooks/useFieldFocusManager': lazyImport(_digigov_form_hooks_useFieldFocusManager),
+  '@digigov/form/hooks/utils': lazyImport(_digigov_form_hooks_utils),
   '@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/inputs/registry': lazyImport(_digigov_form_inputs_registry),
   '@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/resolveField': lazyImport(_digigov_form_Field_utils_resolveField),
   '@digigov/form/Field/utils/useField': lazyImport(_digigov_form_Field_utils_useField),
+  '@digigov/form/FieldArray/FormDialog/ArrayEditModal': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayEditModal),
+  '@digigov/form/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
   '@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),
@@ -136,21 +145,22 @@ export default {
   '@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/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
   '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
-  '@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/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
+  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
   '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
+  '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
   '@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/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/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/email': lazyImport(_digigov_form_validators_utils_email),
   '@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),
@@ -161,5 +171,9 @@ export default {
   '@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)
+  '@digigov/form/validators/utils/uuid4': lazyImport(_digigov_form_validators_utils_uuid4),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayContainerDisplay': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayContainerDisplay),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemDisplay': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemDisplay),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay/ArrayItemHeader': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay_ArrayItemHeader),
+  '@digigov/form/FieldArray/FormDialog/ArrayDisplay': lazyImport(_digigov_form_FieldArray_FormDialog_ArrayDisplay)
 };

package/src/types.tsx

@@ -1,11 +1,11 @@
-import { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
-import {
-  FieldComponentRegistry,
+import type { UseFormReturn, UseFormProps, ErrorOption } from 'react-hook-form';
+import type {
   FieldLabelProps,
   FieldSpec,
   FormData,
 } from '@digigov/form/Field/types';
-import { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldComponentRegistry } from '@digigov/form/inputs/registry';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
 export * from '@digigov/form/Field/types';
 export interface FieldError {
   message: string;
@@ -18,25 +18,33 @@ export interface FieldsetSpec {
   body?: React.ReactNode;
 }
 
+export type registerFieldFocus = (
+  fieldName: string,
+  element: HTMLElement
+) => (name: string) => void;
+
 export interface FormContextProps {
   fieldsetsMap?: Record<string, FieldsetSpec>;
   fieldsMap: Record<string, FieldSpec>;
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   trigger: UseFormReturn['trigger'];
+  setError: UseFormReturn['setError'];
   clearErrors: UseFormReturn['clearErrors'];
   watch: UseFormReturn['watch'];
   getFieldState: UseFormReturn['getFieldState'];
   setValue: UseFormReturn['setValue'];
   getValues: UseFormReturn['getValues'];
+  getValuesFromParentForm?: UseFormReturn['getValues'];
   unregister: UseFormReturn['unregister'];
   formState: UseFormReturn['formState'];
   reset: UseFormReturn['reset'];
   resetField: UseFormReturn['resetField'];
   registerField: (field: FieldSpec) => void;
+  registerFieldFocus: registerFieldFocus;
   errors: UseFormReturn['formState']['errors'];
   componentRegistry?: FieldComponentRegistry;
-  submit: () => Promise<void>;
+  submit: () => Promise<void> | void;
 }
 
 export interface FormBuilderProps {

package/src/utils.ts

@@ -1,6 +1,7 @@
 import { validateFieldsNatively } from '@hookform/resolvers';
-import { appendErrors, FieldError } from 'react-hook-form';
-import * as Yup from 'yup';
+import type { FieldError } from 'react-hook-form';
+import { appendErrors } from 'react-hook-form';
+import type * as Yup from 'yup';
 
 /**
  * Why `path!` ? because it could be `undefined` in some case