@digigov/form 2.0.0-555d1027 → 2.0.0-5e7a6790

package/Field/ErrorGroup.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ErrorOption } from 'react-hook-form';
-import { FieldLabelProps } from '@digigov/form/Field/types';
-import { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';
+import type { ErrorOption } from 'react-hook-form';
+import type { FieldLabelProps } from '@digigov/form/Field/types';
+import type { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';
 interface ErrorGroupContextType {
     setError: (name?: string, label?: FieldLabelProps, error?: ErrorOption) => void;
 }

package/Field/ErrorGroup.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Field/ErrorGroup.tsx"],
-  "sourcesContent": ["import React, { createContext, useEffect, useState } from 'react';\nimport { ErrorOption } from 'react-hook-form';\nimport { FieldLabelProps } from '@digigov/form/Field/types';\nimport { List, ListItem } from '@digigov/ui/content/List';\nimport { ErrorSummary } from '@digigov/ui/feedback/ErrorSummary';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Link } from '@digigov/ui/navigation/Link';\nimport { Heading } from '@digigov/ui/typography/Heading';\nimport { Base } from '@digigov/ui/utils/Base';\nimport { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';\ninterface ErrorGroupContextType {\n  setError: (\n    name?: string,\n    label?: FieldLabelProps,\n    error?: ErrorOption\n  ) => void;\n}\nexport const ErrorGroupContext = createContext<ErrorGroupContextType | null>(\n  null\n);\n\nexport interface ErrorGroupProps {\n  children: React.ReactNode;\n  screenSize?: Breakpoints | undefined;\n  fieldOrder?: any[];\n}\n\nexport const ErrorGroup: React.FC<ErrorGroupProps> = ({\n  children,\n  screenSize,\n  fieldOrder,\n}) => {\n  const [errors, setErrors] = useState<ErrorOption>({});\n  const { t } = useTranslation();\n  const setError = (name, label, error) => {\n    if (errors[name] !== error && errors[name]?.message !== error?.message) {\n      if (!error?.message) {\n        const updatedErrors = { ...errors };\n        delete updatedErrors[name];\n        setErrors(updatedErrors);\n      } else {\n        setErrors({\n          ...errors,\n          [name]: {\n            ...error,\n            label: label.primary,\n          },\n        });\n      }\n    }\n  };\n\n  useEffect(() => {\n    setErrors({});\n  }, [screenSize]);\n  return (\n    <ErrorGroupContext.Provider value={{ setError }}>\n      {Object.keys(errors).length !== 0 && (\n        <ErrorSummary variant=\"error-group\">\n          <Heading size=\"sm\">\n            \u03A4\u03B1 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03B5\u03B4\u03AF\u03B1 \u03C4\u03B7\u03C2 \u03C6\u03CC\u03C1\u03BC\u03B1\u03C2 \u03B5\u03B9\u03BD\u03B1\u03B9 \u03BB\u03AC\u03B8\u03BF\u03C2.{' '}\n          </Heading>\n          <List listStyle=\"bullet\">\n            {(fieldOrder || Object.keys(errors).reverse())\n              .filter((fieldName) => errors[fieldName])\n              .map((fieldName, index) => {\n                return (\n                  <ListItem key={index} id={`${fieldName}-error`}>\n                    <Base as=\"b\">{t(errors[fieldName]?.label)}:</Base>{' '}\n                    <Link href={`#${fieldName}`}>\n                      {t(errors[fieldName]?.message)}\n                    </Link>\n                  </ListItem>\n                );\n              })}\n          </List>\n        </ErrorSummary>\n      )}\n      {children}\n    </ErrorGroupContext.Provider>\n  );\n};\n\nexport default ErrorGroup;\n"],
+  "sourcesContent": ["import React, { createContext, useEffect, useState } from 'react';\nimport type { ErrorOption } from 'react-hook-form';\nimport type { FieldLabelProps } from '@digigov/form/Field/types';\nimport { List, ListItem } from '@digigov/ui/content/List';\nimport { ErrorSummary } from '@digigov/ui/feedback/ErrorSummary';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Link } from '@digigov/ui/navigation/Link';\nimport { Heading } from '@digigov/ui/typography/Heading';\nimport { Base } from '@digigov/ui/utils/Base';\nimport type { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';\ninterface ErrorGroupContextType {\n  setError: (\n    name?: string,\n    label?: FieldLabelProps,\n    error?: ErrorOption\n  ) => void;\n}\nexport const ErrorGroupContext = createContext<ErrorGroupContextType | null>(\n  null\n);\n\nexport interface ErrorGroupProps {\n  children: React.ReactNode;\n  screenSize?: Breakpoints | undefined;\n  fieldOrder?: any[];\n}\n\nexport const ErrorGroup: React.FC<ErrorGroupProps> = ({\n  children,\n  screenSize,\n  fieldOrder,\n}) => {\n  const [errors, setErrors] = useState<ErrorOption>({});\n  const { t } = useTranslation();\n  const setError = (name, label, error) => {\n    if (errors[name] !== error && errors[name]?.message !== error?.message) {\n      if (!error?.message) {\n        const updatedErrors = { ...errors };\n        delete updatedErrors[name];\n        setErrors(updatedErrors);\n      } else {\n        setErrors({\n          ...errors,\n          [name]: {\n            ...error,\n            label: label.primary,\n          },\n        });\n      }\n    }\n  };\n\n  useEffect(() => {\n    setErrors({});\n  }, [screenSize]);\n  return (\n    <ErrorGroupContext.Provider value={{ setError }}>\n      {Object.keys(errors).length !== 0 && (\n        <ErrorSummary variant=\"error-group\">\n          <Heading size=\"sm\">\n            \u03A4\u03B1 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03B5\u03B4\u03AF\u03B1 \u03C4\u03B7\u03C2 \u03C6\u03CC\u03C1\u03BC\u03B1\u03C2 \u03B5\u03B9\u03BD\u03B1\u03B9 \u03BB\u03AC\u03B8\u03BF\u03C2.{' '}\n          </Heading>\n          <List listStyle=\"bullet\">\n            {(fieldOrder || Object.keys(errors).reverse())\n              .filter((fieldName) => errors[fieldName])\n              .map((fieldName, index) => {\n                return (\n                  <ListItem key={index} id={`${fieldName}-error`}>\n                    <Base as=\"b\">{t(errors[fieldName]?.label)}:</Base>{' '}\n                    <Link href={`#${fieldName}`}>\n                      {t(errors[fieldName]?.message)}\n                    </Link>\n                  </ListItem>\n                );\n              })}\n          </List>\n        </ErrorSummary>\n      )}\n      {children}\n    </ErrorGroupContext.Provider>\n  );\n};\n\nexport default ErrorGroup;\n"],
   "mappings": "AAAA,OAAO,SAAS,eAAe,WAAW,gBAAgB;AAG1D,SAAS,MAAM,gBAAgB;AAC/B,SAAS,oBAAoB;AAC7B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,YAAY;AASd,MAAM,oBAAoB;AAAA,EAC/B;AACF;AAQO,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,CAAC,QAAQ,SAAS,IAAI,SAAsB,CAAC,CAAC;AACpD,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,WAAW,CAAC,MAAM,OAAO,UAAU;AACvC,QAAI,OAAO,IAAI,MAAM,SAAS,OAAO,IAAI,GAAG,YAAY,OAAO,SAAS;AACtE,UAAI,CAAC,OAAO,SAAS;AACnB,cAAM,gBAAgB,EAAE,GAAG,OAAO;AAClC,eAAO,cAAc,IAAI;AACzB,kBAAU,aAAa;AAAA,MACzB,OAAO;AACL,kBAAU;AAAA,UACR,GAAG;AAAA,UACH,CAAC,IAAI,GAAG;AAAA,YACN,GAAG;AAAA,YACH,OAAO,MAAM;AAAA,UACf;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAEA,YAAU,MAAM;AACd,cAAU,CAAC,CAAC;AAAA,EACd,GAAG,CAAC,UAAU,CAAC;AACf,SACE,oCAAC,kBAAkB,UAAlB,EAA2B,OAAO,EAAE,SAAS,KAC3C,OAAO,KAAK,MAAM,EAAE,WAAW,KAC9B,oCAAC,gBAAa,SAAQ,iBACpB,oCAAC,WAAQ,MAAK,QAAK,uNACyB,GAC5C,GACA,oCAAC,QAAK,WAAU,aACZ,cAAc,OAAO,KAAK,MAAM,EAAE,QAAQ,GACzC,OAAO,CAAC,cAAc,OAAO,SAAS,CAAC,EACvC,IAAI,CAAC,WAAW,UAAU;AACzB,WACE,oCAAC,YAAS,KAAK,OAAO,IAAI,GAAG,SAAS,YACpC,oCAAC,QAAK,IAAG,OAAK,EAAE,OAAO,SAAS,GAAG,KAAK,GAAE,GAAC,GAAQ,KACnD,oCAAC,QAAK,MAAM,IAAI,SAAS,MACtB,EAAE,OAAO,SAAS,GAAG,OAAO,CAC/B,CACF;AAAA,EAEJ,CAAC,CACL,CACF,GAED,QACH;AAEJ;AAEA,IAAO,qBAAQ;",
   "names": []
 }

package/Field/FieldBase/index.js

@@ -53,7 +53,6 @@ const FieldBase = ({
               {
                 ...field,
                 control,
-                ref: void 0,
                 defaultValue: defaultValue ?? field.value,
                 extra,
                 error: !!error,

package/Field/FieldBase.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-import { FieldBaseProps } from '@digigov/form/Field/types';
+import type { FieldBaseProps } from '@digigov/form/Field/types';
 export declare const FieldBase: React.FC<FieldBaseProps>;

package/Field/FieldBase.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Field/FieldBase.tsx"],
-  "sourcesContent": ["import React, { useContext, useEffect } from 'react';\nimport { Controller } from 'react-hook-form';\nimport { ErrorGroupContext } from '@digigov/form/Field/ErrorGroup';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = ({\n  required,\n  name,\n  component: Component,\n  wrapper,\n  control,\n  type,\n  controlled = false,\n  enabled = true,\n  editable,\n  defaultValue,\n  label,\n  extra = {},\n  layout,\n  error,\n  register,\n  ...componentProps\n}) => {\n  const errorGroupContext = useContext(ErrorGroupContext);\n\n  useEffect(() => {\n    if (errorGroupContext) {\n      errorGroupContext.setError(name, label, error);\n    }\n  }, [error, name, errorGroupContext?.setError]);\n\n  if (!enabled) {\n    return null;\n  }\n\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        register={register}\n        error={errorGroupContext ? undefined : error}\n        hasError={!!error}\n        wrapper={wrapper}\n        name={name}\n        controlled={controlled}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                control={control}\n                ref={undefined}\n                defaultValue={defaultValue ?? field.value}\n                extra={extra}\n                error={!!error}\n                type={type}\n                aria-required={!!required}\n                aria-describedby={error && `${name}-error`}\n                required={required}\n                disabled={editable === false}\n                {...componentProps}\n              />\n            );\n          }}\n        />\n      </FieldBaseContainer>\n    );\n  }\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={errorGroupContext ? undefined : error}\n      hasError={!!error}\n      wrapper={wrapper}\n      name={name}\n    >\n      {Component?.render ? (\n        <Component\n          {...register(name)}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          defaultValue={defaultValue}\n          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          defaultValue={defaultValue}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
-  "mappings": "AAAA,OAAO,SAAS,YAAY,iBAAiB;AAC7C,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;AAClC,OAAO,wBAAwB;AAGxB,MAAM,YAAsC,CAAC;AAAA,EAClD;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb,UAAU;AAAA,EACV;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ,CAAC;AAAA,EACT;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,oBAAoB,WAAW,iBAAiB;AAEtD,YAAU,MAAM;AACd,QAAI,mBAAmB;AACrB,wBAAkB,SAAS,MAAM,OAAO,KAAK;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,OAAO,MAAM,mBAAmB,QAAQ,CAAC;AAE7C,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AAEA,MAAI,YAAY;AACd,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO,oBAAoB,SAAY;AAAA,QACvC,UAAU,CAAC,CAAC;AAAA,QACZ;AAAA,QACA;AAAA,QACA;AAAA;AAAA,MAEA;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE;AAAA,cAAC;AAAA;AAAA,gBACE,GAAG;AAAA,gBACJ;AAAA,gBACA,KAAK;AAAA,gBACL,cAAc,gBAAgB,MAAM;AAAA,gBACpC;AAAA,gBACA,OAAO,CAAC,CAAC;AAAA,gBACT;AAAA,gBACA,iBAAe,CAAC,CAAC;AAAA,gBACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,gBAClC;AAAA,gBACA,UAAU,aAAa;AAAA,gBACtB,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,oBAAoB,SAAY;AAAA,MACvC,UAAU,CAAC,CAAC;AAAA,MACZ;AAAA,MACA;AAAA;AAAA,IAEC,WAAW,SACV;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB;AAAA,QACC,GAAG;AAAA;AAAA,IACN,IAEA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACtB,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
+  "sourcesContent": ["import React, { useContext, useEffect } from 'react';\nimport { Controller } from 'react-hook-form';\nimport { ErrorGroupContext } from '@digigov/form/Field/ErrorGroup';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport type { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = ({\n  required,\n  name,\n  component: Component,\n  wrapper,\n  control,\n  type,\n  controlled = false,\n  enabled = true,\n  editable,\n  defaultValue,\n  label,\n  extra = {},\n  layout,\n  error,\n  register,\n  ...componentProps\n}) => {\n  const errorGroupContext = useContext(ErrorGroupContext);\n\n  useEffect(() => {\n    if (errorGroupContext) {\n      errorGroupContext.setError(name, label, error);\n    }\n  }, [error, name, errorGroupContext?.setError]);\n\n  if (!enabled) {\n    return null;\n  }\n\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        register={register}\n        error={errorGroupContext ? undefined : error}\n        hasError={!!error}\n        wrapper={wrapper}\n        name={name}\n        controlled={controlled}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                control={control}\n                defaultValue={defaultValue ?? field.value}\n                extra={extra}\n                error={!!error}\n                type={type}\n                aria-required={!!required}\n                aria-describedby={error && `${name}-error`}\n                required={required}\n                disabled={editable === false}\n                {...componentProps}\n              />\n            );\n          }}\n        />\n      </FieldBaseContainer>\n    );\n  }\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={errorGroupContext ? undefined : error}\n      hasError={!!error}\n      wrapper={wrapper}\n      name={name}\n    >\n      {Component?.render ? (\n        <Component\n          {...register(name)}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          defaultValue={defaultValue}\n          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          defaultValue={defaultValue}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
+  "mappings": "AAAA,OAAO,SAAS,YAAY,iBAAiB;AAC7C,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;AAClC,OAAO,wBAAwB;AAGxB,MAAM,YAAsC,CAAC;AAAA,EAClD;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb,UAAU;AAAA,EACV;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ,CAAC;AAAA,EACT;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,oBAAoB,WAAW,iBAAiB;AAEtD,YAAU,MAAM;AACd,QAAI,mBAAmB;AACrB,wBAAkB,SAAS,MAAM,OAAO,KAAK;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,OAAO,MAAM,mBAAmB,QAAQ,CAAC;AAE7C,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AAEA,MAAI,YAAY;AACd,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO,oBAAoB,SAAY;AAAA,QACvC,UAAU,CAAC,CAAC;AAAA,QACZ;AAAA,QACA;AAAA,QACA;AAAA;AAAA,MAEA;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE;AAAA,cAAC;AAAA;AAAA,gBACE,GAAG;AAAA,gBACJ;AAAA,gBACA,cAAc,gBAAgB,MAAM;AAAA,gBACpC;AAAA,gBACA,OAAO,CAAC,CAAC;AAAA,gBACT;AAAA,gBACA,iBAAe,CAAC,CAAC;AAAA,gBACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,gBAClC;AAAA,gBACA,UAAU,aAAa;AAAA,gBACtB,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,oBAAoB,SAAY;AAAA,MACvC,UAAU,CAAC,CAAC;AAAA,MACZ;AAAA,MACA;AAAA;AAAA,IAEC,WAAW,SACV;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB;AAAA,QACC,GAAG;AAAA;AAAA,IACN,IAEA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACtB,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
   "names": []
 }

package/Field/FieldBaseContainer/index.js

@@ -7,41 +7,43 @@ import FieldsetLegend from "@digigov/react-core/FieldsetLegend";
 import LabelContainer from "@digigov/react-core/LabelContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 import { Hint } from "@digigov/ui/typography/Hint";
-const FieldBaseContainer = ({
-  name,
-  register,
-  wrapper,
-  label,
-  children,
-  error,
-  hasError,
-  layout,
-  controlled,
-  labelSize = "sm"
-}) => {
-  const { t } = useTranslation();
-  const errorMessage = error?.message.key ? error.message.key : error?.message || "";
-  const errorContext = error?.message.context || {};
-  if (wrapper === "fieldset") {
-    return /* @__PURE__ */ React.createElement(FieldContainer, { error: hasError, ...layout }, /* @__PURE__ */ React.createElement(
-      Fieldset,
-      {
-        className: "outline-none",
-        ...controlled && {
-          tabIndex: -1,
-          ...register(name || "")
-        }
-      },
-      /* @__PURE__ */ React.createElement(FieldsetLegend, { size: labelSize }, label && label.primary),
-      label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, t(label.secondary)),
-      error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)),
-      children,
-      label && label.hint && /* @__PURE__ */ React.createElement(Hint, { size: "sm" }, label.hint)
-    ));
-  } else {
-    return /* @__PURE__ */ React.createElement(FieldContainer, { error: hasError, ...layout }, /* @__PURE__ */ React.createElement(LabelContainer, null, label && /* @__PURE__ */ React.createElement(Label, { label }), error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)), children, label && label.hint && /* @__PURE__ */ React.createElement(Hint, { size: "sm" }, label.hint)));
+const FieldBaseContainer = React.forwardRef(
+  ({
+    name,
+    wrapper,
+    label,
+    children,
+    error,
+    hasError,
+    layout,
+    controlled,
+    labelSize = "sm"
+  }, ref) => {
+    const { t } = useTranslation();
+    const errorMessage = error?.message.key ? error.message.key : error?.message || "";
+    const errorContext = error?.message.context || {};
+    if (wrapper === "fieldset") {
+      return /* @__PURE__ */ React.createElement(FieldContainer, { error: hasError, ...layout }, /* @__PURE__ */ React.createElement(
+        Fieldset,
+        {
+          ref,
+          className: "outline-none",
+          ...controlled && {
+            tabIndex: -1
+          }
+        },
+        /* @__PURE__ */ React.createElement(FieldsetLegend, { size: labelSize }, label && label.primary),
+        label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, t(label.secondary)),
+        error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)),
+        children,
+        label && label.hint && /* @__PURE__ */ React.createElement(Hint, { size: "sm" }, label.hint)
+      ));
+    } else {
+      return /* @__PURE__ */ React.createElement(FieldContainer, { error: hasError, ...layout }, /* @__PURE__ */ React.createElement(LabelContainer, null, label && /* @__PURE__ */ React.createElement(Label, { label }), error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)), children, label && label.hint && /* @__PURE__ */ React.createElement(Hint, { size: "sm" }, label.hint)));
+    }
   }
-};
+);
+FieldBaseContainer.displayName = "FieldBaseContainer";
 var FieldBaseContainer_default = FieldBaseContainer;
 export {
   FieldBaseContainer,

package/Field/FieldBaseContainer.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { FieldContainerProps } from '@digigov/form/Field/types';
-export declare const FieldBaseContainer: React.FC<FieldContainerProps>;
+import type { FieldContainerProps } from '@digigov/form/Field/types';
+export declare const FieldBaseContainer: React.ForwardRefExoticComponent<FieldContainerProps & React.RefAttributes<HTMLFieldSetElement>>;
 export default FieldBaseContainer;

package/Field/FieldBaseContainer.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Field/FieldBaseContainer.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { FieldContainerProps } from '@digigov/form/Field/types';\nimport Label from '@digigov/form/inputs/Label';\nimport { ErrorMessage } from '@digigov/react-core/ErrorMessage';\nimport FieldContainer from '@digigov/react-core/FieldContainer';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport LabelContainer from '@digigov/react-core/LabelContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport const FieldBaseContainer: React.FC<FieldContainerProps> = ({\n  name,\n  register,\n  wrapper,\n  label,\n  children,\n  error,\n  hasError,\n  layout,\n  controlled,\n  labelSize = 'sm',\n}) => {\n  const { t } = useTranslation();\n  const errorMessage = error?.message.key\n    ? error.message.key\n    : error?.message || '';\n  const errorContext = error?.message.context || {};\n  if (wrapper === 'fieldset') {\n    return (\n      <FieldContainer error={hasError} {...layout}>\n        <Fieldset\n          className=\"outline-none\"\n          {...(controlled && {\n            tabIndex: -1,\n            ...(register(name || '') as any),\n          })}\n        >\n          <FieldsetLegend size={labelSize}>\n            {label && label.primary}\n          </FieldsetLegend>\n          {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n          {error && (\n            <ErrorMessage id={`${name}-error`}>\n              {t(errorMessage, errorContext)}\n            </ErrorMessage>\n          )}\n          {children}\n          {label && label.hint && <Hint size=\"sm\">{label.hint}</Hint>}\n        </Fieldset>\n      </FieldContainer>\n    );\n  } else {\n    return (\n      <FieldContainer error={hasError} {...layout}>\n        <LabelContainer>\n          {label && <Label label={label} />}\n          {error && (\n            <ErrorMessage id={`${name}-error`}>\n              {t(errorMessage, errorContext)}\n            </ErrorMessage>\n          )}\n          {children}\n          {label && label.hint && <Hint size=\"sm\">{label.hint}</Hint>}\n        </LabelContainer>\n      </FieldContainer>\n    );\n  }\n};\n\nexport default FieldBaseContainer;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAElB,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,OAAO,oBAAoB;AAC3B,OAAO,cAAc;AACrB,OAAO,oBAAoB;AAC3B,OAAO,oBAAoB;AAC3B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAEd,MAAM,qBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,YAAY;AACd,MAAM;AACJ,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,eAAe,OAAO,QAAQ,MAChC,MAAM,QAAQ,MACd,OAAO,WAAW;AACtB,QAAM,eAAe,OAAO,QAAQ,WAAW,CAAC;AAChD,MAAI,YAAY,YAAY;AAC1B,WACE,oCAAC,kBAAe,OAAO,UAAW,GAAG,UACnC;AAAA,MAAC;AAAA;AAAA,QACC,WAAU;AAAA,QACT,GAAI,cAAc;AAAA,UACjB,UAAU;AAAA,UACV,GAAI,SAAS,QAAQ,EAAE;AAAA,QACzB;AAAA;AAAA,MAEA,oCAAC,kBAAe,MAAM,aACnB,SAAS,MAAM,OAClB;AAAA,MACC,SAAS,MAAM,aAAa,oCAAC,YAAM,EAAE,MAAM,SAAS,CAAE;AAAA,MACtD,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B;AAAA,MAED;AAAA,MACA,SAAS,MAAM,QAAQ,oCAAC,QAAK,MAAK,QAAM,MAAM,IAAK;AAAA,IACtD,CACF;AAAA,EAEJ,OAAO;AACL,WACE,oCAAC,kBAAe,OAAO,UAAW,GAAG,UACnC,oCAAC,sBACE,SAAS,oCAAC,SAAM,OAAc,GAC9B,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,UACA,SAAS,MAAM,QAAQ,oCAAC,QAAK,MAAK,QAAM,MAAM,IAAK,CACtD,CACF;AAAA,EAEJ;AACF;AAEA,IAAO,6BAAQ;",
+  "sourcesContent": ["import type { ComponentRef } from 'react';\nimport React from 'react';\nimport type { FieldContainerProps } from '@digigov/form/Field/types';\nimport Label from '@digigov/form/inputs/Label';\nimport { ErrorMessage } from '@digigov/react-core/ErrorMessage';\nimport FieldContainer from '@digigov/react-core/FieldContainer';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport LabelContainer from '@digigov/react-core/LabelContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport const FieldBaseContainer = React.forwardRef<\n  ComponentRef<typeof Fieldset>,\n  FieldContainerProps\n>(\n  (\n    {\n      name,\n      wrapper,\n      label,\n      children,\n      error,\n      hasError,\n      layout,\n      controlled,\n      labelSize = 'sm',\n    },\n    ref\n  ) => {\n    const { t } = useTranslation();\n    const errorMessage = error?.message.key\n      ? error.message.key\n      : error?.message || '';\n    const errorContext = error?.message.context || {};\n    if (wrapper === 'fieldset') {\n      return (\n        <FieldContainer error={hasError} {...layout}>\n          <Fieldset\n            ref={ref}\n            className=\"outline-none\"\n            {...(controlled && {\n              tabIndex: -1,\n            })}\n          >\n            <FieldsetLegend size={labelSize}>\n              {label && label.primary}\n            </FieldsetLegend>\n            {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            {error && (\n              <ErrorMessage id={`${name}-error`}>\n                {t(errorMessage, errorContext)}\n              </ErrorMessage>\n            )}\n            {children}\n            {label && label.hint && <Hint size=\"sm\">{label.hint}</Hint>}\n          </Fieldset>\n        </FieldContainer>\n      );\n    } else {\n      return (\n        <FieldContainer error={hasError} {...layout}>\n          <LabelContainer>\n            {label && <Label label={label} />}\n            {error && (\n              <ErrorMessage id={`${name}-error`}>\n                {t(errorMessage, errorContext)}\n              </ErrorMessage>\n            )}\n            {children}\n            {label && label.hint && <Hint size=\"sm\">{label.hint}</Hint>}\n          </LabelContainer>\n        </FieldContainer>\n      );\n    }\n  }\n);\n\nFieldBaseContainer.displayName = 'FieldBaseContainer';\n\nexport default FieldBaseContainer;\n"],
+  "mappings": "AACA,OAAO,WAAW;AAElB,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,OAAO,oBAAoB;AAC3B,OAAO,cAAc;AACrB,OAAO,oBAAoB;AAC3B,OAAO,oBAAoB;AAC3B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAEd,MAAM,qBAAqB,MAAM;AAAA,EAItC,CACE;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAY;AAAA,EACd,GACA,QACG;AACH,UAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,UAAM,eAAe,OAAO,QAAQ,MAChC,MAAM,QAAQ,MACd,OAAO,WAAW;AACtB,UAAM,eAAe,OAAO,QAAQ,WAAW,CAAC;AAChD,QAAI,YAAY,YAAY;AAC1B,aACE,oCAAC,kBAAe,OAAO,UAAW,GAAG,UACnC;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA,WAAU;AAAA,UACT,GAAI,cAAc;AAAA,YACjB,UAAU;AAAA,UACZ;AAAA;AAAA,QAEA,oCAAC,kBAAe,MAAM,aACnB,SAAS,MAAM,OAClB;AAAA,QACC,SAAS,MAAM,aAAa,oCAAC,YAAM,EAAE,MAAM,SAAS,CAAE;AAAA,QACtD,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B;AAAA,QAED;AAAA,QACA,SAAS,MAAM,QAAQ,oCAAC,QAAK,MAAK,QAAM,MAAM,IAAK;AAAA,MACtD,CACF;AAAA,IAEJ,OAAO;AACL,aACE,oCAAC,kBAAe,OAAO,UAAW,GAAG,UACnC,oCAAC,sBACE,SAAS,oCAAC,SAAM,OAAc,GAC9B,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,UACA,SAAS,MAAM,QAAQ,oCAAC,QAAK,MAAK,QAAM,MAAM,IAAK,CACtD,CACF;AAAA,IAEJ;AAAA,EACF;AACF;AAEA,mBAAmB,cAAc;AAEjC,IAAO,6BAAQ;",
   "names": []
 }

package/Field/FieldConditional.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { FieldConditionalProps } from '@digigov/form/Field/types';
+import type { FieldConditionalProps } from '@digigov/form/Field/types';
 export declare const FieldConditional: React.FC<FieldConditionalProps>;
 export default FieldConditional;

package/Field/FieldConditional.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Field/FieldConditional.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport {\n  ChildFieldMemoProps,\n  FieldConditionalProps,\n} from '@digigov/form/Field/types';\nimport { evaluateFieldWithConditions } from '@digigov/form/Field/utils/evaluateFieldWithConditions';\n\nconst ChildFieldMemo = React.memo(\n  function ChildField({\n    dependencies,\n    field,\n    control,\n    reset,\n    resetField,\n    register,\n    error,\n    Field,\n  }: ChildFieldMemoProps) {\n    const newField = evaluateFieldWithConditions(\n      field,\n      dependencies as FormData\n    );\n    return (\n      <FieldBase\n        {...newField}\n        Field={Field}\n        name={newField.key}\n        reset={reset}\n        resetField={resetField}\n        control={control}\n        register={register}\n        error={error}\n      />\n    );\n  },\n  (prev, next) => {\n    if (!prev || !prev.dependencies) {\n      return false;\n    }\n    if (prev.error !== next.error) {\n      return false;\n    }\n    for (const dep in next.dependencies) {\n      if (next.dependencies[dep] !== prev.dependencies[dep]) {\n        return false;\n      }\n    }\n    return true;\n  }\n);\n\nexport const FieldConditional: React.FC<FieldConditionalProps> = ({\n  control,\n  field,\n  register,\n  reset,\n  resetField,\n  error,\n  Field,\n}) => {\n  const dependencyKeys = Object.keys(field.condition);\n  const dependencyValues = useWatch({\n    name: dependencyKeys,\n    control,\n  });\n  const variables = dependencyKeys.reduce(\n    (data, fieldKey, index) => ({\n      ...data,\n      [fieldKey]: dependencyValues[index],\n    }),\n    {}\n  );\n  return (\n    <ChildFieldMemo\n      dependencies={variables}\n      field={field}\n      control={control}\n      register={register}\n      reset={reset}\n      resetField={resetField}\n      error={error}\n      Field={Field}\n    />\n  );\n};\n\nexport default FieldConditional;\n"],
+  "sourcesContent": ["import React from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport type {\n  ChildFieldMemoProps,\n  FieldConditionalProps,\n} from '@digigov/form/Field/types';\nimport { evaluateFieldWithConditions } from '@digigov/form/Field/utils/evaluateFieldWithConditions';\n\nconst ChildFieldMemo = React.memo(\n  function ChildField({\n    dependencies,\n    field,\n    control,\n    reset,\n    resetField,\n    register,\n    error,\n    Field,\n  }: ChildFieldMemoProps) {\n    const newField = evaluateFieldWithConditions(\n      field,\n      dependencies as FormData\n    );\n    return (\n      <FieldBase\n        {...newField}\n        Field={Field}\n        name={newField.key}\n        reset={reset}\n        resetField={resetField}\n        control={control}\n        register={register}\n        error={error}\n      />\n    );\n  },\n  (prev, next) => {\n    if (!prev || !prev.dependencies) {\n      return false;\n    }\n    if (prev.error !== next.error) {\n      return false;\n    }\n    for (const dep in next.dependencies) {\n      if (next.dependencies[dep] !== prev.dependencies[dep]) {\n        return false;\n      }\n    }\n    return true;\n  }\n);\n\nexport const FieldConditional: React.FC<FieldConditionalProps> = ({\n  control,\n  field,\n  register,\n  reset,\n  resetField,\n  error,\n  Field,\n}) => {\n  const dependencyKeys = Object.keys(field.condition);\n  const dependencyValues = useWatch({\n    name: dependencyKeys,\n    control,\n  });\n  const variables = dependencyKeys.reduce(\n    (data, fieldKey, index) => ({\n      ...data,\n      [fieldKey]: dependencyValues[index],\n    }),\n    {}\n  );\n  return (\n    <ChildFieldMemo\n      dependencies={variables}\n      field={field}\n      control={control}\n      register={register}\n      reset={reset}\n      resetField={resetField}\n      error={error}\n      Field={Field}\n    />\n  );\n};\n\nexport default FieldConditional;\n"],
   "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAK1B,SAAS,mCAAmC;AAE5C,MAAM,iBAAiB,MAAM;AAAA,EAC3B,SAAS,WAAW;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAwB;AACtB,UAAM,WAAW;AAAA,MACf;AAAA,MACA;AAAA,IACF;AACA,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA,MAAM,SAAS;AAAA,QACf;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AAAA,EACA,CAAC,MAAM,SAAS;AACd,QAAI,CAAC,QAAQ,CAAC,KAAK,cAAc;AAC/B,aAAO;AAAA,IACT;AACA,QAAI,KAAK,UAAU,KAAK,OAAO;AAC7B,aAAO;AAAA,IACT;AACA,eAAW,OAAO,KAAK,cAAc;AACnC,UAAI,KAAK,aAAa,GAAG,MAAM,KAAK,aAAa,GAAG,GAAG;AACrD,eAAO;AAAA,MACT;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,mBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,iBAAiB,OAAO,KAAK,MAAM,SAAS;AAClD,QAAM,mBAAmB,SAAS;AAAA,IAChC,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AACD,QAAM,YAAY,eAAe;AAAA,IAC/B,CAAC,MAAM,UAAU,WAAW;AAAA,MAC1B,GAAG;AAAA,MACH,CAAC,QAAQ,GAAG,iBAAiB,KAAK;AAAA,IACpC;AAAA,IACA,CAAC;AAAA,EACH;AACA,SACE;AAAA,IAAC;AAAA;AAAA,MACC,cAAc;AAAA,MACd;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,2BAAQ;",
   "names": []
 }

package/Field/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { FieldProps } from '@digigov/form/Field/types';
+import type { FieldProps } from '@digigov/form/Field/types';
 export declare const Field: React.FC<FieldProps>;
 export default Field;

package/Field/index.js

@@ -1,11 +1,7 @@
 import React, { useMemo } from "react";
 import { FieldBase } from "@digigov/form/Field/FieldBase";
 import FieldConditional from "@digigov/form/Field/FieldConditional";
-import {
-  FIELD_COMPONENTS,
-  ALTERNATIVE_COMPONENTS
-} from "@digigov/form/Field/utils";
-import { calculateField } from "@digigov/form/Field/utils/calculateField";
+import { resolveField } from "@digigov/form/Field/utils/resolveField";
 import { useField } from "@digigov/form/Field/utils/useField";
 import FieldArray from "@digigov/form/FieldArray";
 import Multiplicity from "@digigov/form/MultiplicityField";
@@ -27,21 +23,14 @@ const Field = ({
     getValues,
     unregister,
     trigger,
-    clearErrors
+    clearErrors,
+    registerFieldFocus
   } = useField(name, customField?.type ? customField : null);
-  const calculatedField = useMemo(
-    () => calculateField(
-      children,
-      field,
-      {
-        ...FIELD_COMPONENTS,
-        ...componentRegistry
-      },
-      ALTERNATIVE_COMPONENTS
-    ),
+  const resolvedField = useMemo(
+    () => resolveField(children, field, componentRegistry),
     [field]
   );
-  if (calculatedField.condition) {
+  if (resolvedField.condition) {
     return /* @__PURE__ */ React.createElement(
       FieldConditional,
       {
@@ -49,14 +38,14 @@ const Field = ({
         reset,
         resetField,
         register,
-        field: calculatedField,
+        field: resolvedField,
         error,
         Field
       }
     );
   }
-  if (calculatedField.type === "array" && !calculatedField.multiplicity) {
-    calculatedField.name = name;
+  if (resolvedField.type === "array" && !resolvedField.multiplicity) {
+    resolvedField.name = name;
     return /* @__PURE__ */ React.createElement(
       FieldArray,
       {
@@ -71,12 +60,13 @@ const Field = ({
         Field,
         reset,
         resetField,
-        ...calculatedField
+        registerFieldFocus,
+        ...resolvedField
       }
     );
   }
-  if (calculatedField.type === "array" && calculatedField.multiplicity === true) {
-    calculatedField.name = name;
+  if (resolvedField.type === "array" && resolvedField.multiplicity === true) {
+    resolvedField.name = name;
     return /* @__PURE__ */ React.createElement(
       Multiplicity,
       {
@@ -91,7 +81,7 @@ const Field = ({
         unregister,
         resetField,
         Field,
-        ...calculatedField
+        ...resolvedField
       }
     );
   }
@@ -100,7 +90,7 @@ const Field = ({
   return /* @__PURE__ */ React.createElement(
     FieldBase,
     {
-      ...calculatedField,
+      ...resolvedField,
       editable,
       name,
       control,

package/Field/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Field/index.tsx"],
-  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport FieldConditional from '@digigov/form/Field/FieldConditional';\nimport {\n  FieldWithCondition,\n  CalculatedField,\n  FieldProps,\n} 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 { useField } from '@digigov/form/Field/utils/useField';\nimport FieldArray from '@digigov/form/FieldArray';\nimport Multiplicity from '@digigov/form/MultiplicityField';\nexport const Field: React.FC<FieldProps> = ({\n  name,\n  children,\n  ...customField\n}) => {\n  const {\n    field,\n    control,\n    register,\n    reset,\n    resetField,\n    error,\n    componentRegistry,\n    formState,\n    setValue,\n    getValues,\n    unregister,\n    trigger,\n    clearErrors,\n  } = useField(name, customField?.type ? customField : null);\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(\n        children,\n        field,\n        {\n          ...FIELD_COMPONENTS,\n          ...componentRegistry,\n        },\n        ALTERNATIVE_COMPONENTS\n      ),\n    [field]\n  );\n  if (calculatedField.condition) {\n    return (\n      <FieldConditional\n        control={control}\n        reset={reset}\n        resetField={resetField}\n        register={register}\n        field={calculatedField as FieldWithCondition}\n        error={error}\n        Field={Field}\n      />\n    );\n  }\n  if (calculatedField.type === 'array' && !calculatedField.multiplicity) {\n    calculatedField.name = name;\n    return (\n      <FieldArray\n        control={control}\n        trigger={trigger}\n        register={register}\n        clearErrors={clearErrors}\n        error={\n          formState.isSubmitted && !formState.isSubmitting ? error : undefined\n        }\n        getValues={getValues}\n        setValue={setValue}\n        formState={formState}\n        Field={Field}\n        reset={reset}\n        resetField={resetField}\n        {...calculatedField}\n      />\n    );\n  }\n  if (\n    calculatedField.type === 'array' &&\n    calculatedField.multiplicity === true\n  ) {\n    calculatedField.name = name;\n    return (\n      <Multiplicity\n        control={control}\n        register={register}\n        trigger={trigger}\n        clearErrors={clearErrors}\n        error={error}\n        formState={formState}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        resetField={resetField}\n        Field={Field}\n        {...calculatedField}\n      />\n    );\n  }\n  const editable =\n    customField.editable === false || customField.disabled === true\n      ? false\n      : true;\n  const customError = error ? error : formState?.errors[name];\n  return (\n    <FieldBase\n      {...calculatedField}\n      editable={editable}\n      name={name}\n      control={control}\n      register={register}\n      reset={reset}\n      error={customError}\n      resetField={resetField}\n      Field={Field}\n    />\n  );\n};\n\nexport default Field;\n"],
-  "mappings": "AAAA,OAAO,SAAS,eAAe;AAC/B,SAAS,iBAAiB;AAC1B,OAAO,sBAAsB;AAM7B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AACzB,OAAO,gBAAgB;AACvB,OAAO,kBAAkB;AAClB,MAAM,QAA8B,CAAC;AAAA,EAC1C;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI,SAAS,MAAM,aAAa,OAAO,cAAc,IAAI;AACzD,QAAM,kBAAmC;AAAA,IACvC,MACE;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,QACE,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,IACF,CAAC,KAAK;AAAA,EACR;AACA,MAAI,gBAAgB,WAAW;AAC7B,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AACA,MAAI,gBAAgB,SAAS,WAAW,CAAC,gBAAgB,cAAc;AACrE,oBAAgB,OAAO;AACvB,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OACE,UAAU,eAAe,CAAC,UAAU,eAAe,QAAQ;AAAA,QAE7D;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,MACE,gBAAgB,SAAS,WACzB,gBAAgB,iBAAiB,MACjC;AACA,oBAAgB,OAAO;AACvB,WACE;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,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,QAAM,WACJ,YAAY,aAAa,SAAS,YAAY,aAAa,OACvD,QACA;AACN,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport FieldConditional from '@digigov/form/Field/FieldConditional';\nimport type { FieldWithCondition, FieldProps } from '@digigov/form/Field/types';\nimport { resolveField } from '@digigov/form/Field/utils/resolveField';\nimport { useField } from '@digigov/form/Field/utils/useField';\nimport FieldArray from '@digigov/form/FieldArray';\nimport Multiplicity from '@digigov/form/MultiplicityField';\nexport const Field: React.FC<FieldProps> = ({\n  name,\n  children,\n  ...customField\n}) => {\n  const {\n    field,\n    control,\n    register,\n    reset,\n    resetField,\n    error,\n    componentRegistry,\n    formState,\n    setValue,\n    getValues,\n    unregister,\n    trigger,\n    clearErrors,\n    registerFieldFocus,\n  } = useField(name, customField?.type ? customField : null);\n  const resolvedField = useMemo(\n    () => resolveField(children, field, componentRegistry),\n    [field]\n  );\n  if (resolvedField.condition) {\n    return (\n      <FieldConditional\n        control={control}\n        reset={reset}\n        resetField={resetField}\n        register={register}\n        field={resolvedField as FieldWithCondition}\n        error={error}\n        Field={Field}\n      />\n    );\n  }\n  if (resolvedField.type === 'array' && !resolvedField.multiplicity) {\n    resolvedField.name = name;\n    return (\n      <FieldArray\n        control={control}\n        trigger={trigger}\n        register={register}\n        clearErrors={clearErrors}\n        error={\n          formState.isSubmitted && !formState.isSubmitting ? error : undefined\n        }\n        getValues={getValues}\n        setValue={setValue}\n        formState={formState}\n        Field={Field}\n        reset={reset}\n        resetField={resetField}\n        registerFieldFocus={registerFieldFocus}\n        {...resolvedField}\n      />\n    );\n  }\n  if (resolvedField.type === 'array' && resolvedField.multiplicity === true) {\n    resolvedField.name = name;\n    return (\n      <Multiplicity\n        control={control}\n        register={register}\n        trigger={trigger}\n        clearErrors={clearErrors}\n        error={error}\n        formState={formState}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        resetField={resetField}\n        Field={Field}\n        {...resolvedField}\n      />\n    );\n  }\n  const editable =\n    customField.editable === false || customField.disabled === true\n      ? false\n      : true;\n  const customError = error ? error : formState?.errors[name];\n  return (\n    <FieldBase\n      {...resolvedField}\n      editable={editable}\n      name={name}\n      control={control}\n      register={register}\n      reset={reset}\n      error={customError}\n      resetField={resetField}\n      Field={Field}\n    />\n  );\n};\n\nexport default Field;\n"],
+  "mappings": "AAAA,OAAO,SAAS,eAAe;AAC/B,SAAS,iBAAiB;AAC1B,OAAO,sBAAsB;AAE7B,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB;AACzB,OAAO,gBAAgB;AACvB,OAAO,kBAAkB;AAClB,MAAM,QAA8B,CAAC;AAAA,EAC1C;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI,SAAS,MAAM,aAAa,OAAO,cAAc,IAAI;AACzD,QAAM,gBAAgB;AAAA,IACpB,MAAM,aAAa,UAAU,OAAO,iBAAiB;AAAA,IACrD,CAAC,KAAK;AAAA,EACR;AACA,MAAI,cAAc,WAAW;AAC3B,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AACA,MAAI,cAAc,SAAS,WAAW,CAAC,cAAc,cAAc;AACjE,kBAAc,OAAO;AACrB,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OACE,UAAU,eAAe,CAAC,UAAU,eAAe,QAAQ;AAAA,QAE7D;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,MAAI,cAAc,SAAS,WAAW,cAAc,iBAAiB,MAAM;AACzE,kBAAc,OAAO;AACrB,WACE;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,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,QAAM,WACJ,YAAY,aAAa,SAAS,YAAY,aAAa,OACvD,QACA;AACN,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,gBAAQ;",
   "names": []
 }

package/Field/types.d.ts

@@ -1,8 +1,10 @@
-import React from 'react';
-import { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';
-import { ValidatorSchema } from '@digigov/form/validators/types';
-import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
-import { GridProps } from '@digigov/ui/layouts/Grid';
+import type React from 'react';
+import type { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';
+import type { FieldComponentRegistry } from '@digigov/form/inputs/registry';
+import type { registerFieldFocus } from '@digigov/form/types';
+import type { ValidatorSchema } from '@digigov/form/validators/types';
+import type { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
+import type { GridProps } from '@digigov/ui/layouts/Grid';
 export interface FieldLabelProps {
     primary?: string;
     secondary?: string;
@@ -41,7 +43,7 @@ export interface ChildFieldMemoProps extends FieldConditionalProps {
     dependencies: FormData;
 }
 export type FormData = UseFormProps['defaultValues'];
-export interface FieldWithCondition extends Omit<CalculatedField, 'condition'> {
+export interface FieldWithCondition extends Omit<ResolvedField, 'condition'> {
     condition: Record<string, FieldCondition>;
 }
 export interface FieldConditionalProps {
@@ -70,8 +72,6 @@ export interface FieldContainerProps {
     wrapper?: FieldSpec['wrapper'];
     labelSize?: FieldsetLegendProps['size'];
 }
-export type FieldComponentRegistry = Record<string, FieldComponentItem>;
-export type OmittedFieldSpec = Omit<FieldSpec, 'component'>;
 export type UnknownValue = never | never[];
 export interface ControlledFieldProps {
     type?: string;
@@ -95,7 +95,7 @@ export interface UncontrolledFieldProps {
     disabled?: boolean;
     Field: React.FC<FieldProps>;
 }
-export interface CalculatedField extends OmittedFieldSpec {
+export interface ResolvedField extends Omit<FieldSpec, 'component'> {
     name: string;
     component: any;
     defaultValue?: never;
@@ -103,7 +103,7 @@ export interface CalculatedField extends OmittedFieldSpec {
     wrapper?: FieldComponentItem['wrapper'];
     multiplicity?: boolean;
 }
-export interface FieldBaseProps extends CalculatedField {
+export interface FieldBaseProps extends ResolvedField {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
@@ -129,5 +129,6 @@ export interface UseFieldProps {
     trigger: UseFormReturn['trigger'];
     clearErrors: UseFormReturn['clearErrors'];
     error?: ErrorOption;
+    registerFieldFocus: registerFieldFocus;
     componentRegistry?: FieldComponentRegistry;
 }

package/Field/utils/evaluateFieldWithConditions.d.ts

@@ -1,2 +1,2 @@
-import { FieldWithCondition, CalculatedField } from '@digigov/form/Field/types';
-export declare function evaluateFieldWithConditions(field: FieldWithCondition, variables: FormData): CalculatedField;
+import type { FieldWithCondition, ResolvedField } from '@digigov/form/Field/types';
+export declare function evaluateFieldWithConditions(field: FieldWithCondition, variables: FormData): ResolvedField;

package/Field/utils/evaluateFieldWithConditions.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/utils/evaluateFieldWithConditions.ts"],
-  "sourcesContent": ["import { FieldWithCondition, CalculatedField } from '@digigov/form/Field/types';\n\nexport function evaluateFieldWithConditions(\n  field: FieldWithCondition,\n  variables: FormData\n): CalculatedField {\n  const newField = { ...field };\n  if (variables) {\n    for (const key in variables) {\n      if (field.condition[key] && field.condition[key].is) {\n        const is = field.condition[key].is;\n        if (\n          is === variables[key] ||\n          (Array.isArray(variables[key]) && variables[key].includes(is))\n        ) {\n          const then = field.condition[key].then || {};\n          for (const attr in then) {\n            newField[attr] = then[attr];\n          }\n        }\n      } else if (field.condition[key]) {\n        const otherwise = field.condition[key].else || {};\n        for (const attr in otherwise) {\n          newField[attr] = otherwise[attr];\n        }\n      }\n    }\n  }\n  return newField;\n}\n"],
-  "mappings": "AAEO,SAAS,4BACd,OACA,WACiB;AACjB,QAAM,WAAW,EAAE,GAAG,MAAM;AAC5B,MAAI,WAAW;AACb,eAAW,OAAO,WAAW;AAC3B,UAAI,MAAM,UAAU,GAAG,KAAK,MAAM,UAAU,GAAG,EAAE,IAAI;AACnD,cAAM,KAAK,MAAM,UAAU,GAAG,EAAE;AAChC,YACE,OAAO,UAAU,GAAG,KACnB,MAAM,QAAQ,UAAU,GAAG,CAAC,KAAK,UAAU,GAAG,EAAE,SAAS,EAAE,GAC5D;AACA,gBAAM,OAAO,MAAM,UAAU,GAAG,EAAE,QAAQ,CAAC;AAC3C,qBAAW,QAAQ,MAAM;AACvB,qBAAS,IAAI,IAAI,KAAK,IAAI;AAAA,UAC5B;AAAA,QACF;AAAA,MACF,WAAW,MAAM,UAAU,GAAG,GAAG;AAC/B,cAAM,YAAY,MAAM,UAAU,GAAG,EAAE,QAAQ,CAAC;AAChD,mBAAW,QAAQ,WAAW;AAC5B,mBAAS,IAAI,IAAI,UAAU,IAAI;AAAA,QACjC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;",
+  "sourcesContent": ["import type {\n  FieldWithCondition,\n  ResolvedField,\n} from '@digigov/form/Field/types';\n\nexport function evaluateFieldWithConditions(\n  field: FieldWithCondition,\n  variables: FormData\n): ResolvedField {\n  const newField = { ...field };\n  if (variables) {\n    for (const key in variables) {\n      if (field.condition[key] && field.condition[key].is) {\n        const is = field.condition[key].is;\n        if (\n          is === variables[key] ||\n          (Array.isArray(variables[key]) && variables[key].includes(is))\n        ) {\n          const then = field.condition[key].then || {};\n          for (const attr in then) {\n            newField[attr] = then[attr];\n          }\n        }\n      } else if (field.condition[key]) {\n        const otherwise = field.condition[key].else || {};\n        for (const attr in otherwise) {\n          newField[attr] = otherwise[attr];\n        }\n      }\n    }\n  }\n  return newField;\n}\n"],
+  "mappings": "AAKO,SAAS,4BACd,OACA,WACe;AACf,QAAM,WAAW,EAAE,GAAG,MAAM;AAC5B,MAAI,WAAW;AACb,eAAW,OAAO,WAAW;AAC3B,UAAI,MAAM,UAAU,GAAG,KAAK,MAAM,UAAU,GAAG,EAAE,IAAI;AACnD,cAAM,KAAK,MAAM,UAAU,GAAG,EAAE;AAChC,YACE,OAAO,UAAU,GAAG,KACnB,MAAM,QAAQ,UAAU,GAAG,CAAC,KAAK,UAAU,GAAG,EAAE,SAAS,EAAE,GAC5D;AACA,gBAAM,OAAO,MAAM,UAAU,GAAG,EAAE,QAAQ,CAAC;AAC3C,qBAAW,QAAQ,MAAM;AACvB,qBAAS,IAAI,IAAI,KAAK,IAAI;AAAA,UAC5B;AAAA,QACF;AAAA,MACF,WAAW,MAAM,UAAU,GAAG,GAAG;AAC/B,cAAM,YAAY,MAAM,UAAU,GAAG,EAAE,QAAQ,CAAC;AAChD,mBAAW,QAAQ,WAAW;AAC5B,mBAAS,IAAI,IAAI,UAAU,IAAI;AAAA,QACjC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;",
   "names": []
 }

package/Field/utils/resolveField/index.js

@@ -0,0 +1,35 @@
+import {
+  ALTERNATIVE_COMPONENTS,
+  FIELD_COMPONENTS
+} from "@digigov/form/inputs/registry";
+function resolveField(children, field, customComponentRegistry) {
+  const fieldComponentRegistry = {
+    ...FIELD_COMPONENTS,
+    ...customComponentRegistry ?? {}
+  };
+  const resolvedField = { ...field };
+  if (children) {
+    resolvedField.component = children;
+    resolvedField.controlled = true;
+  } else if (typeof field.component === "function") {
+  } else if (!field.component && !field.type) {
+    resolvedField.component = fieldComponentRegistry.string.component;
+    resolvedField.controlled = fieldComponentRegistry.string?.controlled || false;
+  } else if (typeof field?.extra?.component === "string" && ALTERNATIVE_COMPONENTS[field.extra.component]) {
+    resolvedField.controlled = ALTERNATIVE_COMPONENTS[field.extra.component]?.controlled || false;
+    resolvedField.component = ALTERNATIVE_COMPONENTS[field.extra.component].component;
+    resolvedField.wrapper = ALTERNATIVE_COMPONENTS[field.extra.component].wrapper;
+  } else if (!field.component && field.type && fieldComponentRegistry[field.type]) {
+    resolvedField.component = fieldComponentRegistry[field.type].component;
+    resolvedField.wrapper = fieldComponentRegistry[field.type].wrapper;
+    resolvedField.controlled = fieldComponentRegistry[field.type]?.controlled || false;
+  } else {
+    resolvedField.component = fieldComponentRegistry.string.component;
+    resolvedField.controlled = fieldComponentRegistry.string?.controlled || false;
+  }
+  return resolvedField;
+}
+export {
+  resolveField
+};
+//# sourceMappingURL=resolveField.js.map

package/Field/utils/{calculateField → resolveField}/package.json

@@ -2,5 +2,5 @@
   "sideEffects": false,
   "module": "./index.js",
   "types": "./index.d.ts",
-  "main": "../../../cjs/Field/utils/calculateField/index.js"
+  "main": "../../../cjs/Field/utils/resolveField/index.js"
 }

package/Field/utils/resolveField.d.ts

@@ -0,0 +1,3 @@
+import type { FieldProps, FieldSpec, ResolvedField } from '@digigov/form/Field/types';
+import { type FieldComponentRegistry } from '@digigov/form/inputs/registry';
+export declare function resolveField(children: FieldProps['children'], field: FieldSpec, customComponentRegistry?: FieldComponentRegistry): ResolvedField;

package/Field/utils/resolveField.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/Field/utils/resolveField.ts"],
+  "sourcesContent": ["import type {\n  FieldProps,\n  FieldSpec,\n  ResolvedField,\n} from '@digigov/form/Field/types';\nimport {\n  ALTERNATIVE_COMPONENTS,\n  FIELD_COMPONENTS,\n  type FieldComponentRegistry,\n} from '@digigov/form/inputs/registry';\n\nexport function resolveField(\n  children: FieldProps['children'],\n  field: FieldSpec,\n  customComponentRegistry?: FieldComponentRegistry\n): ResolvedField {\n  const fieldComponentRegistry = {\n    ...FIELD_COMPONENTS,\n    ...(customComponentRegistry ?? {}),\n  };\n\n  const resolvedField = { ...field };\n\n  if (children) {\n    resolvedField.component = children;\n    resolvedField.controlled = true;\n  } else if (typeof field.component === 'function') {\n    // leave as is\n  } else if (!field.component && !field.type) {\n    resolvedField.component = fieldComponentRegistry.string.component;\n    resolvedField.controlled =\n      fieldComponentRegistry.string?.controlled || false;\n  } else if (\n    typeof field?.extra?.component === 'string' &&\n    ALTERNATIVE_COMPONENTS[field.extra.component]\n  ) {\n    resolvedField.controlled =\n      ALTERNATIVE_COMPONENTS[field.extra.component]?.controlled || false;\n    resolvedField.component =\n      ALTERNATIVE_COMPONENTS[field.extra.component].component;\n    resolvedField.wrapper =\n      ALTERNATIVE_COMPONENTS[field.extra.component].wrapper;\n  } else if (\n    !field.component &&\n    field.type &&\n    fieldComponentRegistry[field.type]\n  ) {\n    resolvedField.component = fieldComponentRegistry[field.type].component;\n    resolvedField.wrapper = fieldComponentRegistry[field.type].wrapper;\n    resolvedField.controlled =\n      fieldComponentRegistry[field.type]?.controlled || false;\n  } else {\n    resolvedField.component = fieldComponentRegistry.string.component;\n    resolvedField.controlled =\n      fieldComponentRegistry.string?.controlled || false;\n  }\n  return resolvedField as ResolvedField;\n}\n"],
+  "mappings": "AAKA;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AAEA,SAAS,aACd,UACA,OACA,yBACe;AACf,QAAM,yBAAyB;AAAA,IAC7B,GAAG;AAAA,IACH,GAAI,2BAA2B,CAAC;AAAA,EAClC;AAEA,QAAM,gBAAgB,EAAE,GAAG,MAAM;AAEjC,MAAI,UAAU;AACZ,kBAAc,YAAY;AAC1B,kBAAc,aAAa;AAAA,EAC7B,WAAW,OAAO,MAAM,cAAc,YAAY;AAAA,EAElD,WAAW,CAAC,MAAM,aAAa,CAAC,MAAM,MAAM;AAC1C,kBAAc,YAAY,uBAAuB,OAAO;AACxD,kBAAc,aACZ,uBAAuB,QAAQ,cAAc;AAAA,EACjD,WACE,OAAO,OAAO,OAAO,cAAc,YACnC,uBAAuB,MAAM,MAAM,SAAS,GAC5C;AACA,kBAAc,aACZ,uBAAuB,MAAM,MAAM,SAAS,GAAG,cAAc;AAC/D,kBAAc,YACZ,uBAAuB,MAAM,MAAM,SAAS,EAAE;AAChD,kBAAc,UACZ,uBAAuB,MAAM,MAAM,SAAS,EAAE;AAAA,EAClD,WACE,CAAC,MAAM,aACP,MAAM,QACN,uBAAuB,MAAM,IAAI,GACjC;AACA,kBAAc,YAAY,uBAAuB,MAAM,IAAI,EAAE;AAC7D,kBAAc,UAAU,uBAAuB,MAAM,IAAI,EAAE;AAC3D,kBAAc,aACZ,uBAAuB,MAAM,IAAI,GAAG,cAAc;AAAA,EACtD,OAAO;AACL,kBAAc,YAAY,uBAAuB,OAAO;AACxD,kBAAc,aACZ,uBAAuB,QAAQ,cAAc;AAAA,EACjD;AACA,SAAO;AACT;",
+  "names": []
+}

package/Field/utils/useField/index.js

@@ -17,7 +17,8 @@ const useField = (name, customField) => {
     setValue,
     getValues,
     unregister,
-    formState
+    formState,
+    registerFieldFocus
   } = useContext(FormContext);
   if (!registerField) {
     throw new Error(`
@@ -55,7 +56,8 @@ const useField = (name, customField) => {
     getValues,
     unregister,
     formState,
-    error
+    error,
+    registerFieldFocus
   };
 };
 export {

package/Field/utils/useField.d.ts

@@ -1,2 +1,2 @@
-import { FieldSpec, UseFieldProps } from '@digigov/form/Field/types';
+import type { FieldSpec, UseFieldProps } from '@digigov/form/Field/types';
 export declare const useField: (name: string, customField: FieldSpec | null) => UseFieldProps;

package/Field/utils/useField.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/utils/useField.ts"],
-  "sourcesContent": ["import { useContext, useMemo } from 'react';\nimport { FieldSpec, UseFieldProps } from '@digigov/form/Field/types';\nimport { FormContext } from '@digigov/form/FormContext';\n\nexport const useField = (\n  name: string,\n  customField: FieldSpec | null\n): UseFieldProps => {\n  const {\n    fieldsMap,\n    control,\n    register,\n    reset,\n    resetField,\n    trigger,\n    clearErrors,\n    errors,\n    registerField,\n    watch,\n    componentRegistry,\n    getFieldState,\n    setValue,\n    getValues,\n    unregister,\n    formState,\n  } = useContext(FormContext);\n  if (!registerField) {\n    throw new Error(`\n      You can't use the Field component without wrapping it in FormBuilder.\n      https://devs.pages.grnet.gr/digigov/digigov-sdk/sdk-docs/forms/create-simple-form/\n    `);\n  }\n  let error = errors[name];\n\n  const nameIndexRegex = name.match(/^\\[*(.*?)\\.(\\d+)\\]*$/);\n  if (nameIndexRegex) {\n    const [, fieldArrayName, indexStr] = nameIndexRegex;\n    error = errors[fieldArrayName]?.[Number(indexStr)];\n  }\n  const nestedNameIndexRegex = name.match(/^\\[*(.*?)\\.(\\d+)\\.(.*?)\\]*$/);\n  if (nestedNameIndexRegex) {\n    const [, fieldArrayName, indexStr, fieldItemName] = nestedNameIndexRegex;\n    error = errors[fieldArrayName]?.[Number(indexStr)]?.[fieldItemName];\n  }\n  useMemo(\n    () => customField?.type && registerField({ ...customField, key: name }),\n    [customField, name, registerField]\n  );\n  return {\n    field: customField || fieldsMap[name],\n    control,\n    register,\n    reset,\n    resetField,\n    trigger,\n    watch,\n    componentRegistry,\n    getFieldState,\n    setValue,\n    clearErrors,\n    getValues,\n    unregister,\n    formState,\n    error,\n  };\n};\n"],
-  "mappings": "AAAA,SAAS,YAAY,eAAe;AAEpC,SAAS,mBAAmB;AAErB,MAAM,WAAW,CACtB,MACA,gBACkB;AAClB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI,WAAW,WAAW;AAC1B,MAAI,CAAC,eAAe;AAClB,UAAM,IAAI,MAAM;AAAA;AAAA;AAAA,KAGf;AAAA,EACH;AACA,MAAI,QAAQ,OAAO,IAAI;AAEvB,QAAM,iBAAiB,KAAK,MAAM,sBAAsB;AACxD,MAAI,gBAAgB;AAClB,UAAM,CAAC,EAAE,gBAAgB,QAAQ,IAAI;AACrC,YAAQ,OAAO,cAAc,IAAI,OAAO,QAAQ,CAAC;AAAA,EACnD;AACA,QAAM,uBAAuB,KAAK,MAAM,6BAA6B;AACrE,MAAI,sBAAsB;AACxB,UAAM,CAAC,EAAE,gBAAgB,UAAU,aAAa,IAAI;AACpD,YAAQ,OAAO,cAAc,IAAI,OAAO,QAAQ,CAAC,IAAI,aAAa;AAAA,EACpE;AACA;AAAA,IACE,MAAM,aAAa,QAAQ,cAAc,EAAE,GAAG,aAAa,KAAK,KAAK,CAAC;AAAA,IACtE,CAAC,aAAa,MAAM,aAAa;AAAA,EACnC;AACA,SAAO;AAAA,IACL,OAAO,eAAe,UAAU,IAAI;AAAA,IACpC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { useContext, useMemo } from 'react';\nimport type { FieldSpec, UseFieldProps } from '@digigov/form/Field/types';\nimport { FormContext } from '@digigov/form/FormContext';\n\nexport const useField = (\n  name: string,\n  customField: FieldSpec | null\n): UseFieldProps => {\n  const {\n    fieldsMap,\n    control,\n    register,\n    reset,\n    resetField,\n    trigger,\n    clearErrors,\n    errors,\n    registerField,\n    watch,\n    componentRegistry,\n    getFieldState,\n    setValue,\n    getValues,\n    unregister,\n    formState,\n    registerFieldFocus,\n  } = useContext(FormContext);\n  if (!registerField) {\n    throw new Error(`\n      You can't use the Field component without wrapping it in FormBuilder.\n      https://devs.pages.grnet.gr/digigov/digigov-sdk/sdk-docs/forms/create-simple-form/\n    `);\n  }\n  let error = errors[name];\n\n  const nameIndexRegex = name.match(/^\\[*(.*?)\\.(\\d+)\\]*$/);\n  if (nameIndexRegex) {\n    const [, fieldArrayName, indexStr] = nameIndexRegex;\n    error = errors[fieldArrayName]?.[Number(indexStr)];\n  }\n  const nestedNameIndexRegex = name.match(/^\\[*(.*?)\\.(\\d+)\\.(.*?)\\]*$/);\n  if (nestedNameIndexRegex) {\n    const [, fieldArrayName, indexStr, fieldItemName] = nestedNameIndexRegex;\n    error = errors[fieldArrayName]?.[Number(indexStr)]?.[fieldItemName];\n  }\n  useMemo(\n    () => customField?.type && registerField({ ...customField, key: name }),\n    [customField, name, registerField]\n  );\n  return {\n    field: customField || fieldsMap[name],\n    control,\n    register,\n    reset,\n    resetField,\n    trigger,\n    watch,\n    componentRegistry,\n    getFieldState,\n    setValue,\n    clearErrors,\n    getValues,\n    unregister,\n    formState,\n    error,\n    registerFieldFocus,\n  };\n};\n"],
+  "mappings": "AAAA,SAAS,YAAY,eAAe;AAEpC,SAAS,mBAAmB;AAErB,MAAM,WAAW,CACtB,MACA,gBACkB;AAClB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI,WAAW,WAAW;AAC1B,MAAI,CAAC,eAAe;AAClB,UAAM,IAAI,MAAM;AAAA;AAAA;AAAA,KAGf;AAAA,EACH;AACA,MAAI,QAAQ,OAAO,IAAI;AAEvB,QAAM,iBAAiB,KAAK,MAAM,sBAAsB;AACxD,MAAI,gBAAgB;AAClB,UAAM,CAAC,EAAE,gBAAgB,QAAQ,IAAI;AACrC,YAAQ,OAAO,cAAc,IAAI,OAAO,QAAQ,CAAC;AAAA,EACnD;AACA,QAAM,uBAAuB,KAAK,MAAM,6BAA6B;AACrE,MAAI,sBAAsB;AACxB,UAAM,CAAC,EAAE,gBAAgB,UAAU,aAAa,IAAI;AACpD,YAAQ,OAAO,cAAc,IAAI,OAAO,QAAQ,CAAC,IAAI,aAAa;AAAA,EACpE;AACA;AAAA,IACE,MAAM,aAAa,QAAQ,cAAc,EAAE,GAAG,aAAa,KAAK,KAAK,CAAC;AAAA,IACtE,CAAC,aAAa,MAAM,aAAa;AAAA,EACnC;AACA,SAAO;AAAA,IACL,OAAO,eAAe,UAAU,IAAI;AAAA,IACpC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
   "names": []
 }