@digigov/form 2.0.0-rc.17 → 2.0.0-rc.18

package/Field/FieldBase/index.js

@@ -43,6 +43,7 @@ const FieldBase = (props) => {
               Component,
               {
                 ...field,
+                control,
                 ref: void 0,
                 defaultValue,
                 extra,

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          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;",
+  "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                control={control}\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;AAAA,gBACA,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

@@ -1,6 +1,6 @@
 import React from "react";
 import Label from "@digigov/form/inputs/Label";
-import ErrorMessage from "@digigov/react-core/ErrorMessage";
+import { ErrorMessage } from "@digigov/react-core/ErrorMessage";
 import FieldContainer from "@digigov/react-core/FieldContainer";
 import CoreFieldset from "@digigov/react-core/Fieldset";
 import FieldsetLegend from "@digigov/react-core/FieldsetLegend";

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 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,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;",
+  "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,OAAO,WAAW;AAElB,OAAO,WAAW;AAClB,SAAQ,oBAAmB;AAC3B,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,7 +1,7 @@
 import React from "react";
 import { useWatch } from "react-hook-form";
 import { FieldBase } from "@digigov/form/Field/FieldBase";
-import { evaluateFieldWithConditions } from "@digigov/form/Field/utils";
+import { evaluateFieldWithConditions } from "@digigov/form/Field/utils/evaluateFieldWithConditions";
 const ChildFieldMemo = React.memo(
   function ChildField({
     dependencies,
@@ -9,7 +9,8 @@ const ChildFieldMemo = React.memo(
     control,
     reset,
     register,
-    error
+    error,
+    Field
   }) {
     const newField = evaluateFieldWithConditions(
       field,
@@ -19,6 +20,7 @@ const ChildFieldMemo = React.memo(
       FieldBase,
       {
         ...newField,
+        Field,
         name: newField.key,
         reset,
         control,
@@ -47,7 +49,8 @@ const FieldConditional = ({
   field,
   register,
   reset,
-  error
+  error,
+  Field
 }) => {
   const dependencyKeys = Object.keys(field.condition);
   const dependencyValues = useWatch({
@@ -69,7 +72,8 @@ const FieldConditional = ({
       control,
       register,
       reset,
-      error
+      error,
+      Field
     }
   );
 };

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,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;",
+  "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    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        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  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      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,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;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;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;AAAA,EACF;AAEJ;AAEA,IAAO,2BAAQ;",
   "names": []
 }

package/Field/index.js

@@ -1,7 +1,12 @@
 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 = ({
@@ -25,7 +30,15 @@ const Field = ({
     clearErrors
   } = useField(name, customField?.type ? customField : null);
   const calculatedField = useMemo(
-    () => calculateField(children, field, componentRegistry),
+    () => calculateField(
+      children,
+      field,
+      {
+        ...FIELD_COMPONENTS,
+        ...componentRegistry
+      },
+      ALTERNATIVE_COMPONENTS
+    ),
     [field]
   );
   if (calculatedField.condition) {
@@ -36,7 +49,8 @@ const Field = ({
         reset,
         register,
         field: calculatedField,
-        error
+        error,
+        Field
       }
     );
   }
@@ -49,6 +63,7 @@ const Field = ({
         register,
         error,
         formState,
+        Field,
         ...calculatedField
       }
     );
@@ -67,6 +82,7 @@ const Field = ({
         setValue,
         getValues,
         unregister,
+        Field,
         ...calculatedField
       }
     );
@@ -80,7 +96,8 @@ const Field = ({
       control,
       register,
       reset,
-      error
+      error,
+      Field
     }
   );
 };

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  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    () => 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      disabled={disabled}\n      control={control}\n      register={register}\n      reset={reset}\n      error={error}\n    />\n  );\n};\n\nexport default Field;\n"],
-  "mappings": "AAAA,OAAO,SAAS,eAAe;AAC/B,SAAS,iBAAiB;AAC1B,OAAO,sBAAsB;AAM7B,SAAS,UAAU,sBAAsB;AACzC,OAAO,gBAAgB;AACvB,OAAO,kBAAkB;AAElB,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,MAAM,eAAe,UAAU,OAAO,iBAAiB;AAAA,IACvD,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;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 {\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        Field={Field}\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        Field={Field}\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        Field={Field}\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      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;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,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;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,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;AAAA;AAAA,EACF;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>;
 }
@@ -14,6 +46,7 @@ export interface FieldConditionalProps {
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
     error?: ErrorOption;
+    Field: React.FC<FieldProps>;
 }
 export type FieldComponentItem = {
     component: any;
@@ -41,6 +74,7 @@ export interface ControlledFieldProps {
     error?: boolean;
     name?: string;
     disabled?: boolean;
+    Field: React.FC<FieldProps>;
 }
 export interface UncontrolledFieldProps {
     name: string;
@@ -50,6 +84,7 @@ export interface UncontrolledFieldProps {
     extra?: Record<string, never>;
     type?: string;
     disabled?: boolean;
+    Field: React.FC<FieldProps>;
 }
 export interface CalculatedField extends OmittedFieldSpec {
     name: string;
@@ -63,6 +98,7 @@ export interface FieldBaseProps extends CalculatedField {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    Field: React.FC<FieldProps>;
 }
 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/Field/utils/calculateField/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "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": []
+}

package/Field/utils/evaluateFieldWithConditions/index.js

@@ -0,0 +1,26 @@
+function evaluateFieldWithConditions(field, variables) {
+  const newField = { ...field };
+  if (variables) {
+    for (const key in variables) {
+      if (field.condition[key] && field.condition[key].is) {
+        const is = field.condition[key].is;
+        if (is === variables[key] || Array.isArray(variables[key]) && variables[key].includes(is)) {
+          const then = field.condition[key].then || {};
+          for (const attr in then) {
+            newField[attr] = then[attr];
+          }
+        }
+      } else if (field.condition[key]) {
+        const otherwise = field.condition[key].else || {};
+        for (const attr in otherwise) {
+          newField[attr] = otherwise[attr];
+        }
+      }
+    }
+  }
+  return newField;
+}
+export {
+  evaluateFieldWithConditions
+};
+//# sourceMappingURL=evaluateFieldWithConditions.js.map

package/Field/utils/evaluateFieldWithConditions/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "main": "../../../cjs/Field/utils/evaluateFieldWithConditions/index.js"
+}

package/Field/utils/evaluateFieldWithConditions.d.ts

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

package/Field/utils/evaluateFieldWithConditions.js.map

@@ -0,0 +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;",
+  "names": []
+}

package/Field/utils/index.d.ts

@@ -0,0 +1,4 @@
+import { FieldComponentRegistry } from '@digigov/form/Field/types';
+export declare const FIELD_COMPONENTS: FieldComponentRegistry;
+export declare const ALTERNATIVE_COMPONENTS: FieldComponentRegistry;
+export declare const CONTROLLED_FIELD_COMPONENTS: FieldComponentRegistry;

package/Field/utils/index.js

@@ -1,14 +1,12 @@
-import { useContext, useMemo } from "react";
-import { FormContext } from "@digigov/form/FormContext";
+import AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
 import Checkboxes from "@digigov/form/inputs/Checkboxes";
 import DateInput from "@digigov/form/inputs/DateInput";
 import FileInput from "@digigov/form/inputs/FileInput";
 import ImageInput from "@digigov/form/inputs/ImageInput";
 import Input from "@digigov/form/inputs/Input";
 import OtpInput from "@digigov/form/inputs/OtpInput";
-import Radio from "@digigov/form/inputs/Radio";
+import Radio, { ControlledRadioButtonsGroup } from "@digigov/form/inputs/Radio";
 import Select from "@digigov/form/inputs/Select";
-import AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
 const FIELD_COMPONENTS = {
   text: {
     component: Input
@@ -56,100 +54,25 @@ const ALTERNATIVE_COMPONENTS = {
     wrapper: "fieldset"
   }
 };
-function calculateField(children, field, componentRegistry) {
-  const calculatedField = { ...field };
-  const fieldComponentRegistry = { ...FIELD_COMPONENTS, ...componentRegistry };
-  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" && ALTERNATIVE_COMPONENTS[field.extra.component]) {
-    calculatedField.controlled = ALTERNATIVE_COMPONENTS[field.extra.component]?.controlled || false;
-    calculatedField.component = ALTERNATIVE_COMPONENTS[field.extra.component].component;
-    calculatedField.wrapper = ALTERNATIVE_COMPONENTS[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;
-}
-const useField = (name, customField) => {
-  const {
-    fieldsMap,
-    control,
-    register,
-    reset,
-    trigger,
-    clearErrors,
-    errors,
-    registerField,
-    watch,
-    componentRegistry,
-    getFieldState,
-    setValue,
-    getValues,
-    unregister,
-    formState
-  } = useContext(FormContext);
-  if (!registerField) {
-    throw new Error(`
-      You can't use the Field component without wrapping it in FormBuilder.
-      https://devs.pages.grnet.gr/digigov/digigov-sdk/sdk-docs/forms/create-simple-form/
-    `);
+const CONTROLLED_FIELD_COMPONENTS = {
+  ...FIELD_COMPONENTS,
+  "choice:single": {
+    wrapper: "fieldset",
+    controlled: true,
+    component: ControlledRadioButtonsGroup
+  },
+  text: {
+    component: Input,
+    controlled: true
+  },
+  string: {
+    component: Input,
+    controlled: true
   }
-  useMemo(
-    () => customField?.type && registerField({ ...customField, key: name }),
-    [customField, name, registerField]
-  );
-  return {
-    field: customField || fieldsMap[name],
-    control,
-    register,
-    reset,
-    trigger,
-    watch,
-    componentRegistry,
-    getFieldState,
-    setValue,
-    clearErrors,
-    getValues,
-    unregister,
-    formState,
-    error: errors[name]
-  };
 };
-function evaluateFieldWithConditions(field, variables) {
-  const newField = { ...field };
-  if (variables) {
-    for (const key in variables) {
-      if (field.condition[key] && field.condition[key].is) {
-        const is = field.condition[key].is;
-        if (is === variables[key] || Array.isArray(variables[key]) && variables[key].includes(is)) {
-          const then = field.condition[key].then || {};
-          for (const attr in then) {
-            newField[attr] = then[attr];
-          }
-        }
-      } else if (field.condition[key]) {
-        const otherwise = field.condition[key].else || {};
-        for (const attr in otherwise) {
-          newField[attr] = otherwise[attr];
-        }
-      }
-    }
-  }
-  return newField;
-}
 export {
-  calculateField,
-  evaluateFieldWithConditions,
-  useField
+  ALTERNATIVE_COMPONENTS,
+  CONTROLLED_FIELD_COMPONENTS,
+  FIELD_COMPONENTS
 };
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=index.js.map

package/Field/utils/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/Field/utils/index.ts"],
+  "sourcesContent": ["import { FieldComponentRegistry } from '@digigov/form/Field/types';\nimport AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';\nimport Checkboxes from '@digigov/form/inputs/Checkboxes';\nimport DateInput from '@digigov/form/inputs/DateInput';\nimport FileInput from '@digigov/form/inputs/FileInput';\nimport ImageInput from '@digigov/form/inputs/ImageInput';\nimport Input from '@digigov/form/inputs/Input';\nimport OtpInput from '@digigov/form/inputs/OtpInput';\nimport Radio, { ControlledRadioButtonsGroup } from '@digigov/form/inputs/Radio';\nimport Select from '@digigov/form/inputs/Select';\n\nexport const FIELD_COMPONENTS: FieldComponentRegistry = {\n  text: {\n    component: Input,\n  },\n  string: {\n    component: Input,\n  },\n  file: {\n    wrapper: 'fieldset',\n    component: FileInput,\n  },\n  image: {\n    wrapper: 'fieldset',\n    component: ImageInput,\n  },\n  date: {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: DateInput,\n  },\n  otp: {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: OtpInput,\n  },\n  'choice:multiple': {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: Checkboxes,\n  },\n  'choice:single': {\n    wrapper: 'fieldset',\n    controlled: false,\n    component: Radio,\n  },\n};\n\nexport const ALTERNATIVE_COMPONENTS: FieldComponentRegistry = {\n  Select: {\n    component: Select,\n    controlled: false,\n  },\n  AutoComplete: {\n    component: AutoCompleteInput,\n    controlled: true,\n    wrapper: 'fieldset',\n  },\n};\n\nexport const CONTROLLED_FIELD_COMPONENTS: FieldComponentRegistry = {\n  ...FIELD_COMPONENTS,\n  'choice:single': {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: ControlledRadioButtonsGroup,\n  },\n  text: {\n    component: Input,\n    controlled: true,\n  },\n  string: {\n    component: Input,\n    controlled: true,\n  },\n};\n"],
+  "mappings": "AACA,OAAO,uBAAuB;AAC9B,OAAO,gBAAgB;AACvB,OAAO,eAAe;AACtB,OAAO,eAAe;AACtB,OAAO,gBAAgB;AACvB,OAAO,WAAW;AAClB,OAAO,cAAc;AACrB,OAAO,SAAS,mCAAmC;AACnD,OAAO,YAAY;AAEZ,MAAM,mBAA2C;AAAA,EACtD,MAAM;AAAA,IACJ,WAAW;AAAA,EACb;AAAA,EACA,QAAQ;AAAA,IACN,WAAW;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,SAAS;AAAA,IACT,WAAW;AAAA,EACb;AAAA,EACA,OAAO;AAAA,IACL,SAAS;AAAA,IACT,WAAW;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW;AAAA,EACb;AAAA,EACA,KAAK;AAAA,IACH,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW;AAAA,EACb;AAAA,EACA,mBAAmB;AAAA,IACjB,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW;AAAA,EACb;AAAA,EACA,iBAAiB;AAAA,IACf,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW;AAAA,EACb;AACF;AAEO,MAAM,yBAAiD;AAAA,EAC5D,QAAQ;AAAA,IACN,WAAW;AAAA,IACX,YAAY;AAAA,EACd;AAAA,EACA,cAAc;AAAA,IACZ,WAAW;AAAA,IACX,YAAY;AAAA,IACZ,SAAS;AAAA,EACX;AACF;AAEO,MAAM,8BAAsD;AAAA,EACjE,GAAG;AAAA,EACH,iBAAiB;AAAA,IACf,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,WAAW;AAAA,IACX,YAAY;AAAA,EACd;AAAA,EACA,QAAQ;AAAA,IACN,WAAW;AAAA,IACX,YAAY;AAAA,EACd;AACF;",
+  "names": []
+}

package/Field/utils/useField/index.js

@@ -0,0 +1,51 @@
+import { useContext, useMemo } from "react";
+import { FormContext } from "@digigov/form/FormContext";
+const useField = (name, customField) => {
+  const {
+    fieldsMap,
+    control,
+    register,
+    reset,
+    trigger,
+    clearErrors,
+    errors,
+    registerField,
+    watch,
+    componentRegistry,
+    getFieldState,
+    setValue,
+    getValues,
+    unregister,
+    formState
+  } = useContext(FormContext);
+  if (!registerField) {
+    throw new Error(`
+      You can't use the Field component without wrapping it in FormBuilder.
+      https://devs.pages.grnet.gr/digigov/digigov-sdk/sdk-docs/forms/create-simple-form/
+    `);
+  }
+  useMemo(
+    () => customField?.type && registerField({ ...customField, key: name }),
+    [customField, name, registerField]
+  );
+  return {
+    field: customField || fieldsMap[name],
+    control,
+    register,
+    reset,
+    trigger,
+    watch,
+    componentRegistry,
+    getFieldState,
+    setValue,
+    clearErrors,
+    getValues,
+    unregister,
+    formState,
+    error: errors[name]
+  };
+};
+export {
+  useField
+};
+//# sourceMappingURL=useField.js.map

package/{FormBuilder/FormBuilder → Field/utils/useField}/package.json

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

package/Field/utils/useField.d.ts

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

package/Field/utils/useField.js.map

@@ -0,0 +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    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\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\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    trigger,\n    watch,\n    componentRegistry,\n    getFieldState,\n    setValue,\n    clearErrors,\n    getValues,\n    unregister,\n    formState,\n    error: errors[name],\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,EACF,IAAI,WAAW,WAAW;AAE1B,MAAI,CAAC,eAAe;AAClB,UAAM,IAAI,MAAM;AAAA;AAAA;AAAA,KAGf;AAAA,EACH;AAEA;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,OAAO,OAAO,IAAI;AAAA,EACpB;AACF;",
+  "names": []
+}