@digigov/form 2.0.0-7d9a8d86 → 2.0.0-834daea4

package/FieldArray/index.js

@@ -1,10 +1,12 @@
 import React from "react";
-import {useFieldArray} from "react-hook-form";
-import FieldContainer from "@digigov/form/Field/FieldBaseContainer";
-import FieldObject from "@digigov/form/FieldObject";
-import {FieldsetLabel} from "@digigov/form/Fieldset";
-import Fieldset from "@digigov/react-core/Fieldset";
-import {Button, Card, Hint} from "@digigov/ui";
+import { useFieldArray } from "react-hook-form";
+import { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
+import { FieldObject } from "@digigov/form/FieldObject";
+import { FieldsetLabel } from "@digigov/form/Fieldset";
+import { Fieldset } from "@digigov/form/Fieldset";
+import { Card } from "@digigov/ui/content/Card";
+import { Button } from "@digigov/ui/form/Button";
+import { Hint } from "@digigov/ui/typography/Hint";
 const FieldArray = ({
   name,
   register,
@@ -13,40 +15,58 @@ const FieldArray = ({
   error,
   layout,
   label,
+  Field,
   ...customField
 }) => {
-  const {fields, append, remove} = useFieldArray({
+  const { fields, append, remove } = useFieldArray({
     control,
     name
   });
-  return /* @__PURE__ */ React.createElement(FieldContainer, {
-    label,
-    layout,
-    error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
-    wrapper: "fieldset",
-    name
-  }, fields.length === 0 && /* @__PURE__ */ React.createElement(Hint, null, customField.extra?.label.object?.nothing_added), fields.map((field, index) => /* @__PURE__ */ React.createElement(Card, {
-    variant: "border",
-    key: field.id
-  }, /* @__PURE__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ React.createElement(FieldObject, {
-    name: `${name}.${index}`,
-    error: Array.isArray(error) && error[index],
-    formState,
-    register,
-    control,
-    ...customField.extra?.of
-  }), /* @__PURE__ */ React.createElement(Button, {
-    type: "button",
-    color: "warning",
-    onClick: () => remove(index)
-  }, "Remove")))), /* @__PURE__ */ React.createElement(Button, {
-    type: "button",
-    color: "secondary",
-    onClick: (ev) => {
-      ev.preventDefault();
-      append({});
-    }
-  }, customField.extra?.label.object?.add));
+  return /* @__PURE__ */ React.createElement(
+    FieldBaseContainer,
+    {
+      label,
+      layout,
+      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
+      wrapper: "fieldset",
+      name
+    },
+    fields.length === 0 && /* @__PURE__ */ React.createElement(Hint, null, customField.extra?.label.object?.nothing_added),
+    fields.map((field, index) => /* @__PURE__ */ React.createElement(Card, { variant: "border", key: field.id }, /* @__PURE__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ React.createElement(
+      FieldObject,
+      {
+        name: `${name}.${index}`,
+        error: Array.isArray(error) && error[index],
+        formState,
+        register,
+        control,
+        ...customField.extra?.of,
+        Field
+      }
+    ), /* @__PURE__ */ React.createElement(
+      Button,
+      {
+        name: `${name}-object-remove`,
+        type: "button",
+        color: "warning",
+        onClick: () => remove(index)
+      },
+      customField.extra?.label.object?.delete
+    )))),
+    /* @__PURE__ */ React.createElement(
+      Button,
+      {
+        type: "button",
+        name: `${name}-add-object`,
+        color: "secondary",
+        onClick: (ev) => {
+          ev.preventDefault();
+          append({});
+        }
+      },
+      customField.extra?.label.object?.add
+    )
+  );
 };
 var FieldArray_default = FieldArray;
 export {

package/FieldArray/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FieldArray/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport FieldContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport FieldObject from '@digigov/form/FieldObject';\nimport { FieldsetLabel } from '@digigov/form/Fieldset';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport { Button, Card, Hint } from '@digigov/ui';\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  register,\n  control,\n  formState,\n  error,\n  layout,\n  label,\n  ...customField\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n\n  return (\n    <FieldContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted &&\n        !formState.isSubmitting &&\n        error?.message &&\n        error\n          ? error\n          : undefined\n      }\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {fields.length === 0 && (\n        <Hint>{customField.extra?.label.object?.nothing_added}</Hint>\n      )}\n      {fields.map((field, index) => (\n        <Card variant=\"border\" key={field.id}>\n          <Fieldset>\n            <FieldsetLabel>\n              {customField.extra?.label.object.title} {index + 1}\n            </FieldsetLabel>\n            <FieldObject\n              name={`${name}.${index}`}\n              error={Array.isArray(error) && error[index]}\n              formState={formState}\n              register={register}\n              control={control}\n              {...customField.extra?.of}\n            />\n            <Button type=\"button\" color=\"warning\" onClick={() => remove(index)}>\n              Remove\n            </Button>\n          </Fieldset>\n        </Card>\n      ))}\n\n      <Button\n        type=\"button\"\n        color=\"secondary\"\n        onClick={(ev) => {\n          ev.preventDefault();\n          append({});\n        }}\n      >\n        {customField.extra?.label.object?.add}\n      </Button>\n    </FieldContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": "AAAA;AACA;AACA;AAEA;AACA;AACA;AACA;AAOO,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,KACG;AAAA,MACC;AACJ,QAAM,CAAE,QAAQ,QAAQ,UAAW,cAAc;AAAA,IAC/C;AAAA,IACA;AAAA;AAGF,SACE,oCAAC,gBAAD;AAAA,IACE;AAAA,IACA;AAAA,IACA,OACE,UAAU,eACV,CAAC,UAAU,gBACX,OAAO,WACP,QACI,QACA;AAAA,IAEN,SAAQ;AAAA,IACR;AAAA,KAEC,OAAO,WAAW,KACjB,oCAAC,MAAD,MAAO,YAAY,OAAO,MAAM,QAAQ,gBAEzC,OAAO,IAAI,CAAC,OAAO,UAClB,oCAAC,MAAD;AAAA,IAAM,SAAQ;AAAA,IAAS,KAAK,MAAM;AAAA,KAChC,oCAAC,UAAD,MACE,oCAAC,eAAD,MACG,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,IAEnD,oCAAC,aAAD;AAAA,IACE,MAAM,GAAG,QAAQ;AAAA,IACjB,OAAO,MAAM,QAAQ,UAAU,MAAM;AAAA,IACrC;AAAA,IACA;AAAA,IACA;AAAA,OACI,YAAY,OAAO;AAAA,MAEzB,oCAAC,QAAD;AAAA,IAAQ,MAAK;AAAA,IAAS,OAAM;AAAA,IAAU,SAAS,MAAM,OAAO;AAAA,KAAQ,cAO1E,oCAAC,QAAD;AAAA,IACE,MAAK;AAAA,IACL,OAAM;AAAA,IACN,SAAS,CAAC,OAAO;AACf,SAAG;AACH,aAAO;AAAA;AAAA,KAGR,YAAY,OAAO,MAAM,QAAQ;AAAA;AAM1C,IAAO,qBAAQ;",
+  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { FieldsetLabel } from '@digigov/form/Fieldset';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  Field: React.FC<FieldProps>;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  register,\n  control,\n  formState,\n  error,\n  layout,\n  label,\n  Field,\n  ...customField\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted &&\n        !formState.isSubmitting &&\n        error?.message &&\n        error\n          ? error\n          : undefined\n      }\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {fields.length === 0 && (\n        <Hint>{customField.extra?.label.object?.nothing_added}</Hint>\n      )}\n      {fields.map((field, index) => (\n        <Card variant=\"border\" key={field.id}>\n          <Fieldset>\n            <FieldsetLabel>\n              {customField.extra?.label.object.title} {index + 1}\n            </FieldsetLabel>\n            <FieldObject\n              name={`${name}.${index}`}\n              error={Array.isArray(error) && error[index]}\n              formState={formState}\n              register={register}\n              control={control}\n              {...customField.extra?.of}\n              Field={Field}\n            />\n            <Button\n              name={`${name}-object-remove`}\n              type=\"button\"\n              color=\"warning\"\n              onClick={() => remove(index)}\n            >\n              {customField.extra?.label.object?.delete}\n            </Button>\n          </Fieldset>\n        </Card>\n      ))}\n\n      <Button\n        type=\"button\"\n        name={`${name}-add-object`}\n        color=\"secondary\"\n        onClick={(ev) => {\n          ev.preventDefault();\n          append({});\n        }}\n      >\n        {customField.extra?.label.object?.add}\n      </Button>\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAsB,qBAAoC;AAC1D,SAAS,0BAA0B;AAEnC,SAAS,mBAAmB;AAC5B,SAAS,qBAAqB;AAC9B,SAAS,gBAAgB;AACzB,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,YAAY;AASd,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,IAAI,cAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AAED,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,OACE,UAAU,eACV,CAAC,UAAU,gBACX,OAAO,WACP,QACI,QACA;AAAA,MAEN,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,OAAO,WAAW,KACjB,oCAAC,YAAM,YAAY,OAAO,MAAM,QAAQ,aAAc;AAAA,IAEvD,OAAO,IAAI,CAAC,OAAO,UAClB,oCAAC,QAAK,SAAQ,UAAS,KAAK,MAAM,MAChC,oCAAC,gBACC,oCAAC,qBACE,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,CACnD,GACA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,QACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,QAC1C;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG,YAAY,OAAO;AAAA,QACvB;AAAA;AAAA,IACF,GACA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI;AAAA,QACb,MAAK;AAAA,QACL,OAAM;AAAA,QACN,SAAS,MAAM,OAAO,KAAK;AAAA;AAAA,MAE1B,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CACF,CACF,CACD;AAAA,IAED;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA;AAAA,MAEC,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC;AAAA,EACF;AAEJ;AAEA,IAAO,qBAAQ;",
   "names": []
 }

package/FieldArray/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/FieldObject/index.d.ts

@@ -8,6 +8,7 @@ export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
     reset: UseFormReturn['reset'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    Field: React.FC<FieldProps>;
 }
 export declare const FieldObject: React.FC<FieldObjectProps>;
 export interface FieldObjectItemProps {
@@ -18,5 +19,7 @@ export interface FieldObjectItemProps {
     reset: UseFormReturn['reset'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    children?: React.ReactNode;
+    Field: React.FC<FieldProps>;
 }
 export default FieldObject;

package/FieldObject/index.js

@@ -1,9 +1,13 @@
-import React, {useMemo} from "react";
-import {FieldBase} from "@digigov/form/Field/FieldBase";
-import {calculateField} from "@digigov/form/Field/utils";
-import Fieldset, {FieldsetCaption} from "@digigov/form/Fieldset";
-import {FieldsetLegend} from "@digigov/react-core/FieldsetLegend";
-import {useTranslation} from "@digigov/ui/i18n";
+import React, { useMemo } from "react";
+import { FieldBase } from "@digigov/form/Field/FieldBase";
+import {
+  FIELD_COMPONENTS,
+  ALTERNATIVE_COMPONENTS
+} from "@digigov/form/Field/utils";
+import { calculateField } from "@digigov/form/Field/utils/calculateField";
+import { Fieldset, FieldsetCaption } from "@digigov/form/Fieldset";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
+import { useTranslation } from "@digigov/ui/i18n";
 const FieldObject = ({
   name,
   label,
@@ -11,21 +15,25 @@ const FieldObject = ({
   control,
   register,
   reset,
-  formState
+  formState,
+  error,
+  Field
 }) => {
-  const {t} = useTranslation();
-  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, {
-    size: "sm"
-  }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(FieldObjectItem, {
-    key: `${name}.${field.key}`,
-    name: `${name}.${field.key}`,
-    control,
-    register,
-    reset,
-    field,
-    error: formState.errors && formState.errors[field.key],
-    formState
-  })));
+  const { t } = useTranslation();
+  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm" }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(
+    FieldObjectItem,
+    {
+      key: `${name}.${field.key}`,
+      name: `${name}.${field.key}`,
+      control,
+      register,
+      reset,
+      field,
+      error: error && error[field.key],
+      formState,
+      Field
+    }
+  )));
 };
 const FieldObjectItem = ({
   name,
@@ -35,18 +43,26 @@ const FieldObjectItem = ({
   control,
   formState,
   reset,
-  register
+  register,
+  Field
 }) => {
-  const calculatedField = useMemo(() => calculateField(children, field), [field]);
+  const calculatedField = useMemo(
+    () => calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),
+    [field]
+  );
   const customError = error ? error : formState?.errors[name];
-  return /* @__PURE__ */ React.createElement(FieldBase, {
-    ...calculatedField,
-    name,
-    control,
-    reset,
-    register,
-    error: customError
-  });
+  return /* @__PURE__ */ React.createElement(
+    FieldBase,
+    {
+      ...calculatedField,
+      name,
+      Field,
+      control,
+      reset,
+      register,
+      error: customError
+    }
+  );
 };
 var FieldObject_default = FieldObject;
 export {

package/FieldObject/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FieldObject/index.tsx"],
-  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField, FieldProps } from '@digigov/form/Field/types';\nimport { calculateField } from '@digigov/form/Field/utils';\nimport Fieldset, { FieldsetCaption } from '@digigov/form/Fieldset';\nimport { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/react-core/FieldsetLegend';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  formState,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\">{t(label.primary)}</FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}.${field.key}`}\n          name={`${name}.${field.key}`}\n          control={control}\n          register={register}\n          reset={reset}\n          field={field}\n          error={formState.errors && formState.errors[field.key]}\n          formState={formState}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  register,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () => calculateField(children, field),\n    [field]\n  );\n\n  const customError = error ? error : formState?.errors[name];\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      control={control}\n      reset={reset}\n      register={register}\n      error={customError}\n    />\n  );\n};\n\nexport default FieldObject;\n"],
-  "mappings": "AAAA;AAEA;AAEA;AACA;AAEA;AACA;AAUO,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,CAAE,KAAM;AAEd,SACE,oCAAC,UAAD,MACG,OAAO,WACN,oCAAC,gBAAD;AAAA,IAAgB,MAAK;AAAA,KAAM,EAAE,MAAM,WAEpC,OAAO,aACN,oCAAC,iBAAD,MAAkB,EAAE,MAAM,aAE3B,OAAO,OAAO,IAAI,CAAC,UAClB,oCAAC,iBAAD;AAAA,IACE,KAAK,GAAG,QAAQ,MAAM;AAAA,IACtB,MAAM,GAAG,QAAQ,MAAM;AAAA,IACvB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,UAAU,UAAU,UAAU,OAAO,MAAM;AAAA,IAClD;AAAA;AAAA;AAiBV,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,MACI;AACJ,QAAM,kBAAmC,QACvC,MAAM,eAAe,UAAU,QAC/B,CAAC;AAGH,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO;AACtD,SACE,oCAAC,WAAD;AAAA,OACM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO;AAAA;AAAA;AAKb,IAAO,sBAAQ;",
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField, FieldProps } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';\nimport { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  Field: React.FC<FieldProps>;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  formState,\n  error,\n  Field,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\">{t(label.primary)}</FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}.${field.key}`}\n          name={`${name}.${field.key}`}\n          control={control}\n          register={register}\n          reset={reset}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n          Field={Field}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n  Field: React.FC<FieldProps>;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  register,\n  Field,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n\n  const customError = error ? error : formState?.errors[name];\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      Field={Field}\n      control={control}\n      reset={reset}\n      register={register}\n      error={customError}\n    />\n  );\n};\n\nexport default FieldObject;\n"],
+  "mappings": "AAAA,OAAO,SAAS,eAAe;AAE/B,SAAS,iBAAiB;AAE1B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,UAAU,uBAAuB;AAE1C,SAAS,sBAAsB;AAC/B,SAAS,sBAAsB;AAWxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,IAAI,eAAe;AAE7B,SACE,oCAAC,gBACE,OAAO,WACN,oCAAC,kBAAe,MAAK,QAAM,EAAE,MAAM,OAAO,CAAE,GAE7C,OAAO,aACN,oCAAC,uBAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,OAAO,OAAO,IAAI,CAAC,UAClB;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,IAAI,IAAI,MAAM,GAAG;AAAA,MACzB,MAAM,GAAG,IAAI,IAAI,MAAM,GAAG;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA,MACA;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAcA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,kBAAmC;AAAA,IACvC,MACE,eAAe,UAAU,OAAO,kBAAkB,sBAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AAEA,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA;AAAA,EACT;AAEJ;AAEA,IAAO,sBAAQ;",
   "names": []
 }

package/Fieldset/FieldsetWithContext/index.js

@@ -1,4 +1,4 @@
-import React, {useContext, useMemo} from "react";
+import React, { useContext, useMemo } from "react";
 import Field from "@digigov/form/Field";
 import {
   Fieldset,
@@ -6,23 +6,22 @@ import {
   FieldsetCaption,
   FieldsetBody
 } from "@digigov/form/Fieldset/";
-import {FormContext} from "@digigov/form/FormContext";
-import {useTranslation} from "@digigov/ui/i18n";
-const FieldsetWithContext = ({name}) => {
-  const {label, body, fields} = useFieldset(name);
-  const {t} = useTranslation();
-  return useMemo(() => /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLabel, null, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, null, t(label.secondary)), body && /* @__PURE__ */ React.createElement(FieldsetBody, null, body), fields.map((field) => /* @__PURE__ */ React.createElement(Field, {
-    key: field,
-    name: field
-  }))), [label?.primary, label?.secondary, body, fields]);
+import { FormContext } from "@digigov/form/FormContext";
+import { useTranslation } from "@digigov/ui/i18n";
+const FieldsetWithContext = ({ name }) => {
+  const { label, body, fields } = useFieldset(name);
+  const { t } = useTranslation();
+  return useMemo(
+    () => /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLabel, null, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, null, t(label.secondary)), body && /* @__PURE__ */ React.createElement(FieldsetBody, null, body), fields.map((field) => /* @__PURE__ */ React.createElement(Field, { key: field, name: field }))),
+    [label?.primary, label?.secondary, body, fields]
+  );
 };
 const useFieldset = (name) => {
-  const {fieldsetsMap} = useContext(FormContext);
+  const { fieldsetsMap } = useContext(FormContext);
   if (fieldsetsMap && fieldsetsMap[name]) {
     return useMemo(() => fieldsetsMap[name], [name]);
   } else {
-    if (!fieldsetsMap)
-      throw new Error(`Fieldsets is not defined`);
+    if (!fieldsetsMap) throw new Error(`Fieldsets is not defined`);
     throw new Error(`No fieldset with name ${name} found`);
   }
 };

package/Fieldset/FieldsetWithContext.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/Fieldset/FieldsetWithContext.tsx"],
   "sourcesContent": ["import React, { useContext, useMemo } from 'react';\nimport Field from '@digigov/form/Field';\nimport {\n  Fieldset,\n  FieldsetLabel,\n  FieldsetCaption,\n  FieldsetBody,\n} from '@digigov/form/Fieldset/';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FieldsetSpec } from '@digigov/form/types';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const FieldsetWithContext: React.FC<{ name: string }> = ({ name }) => {\n  const { label, body, fields } = useFieldset(name);\n  const { t } = useTranslation();\n  return useMemo(\n    () => (\n      <Fieldset>\n        {label?.primary && <FieldsetLabel>{t(label.primary)}</FieldsetLabel>}\n        {label?.secondary && (\n          <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n        )}\n        {body && <FieldsetBody>{body}</FieldsetBody>}\n        {fields.map((field) => (\n          <Field key={field} name={field} />\n        ))}\n      </Fieldset>\n    ),\n    [label?.primary, label?.secondary, body, fields]\n  );\n};\n\nconst useFieldset = (name: string): FieldsetSpec => {\n  const { fieldsetsMap } = useContext(FormContext);\n  if (fieldsetsMap && fieldsetsMap[name]) {\n    return useMemo(() => fieldsetsMap[name], [name]);\n  } else {\n    if (!fieldsetsMap) throw new Error(`Fieldsets is not defined`);\n    throw new Error(`No fieldset with name ${name} found`);\n  }\n};\n"],
-  "mappings": "AAAA;AACA;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAEA;AAEO,MAAM,sBAAkD,CAAC,CAAE,UAAW;AAC3E,QAAM,CAAE,OAAO,MAAM,UAAW,YAAY;AAC5C,QAAM,CAAE,KAAM;AACd,SAAO,QACL,MACE,oCAAC,UAAD,MACG,OAAO,WAAW,oCAAC,eAAD,MAAgB,EAAE,MAAM,WAC1C,OAAO,aACN,oCAAC,iBAAD,MAAkB,EAAE,MAAM,aAE3B,QAAQ,oCAAC,cAAD,MAAe,OACvB,OAAO,IAAI,CAAC,UACX,oCAAC,OAAD;AAAA,IAAO,KAAK;AAAA,IAAO,MAAM;AAAA,QAI/B,CAAC,OAAO,SAAS,OAAO,WAAW,MAAM;AAAA;AAI7C,MAAM,cAAc,CAAC,SAA+B;AAClD,QAAM,CAAE,gBAAiB,WAAW;AACpC,MAAI,gBAAgB,aAAa,OAAO;AACtC,WAAO,QAAQ,MAAM,aAAa,OAAO,CAAC;AAAA,SACrC;AACL,QAAI,CAAC;AAAc,YAAM,IAAI,MAAM;AACnC,UAAM,IAAI,MAAM,yBAAyB;AAAA;AAAA;",
+  "mappings": "AAAA,OAAO,SAAS,YAAY,eAAe;AAC3C,OAAO,WAAW;AAClB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,mBAAmB;AAE5B,SAAS,sBAAsB;AAExB,MAAM,sBAAkD,CAAC,EAAE,KAAK,MAAM;AAC3E,QAAM,EAAE,OAAO,MAAM,OAAO,IAAI,YAAY,IAAI;AAChD,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,SAAO;AAAA,IACL,MACE,oCAAC,gBACE,OAAO,WAAW,oCAAC,qBAAe,EAAE,MAAM,OAAO,CAAE,GACnD,OAAO,aACN,oCAAC,uBAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,QAAQ,oCAAC,oBAAc,IAAK,GAC5B,OAAO,IAAI,CAAC,UACX,oCAAC,SAAM,KAAK,OAAO,MAAM,OAAO,CACjC,CACH;AAAA,IAEF,CAAC,OAAO,SAAS,OAAO,WAAW,MAAM,MAAM;AAAA,EACjD;AACF;AAEA,MAAM,cAAc,CAAC,SAA+B;AAClD,QAAM,EAAE,aAAa,IAAI,WAAW,WAAW;AAC/C,MAAI,gBAAgB,aAAa,IAAI,GAAG;AACtC,WAAO,QAAQ,MAAM,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC;AAAA,EACjD,OAAO;AACL,QAAI,CAAC,aAAc,OAAM,IAAI,MAAM,0BAA0B;AAC7D,UAAM,IAAI,MAAM,yBAAyB,IAAI,QAAQ;AAAA,EACvD;AACF;",
   "names": []
 }

package/Fieldset/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { FieldsetLabelProps, FieldsetCaptionProps, FieldsetBodyProps } from '@digigov/form/Fieldset/types';
-import Fieldset from '@digigov/react-core/Fieldset';
+import { Fieldset } from '@digigov/react-core/Fieldset';
 export declare const FieldsetLabel: React.FC<FieldsetLabelProps>;
 export declare const FieldsetCaption: React.FC<FieldsetCaptionProps>;
 export declare const FieldsetBody: React.FC<FieldsetBodyProps>;

package/Fieldset/index.js

@@ -1,32 +1,23 @@
 import React from "react";
-import Fieldset from "@digigov/react-core/Fieldset";
-import FieldsetLegend from "@digigov/react-core/FieldsetLegend";
-import Hint from "@digigov/react-core/Hint";
-import Grid from "@digigov/ui/layouts/Grid";
-import NormalText from "@digigov/ui/typography/NormalText";
+import { Fieldset } from "@digigov/react-core/Fieldset";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
+import { Grid } from "@digigov/ui/layouts/Grid";
+import { Hint } from "@digigov/ui/typography/Hint";
+import { NormalText } from "@digigov/ui/typography/NormalText";
 const FieldsetLabel = ({
   children,
   ...props
 }) => {
-  return /* @__PURE__ */ React.createElement(FieldsetLegend, {
-    heading: true,
-    size: "xl",
-    ...props
-  }, children);
+  return /* @__PURE__ */ React.createElement(FieldsetLegend, { heading: true, size: "xl", ...props }, children);
 };
 const FieldsetCaption = ({
   children,
   ...props
 }) => {
-  return /* @__PURE__ */ React.createElement(Hint, {
-    ...props
-  }, children);
+  return /* @__PURE__ */ React.createElement(Hint, { ...props }, children);
 };
-const FieldsetBody = ({children}) => {
-  return /* @__PURE__ */ React.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /* @__PURE__ */ React.createElement(NormalText, null, children));
+const FieldsetBody = ({ children }) => {
+  return /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(NormalText, null, children));
 };
 var Fieldset_default = Fieldset;
 export {

package/Fieldset/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Fieldset/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport Hint from '@digigov/react-core/Hint';\nimport Grid from '@digigov/ui/layouts/Grid';\nimport NormalText from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
-  "mappings": "AAAA;AAMA;AACA;AACA;AACA;AACA;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,KACG;AAAA,MACC;AACJ,SACE,oCAAC,gBAAD;AAAA,IAAgB,SAAO;AAAA,IAAC,MAAK;AAAA,OAAS;AAAA,KACnC;AAAA;AAKA,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,KACG;AAAA,MACC;AACJ,SAAO,oCAAC,MAAD;AAAA,OAAU;AAAA,KAAQ;AAAA;AAGpB,MAAM,eAA4C,CAAC,CAAE,cAAe;AACzE,SACE,oCAAC,MAAD;AAAA,IAAM,MAAI;AAAA,IAAC,IAAI;AAAA,KACb,oCAAC,YAAD,MAAa;AAAA;AAMnB,IAAO,mBAAQ;",
+  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport { Fieldset } from '@digigov/react-core/Fieldset';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { Grid } from '@digigov/ui/layouts/Grid';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { NormalText } from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAMlB,SAAS,gBAAgB;AACzB,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,YAAY;AACrB,SAAS,kBAAkB;AAEpB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,oCAAC,kBAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,oCAAC,QAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,oCAAC,QAAK,MAAI,MAAC,IAAI,MACb,oCAAC,kBAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ;",
   "names": []
 }

package/Fieldset/types.d.ts

@@ -1,8 +1,9 @@
-import { FieldsetLegendProps } from '@digigov/react-core/FieldsetLegend';
-import { HintProps } from '@digigov/react-core/Hint';
+import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
+import { HintProps } from '@digigov/ui/typography/Hint';
 export interface FieldsetLabelProps extends FieldsetLegendProps {
 }
 export interface FieldsetCaptionProps extends HintProps {
 }
 export interface FieldsetBodyProps {
+    children?: React.ReactNode;
 }

package/Form.stories.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../src/Form.stories.js"],
   "sourcesContent": ["export default {\n  title: 'Digigov Form',\n};\n"],
-  "mappings": "AAAA,IAAO,uBAAQ;AAAA,EACb,OAAO;AAAA;",
+  "mappings": "AAAA,IAAO,uBAAQ;AAAA,EACb,OAAO;AACT;",
   "names": []
 }

package/FormBuilder/FormBuilder.stories/index.js

@@ -4,8 +4,9 @@ var FormBuilder_stories_default = {
   component: FormBuilder,
   displayName: "FormBuilder"
 };
-export * from "@digigov/form/FormBuilder/__stories__/Default";
+import { Default } from "@digigov/form/FormBuilder/__stories__/Default";
 export {
+  Default,
   FormBuilder_stories_default as default
 };
 //# sourceMappingURL=FormBuilder.stories.js.map

package/FormBuilder/FormBuilder.stories.d.ts

@@ -4,5 +4,5 @@ declare namespace _default {
     export let displayName: string;
 }
 export default _default;
-export * from "@digigov/form/FormBuilder/__stories__/Default";
+export { Default } from "@digigov/form/FormBuilder/__stories__/Default";
 import FormBuilder from '@digigov/form/FormBuilder';

package/FormBuilder/FormBuilder.stories.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FormBuilder/FormBuilder.stories.js"],
-  "sourcesContent": ["import FormBuilder from '@digigov/form/FormBuilder';\nexport default {\n  title: 'Digigov Form/FormBuilder',\n  component: FormBuilder,\n  displayName: 'FormBuilder',\n};\nexport * from '@digigov/form/FormBuilder/__stories__/Default';\n"],
-  "mappings": "AAAA;AACA,IAAO,8BAAQ;AAAA,EACb,OAAO;AAAA,EACP,WAAW;AAAA,EACX,aAAa;AAAA;AAEf;",
+  "sourcesContent": ["import FormBuilder from '@digigov/form/FormBuilder';\nexport default {\n  title: 'Digigov Form/FormBuilder',\n  component: FormBuilder,\n  displayName: 'FormBuilder',\n};\nexport { Default } from '@digigov/form/FormBuilder/__stories__/Default';\n"],
+  "mappings": "AAAA,OAAO,iBAAiB;AACxB,IAAO,8BAAQ;AAAA,EACb,OAAO;AAAA,EACP,WAAW;AAAA,EACX,aAAa;AACf;AACA,SAAS,eAAe;",
   "names": []
 }

package/FormBuilder/__stories__/Default/index.js

@@ -1,23 +1,29 @@
 import React from "react";
-import FormBuilder, {Field} from "@digigov/form";
-import {Button} from "@digigov/ui/form/Button";
+import FormBuilder, { Field } from "@digigov/form";
+import { Button } from "@digigov/ui/form/Button";
 const initialValues = {
   "business-title": null
 };
-const Default = () => /* @__PURE__ */ React.createElement(FormBuilder, {
-  onSubmit: (data) => {
-    console.log(data);
+const Default = () => /* @__PURE__ */ React.createElement(
+  FormBuilder,
+  {
+    onSubmit: (data) => {
+      console.log(data);
+    },
+    initial: initialValues
   },
-  initial: initialValues
-}, /* @__PURE__ */ React.createElement(Field, {
-  key: "business-title",
-  name: "business-title",
-  type: "string",
-  label: {primary: "\u038C\u03BD\u03BF\u03BC\u03B1 \u03B5\u03C0\u03B9\u03C7\u03B5\u03AF\u03C1\u03B7\u03C3\u03B7\u03C2"},
-  required: true
-}), /* @__PURE__ */ React.createElement(Button, {
-  type: "submit"
-}, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"));
+  /* @__PURE__ */ React.createElement(
+    Field,
+    {
+      key: "business-title",
+      name: "business-title",
+      type: "string",
+      label: { primary: "\u038C\u03BD\u03BF\u03BC\u03B1 \u03B5\u03C0\u03B9\u03C7\u03B5\u03AF\u03C1\u03B7\u03C3\u03B7\u03C2" },
+      required: true
+    }
+  ),
+  /* @__PURE__ */ React.createElement(Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1")
+);
 var Default_default = Default;
 export {
   Default,

package/FormBuilder/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-export declare const Default: () => JSX.Element;
+import React from 'react';
+export declare const Default: () => React.JSX.Element;
 export default Default;

package/FormBuilder/__stories__/Default.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/FormBuilder/__stories__/Default.tsx"],
   "sourcesContent": ["import React from 'react';\nimport FormBuilder, { Field } from '@digigov/form';\nimport { Button } from '@digigov/ui/form/Button';\n\nconst initialValues = {\n  'business-title': null,\n};\n\nexport const Default = () => (\n  <FormBuilder\n    onSubmit={(data) => {\n      console.log(data);\n    }}\n    initial={initialValues}\n  >\n    <Field\n      key=\"business-title\"\n      name=\"business-title\"\n      type=\"string\"\n      label={{ primary: '\u038C\u03BD\u03BF\u03BC\u03B1 \u03B5\u03C0\u03B9\u03C7\u03B5\u03AF\u03C1\u03B7\u03C3\u03B7\u03C2' }}\n      required\n    />\n    <Button type=\"submit\">\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1</Button>\n  </FormBuilder>\n);\n\nexport default Default;\n"],
-  "mappings": "AAAA;AACA;AACA;AAEA,MAAM,gBAAgB;AAAA,EACpB,kBAAkB;AAAA;AAGb,MAAM,UAAU,MACrB,oCAAC,aAAD;AAAA,EACE,UAAU,CAAC,SAAS;AAClB,YAAQ,IAAI;AAAA;AAAA,EAEd,SAAS;AAAA,GAET,oCAAC,OAAD;AAAA,EACE,KAAI;AAAA,EACJ,MAAK;AAAA,EACL,MAAK;AAAA,EACL,OAAO,CAAE,SAAS;AAAA,EAClB,UAAQ;AAAA,IAEV,oCAAC,QAAD;AAAA,EAAQ,MAAK;AAAA,GAAS;AAI1B,IAAO,kBAAQ;",
+  "mappings": "AAAA,OAAO,WAAW;AAClB,OAAO,eAAe,aAAa;AACnC,SAAS,cAAc;AAEvB,MAAM,gBAAgB;AAAA,EACpB,kBAAkB;AACpB;AAEO,MAAM,UAAU,MACrB;AAAA,EAAC;AAAA;AAAA,IACC,UAAU,CAAC,SAAS;AAClB,cAAQ,IAAI,IAAI;AAAA,IAClB;AAAA,IACA,SAAS;AAAA;AAAA,EAET;AAAA,IAAC;AAAA;AAAA,MACC,KAAI;AAAA,MACJ,MAAK;AAAA,MACL,MAAK;AAAA,MACL,OAAO,EAAE,SAAS,oGAAoB;AAAA,MACtC,UAAQ;AAAA;AAAA,EACV;AAAA,EACA,oCAAC,UAAO,MAAK,YAAS,kDAAQ;AAChC;AAGF,IAAO,kBAAQ;",
   "names": []
 }

package/FormBuilder/index.d.ts

@@ -1,2 +1,9 @@
-import { FormBuilder } from '@digigov/form/FormBuilder/FormBuilder';
+import React from 'react';
+import { FormBaseProps, FormBuilderProps } from '@digigov/form/types';
+declare const FormBase: React.ForwardRefExoticComponent<FormBaseProps & React.RefAttributes<HTMLFormElement>>;
+declare const useFormContext: () => import("@digigov/form/types").FormContextProps;
+declare const useFormValues: () => import("react-hook-form").FieldValues;
+declare const FormBuilder: React.ForwardRefExoticComponent<FormBuilderProps & React.RefAttributes<HTMLFormElement>>;
+export declare const ControlledFormBuilder: (props: any) => React.JSX.Element;
 export default FormBuilder;
+export { useFormContext, useFormValues, FormBase };