@digigov/form 2.0.0-7d9a8d86 → 2.0.0-85c27c19

package/Field/FieldBase/index.js

@@ -1,5 +1,5 @@
 import React from "react";
-import {Controller} from "react-hook-form";
+import { Controller } from "react-hook-form";
 import FieldBaseContainer from "@digigov/form/Field/FieldBaseContainer";
 const FieldBase = (props) => {
   const {
@@ -24,62 +24,83 @@ const FieldBase = (props) => {
     return null;
   }
   if (controlled) {
-    return /* @__PURE__ */ React.createElement(FieldBaseContainer, {
+    return /* @__PURE__ */ React.createElement(
+      FieldBaseContainer,
+      {
+        label,
+        layout,
+        error,
+        wrapper,
+        name
+      },
+      /* @__PURE__ */ React.createElement(
+        Controller,
+        {
+          control,
+          name,
+          render: ({ field }) => {
+            return /* @__PURE__ */ React.createElement(
+              Component,
+              {
+                ...field,
+                ref: void 0,
+                defaultValue,
+                extra,
+                error: !!error,
+                type,
+                "aria-required": !!required,
+                "aria-describedby": error && `${name}-error`,
+                required,
+                disabled: editable === false,
+                ...componentProps
+              }
+            );
+          }
+        }
+      )
+    );
+  }
+  return /* @__PURE__ */ React.createElement(
+    FieldBaseContainer,
+    {
       label,
       layout,
       error,
       wrapper,
       name
-    }, /* @__PURE__ */ React.createElement(Controller, {
-      control,
-      name,
-      render: ({field}) => {
-        return /* @__PURE__ */ React.createElement(Component, {
-          ...field,
-          ref: void 0,
-          defaultValue,
-          extra,
-          error: !!error,
-          type,
-          "aria-required": !!required,
-          "aria-describedby": error && `${name}-error`,
-          required,
-          disabled: editable === false,
-          ...componentProps
-        });
+    },
+    Component?.render ? /* @__PURE__ */ React.createElement(
+      Component,
+      {
+        ...register(name),
+        control,
+        error: !!error,
+        extra,
+        type,
+        "aria-required": !!required,
+        "aria-describedby": error && `${name}-error`,
+        required,
+        disabled: editable === false,
+        ...componentProps
       }
-    }));
-  }
-  return /* @__PURE__ */ React.createElement(FieldBaseContainer, {
-    label,
-    layout,
-    error,
-    wrapper,
-    name
-  }, Component?.render ? /* @__PURE__ */ React.createElement(Component, {
-    ...register(name),
-    control,
-    error: !!error,
-    extra,
-    type,
-    "aria-required": !!required,
-    "aria-describedby": error && `${name}-error`,
-    required,
-    disabled: editable === false,
-    ...componentProps
-  }) : /* @__PURE__ */ React.createElement(Component, {
-    ...register(name),
-    register,
-    control,
-    error: !!error,
-    extra,
-    type,
-    "aria-required": !!required,
-    "aria-describedby": error && `${name}-error`,
-    required,
-    disabled: editable === false,
-    ...componentProps
-  }));
+    ) : /* @__PURE__ */ React.createElement(
+      Component,
+      {
+        ...register(name),
+        register,
+        control,
+        error: !!error,
+        extra,
+        type,
+        "aria-required": !!required,
+        "aria-describedby": error && `${name}-error`,
+        required,
+        disabled: editable === false,
+        ref: void 0,
+        ...componentProps
+      }
+    )
+  );
 };
 export {
   FieldBase

package/Field/FieldBase.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Field/FieldBase.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { Controller } from 'react-hook-form';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = (props) => {\n  const {\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  } = props;\n  if (!enabled) {\n    return null;\n  }\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        error={error}\n        wrapper={wrapper}\n        name={name}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                ref={undefined}\n                defaultValue={defaultValue}\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      error={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          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\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          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
-  "mappings": "AAAA;AACA;AACA;AAGO,MAAM,YAAsC,CAAC,UAAU;AAC5D,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,IACb,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,OACG;AAAA,MACD;AACJ,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA;AAET,MAAI,YAAY;AACd,WACE,oCAAC,oBAAD;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,OAEA,oCAAC,YAAD;AAAA,MACE;AAAA,MACA;AAAA,MACA,QAAQ,CAAC,CAAE,WAAY;AACrB,eACE,oCAAC,WAAD;AAAA,aACM;AAAA,UACJ,KAAK;AAAA,UACL;AAAA,UACA;AAAA,UACA,OAAO,CAAC,CAAC;AAAA,UACT;AAAA,UACA,iBAAe,CAAC,CAAC;AAAA,UACjB,oBAAkB,SAAS,GAAG;AAAA,UAC9B;AAAA,UACA,UAAU,aAAa;AAAA,aACnB;AAAA;AAAA;AAAA;AAAA;AASlB,SACE,oCAAC,oBAAD;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,KAEC,WAAW,SACV,oCAAC,WAAD;AAAA,OACM,SAAS;AAAA,IACb;AAAA,IACA,OAAO,CAAC,CAAC;AAAA,IACT;AAAA,IACA;AAAA,IACA,iBAAe,CAAC,CAAC;AAAA,IACjB,oBAAkB,SAAS,GAAG;AAAA,IAC9B;AAAA,IACA,UAAU,aAAa;AAAA,OACnB;AAAA,OAGN,oCAAC,WAAD;AAAA,OACM,SAAS;AAAA,IACb;AAAA,IACA;AAAA,IACA,OAAO,CAAC,CAAC;AAAA,IACT;AAAA,IACA;AAAA,IACA,iBAAe,CAAC,CAAC;AAAA,IACjB,oBAAkB,SAAS,GAAG;AAAA,IAC9B;AAAA,IACA,UAAU,aAAa;AAAA,OACnB;AAAA;AAAA;",
+  "sourcesContent": ["import React from 'react';\nimport { Controller } from 'react-hook-form';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = (props) => {\n  const {\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  } = props;\n  if (!enabled) {\n    return null;\n  }\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        error={error}\n        wrapper={wrapper}\n        name={name}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                ref={undefined}\n                defaultValue={defaultValue}\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      error={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          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\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          ref={undefined}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,kBAAkB;AAC3B,OAAO,wBAAwB;AAGxB,MAAM,YAAsC,CAAC,UAAU;AAC5D,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,IACb,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ,CAAC;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AACJ,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AACA,MAAI,YAAY;AACd,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;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,KAAK;AAAA,gBACL;AAAA,gBACA;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;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,QACtB,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,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB,KAAK;AAAA,QACJ,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
   "names": []
 }

package/Field/FieldBaseContainer/index.js

@@ -6,7 +6,7 @@ import CoreFieldset from "@digigov/react-core/Fieldset";
 import FieldsetLegend from "@digigov/react-core/FieldsetLegend";
 import Hint from "@digigov/react-core/Hint";
 import LabelContainer from "@digigov/react-core/LabelContainer";
-import {useTranslation} from "@digigov/ui/i18n";
+import { useTranslation } from "@digigov/ui/i18n";
 const FieldBaseContainer = ({
   name,
   wrapper,
@@ -15,27 +15,13 @@ const FieldBaseContainer = ({
   error,
   layout
 }) => {
-  const {t} = useTranslation();
+  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: !!error,
-      ...layout
-    }, /* @__PURE__ */ React.createElement(CoreFieldset, null, /* @__PURE__ */ React.createElement(FieldsetLegend, {
-      size: "sm"
-    }, 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));
+    return /* @__PURE__ */ React.createElement(FieldContainer, { error: !!error, ...layout }, /* @__PURE__ */ React.createElement(CoreFieldset, null, /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm" }, 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));
   } else {
-    return /* @__PURE__ */ React.createElement(FieldContainer, {
-      error: !!error,
-      ...layout
-    }, /* @__PURE__ */ React.createElement(LabelContainer, null, label && /* @__PURE__ */ React.createElement(Label, {
-      label
-    }), error && /* @__PURE__ */ React.createElement(ErrorMessage, {
-      id: `${name}-error`
-    }, t(errorMessage, errorContext)), children));
+    return /* @__PURE__ */ React.createElement(FieldContainer, { error: !!error, ...layout }, /* @__PURE__ */ React.createElement(LabelContainer, null, label && /* @__PURE__ */ React.createElement(Label, { label }), error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)), children));
   }
 };
 var FieldBaseContainer_default = FieldBaseContainer;

package/Field/FieldBaseContainer.js.map

@@ -2,6 +2,6 @@
   "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 CoreFieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport Hint from '@digigov/react-core/Hint';\nimport LabelContainer from '@digigov/react-core/LabelContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const FieldBaseContainer: React.FC<FieldContainerProps> = ({\n  name,\n  wrapper,\n  label,\n  children,\n  error,\n  layout,\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={!!error} {...layout}>\n        <CoreFieldset>\n          <FieldsetLegend size=\"sm\">{label && label.primary}</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        </CoreFieldset>\n      </FieldContainer>\n    );\n  } else {\n    return (\n      <FieldContainer error={!!error} {...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        </LabelContainer>\n      </FieldContainer>\n    );\n  }\n};\n\nexport default FieldBaseContainer;\n"],
-  "mappings": "AAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEO,MAAM,qBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,CAAE,KAAM;AACd,QAAM,eAAe,OAAO,QAAQ,MAChC,MAAM,QAAQ,MACd,OAAO,WAAW;AACtB,QAAM,eAAe,OAAO,QAAQ,WAAW;AAC/C,MAAI,YAAY,YAAY;AAC1B,WACE,oCAAC,gBAAD;AAAA,MAAgB,OAAO,CAAC,CAAC;AAAA,SAAW;AAAA,OAClC,oCAAC,cAAD,MACE,oCAAC,gBAAD;AAAA,MAAgB,MAAK;AAAA,OAAM,SAAS,MAAM,UACzC,SAAS,MAAM,aAAa,oCAAC,MAAD,MAAO,EAAE,MAAM,aAC3C,SACC,oCAAC,cAAD;AAAA,MAAc,IAAI,GAAG;AAAA,OAClB,EAAE,cAAc,gBAGpB;AAAA,SAIF;AACL,WACE,oCAAC,gBAAD;AAAA,MAAgB,OAAO,CAAC,CAAC;AAAA,SAAW;AAAA,OAClC,oCAAC,gBAAD,MACG,SAAS,oCAAC,OAAD;AAAA,MAAO;AAAA,QAChB,SACC,oCAAC,cAAD;AAAA,MAAc,IAAI,GAAG;AAAA,OAClB,EAAE,cAAc,gBAGpB;AAAA;AAAA;AAOX,IAAO,6BAAQ;",
+  "mappings": "AAAA,OAAO,WAAW;AAElB,OAAO,WAAW;AAClB,OAAO,kBAAkB;AACzB,OAAO,oBAAoB;AAC3B,OAAO,kBAAkB;AACzB,OAAO,oBAAoB;AAC3B,OAAO,UAAU;AACjB,OAAO,oBAAoB;AAC3B,SAAS,sBAAsB;AAExB,MAAM,qBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,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,CAAC,CAAC,OAAQ,GAAG,UAClC,oCAAC,oBACC,oCAAC,kBAAe,MAAK,QAAM,SAAS,MAAM,OAAQ,GACjD,SAAS,MAAM,aAAa,oCAAC,YAAM,EAAE,MAAM,SAAS,CAAE,GACtD,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,QACH,CACF;AAAA,EAEJ,OAAO;AACL,WACE,oCAAC,kBAAe,OAAO,CAAC,CAAC,OAAQ,GAAG,UAClC,oCAAC,sBACE,SAAS,oCAAC,SAAM,OAAc,GAC9B,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,QACH,CACF;AAAA,EAEJ;AACF;AAEA,IAAO,6BAAQ;",
   "names": []
 }

package/Field/FieldConditional/index.js

@@ -1,38 +1,47 @@
 import React from "react";
-import {useWatch} from "react-hook-form";
-import {FieldBase} from "@digigov/form/Field/FieldBase";
-import {evaluateFieldWithConditions} from "@digigov/form/Field/utils";
-const ChildFieldMemo = React.memo(function ChildField({
-  dependencies,
-  field,
-  control,
-  reset,
-  register,
-  error
-}) {
-  const newField = evaluateFieldWithConditions(field, dependencies);
-  return /* @__PURE__ */ React.createElement(FieldBase, {
-    ...newField,
-    name: newField.key,
-    reset,
+import { useWatch } from "react-hook-form";
+import { FieldBase } from "@digigov/form/Field/FieldBase";
+import { evaluateFieldWithConditions } from "@digigov/form/Field/utils/evaluateFieldWithConditions";
+const ChildFieldMemo = React.memo(
+  function ChildField({
+    dependencies,
+    field,
     control,
+    reset,
     register,
     error
-  });
-}, (prev, next) => {
-  if (!prev || !prev.dependencies) {
-    return false;
-  }
-  if (prev.error !== next.error) {
-    return false;
-  }
-  for (const dep in next.dependencies) {
-    if (next.dependencies[dep] !== prev.dependencies[dep]) {
+  }) {
+    const newField = evaluateFieldWithConditions(
+      field,
+      dependencies
+    );
+    return /* @__PURE__ */ React.createElement(
+      FieldBase,
+      {
+        ...newField,
+        name: newField.key,
+        reset,
+        control,
+        register,
+        error
+      }
+    );
+  },
+  (prev, next) => {
+    if (!prev || !prev.dependencies) {
       return false;
     }
+    if (prev.error !== next.error) {
+      return false;
+    }
+    for (const dep in next.dependencies) {
+      if (next.dependencies[dep] !== prev.dependencies[dep]) {
+        return false;
+      }
+    }
+    return true;
   }
-  return true;
-});
+);
 const FieldConditional = ({
   control,
   field,
@@ -45,18 +54,24 @@ const FieldConditional = ({
     name: dependencyKeys,
     control
   });
-  const variables = dependencyKeys.reduce((data, fieldKey, index) => ({
-    ...data,
-    [fieldKey]: dependencyValues[index]
-  }), {});
-  return /* @__PURE__ */ React.createElement(ChildFieldMemo, {
-    dependencies: variables,
-    field,
-    control,
-    register,
-    reset,
-    error
-  });
+  const variables = dependencyKeys.reduce(
+    (data, fieldKey, index) => ({
+      ...data,
+      [fieldKey]: dependencyValues[index]
+    }),
+    {}
+  );
+  return /* @__PURE__ */ React.createElement(
+    ChildFieldMemo,
+    {
+      dependencies: variables,
+      field,
+      control,
+      register,
+      reset,
+      error
+    }
+  );
 };
 var FieldConditional_default = FieldConditional;
 export {

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';\n\nconst ChildFieldMemo = React.memo(\n  function ChildField({\n    dependencies,\n    field,\n    control,\n    reset,\n    register,\n    error,\n  }: ChildFieldMemoProps) {\n    const newField = evaluateFieldWithConditions(\n      field,\n      dependencies as FormData\n    );\n    return (\n      <FieldBase\n        {...newField}\n        name={newField.key}\n        reset={reset}\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  error,\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      error={error}\n    />\n  );\n};\n\nexport default FieldConditional;\n"],
-  "mappings": "AAAA;AACA;AACA;AAKA;AAEA,MAAM,iBAAiB,MAAM,KAC3B,oBAAoB;AAAA,EAClB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GACsB;AACtB,QAAM,WAAW,4BACf,OACA;AAEF,SACE,oCAAC,WAAD;AAAA,OACM;AAAA,IACJ,MAAM,SAAS;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,GAIN,CAAC,MAAM,SAAS;AACd,MAAI,CAAC,QAAQ,CAAC,KAAK,cAAc;AAC/B,WAAO;AAAA;AAET,MAAI,KAAK,UAAU,KAAK,OAAO;AAC7B,WAAO;AAAA;AAET,aAAW,OAAO,KAAK,cAAc;AACnC,QAAI,KAAK,aAAa,SAAS,KAAK,aAAa,MAAM;AACrD,aAAO;AAAA;AAAA;AAGX,SAAO;AAAA;AAIJ,MAAM,mBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,iBAAiB,OAAO,KAAK,MAAM;AACzC,QAAM,mBAAmB,SAAS;AAAA,IAChC,MAAM;AAAA,IACN;AAAA;AAEF,QAAM,YAAY,eAAe,OAC/B,CAAC,MAAM,UAAU,UAAW;AAAA,OACvB;AAAA,KACF,WAAW,iBAAiB;AAAA,MAE/B;AAEF,SACE,oCAAC,gBAAD;AAAA,IACE,cAAc;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA;AAKN,IAAO,2BAAQ;",
+  "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    register,\n    error,\n  }: ChildFieldMemoProps) {\n    const newField = evaluateFieldWithConditions(\n      field,\n      dependencies as FormData\n    );\n    return (\n      <FieldBase\n        {...newField}\n        name={newField.key}\n        reset={reset}\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  error,\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      error={error}\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,EACF,GAAwB;AACtB,UAAM,WAAW;AAAA,MACf;AAAA,MACA;AAAA,IACF;AACA,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ,MAAM,SAAS;AAAA,QACf;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;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;AAAA,EACF;AAEJ;AAEA,IAAO,2BAAQ;",
   "names": []
 }

package/Field/index.js

@@ -1,11 +1,17 @@
-import React, {useMemo} from "react";
-import {FieldBase} from "@digigov/form/Field/FieldBase";
+import React, { useMemo } from "react";
+import { FieldBase } from "@digigov/form/Field/FieldBase";
 import FieldConditional from "@digigov/form/Field/FieldConditional";
-import {useField, calculateField} from "@digigov/form/Field/utils";
+import {
+  FIELD_COMPONENTS,
+  ALTERNATIVE_COMPONENTS
+} from "@digigov/form/Field/utils";
+import { calculateField } from "@digigov/form/Field/utils/calculateField";
+import { useField } from "@digigov/form/Field/utils/useField";
 import FieldArray from "@digigov/form/FieldArray";
 import Multiplicity from "@digigov/form/MultiplicityField";
 const Field = ({
   name,
+  disabled,
   children,
   ...customField
 }) => {
@@ -23,49 +29,74 @@ const Field = ({
     trigger,
     clearErrors
   } = useField(name, customField?.type ? customField : null);
-  const calculatedField = useMemo(() => calculateField(children, field, componentRegistry), [field]);
+  const calculatedField = useMemo(
+    () => calculateField(
+      children,
+      field,
+      {
+        ...FIELD_COMPONENTS,
+        ...componentRegistry
+      },
+      ALTERNATIVE_COMPONENTS
+    ),
+    [field]
+  );
   if (calculatedField.condition) {
-    return /* @__PURE__ */ React.createElement(FieldConditional, {
-      control,
-      reset,
-      register,
-      field: calculatedField,
-      error
-    });
+    return /* @__PURE__ */ React.createElement(
+      FieldConditional,
+      {
+        control,
+        reset,
+        register,
+        field: calculatedField,
+        error
+      }
+    );
   }
   if (calculatedField.type === "array" && !calculatedField.multiplicity) {
     calculatedField.name = name;
-    return /* @__PURE__ */ React.createElement(FieldArray, {
-      control,
-      register,
-      error,
-      formState,
-      ...calculatedField
-    });
+    return /* @__PURE__ */ React.createElement(
+      FieldArray,
+      {
+        control,
+        register,
+        error,
+        formState,
+        ...calculatedField
+      }
+    );
   }
   if (calculatedField.type === "array" && calculatedField.multiplicity === true) {
     calculatedField.name = name;
-    return /* @__PURE__ */ React.createElement(Multiplicity, {
+    return /* @__PURE__ */ React.createElement(
+      Multiplicity,
+      {
+        control,
+        register,
+        trigger,
+        clearErrors,
+        error,
+        formState,
+        setValue,
+        getValues,
+        unregister,
+        ...calculatedField
+      }
+    );
+  }
+  return /* @__PURE__ */ React.createElement(
+    FieldBase,
+    {
+      ...calculatedField,
+      name,
+      disabled,
       control,
       register,
-      trigger,
-      clearErrors,
+      reset,
       error,
-      formState,
-      setValue,
-      getValues,
-      unregister,
-      ...calculatedField
-    });
-  }
-  return /* @__PURE__ */ React.createElement(FieldBase, {
-    ...calculatedField,
-    name,
-    control,
-    register,
-    reset,
-    error
-  });
+      fieldComponent: Field
+    }
+  );
 };
 var Field_default = Field;
 export {

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 { useField, calculateField } from '@digigov/form/Field/utils';\nimport FieldArray from '@digigov/form/FieldArray';\nimport Multiplicity from '@digigov/form/MultiplicityField';\n\nexport const Field: React.FC<FieldProps> = ({\n  name,\n  children,\n  ...customField\n}) => {\n  const {\n    field,\n    control,\n    register,\n    reset,\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    () => calculateField(children, field, componentRegistry),\n    [field]\n  );\n\n  if (calculatedField.condition) {\n    return (\n      <FieldConditional\n        control={control}\n        reset={reset}\n        register={register}\n        field={calculatedField as FieldWithCondition}\n        error={error}\n      />\n    );\n  }\n  if (calculatedField.type === 'array' && !calculatedField.multiplicity) {\n    calculatedField.name = name;\n    return (\n      <FieldArray\n        control={control}\n        register={register}\n        error={error}\n        formState={formState}\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        {...calculatedField}\n      />\n    );\n  }\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      control={control}\n      register={register}\n      reset={reset}\n      error={error}\n    />\n  );\n};\n\nexport default Field;\n"],
-  "mappings": "AAAA;AACA;AACA;AAMA;AACA;AACA;AAEO,MAAM,QAA8B,CAAC;AAAA,EAC1C;AAAA,EACA;AAAA,KACG;AAAA,MACC;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,MACE,SAAS,MAAM,aAAa,OAAO,cAAc;AACrD,QAAM,kBAAmC,QACvC,MAAM,eAAe,UAAU,OAAO,oBACtC,CAAC;AAGH,MAAI,gBAAgB,WAAW;AAC7B,WACE,oCAAC,kBAAD;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA,MACP;AAAA;AAAA;AAIN,MAAI,gBAAgB,SAAS,WAAW,CAAC,gBAAgB,cAAc;AACrE,oBAAgB,OAAO;AACvB,WACE,oCAAC,YAAD;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,SACI;AAAA;AAAA;AAIV,MACE,gBAAgB,SAAS,WACzB,gBAAgB,iBAAiB,MACjC;AACA,oBAAgB,OAAO;AACvB,WACE,oCAAC,cAAD;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,SACI;AAAA;AAAA;AAIV,SACE,oCAAC,WAAD;AAAA,OACM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA;AAKN,IAAO,gBAAQ;",
+  "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  disabled,\n  children,\n  ...customField\n}) => {\n  const {\n    field,\n    control,\n    register,\n    reset,\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\n  if (calculatedField.condition) {\n    return (\n      <FieldConditional\n        control={control}\n        reset={reset}\n        register={register}\n        field={calculatedField as FieldWithCondition}\n        error={error}\n      />\n    );\n  }\n  if (calculatedField.type === 'array' && !calculatedField.multiplicity) {\n    calculatedField.name = name;\n    return (\n      <FieldArray\n        control={control}\n        register={register}\n        error={error}\n        formState={formState}\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        {...calculatedField}\n      />\n    );\n  }\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      disabled={disabled}\n      control={control}\n      register={register}\n      reset={reset}\n      error={error}\n      fieldComponent={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;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,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;AAEA,MAAI,gBAAgB,WAAW;AAC7B,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;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,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,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,SACE;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,gBAAgB;AAAA;AAAA,EAClB;AAEJ;AAEA,IAAO,gBAAQ;",
   "names": []
 }

package/Field/types.d.ts

@@ -1,10 +1,42 @@
 import React from 'react';
-import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldSpec } from '@digigov/form/types';
-import { FieldCondition, FormData } from '@digigov/form/types';
+import { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';
+import { ValidatorSchema } from '@digigov/form/validators/types';
+import { GridProps } from '@digigov/ui/layouts/Grid';
+export type FieldLabelProps = {
+    primary?: string;
+    secondary?: string;
+};
+export interface FieldSpec {
+    key: string;
+    type?: 'int' | 'string' | 'text' | 'boolean' | 'email' | 'uuid4' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'date' | 'otp' | 'afm' | 'iban' | 'file' | 'image' | 'postal_code' | 'phone_number' | 'array' | 'object';
+    component?: any;
+    maxLength?: number;
+    condition?: Record<string, FieldCondition>;
+    controlled?: boolean;
+    label?: FieldLabelProps;
+    extra?: {
+        [key: string]: any;
+    };
+    editable?: boolean;
+    required?: boolean;
+    enabled?: boolean;
+    disabled?: boolean;
+    layout?: Record<string, GridProps['xs'] | GridProps['sm'] | GridProps['md'] | GridProps['lg'] | GridProps['xl']>;
+    validators?: ValidatorSchema[];
+    wrapper?: 'label' | 'fieldset';
+    maxWidth?: string;
+    maxHeight?: string;
+    width?: string;
+}
+export interface FieldCondition {
+    is: string | string[] | number | number[] | boolean | boolean[];
+    then?: Partial<FieldSpec>;
+    else?: Partial<FieldSpec>;
+}
 export interface ChildFieldMemoProps extends FieldConditionalProps {
     dependencies: FormData;
 }
+export type FormData = UseFormProps['defaultValues'];
 export interface FieldWithCondition extends Omit<CalculatedField, 'condition'> {
     condition: Record<string, FieldCondition>;
 }
@@ -63,6 +95,7 @@ export interface FieldBaseProps extends CalculatedField {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    fieldComponent?: React.FC<FieldBaseProps>;
 }
 export interface FieldProps extends FieldSpec {
     name: string;

package/Field/utils/calculateField/index.js

@@ -0,0 +1,27 @@
+function calculateField(children, field, fieldComponentRegistry, alternativeComponents) {
+  const calculatedField = { ...field };
+  if (children) {
+    calculatedField.component = children;
+    calculatedField.controlled = true;
+  } else if (typeof field.component === "function") {
+  } else if (!field.component && !field.type) {
+    calculatedField.component = fieldComponentRegistry.string.component;
+    calculatedField.controlled = fieldComponentRegistry.string?.controlled || false;
+  } else if (typeof field?.extra?.component === "string" && alternativeComponents[field.extra.component]) {
+    calculatedField.controlled = alternativeComponents[field.extra.component]?.controlled || false;
+    calculatedField.component = alternativeComponents[field.extra.component].component;
+    calculatedField.wrapper = alternativeComponents[field.extra.component].wrapper;
+  } else if (!field.component && field.type && fieldComponentRegistry[field.type]) {
+    calculatedField.component = fieldComponentRegistry[field.type].component;
+    calculatedField.wrapper = fieldComponentRegistry[field.type].wrapper;
+    calculatedField.controlled = fieldComponentRegistry[field.type]?.controlled || false;
+  } else {
+    calculatedField.component = fieldComponentRegistry.string.component;
+    calculatedField.controlled = fieldComponentRegistry.string?.controlled || false;
+  }
+  return calculatedField;
+}
+export {
+  calculateField
+};
+//# sourceMappingURL=calculateField.js.map

package/{inputs/Input/__stories__/Default → Field/utils/calculateField}/package.json

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

package/Field/utils/calculateField.d.ts

@@ -0,0 +1,2 @@
+import { FieldProps, FieldSpec, FieldComponentRegistry, CalculatedField } from '@digigov/form/Field/types';
+export declare function calculateField(children: FieldProps['children'], field: FieldSpec, fieldComponentRegistry: FieldComponentRegistry, alternativeComponents: FieldComponentRegistry): CalculatedField;

package/Field/utils/calculateField.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/Field/utils/calculateField.ts"],
+  "sourcesContent": ["import {\n  FieldProps,\n  FieldSpec,\n  FieldComponentRegistry,\n  CalculatedField,\n} from '@digigov/form/Field/types';\n\nexport function calculateField(\n  children: FieldProps['children'],\n  field: FieldSpec,\n  fieldComponentRegistry: FieldComponentRegistry,\n  alternativeComponents: FieldComponentRegistry\n): CalculatedField {\n  const calculatedField = { ...field };\n  if (children) {\n    calculatedField.component = children;\n    calculatedField.controlled = true;\n  } else if (typeof field.component === 'function') {\n    // leave as is\n  } else if (!field.component && !field.type) {\n    calculatedField.component = fieldComponentRegistry.string.component;\n    calculatedField.controlled =\n      fieldComponentRegistry.string?.controlled || false;\n  } else if (\n    typeof field?.extra?.component === 'string' &&\n    alternativeComponents[field.extra.component]\n  ) {\n    calculatedField.controlled =\n      alternativeComponents[field.extra.component]?.controlled || false;\n    calculatedField.component =\n      alternativeComponents[field.extra.component].component;\n    calculatedField.wrapper =\n      alternativeComponents[field.extra.component].wrapper;\n  } else if (\n    !field.component &&\n    field.type &&\n    fieldComponentRegistry[field.type]\n  ) {\n    calculatedField.component = fieldComponentRegistry[field.type].component;\n    calculatedField.wrapper = fieldComponentRegistry[field.type].wrapper;\n    calculatedField.controlled =\n      fieldComponentRegistry[field.type]?.controlled || false;\n  } else {\n    calculatedField.component = fieldComponentRegistry.string.component;\n    calculatedField.controlled =\n      fieldComponentRegistry.string?.controlled || false;\n  }\n  return calculatedField as CalculatedField;\n}\n"],
+  "mappings": "AAOO,SAAS,eACd,UACA,OACA,wBACA,uBACiB;AACjB,QAAM,kBAAkB,EAAE,GAAG,MAAM;AACnC,MAAI,UAAU;AACZ,oBAAgB,YAAY;AAC5B,oBAAgB,aAAa;AAAA,EAC/B,WAAW,OAAO,MAAM,cAAc,YAAY;AAAA,EAElD,WAAW,CAAC,MAAM,aAAa,CAAC,MAAM,MAAM;AAC1C,oBAAgB,YAAY,uBAAuB,OAAO;AAC1D,oBAAgB,aACd,uBAAuB,QAAQ,cAAc;AAAA,EACjD,WACE,OAAO,OAAO,OAAO,cAAc,YACnC,sBAAsB,MAAM,MAAM,SAAS,GAC3C;AACA,oBAAgB,aACd,sBAAsB,MAAM,MAAM,SAAS,GAAG,cAAc;AAC9D,oBAAgB,YACd,sBAAsB,MAAM,MAAM,SAAS,EAAE;AAC/C,oBAAgB,UACd,sBAAsB,MAAM,MAAM,SAAS,EAAE;AAAA,EACjD,WACE,CAAC,MAAM,aACP,MAAM,QACN,uBAAuB,MAAM,IAAI,GACjC;AACA,oBAAgB,YAAY,uBAAuB,MAAM,IAAI,EAAE;AAC/D,oBAAgB,UAAU,uBAAuB,MAAM,IAAI,EAAE;AAC7D,oBAAgB,aACd,uBAAuB,MAAM,IAAI,GAAG,cAAc;AAAA,EACtD,OAAO;AACL,oBAAgB,YAAY,uBAAuB,OAAO;AAC1D,oBAAgB,aACd,uBAAuB,QAAQ,cAAc;AAAA,EACjD;AACA,SAAO;AACT;",
+  "names": []
+}