@digigov/form 2.0.0-a402a664 → 2.0.0-aa380ec7

package/cjs/FieldArray/index.js

@@ -32,13 +32,9 @@ __export(FieldArray_exports, {
 });
 module.exports = __toCommonJS(FieldArray_exports);
 var import_react = __toESM(require("react"));
-var import_react_hook_form = require("react-hook-form");
 var import_FieldBaseContainer = require("@digigov/form/Field/FieldBaseContainer");
+var import_BaseFieldArray = __toESM(require("@digigov/form/FieldArray/BaseFieldArray"));
 var import_FormDialog = require("@digigov/form/FieldArray/FormDialog");
-var import_FieldObject = require("@digigov/form/FieldObject");
-var import_Fieldset = require("@digigov/form/Fieldset");
-var import_Card = require("@digigov/ui/content/Card");
-var import_Button = require("@digigov/ui/form/Button");
 const FieldArray = ({
   name,
   trigger,
@@ -54,21 +50,32 @@ const FieldArray = ({
   resetField,
   label,
   Field,
+  registerFieldFocus,
   ...customField
 }) => {
-  const { append, remove } = (0, import_react_hook_form.useFieldArray)({
-    control,
-    name
-  });
-  const fields = getValues(name) || [];
+  const buttonRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    let unregister = () => {
+    };
+    if (buttonRef.current) {
+      unregister = registerFieldFocus(name, buttonRef.current);
+    }
+    return () => {
+      unregister(name);
+    };
+  }, [name, registerFieldFocus]);
+  const hasItemErrors = !!error && Object.keys(error).some((key) => /^\d+$/.test(key));
+  (0, import_react.useEffect)(() => {
+    if (!hasItemErrors) clearErrors(name);
+  }, [clearErrors, hasItemErrors, name]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_FieldBaseContainer.FieldBaseContainer,
     {
       label,
       layout,
       register,
-      error: error?.message && error ? error : void 0,
-      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
+      error: error?.message ? error : void 0,
+      hasError: !!error,
       wrapper: "fieldset",
       name,
       labelSize: customField.extra?.labelSize,
@@ -77,6 +84,7 @@ const FieldArray = ({
     customField.extra?.variant === "dialog" ? /* @__PURE__ */ import_react.default.createElement(
       import_FormDialog.FormDialog,
       {
+        ref: buttonRef,
         name,
         trigger,
         register,
@@ -94,50 +102,20 @@ const FieldArray = ({
         sortable: customField.extra.sortable,
         ...customField
       }
-    ) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, fields.map((field, index) => /* @__PURE__ */ import_react.default.createElement(
-      import_Card.Card,
+    ) : /* @__PURE__ */ import_react.default.createElement(
+      import_BaseFieldArray.default,
       {
-        variant: customField.extra?.border ? "border" : "divider",
-        key: field.id || index
-      },
-      /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetLabel, null, customField.extra?.label.object.title, " ", !customField.extra?.noIndex && index + 1), /* @__PURE__ */ import_react.default.createElement(
-        import_FieldObject.FieldObject,
-        {
-          name: `${name}.${index}`,
-          error: Array.isArray(error) && error[index],
-          formState,
-          register,
-          control,
-          ...customField.extra?.of,
-          Field
-        }
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_Button.Button,
-        {
-          name: `${name}-object-remove`,
-          variant: customField.extra?.label.object?.deleteButtonVariant,
-          type: "button",
-          color: "warning",
-          onClick: () => remove(index),
-          disabled: !customField?.editable
-        },
-        customField.extra?.label.object?.delete
-      ))
-    )), customField.editable && /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        type: "button",
-        name: `${name}-add-object`,
-        color: "secondary",
-        variant: customField.extra?.label.object?.addButtonVariant,
-        onClick: (ev) => {
-          ev.preventDefault();
-          append({});
-        },
-        disabled: !customField?.editable
-      },
-      customField.extra?.label.object?.add
-    ))
+        ref: buttonRef,
+        name,
+        register,
+        control,
+        formState,
+        error,
+        getValues,
+        Field,
+        ...customField
+      }
+    )
   );
 };
 var FieldArray_default = FieldArray;

package/cjs/FieldArray/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FieldArray/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { FieldsetLabel, Fieldset } from '@digigov/form/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\n\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  trigger: UseFormReturn['trigger'];\n  register: UseFormReturn['register'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  getValues: UseFormReturn['getValues'];\n  setValue: UseFormReturn['setValue'];\n  reset: UseFormReturn['reset'];\n  resetField?: UseFormReturn['resetField'];\n  Field: React.FC<FieldProps>;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  trigger,\n  register,\n  clearErrors,\n  control,\n  formState,\n  error,\n  getValues,\n  setValue,\n  layout,\n  reset,\n  resetField,\n  label,\n  Field,\n  ...customField\n}) => {\n  const { append, remove } = useFieldArray({\n    control,\n    name,\n  });\n  const fields = getValues(name) || [];\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={error?.message && error ? error : undefined}\n      hasError={formState.isSubmitted && !formState.isSubmitting && !!error}\n      wrapper=\"fieldset\"\n      name={name}\n      labelSize={customField.extra?.labelSize}\n      controlled={true}\n    >\n      {customField.extra?.variant === 'dialog' ? (\n        <FormDialog\n          name={name}\n          trigger={trigger}\n          register={register}\n          clearErrors={clearErrors}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          setValue={setValue}\n          layout={layout}\n          label={label}\n          Field={Field}\n          reset={reset}\n          resetField={resetField}\n          sortable={customField.extra.sortable}\n          {...customField}\n        />\n      ) : (\n        <>\n          {fields.map((field, index) => (\n            <Card\n              variant={customField.extra?.border ? 'border' : 'divider'}\n              key={field.id || index}\n            >\n              <Fieldset>\n                <FieldsetLabel>\n                  {customField.extra?.label.object.title}{' '}\n                  {!customField.extra?.noIndex && index + 1}\n                </FieldsetLabel>\n                <FieldObject\n                  name={`${name}.${index}`}\n                  error={Array.isArray(error) && error[index]}\n                  formState={formState}\n                  register={register}\n                  control={control}\n                  {...customField.extra?.of}\n                  Field={Field}\n                />\n                <Button\n                  name={`${name}-object-remove`}\n                  variant={customField.extra?.label.object?.deleteButtonVariant}\n                  type=\"button\"\n                  color=\"warning\"\n                  onClick={() => remove(index)}\n                  disabled={!customField?.editable}\n                >\n                  {customField.extra?.label.object?.delete}\n                </Button>\n              </Fieldset>\n            </Card>\n          ))}\n          {customField.editable && (\n            <Button\n              type=\"button\"\n              name={`${name}-add-object`}\n              color=\"secondary\"\n              variant={customField.extra?.label.object?.addButtonVariant}\n              onClick={(ev) => {\n                ev.preventDefault();\n                append({});\n              }}\n              disabled={!customField?.editable}\n            >\n              {customField.extra?.label.object?.add}\n            </Button>\n          )}\n        </>\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA0D;AAC1D,gCAAmC;AAEnC,wBAA2B;AAC3B,yBAA4B;AAC5B,sBAAwC;AACxC,kBAAqB;AACrB,oBAAuB;AAehB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,OAAO,QAAI,sCAAc;AAAA,IACvC;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,SAAS,UAAU,IAAI,KAAK,CAAC;AACnC,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,OAAO,WAAW,QAAQ,QAAQ;AAAA,MACzC,UAAU,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,MAChE,SAAQ;AAAA,MACR;AAAA,MACA,WAAW,YAAY,OAAO;AAAA,MAC9B,YAAY;AAAA;AAAA,IAEX,YAAY,OAAO,YAAY,WAC9B,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,UAAU,YAAY,MAAM;AAAA,QAC3B,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA,2BAAAA,QAAA,gBACG,OAAO,IAAI,CAAC,OAAO,UAClB,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,YAAY,OAAO,SAAS,WAAW;AAAA,QAChD,KAAK,MAAM,MAAM;AAAA;AAAA,MAEjB,6BAAAA,QAAA,cAAC,gCACC,6BAAAA,QAAA,cAAC,qCACE,YAAY,OAAO,MAAM,OAAO,OAAO,KACvC,CAAC,YAAY,OAAO,WAAW,QAAQ,CAC1C,GACA,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,UACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,UAC1C;AAAA,UACA;AAAA,UACA;AAAA,UACC,GAAG,YAAY,OAAO;AAAA,UACvB;AAAA;AAAA,MACF,GACA,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM,GAAG,IAAI;AAAA,UACb,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,UAC1C,MAAK;AAAA,UACL,OAAM;AAAA,UACN,SAAS,MAAM,OAAO,KAAK;AAAA,UAC3B,UAAU,CAAC,aAAa;AAAA;AAAA,QAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,MACpC,CACF;AAAA,IACF,CACD,GACA,YAAY,YACX,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,QAC1C,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA,QACA,UAAU,CAAC,aAAa;AAAA;AAAA,MAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CAEJ;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
-  "names": ["React"]
+  "sourcesContent": ["import React, { useEffect, useRef } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport type { FieldProps } from '@digigov/form/Field/types';\nimport BaseFieldArray from '@digigov/form/FieldArray/BaseFieldArray';\nimport { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport type { registerFieldFocus } from '@digigov/form/types';\n\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  trigger: UseFormReturn['trigger'];\n  register: UseFormReturn['register'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  getValues: UseFormReturn['getValues'];\n  setValue: UseFormReturn['setValue'];\n  reset: UseFormReturn['reset'];\n  resetField?: UseFormReturn['resetField'];\n  Field: React.FC<FieldProps>;\n  registerFieldFocus: registerFieldFocus;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  trigger,\n  register,\n  clearErrors,\n  control,\n  formState,\n  error,\n  getValues,\n  setValue,\n  layout,\n  reset,\n  resetField,\n  label,\n  Field,\n  registerFieldFocus,\n  ...customField\n}) => {\n  /** The ref of the add-button */\n  const buttonRef = useRef<HTMLButtonElement | null>(null);\n\n  // Register the button to be focusable\n  useEffect(() => {\n    let unregister: (name: string) => void = () => {};\n    if (buttonRef.current) {\n      unregister = registerFieldFocus(name, buttonRef.current);\n    }\n\n    return () => {\n      unregister(name);\n    };\n  }, [name, registerFieldFocus]);\n\n  // Clear container error when there are no item errors\n  const hasItemErrors: boolean =\n    !!error && Object.keys(error).some((key) => /^\\d+$/.test(key));\n  useEffect(() => {\n    if (!hasItemErrors) clearErrors(name);\n  }, [clearErrors, hasItemErrors, name]);\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={error?.message ? error : undefined}\n      hasError={!!error}\n      wrapper=\"fieldset\"\n      name={name}\n      labelSize={customField.extra?.labelSize}\n      controlled={true}\n    >\n      {customField.extra?.variant === 'dialog' ? (\n        <FormDialog\n          ref={buttonRef}\n          name={name}\n          trigger={trigger}\n          register={register}\n          clearErrors={clearErrors}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          setValue={setValue}\n          layout={layout}\n          label={label}\n          Field={Field}\n          reset={reset}\n          resetField={resetField}\n          sortable={customField.extra.sortable}\n          {...customField}\n        />\n      ) : (\n        <BaseFieldArray\n          ref={buttonRef}\n          name={name}\n          register={register}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          Field={Field}\n          {...customField}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyC;AAEzC,gCAAmC;AAEnC,4BAA2B;AAC3B,wBAA2B;AAiBpB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AAEJ,QAAM,gBAAY,qBAAiC,IAAI;AAGvD,8BAAU,MAAM;AACd,QAAI,aAAqC,MAAM;AAAA,IAAC;AAChD,QAAI,UAAU,SAAS;AACrB,mBAAa,mBAAmB,MAAM,UAAU,OAAO;AAAA,IACzD;AAEA,WAAO,MAAM;AACX,iBAAW,IAAI;AAAA,IACjB;AAAA,EACF,GAAG,CAAC,MAAM,kBAAkB,CAAC;AAG7B,QAAM,gBACJ,CAAC,CAAC,SAAS,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,KAAK,GAAG,CAAC;AAC/D,8BAAU,MAAM;AACd,QAAI,CAAC,cAAe,aAAY,IAAI;AAAA,EACtC,GAAG,CAAC,aAAa,eAAe,IAAI,CAAC;AAErC,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,OAAO,UAAU,QAAQ;AAAA,MAChC,UAAU,CAAC,CAAC;AAAA,MACZ,SAAQ;AAAA,MACR;AAAA,MACA,WAAW,YAAY,OAAO;AAAA,MAC9B,YAAY;AAAA;AAAA,IAEX,YAAY,OAAO,YAAY,WAC9B,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,UAAU,YAAY,MAAM;AAAA,QAC3B,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA;AAAA,MAAC,sBAAAC;AAAA,MAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["React", "BaseFieldArray"]
 }

package/cjs/FieldObject/index.js

@@ -33,8 +33,7 @@ __export(FieldObject_exports, {
 module.exports = __toCommonJS(FieldObject_exports);
 var import_react = __toESM(require("react"));
 var import_FieldBase = require("@digigov/form/Field/FieldBase");
-var import_utils = require("@digigov/form/Field/utils");
-var import_calculateField = require("@digigov/form/Field/utils/calculateField");
+var import_resolveField = require("@digigov/form/Field/utils/resolveField");
 var import_Fieldset = require("@digigov/form/Fieldset");
 var import_FieldContainer = require("@digigov/ui/form/FieldContainer");
 var import_i18n = require("@digigov/ui/i18n");
@@ -55,8 +54,8 @@ const FieldObject = ({
   return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { size: "sm", marginBottom: 3 }, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, { marginBottom: 3 }, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ import_react.default.createElement(
     FieldObjectItem,
     {
-      key: `${name}${field.key ? `.${field.key}` : ""}`,
-      name: `${name}${field.key ? `.${field.key}` : ""}`,
+      key: `${name ? name + "." : ""}${field.key ? `${field.key}` : ""}`,
+      name: `${name ? name + "." : ""}${field.key ? `${field.key}` : ""}`,
       control,
       register,
       reset,
@@ -82,10 +81,7 @@ const FieldObjectItem = ({
   defaultValue,
   Field
 }) => {
-  const calculatedField = (0, import_react.useMemo)(
-    () => (0, import_calculateField.calculateField)(children, field, import_utils.FIELD_COMPONENTS, import_utils.ALTERNATIVE_COMPONENTS),
-    [field]
-  );
+  const resolvedField = (0, import_react.useMemo)(() => (0, import_resolveField.resolveField)(children, field), [field]);
   if (Field) {
     if (!field.type) {
       field.type = "string";
@@ -96,7 +92,7 @@ const FieldObjectItem = ({
     return /* @__PURE__ */ import_react.default.createElement(
       import_FieldBase.FieldBase,
       {
-        ...calculatedField,
+        ...resolvedField,
         name,
         Field,
         control,

package/cjs/FieldObject/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FieldObject/index.tsx"],
-  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { FieldProps, CalculatedField } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';\nimport { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  defaultValue?: undefined;\n  Field: React.FC<FieldProps>;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  resetField,\n  formState,\n  error,\n  defaultValue,\n  Field,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\" marginBottom={3}>\n          {t(label.primary)}\n        </FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption marginBottom={3}>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}${field.key ? `.${field.key}` : ''}`}\n          name={`${name}${field.key ? `.${field.key}` : ''}`}\n          control={control}\n          register={register}\n          reset={reset}\n          resetField={resetField}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n          defaultValue={defaultValue?.[field.key] || undefined}\n          Field={Field}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  key: string;\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n  defaultValue?: undefined;\n  Field: React.FC<FieldProps>;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  resetField,\n  register,\n  defaultValue,\n  Field,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n  if (Field) {\n    if (!field.type) {\n      field.type = 'string';\n    }\n    return <Field {...field} name={name} />;\n  } else {\n    const customError = error ? error : formState?.errors[name];\n    return (\n      <FieldBase\n        {...calculatedField}\n        name={name}\n        Field={Field}\n        control={control}\n        reset={reset}\n        resetField={resetField}\n        register={register}\n        error={customError}\n        defaultValue={defaultValue}\n      />\n    );\n  }\n};\n\nexport default FieldObject;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,mBAGO;AACP,4BAA+B;AAC/B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;AAaxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WACN,6BAAAA,QAAA,cAAC,wCAAe,MAAK,MAAK,cAAc,KACrC,EAAE,MAAM,OAAO,CAClB,GAED,OAAO,aACN,6BAAAA,QAAA,cAAC,mCAAgB,cAAc,KAAI,EAAE,MAAM,SAAS,CAAE,GAEvD,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,GAAG,KAAK,EAAE;AAAA,MAC/C,MAAM,GAAG,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,GAAG,KAAK,EAAE;AAAA,MAChD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA,MACA,cAAc,eAAe,MAAM,GAAG,KAAK;AAAA,MAC3C;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAiBA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,sBAAmC;AAAA,IACvC,UACE,sCAAe,UAAU,OAAO,+BAAkB,mCAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AACA,MAAI,OAAO;AACT,QAAI,CAAC,MAAM,MAAM;AACf,YAAM,OAAO;AAAA,IACf;AACA,WAAO,6BAAAA,QAAA,cAAC,SAAO,GAAG,OAAO,MAAY;AAAA,EACvC,OAAO;AACL,UAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,WACE,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,IAAO,sBAAQ;",
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport type { FieldProps } from '@digigov/form/Field/types';\nimport { resolveField } from '@digigov/form/Field/utils/resolveField';\nimport { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';\nimport type { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  defaultValue?: any;\n  Field: React.FC<FieldProps>;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  resetField,\n  formState,\n  error,\n  defaultValue,\n  Field,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\" marginBottom={3}>\n          {t(label.primary)}\n        </FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption marginBottom={3}>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name ? name + '.' : ''}${field.key ? `${field.key}` : ''}`}\n          name={`${name ? name + '.' : ''}${field.key ? `${field.key}` : ''}`}\n          control={control}\n          register={register}\n          reset={reset}\n          resetField={resetField}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n          defaultValue={defaultValue?.[field.key] || undefined}\n          Field={Field}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  key: string;\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n  defaultValue?: undefined;\n  Field: React.FC<FieldProps>;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  resetField,\n  register,\n  defaultValue,\n  Field,\n}) => {\n  const resolvedField = useMemo(() => resolveField(children, field), [field]);\n  if (Field) {\n    if (!field.type) {\n      field.type = 'string';\n    }\n    return <Field {...field} name={name} />;\n  } else {\n    const customError = error ? error : formState?.errors[name];\n    return (\n      <FieldBase\n        {...resolvedField}\n        name={name}\n        Field={Field}\n        control={control}\n        reset={reset}\n        resetField={resetField}\n        register={register}\n        error={customError}\n        defaultValue={defaultValue}\n      />\n    );\n  }\n};\n\nexport default FieldObject;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,0BAA6B;AAC7B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;AAaxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WACN,6BAAAA,QAAA,cAAC,wCAAe,MAAK,MAAK,cAAc,KACrC,EAAE,MAAM,OAAO,CAClB,GAED,OAAO,aACN,6BAAAA,QAAA,cAAC,mCAAgB,cAAc,KAAI,EAAE,MAAM,SAAS,CAAE,GAEvD,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,OAAO,OAAO,MAAM,EAAE,GAAG,MAAM,MAAM,GAAG,MAAM,GAAG,KAAK,EAAE;AAAA,MAChE,MAAM,GAAG,OAAO,OAAO,MAAM,EAAE,GAAG,MAAM,MAAM,GAAG,MAAM,GAAG,KAAK,EAAE;AAAA,MACjE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA,MACA,cAAc,eAAe,MAAM,GAAG,KAAK;AAAA,MAC3C;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAiBA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,oBAAgB,sBAAQ,UAAM,kCAAa,UAAU,KAAK,GAAG,CAAC,KAAK,CAAC;AAC1E,MAAI,OAAO;AACT,QAAI,CAAC,MAAM,MAAM;AACf,YAAM,OAAO;AAAA,IACf;AACA,WAAO,6BAAAA,QAAA,cAAC,SAAO,GAAG,OAAO,MAAY;AAAA,EACvC,OAAO;AACL,UAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,WACE,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,IAAO,sBAAQ;",
   "names": ["React"]
 }

package/cjs/Fieldset/FieldsetWithContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/FieldsetWithContext.tsx"],
-  "sourcesContent": ["import React, { useContext, useMemo } from 'react';\nimport Field from '@digigov/form/Field';\nimport {\n  Fieldset,\n  FieldsetLabel,\n  FieldsetCaption,\n  FieldsetBody,\n} from '@digigov/form/Fieldset/';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FieldsetSpec } from '@digigov/form/types';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const FieldsetWithContext: React.FC<{ name: string }> = ({ name }) => {\n  const { label, body, fields } = useFieldset(name);\n  const { t } = useTranslation();\n  return useMemo(\n    () => (\n      <Fieldset>\n        {label?.primary && <FieldsetLabel>{t(label.primary)}</FieldsetLabel>}\n        {label?.secondary && (\n          <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n        )}\n        {body && <FieldsetBody>{body}</FieldsetBody>}\n        {fields.map((field) => (\n          <Field key={field} name={field} />\n        ))}\n      </Fieldset>\n    ),\n    [label?.primary, label?.secondary, body, fields]\n  );\n};\n\nconst useFieldset = (name: string): FieldsetSpec => {\n  const { fieldsetsMap } = useContext(FormContext);\n  if (fieldsetsMap && fieldsetsMap[name]) {\n    return useMemo(() => fieldsetsMap[name], [name]);\n  } else {\n    if (!fieldsetsMap) throw new Error(`Fieldsets is not defined`);\n    throw new Error(`No fieldset with name ${name} found`);\n  }\n};\n"],
+  "sourcesContent": ["import React, { useContext, useMemo } from 'react';\nimport Field from '@digigov/form/Field';\nimport {\n  Fieldset,\n  FieldsetLabel,\n  FieldsetCaption,\n  FieldsetBody,\n} from '@digigov/form/Fieldset/';\nimport { FormContext } from '@digigov/form/FormContext';\nimport type { FieldsetSpec } from '@digigov/form/types';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const FieldsetWithContext: React.FC<{ name: string }> = ({ name }) => {\n  const { label, body, fields } = useFieldset(name);\n  const { t } = useTranslation();\n  return useMemo(\n    () => (\n      <Fieldset>\n        {label?.primary && <FieldsetLabel>{t(label.primary)}</FieldsetLabel>}\n        {label?.secondary && (\n          <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n        )}\n        {body && <FieldsetBody>{body}</FieldsetBody>}\n        {fields.map((field) => (\n          <Field key={field} name={field} />\n        ))}\n      </Fieldset>\n    ),\n    [label?.primary, label?.secondary, body, fields]\n  );\n};\n\nconst useFieldset = (name: string): FieldsetSpec => {\n  const { fieldsetsMap } = useContext(FormContext);\n  if (fieldsetsMap && fieldsetsMap[name]) {\n    return useMemo(() => fieldsetsMap[name], [name]);\n  } else {\n    if (!fieldsetsMap) throw new Error(`Fieldsets is not defined`);\n    throw new Error(`No fieldset with name ${name} found`);\n  }\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2C;AAC3C,mBAAkB;AAClB,sBAKO;AACP,yBAA4B;AAE5B,kBAA+B;AAExB,MAAM,sBAAkD,CAAC,EAAE,KAAK,MAAM;AAC3E,QAAM,EAAE,OAAO,MAAM,OAAO,IAAI,YAAY,IAAI;AAChD,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,aAAO;AAAA,IACL,MACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WAAW,6BAAAA,QAAA,cAAC,qCAAe,EAAE,MAAM,OAAO,CAAE,GACnD,OAAO,aACN,6BAAAA,QAAA,cAAC,uCAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,QAAQ,6BAAAA,QAAA,cAAC,oCAAc,IAAK,GAC5B,OAAO,IAAI,CAAC,UACX,6BAAAA,QAAA,cAAC,aAAAC,SAAA,EAAM,KAAK,OAAO,MAAM,OAAO,CACjC,CACH;AAAA,IAEF,CAAC,OAAO,SAAS,OAAO,WAAW,MAAM,MAAM;AAAA,EACjD;AACF;AAEA,MAAM,cAAc,CAAC,SAA+B;AAClD,QAAM,EAAE,aAAa,QAAI,yBAAW,8BAAW;AAC/C,MAAI,gBAAgB,aAAa,IAAI,GAAG;AACtC,eAAO,sBAAQ,MAAM,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC;AAAA,EACjD,OAAO;AACL,QAAI,CAAC,aAAc,OAAM,IAAI,MAAM,0BAA0B;AAC7D,UAAM,IAAI,MAAM,yBAAyB,IAAI,QAAQ;AAAA,EACvD;AACF;",
   "names": ["React", "Field"]
 }

package/cjs/Fieldset/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport { Fieldset } from '@digigov/react-core/Fieldset';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { Grid } from '@digigov/ui/layouts/Grid';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { NormalText } from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
+  "sourcesContent": ["import React from 'react';\nimport type {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport { Fieldset } from '@digigov/react-core/Fieldset';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { Grid } from '@digigov/ui/layouts/Grid';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { NormalText } from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAMlB,sBAAyB;AACzB,4BAA+B;AAC/B,kBAAqB;AACrB,kBAAqB;AACrB,wBAA2B;AAEpB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,6BAAAA,QAAA,cAAC,wCAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,6BAAAA,QAAA,cAAC,oBAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,6BAAAA,QAAA,cAAC,oBAAK,MAAI,MAAC,IAAI,MACb,6BAAAA,QAAA,cAAC,oCAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ;",
   "names": ["React"]
 }

package/cjs/Fieldset/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/types.tsx"],
-  "sourcesContent": ["import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';\nimport { HintProps } from '@digigov/ui/typography/Hint';\n\nexport interface FieldsetLabelProps extends FieldsetLegendProps {}\nexport interface FieldsetCaptionProps extends HintProps {}\nexport interface FieldsetBodyProps {\n  children?: React.ReactNode;\n}\n"],
+  "sourcesContent": ["import type { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';\nimport type { HintProps } from '@digigov/ui/typography/Hint';\n\nexport interface FieldsetLabelProps extends FieldsetLegendProps {}\nexport interface FieldsetCaptionProps extends HintProps {}\nexport interface FieldsetBodyProps {\n  children?: React.ReactNode;\n}\n"],
   "mappings": ";;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/cjs/FormBuilder/index.js

@@ -38,10 +38,11 @@ var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
 var import_Field = require("@digigov/form/Field");
 var import_ErrorGroup = require("@digigov/form/Field/ErrorGroup");
-var import_utils = require("@digigov/form/Field/utils");
 var import_FieldsetWithContext = require("@digigov/form/Fieldset/FieldsetWithContext");
 var import_FormContext = require("@digigov/form/FormContext");
-var import_utils2 = require("@digigov/form/utils");
+var import_useFieldFocusManager = __toESM(require("@digigov/form/hooks/useFieldFocusManager"));
+var import_registry = require("@digigov/form/inputs/registry");
+var import_utils = require("@digigov/form/utils");
 var import_validators = require("@digigov/form/validators");
 var import_Button = require("@digigov/ui/form/Button");
 var import_Form = require("@digigov/ui/form/Form");
@@ -68,26 +69,32 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
     mode,
     defaultValues: initial,
     reValidateMode,
-    shouldFocusError,
+    shouldFocusError: false,
     criteriaMode
   });
   const handleSubmit = (0, import_react.useCallback)(
     (data) => {
       if (onSubmit) {
-        form.reset(data);
         onSubmit(data);
       }
     },
     [onSubmit]
   );
+  const { setError } = form;
   (0, import_react.useEffect)(() => {
     if (errors) {
       for (const fieldName in errors) {
-        form.setError(fieldName, errors[fieldName]);
+        setError(fieldName, errors[fieldName]);
       }
     }
-  }, [errors]);
-  const submit = form.handleSubmit(handleSubmit);
+  }, [errors, setError]);
+  const { registerCustomFocusableElement: registerFieldFocus, focusOnError } = (0, import_useFieldFocusManager.default)({
+    control: form.control,
+    subscribe: form.subscribe,
+    enabled: shouldFocusError,
+    setFocus: form.setFocus
+  });
+  const submit = form.handleSubmit(handleSubmit, focusOnError);
   const ctx = {
     fieldsMap,
     fieldsetsMap,
@@ -96,6 +103,7 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
     watch: form.watch,
     resetField: form.resetField,
     registerField,
+    registerFieldFocus,
     errors: form.formState.errors,
     formState: form.formState,
     reset: form.reset,
@@ -112,6 +120,144 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
   };
   return /* @__PURE__ */ import_react.default.createElement(import_FormContext.FormContext.Provider, { value: ctx }, /* @__PURE__ */ import_react.default.createElement(import_Form.Form, { grid, onSubmit: submit, ref, ...props }, children));
 });
+const useFormValues = () => {
+  const ctx = (0, import_FormContext.useFormContext)();
+  return ctx.getValues();
+};
+const FormBuilder = import_react.default.forwardRef(
+  function FormBuilder2({
+    fields = [],
+    fieldsets,
+    initial = {},
+    onSubmit,
+    children,
+    reValidateMode = "onSubmit",
+    mode = "onSubmit",
+    shouldFocusError = true,
+    criteriaMode = "all",
+    auto = false,
+    validatorRegistry,
+    componentRegistry,
+    grid = false,
+    ...props
+  }, ref) {
+    const { screenSize } = (0, import_useScreen.useScreenSize)();
+    const transformedFields = (0, import_react.useMemo)(
+      () => fields.map((field) => {
+        const layout = field.layout;
+        if (!layout) {
+          return {
+            ...field,
+            layout: DEFAULT_LAYOUT
+          };
+        }
+        return {
+          ...field,
+          layout: BREAKPOINTS.reduce(
+            (expandedLayout, breakpoint, breakpointIndex) => {
+              if (field?.layout?.[breakpoint]) {
+                expandedLayout[breakpoint] = field?.layout[breakpoint];
+              } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {
+                expandedLayout[breakpoint] = expandedLayout[BREAKPOINTS[breakpointIndex - 1]];
+              } else {
+                expandedLayout[breakpoint] = 12;
+              }
+              return expandedLayout;
+            },
+            {}
+          )
+        };
+      }),
+      [fields]
+    );
+    const fieldsState = (0, import_react.useRef)(transformedFields);
+    const setFieldsState = (0, import_react.useCallback)((newFields) => {
+      fieldsState.current = newFields;
+    }, []);
+    const registerField = (0, import_react.useCallback)(
+      (field) => {
+        const fieldIndex = fieldsState.current.findIndex(
+          (f) => f.key === field.key
+        );
+        if (fieldIndex > -1) {
+          fieldsState.current[fieldIndex] = field;
+        } else {
+          fieldsState.current.push(field);
+        }
+        setFieldsState(fieldsState.current);
+      },
+      [setFieldsState]
+    );
+    const schema = (0, import_validators.useValidationSchema)(fieldsState, validatorRegistry);
+    const resolver = (0, import_react.useMemo)(() => {
+      if (!schema) return;
+      return (0, import_utils.yupResolver)(schema);
+    }, [schema]);
+    const fieldsMap = (0, import_react.useMemo)(() => {
+      if (!schema || !transformedFields) return {};
+      return transformedFields.reduce(
+        (map, field) => ({ ...map, [field.key]: field }),
+        {}
+      );
+    }, [schema, transformedFields]);
+    const fieldsetsMap = (0, import_react.useMemo)(() => {
+      if (!schema || !fieldsets) return;
+      return fieldsets.reduce(
+        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),
+        {}
+      );
+    }, [fieldsets, schema]);
+    const fieldChildren = (0, import_react.useMemo)(() => {
+      if (!schema || !auto) return;
+      if (fieldsets) {
+        return fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_FieldsetWithContext.FieldsetWithContext, { key: fieldset.key, name: fieldset.key }));
+      }
+      if (transformedFields) {
+        const fieldsByLayouts = groupFieldsByLayout(transformedFields);
+        const fieldsByLayoutSize = fieldsByLayouts[screenSize];
+        return fieldsByLayoutSize.map((item, index) => {
+          if (Array.isArray(item)) {
+            return /* @__PURE__ */ import_react.default.createElement(
+              import_ErrorGroup.ErrorGroup,
+              {
+                key: index,
+                screenSize,
+                fieldOrder: item.map((field) => field.key)
+              },
+              item.map((f) => {
+                return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: f.key, name: f.key });
+              })
+            );
+          } else {
+            return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: item.key, name: item.key });
+          }
+        });
+      }
+    }, [auto, fieldsets, schema, screenSize, transformedFields]);
+    return /* @__PURE__ */ import_react.default.createElement(
+      FormBase,
+      {
+        resolver,
+        fieldsetsMap,
+        fieldsMap,
+        registerField,
+        initial,
+        reValidateMode,
+        mode,
+        shouldFocusError,
+        criteriaMode,
+        onSubmit,
+        componentRegistry,
+        ref,
+        grid,
+        ...props
+      },
+      fieldChildren,
+      auto && /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
+      children
+    );
+  }
+);
 const DEFAULT_LAYOUT = {
   xs: 12,
   sm: 12,
@@ -120,7 +266,7 @@ const DEFAULT_LAYOUT = {
   xl: 12
 };
 const BREAKPOINTS = ["xs", "sm", "md", "lg", "xl"];
-const groupFieldsByLayout = (fields) => {
+function groupFieldsByLayout(fields) {
   return BREAKPOINTS.reduce((sizes, size) => {
     sizes[size] = fields.reduce((acc, item) => {
       const layoutValue = item.layout?.[size] || 12;
@@ -141,131 +287,9 @@ const groupFieldsByLayout = (fields) => {
     });
     return sizes;
   }, {});
-};
-const useFormValues = () => {
-  const ctx = (0, import_FormContext.useFormContext)();
-  return ctx.getValues();
-};
-const FormBuilder = import_react.default.forwardRef(function FormBuilder2({
-  fields = [],
-  fieldsets,
-  initial = {},
-  onSubmit,
-  children,
-  reValidateMode = "onSubmit",
-  mode = "onSubmit",
-  shouldFocusError = true,
-  criteriaMode = "all",
-  auto = false,
-  validatorRegistry,
-  componentRegistry,
-  grid = false,
-  ...props
-}, ref) {
-  const { screenSize } = (0, import_useScreen.useScreenSize)();
-  fields = fields.map((field) => {
-    const layout = field.layout;
-    if (!layout) {
-      return {
-        ...field,
-        layout: DEFAULT_LAYOUT
-      };
-    }
-    return {
-      ...field,
-      layout: BREAKPOINTS.reduce(
-        (expandedLayout, breakpoint, breakpointIndex) => {
-          if (field?.layout?.[breakpoint]) {
-            expandedLayout[breakpoint] = field?.layout[breakpoint];
-          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {
-            expandedLayout[breakpoint] = expandedLayout[BREAKPOINTS[breakpointIndex - 1]];
-          } else {
-            expandedLayout[breakpoint] = 12;
-          }
-          return expandedLayout;
-        },
-        {}
-      )
-    };
-  });
-  const fieldsState = (0, import_react.useRef)(fields);
-  const setFieldsState = (0, import_react.useCallback)((newFields) => {
-    fieldsState.current = newFields;
-  }, []);
-  const schema = (0, import_validators.useValidationSchema)(fieldsState, validatorRegistry);
-  const registerField = (0, import_react.useCallback)((field) => {
-    const fieldIndex = fieldsState.current.findIndex(
-      (f) => f.key === field.key
-    );
-    if (fieldIndex > -1) {
-      fieldsState.current[fieldIndex] = field;
-    } else {
-      fieldsState.current.push(field);
-    }
-    setFieldsState(fieldsState.current);
-  }, []);
-  let resolver;
-  let fieldsMap;
-  let fieldsetsMap;
-  let fieldChildren;
-  if (schema) {
-    resolver = (0, import_utils2.yupResolver)(schema);
-    fieldsMap = fields ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {}) : {};
-    fieldsetsMap = fieldsets && fieldsets.reduce(
-      (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),
-      {}
-    );
-    if (auto) {
-      if (fieldsets) {
-        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_FieldsetWithContext.FieldsetWithContext, { key: fieldset.key, name: fieldset.key }));
-      } else if (fields) {
-        const fieldsByLayouts = groupFieldsByLayout(fields);
-        const fieldsByLayoutSize = fieldsByLayouts[screenSize];
-        fieldChildren = fieldsByLayoutSize.map((item, index) => {
-          if (Array.isArray(item)) {
-            return /* @__PURE__ */ import_react.default.createElement(
-              import_ErrorGroup.ErrorGroup,
-              {
-                key: index,
-                screenSize,
-                fieldOrder: item.map((field) => field.key)
-              },
-              item.map((f) => {
-                return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: f.key, name: f.key });
-              })
-            );
-          } else {
-            return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: item.key, name: item.key });
-          }
-        });
-      }
-    }
-  }
-  return /* @__PURE__ */ import_react.default.createElement(
-    FormBase,
-    {
-      resolver,
-      fieldsetsMap,
-      fieldsMap,
-      registerField,
-      initial,
-      reValidateMode,
-      mode,
-      shouldFocusError,
-      criteriaMode,
-      onSubmit,
-      componentRegistry,
-      ref,
-      grid,
-      ...props
-    },
-    fieldChildren,
-    auto && /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
-    children
-  );
-});
+}
 const ControlledFormBuilder = (props) => {
-  return /* @__PURE__ */ import_react.default.createElement(FormBuilder, { ...props, componentRegistry: import_utils.CONTROLLED_FIELD_COMPONENTS });
+  return /* @__PURE__ */ import_react.default.createElement(FormBuilder, { ...props, componentRegistry: import_registry.CONTROLLED_FIELD_COMPONENTS });
 };
 var FormBuilder_default = FormBuilder;
 // Annotate the CommonJS export names for ESM import in node: