@digigov/form 2.0.0-d57821ba → 2.0.0-e20fed09

package/FieldArray/FormDialog.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/FieldArray/FormDialog.tsx"],
+  "sourcesContent": ["import React, { LegacyRef, useEffect, useRef, useState } from 'react';\nimport {\n  ErrorOption,\n  useFieldArray,\n  UseFieldArrayMove,\n  UseFormReturn,\n  useWatch,\n} from 'react-hook-form';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport {\n  Modal,\n  ModalAction,\n  ModalContent,\n  ModalHeading,\n  useModal,\n} from '@digigov/ui/app/Modal';\nimport {\n  Table,\n  TableBody,\n  TableContainer,\n  TableDataCell,\n  TableHead,\n  TableHeadCell,\n  TableRow,\n} from '@digigov/ui/content';\nimport { Button } from '@digigov/ui/form/Button';\nimport { StackProps, Grid, Stack } from '@digigov/ui/layouts';\nimport Heading from '@digigov/ui/typography/Heading';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface FormDialogProps extends FieldProps {\n  control: UseFormReturn['control'];\n  trigger: UseFormReturn['trigger'];\n  register: UseFormReturn['register'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  getValues: UseFormReturn['getValues'];\n  setValue: UseFormReturn['setValue'];\n  reset: UseFormReturn['reset'];\n  resetField?: UseFormReturn['resetField'];\n  sortable: boolean;\n  Field: React.FC<FieldProps>;\n}\n\nexport interface DialogProps {\n  name: string;\n  heading: string;\n  actions: React.ReactNode;\n  children: React.ReactNode;\n  registerModal: (any) => {};\n}\n\nexport const FormDialog: React.FC<FormDialogProps> = React.forwardRef(\n  function FormDialog(\n    {\n      name,\n      trigger,\n      register,\n      control,\n      formState,\n      error,\n      getValues,\n      Field,\n      reset,\n      sortable,\n      ...customField\n    },\n    ref\n  ) {\n    const [isAppending, setIsAppending] = useState(false);\n    const [currentIndex, setCurrentIndex] = useState(0);\n    const { fields, append, remove, update, move } = useFieldArray({\n      control,\n      name,\n    });\n    const { open, close, registerModal } = useModal();\n    const currentLength = fields.length > 0 ? fields.length - 1 : fields.length;\n    const currentName = isAppending\n      ? `${name}.${currentLength}`\n      : `${name}.${currentIndex}`;\n    useEffect(() => {\n      if (isAppending) {\n        setCurrentIndex(currentLength);\n        open(`modal-${name}`);\n      }\n    }, [isAppending]);\n\n    const valuesRef = useRef(null);\n    if (!error) {\n      const values = getValues(currentName);\n      if (typeof values === 'object') {\n        valuesRef.current = { ...values };\n      } else {\n        valuesRef.current = values;\n      }\n    }\n    const values = getValues(name);\n    const ofField = {\n      ...customField.extra?.of,\n      name: currentName,\n    };\n    const defaultValue = getValues(currentName) || ofField.defaultValue;\n    const noValuesCommitted =\n      fields.length === 0 || (fields.length === 1 && isAppending);\n    const titleNumber = customField.extra?.label.object.titleNumbering\n      ? `${currentLength + 1}`\n      : '';\n    return (\n      <>\n        {noValuesCommitted && (\n          <Hint {...customField.extra?.label.object?.nothing_added_props}>\n            {customField.extra?.label.object?.nothing_added}\n          </Hint>\n        )}\n        <ArrayItemModal\n          title={\n            customField.extra?.label.object.title &&\n            `${customField.extra?.label.object.title} ${titleNumber}`\n          }\n          hint={customField.label?.secondary}\n          name={name}\n          defaultValue={defaultValue}\n          currentName={currentName}\n          editOrAppend={async () => {\n            const hasNoErrors = await trigger(\n              ofField.type === 'object'\n                ? ofField.extra.fields.map(({ key }) => `${currentName}.${key}`)\n                : currentName\n            );\n            if (!hasNoErrors) {\n              update(currentIndex, valuesRef.current);\n            }\n            if (hasNoErrors) {\n              const newValues = getValues(currentName);\n              if (isAppending) {\n                setIsAppending(false);\n              }\n              if (newValues === '') {\n                remove(currentIndex);\n              } else {\n                update(currentIndex, newValues);\n              }\n              close();\n            }\n          }}\n          cancel={() => {\n            if (isAppending) {\n              setIsAppending(false);\n              remove(currentIndex);\n              close();\n              return;\n            }\n            update(currentIndex, valuesRef.current);\n            reset(undefined, {\n              keepTouched: true,\n              keepDefaultValues: true,\n              keepIsValid: true,\n              keepIsSubmitted: true,\n              keepValues: true,\n            });\n            close();\n          }}\n          type={isAppending ? 'append' : 'edit'}\n          appendLabel={customField.extra?.label.object.append.label}\n          appendProps={customField.extra?.label.object.append.props}\n          editLabel={customField.extra?.label.object.edit.label}\n          editProps={customField.extra?.label.object.edit.props}\n          cancelLabel={customField.extra?.label.object.cancel.label}\n          cancelProps={customField.extra?.label.object.cancel.props}\n          control={control}\n          {...registerModal(`modal-${name}`)}\n        >\n          <Fieldset>\n            {ofField?.type === 'object' ? (\n              <FieldObject\n                defaultValue={defaultValue || undefined}\n                error={error && error[currentIndex]}\n                formState={formState}\n                register={register}\n                control={control}\n                {...ofField}\n                key={currentName}\n                Field={Field}\n              />\n            ) : (\n              <Field\n                name={currentName}\n                {...ofField}\n                error={error && error[currentIndex]}\n                key={currentName}\n              />\n            )}\n          </Fieldset>\n        </ArrayItemModal>\n        {!noValuesCommitted && (\n          <TableContainer {...customField.extra?.tableContainer}>\n            <Table\n              ref={ref as LegacyRef<HTMLTableElement>}\n              verticalAlign={customField.extra?.verticalAlign}\n            >\n              {!customField.extra?.noHeader &&\n                !noValuesCommitted &&\n                ofField?.extra &&\n                values?.length > 0 && (\n                  <ArrayItemHeader\n                    labels={\n                      ofField.type === 'object'\n                        ? ofField.extra.fields.map(({ label }) => label.primary)\n                        : [ofField.label.primary]\n                    }\n                    disabled={customField?.editable === false}\n                  />\n                )}\n              <TableBody>\n                {!noValuesCommitted &&\n                  values?.map?.((field, index) => {\n                    return (\n                      <ArrayItemDisplay\n                        key={index}\n                        name={`${name}.${index}`}\n                        index={index}\n                        isFirst={index === 0}\n                        isLast={index === values.length - 1}\n                        data={field}\n                        edit={() => {\n                          setCurrentIndex(index);\n                          open(`modal-${name}`);\n                        }}\n                        stackProps={customField?.extra?.stackProps}\n                        wordBreak={customField?.extra?.wordBreak}\n                        valueDisplay={customField?.extra?.valueDisplay}\n                        remove={() => {\n                          remove(index);\n                        }}\n                        border={customField.extra?.border}\n                        move={move}\n                        sortable={sortable}\n                        disabledEdit={\n                          sortable ? true : (customField.extra?.noEdit ?? false)\n                        }\n                        disabledDelete={customField.extra?.noDelete ?? false}\n                        disabled={customField?.editable === false}\n                      />\n                    );\n                  })}\n              </TableBody>\n            </Table>\n          </TableContainer>\n        )}\n        {customField.extra?.editVariant !== 'display' && (\n          <div\n            className={\n              customField.extra?.label.object?.addButtonVariant === 'link'\n                ? 'px-2 py-2 bg-gray-200 border-t border-b border-gray-400'\n                : ''\n            }\n          >\n            <Button\n              type=\"button\"\n              name={`${name}-add-object`}\n              color=\"secondary\"\n              variant={customField.extra?.label.object?.addButtonVariant}\n              onClick={(ev) => {\n                ev.preventDefault();\n                if (customField?.extra?.of?.type === 'object') {\n                  append({});\n                } else {\n                  append('');\n                }\n                setCurrentIndex(currentLength + 1);\n                setIsAppending(true);\n              }}\n              disabled={\n                customField?.editable === false ||\n                customField.extra?.editVariant === 'noinput' ||\n                fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)\n              }\n            >\n              {customField.extra?.label.object?.add}\n            </Button>\n          </div>\n        )}\n      </>\n    );\n  }\n);\n\nexport const ArrayItemModal = React.forwardRef(function ArrayItemModal(\n  {\n    type,\n    currentName,\n    title,\n    hint,\n    defaultValue,\n    editOrAppend,\n    cancel,\n    control,\n    addTitle,\n    editLabel,\n    editProps,\n    appendLabel,\n    appendProps,\n    cancelLabel,\n    cancelProps,\n    children,\n    ...props\n  }: {\n    type: 'append' | 'edit';\n    name: string;\n    title?: string;\n    hint?: string;\n    editOrAppend: () => void;\n    cancel: () => void;\n    addTitle?: string;\n    editLabel?: string;\n    editProps?: any;\n    appendLabel?: string;\n    appendProps?: any;\n    cancelLabel?: string;\n    cancelProps?: any;\n    children: React.ReactNode;\n    [key: string]: any;\n  },\n  ref\n) {\n  const value = useWatch({\n    control,\n    name: currentName,\n    defaultValue: defaultValue,\n  });\n  const disabled = value === undefined || value === null || value === '';\n  return (\n    <Modal\n      {...props}\n      ref={ref as LegacyRef<HTMLDivElement>}\n      aria-labelledby=\"modal-label\"\n    >\n      <ModalHeading id=\"modal-label\">\n        {title\n          ? title\n          : type === 'edit'\n            ? '\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1'\n            : addTitle || '\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7'}\n      </ModalHeading>\n      <ModalContent>\n        {hint && <Hint>{hint}</Hint>}\n        {children}\n      </ModalContent>\n      <ModalAction>\n        {type === 'edit' ? (\n          <Button\n            color=\"secondary\"\n            {...editProps}\n            type=\"button\"\n            onClick={(e) => {\n              e.preventDefault();\n              editOrAppend();\n            }}\n            disabled={disabled}\n          >\n            {editLabel || '\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7'}\n          </Button>\n        ) : (\n          <Button\n            color=\"primary\"\n            {...appendProps}\n            type=\"button\"\n            onClick={(e) => {\n              e.preventDefault();\n              editOrAppend();\n            }}\n            disabled={disabled}\n          >\n            {appendLabel || '\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7'}\n          </Button>\n        )}\n        <Button\n          variant=\"link\"\n          type=\"button\"\n          {...cancelProps}\n          onClick={(e) => {\n            e.preventDefault();\n            cancel();\n          }}\n        >\n          {cancelLabel || '\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7'}\n        </Button>\n      </ModalAction>\n    </Modal>\n  );\n});\n\nexport const ArrayItemHeader = ({ labels, disabled }) => {\n  return (\n    <TableHead>\n      <TableRow>\n        {labels.map((label, index) => {\n          return <TableHeadCell key={index}>{label}</TableHeadCell>;\n        })}\n        {!disabled && <TableHeadCell>\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B5\u03C2</TableHeadCell>}\n      </TableRow>\n    </TableHead>\n  );\n};\n\nexport const ArrayItemDisplay = ({\n  name,\n  data,\n  edit,\n  remove,\n  disabledEdit,\n  disabledDelete,\n  disabled,\n  sortable,\n  index,\n  isFirst,\n  isLast,\n  move,\n  valueDisplay,\n  border = true,\n  wordBreak = 'break-all',\n  stackProps = {\n    spacing: 4,\n    alignItems: 'flex-end',\n    justifyContent: 'flex-end',\n    direction: 'column',\n  },\n}: {\n  data: any;\n  name: string;\n  edit: (name: string) => void;\n  remove: (name: string) => void;\n  disabledEdit?: boolean;\n  disabledDelete?: boolean;\n  disabled?: boolean;\n  sortable: boolean;\n  index: number;\n  isFirst: boolean;\n  isLast: boolean;\n  move: UseFieldArrayMove;\n  valueDisplay?: (value) => React.ReactNode;\n  border: boolean;\n  wordBreak?: 'break-all' | 'none';\n  stackProps?: StackProps;\n}) => {\n  if (data === undefined || data === null) {\n    return null;\n  }\n  if (\n    Object.keys(data).length === 0 ||\n    (Object.keys(data).length === 1 && data.id)\n  ) {\n    return null;\n  }\n  delete data.id;\n  const values: (string | Record<string, any>)[] =\n    typeof data === 'string' ? [data] : Object.values(data || {});\n  const borderVariant = border === false || sortable ? 'none' : 'border';\n  return (\n    <>\n      <TableRow>\n        {values?.map?.((value, valueIndex) => {\n          return (\n            <TableDataCell\n              key={valueIndex}\n              variant={borderVariant}\n              wordBreak={wordBreak}\n              pb={sortable ? 0 : undefined}\n              pt={sortable ? 4 : undefined}\n            >\n              {sortable && valueIndex === 0 && (\n                <Heading size=\"sm\" className=\"mb-2\">\n                  \u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE #{index + 1}\n                </Heading>\n              )}\n              {(value as Record<string, any>)?.name ||\n                (Array.isArray(value)\n                  ? value.join('\\n')\n                  : valueDisplay\n                    ? valueDisplay(value)\n                    : value) ||\n                ''}\n            </TableDataCell>\n          );\n        })}\n        {disabled === true ||\n        (disabledEdit === true && disabledDelete === true) ? null : (\n          <TableDataCell variant={borderVariant}>\n            <Stack {...stackProps}>\n              {disabledEdit !== true && (\n                <Button\n                  variant=\"link\"\n                  type=\"button\"\n                  onClick={() => {\n                    edit(name);\n                  }}\n                >\n                  \u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\n                </Button>\n              )}\n              {disabledDelete !== true && (\n                <Button\n                  variant=\"link\"\n                  type=\"button\"\n                  onClick={() => remove(name)}\n                >\n                  \u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\n                </Button>\n              )}\n            </Stack>\n          </TableDataCell>\n        )}\n      </TableRow>\n      {sortable && (\n        <TableRow>\n          <TableDataCell\n            variant={isLast ? 'none' : 'border'}\n            colSpan={\n              disabled === true ||\n              (disabledEdit === true && disabledDelete === true)\n                ? values.length\n                : values.length + 1\n            }\n          >\n            {sortable && !disabled && !(isFirst && isLast) && (\n              <Grid xs={12} mt={2}>\n                \u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7{' '}\n                {!isFirst && (\n                  <>\n                    \u03C0\u03C1\u03BF\u03C2 \u03C4\u03B1{' '}\n                    <Button\n                      type=\"button\"\n                      variant=\"link\"\n                      onClick={() => move(index, index - 1)}\n                    >\n                      \u03C0\u03AC\u03BD\u03C9\n                    </Button>\n                  </>\n                )}\n                {!isFirst && !isLast && ' \u03AE '}\n                {!isLast && (\n                  <>\n                    \u03C0\u03C1\u03BF\u03C2 \u03C4\u03B1{' '}\n                    <Button\n                      type=\"button\"\n                      variant=\"link\"\n                      onClick={() => move(index, index + 1)}\n                    >\n                      \u03BA\u03AC\u03C4\u03C9\n                    </Button>\n                  </>\n                )}\n              </Grid>\n            )}\n          </TableDataCell>\n        </TableRow>\n      )}\n    </>\n  );\n};\n\nexport default FormDialog;\n"],
+  "mappings": "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",
+  "names": ["FormDialog", "values", "ArrayItemModal"]
+}

package/FieldArray/__stories__/Default.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;

package/FieldArray/__stories__/WithExactLength.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const WithExactLength: () => React.JSX.Element;
+export declare const WithExactLength: (_: any) => React.JSX.Element;

package/FieldArray/__stories__/WithModal.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const WithModal: (_: any) => React.JSX.Element;

package/FieldArray/index.d.ts

@@ -3,9 +3,16 @@ import { ErrorOption, UseFormReturn } from 'react-hook-form';
 import { FieldProps } from '@digigov/form/Field/types';
 export interface FieldArrayProps extends FieldProps {
     control: UseFormReturn['control'];
+    trigger: UseFormReturn['trigger'];
     register: UseFormReturn['register'];
+    clearErrors: UseFormReturn['clearErrors'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    getValues: UseFormReturn['getValues'];
+    setValue: UseFormReturn['setValue'];
+    reset: UseFormReturn['reset'];
+    resetField?: UseFormReturn['resetField'];
+    Field: React.FC<FieldProps>;
 }
 export declare const FieldArray: React.FC<FieldArrayProps>;
 export default FieldArray;

package/FieldArray/index.js

@@ -1,69 +1,129 @@
-import React from "react";
+import React, { useEffect, useRef } 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 { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
+import { FormDialog } from "@digigov/form/FieldArray/FormDialog";
+import { FieldObject } from "@digigov/form/FieldObject";
+import { FieldsetLabel, 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,
+  trigger,
   register,
+  clearErrors,
   control,
   formState,
   error,
+  getValues,
+  setValue,
   layout,
+  reset,
+  resetField,
   label,
+  Field,
   ...customField
 }) => {
-  const { fields, append, remove } = useFieldArray({
+  const { append, remove } = useFieldArray({
     control,
     name
   });
+  const fields = getValues(name) || [];
+  const containerRef = useRef(null);
+  const { errors } = formState;
+  useEffect(() => {
+    if (!containerRef.current) return;
+    const fieldErrors = Object.keys(errors);
+    if (!fieldErrors.length) return;
+    if (
+      // Check if there are errors related to the current field array
+      fieldErrors.some((key) => {
+        const fieldArrayName = key.split(".")[0];
+        return fieldArrayName === name;
+      })
+    ) {
+      if (containerRef.current && errors[name]) {
+        containerRef.current.focus();
+      }
+    }
+  }, [errors, name]);
   return /* @__PURE__ */ React.createElement(
-    FieldContainer,
+    FieldBaseContainer,
     {
       label,
       layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
+      register,
+      ref: containerRef,
+      error: error?.message && error ? error : void 0,
+      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
       wrapper: "fieldset",
-      name
+      name,
+      labelSize: customField.extra?.labelSize,
+      controlled: true
     },
-    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,
+    customField.extra?.variant === "dialog" ? /* @__PURE__ */ React.createElement(
+      FormDialog,
       {
-        name: `${name}.${index}`,
-        error: Array.isArray(error) && error[index],
-        formState,
+        name,
+        trigger,
         register,
+        clearErrors,
         control,
-        ...customField.extra?.of
+        formState,
+        error,
+        getValues,
+        setValue,
+        layout,
+        label,
+        Field,
+        reset,
+        resetField,
+        sortable: customField.extra.sortable,
+        ...customField
       }
-    ), /* @__PURE__ */ React.createElement(
-      Button,
+    ) : /* @__PURE__ */ React.createElement(React.Fragment, null, fields.map((field, index) => /* @__PURE__ */ React.createElement(
+      Card,
       {
-        name: `${name}-object-remove`,
-        type: "button",
-        color: "warning",
-        onClick: () => remove(index)
+        variant: customField.extra?.border ? "border" : "divider",
+        key: field.id || index
       },
-      customField.extra?.label.object?.delete
-    )))),
-    /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(FieldsetLabel, null, customField.extra?.label.object.title, " ", !customField.extra?.noIndex && 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`,
+          variant: customField.extra?.label.object?.deleteButtonVariant,
+          type: "button",
+          color: "warning",
+          onClick: () => remove(index),
+          disabled: !customField?.editable
+        },
+        customField.extra?.label.object?.delete
+      ))
+    )), customField.editable && /* @__PURE__ */ React.createElement(
       Button,
       {
         type: "button",
         name: `${name}-add-object`,
         color: "secondary",
+        variant: customField.extra?.label.object?.addButtonVariant,
         onClick: (ev) => {
           ev.preventDefault();
           append({});
-        }
+        },
+        disabled: !customField?.editable
       },
       customField.extra?.label.object?.add
-    )
+    ))
   );
 };
 var FieldArray_default = FieldArray;

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 { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\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\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    </FieldContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAsB,qBAAoC;AAC1D,OAAO,oBAAoB;AAE3B,OAAO,iBAAiB;AACxB,SAAS,qBAAqB;AAC9B,OAAO,cAAc;AACrB,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,YAAY;AAOd,MAAM,aAAwC,CAAC;AAAA,EACpD;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;AAAA,IACzB,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;",
+  "sourcesContent": ["import React, { useEffect, useRef } from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { FieldsetLabel, Fieldset } from '@digigov/form/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\n\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  trigger: UseFormReturn['trigger'];\n  register: UseFormReturn['register'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  getValues: UseFormReturn['getValues'];\n  setValue: UseFormReturn['setValue'];\n  reset: UseFormReturn['reset'];\n  resetField?: UseFormReturn['resetField'];\n  Field: React.FC<FieldProps>;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  trigger,\n  register,\n  clearErrors,\n  control,\n  formState,\n  error,\n  getValues,\n  setValue,\n  layout,\n  reset,\n  resetField,\n  label,\n  Field,\n  ...customField\n}) => {\n  const { append, remove } = useFieldArray({\n    control,\n    name,\n  });\n  const fields = getValues(name) || [];\n\n  /** The ref of the FieldBaseContainer. */\n  const containerRef = useRef<HTMLFieldSetElement | null>(null);\n\n  const { errors } = formState;\n\n  // Focus the fieldset when there are errors related to this field array\n  useEffect(() => {\n    if (!containerRef.current) return;\n    const fieldErrors = Object.keys(errors);\n    // no errors\n    if (!fieldErrors.length) return;\n\n    if (\n      // Check if there are errors related to the current field array\n      fieldErrors.some((key) => {\n        const fieldArrayName = key.split('.')[0];\n        return fieldArrayName === name;\n      })\n    ) {\n      if (containerRef.current && errors[name]) {\n        containerRef.current.focus();\n      }\n    }\n  }, [errors, name]);\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      ref={containerRef}\n      error={error?.message && error ? error : undefined}\n      hasError={formState.isSubmitted && !formState.isSubmitting && !!error}\n      wrapper=\"fieldset\"\n      name={name}\n      labelSize={customField.extra?.labelSize}\n      controlled={true}\n    >\n      {customField.extra?.variant === 'dialog' ? (\n        <FormDialog\n          name={name}\n          trigger={trigger}\n          register={register}\n          clearErrors={clearErrors}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          setValue={setValue}\n          layout={layout}\n          label={label}\n          Field={Field}\n          reset={reset}\n          resetField={resetField}\n          sortable={customField.extra.sortable}\n          {...customField}\n        />\n      ) : (\n        <>\n          {fields.map((field, index) => (\n            <Card\n              variant={customField.extra?.border ? 'border' : 'divider'}\n              key={field.id || index}\n            >\n              <Fieldset>\n                <FieldsetLabel>\n                  {customField.extra?.label.object.title}{' '}\n                  {!customField.extra?.noIndex && index + 1}\n                </FieldsetLabel>\n                <FieldObject\n                  name={`${name}.${index}`}\n                  error={Array.isArray(error) && error[index]}\n                  formState={formState}\n                  register={register}\n                  control={control}\n                  {...customField.extra?.of}\n                  Field={Field}\n                />\n                <Button\n                  name={`${name}-object-remove`}\n                  variant={customField.extra?.label.object?.deleteButtonVariant}\n                  type=\"button\"\n                  color=\"warning\"\n                  onClick={() => remove(index)}\n                  disabled={!customField?.editable}\n                >\n                  {customField.extra?.label.object?.delete}\n                </Button>\n              </Fieldset>\n            </Card>\n          ))}\n          {customField.editable && (\n            <Button\n              type=\"button\"\n              name={`${name}-add-object`}\n              color=\"secondary\"\n              variant={customField.extra?.label.object?.addButtonVariant}\n              onClick={(ev) => {\n                ev.preventDefault();\n                append({});\n              }}\n              disabled={!customField?.editable}\n            >\n              {customField.extra?.label.object?.add}\n            </Button>\n          )}\n        </>\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": "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",
   "names": []
 }

package/FieldObject/index.d.ts

@@ -6,18 +6,25 @@ export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    defaultValue?: undefined;
+    Field: React.FC<FieldProps>;
 }
 export declare const FieldObject: React.FC<FieldObjectProps>;
 export interface FieldObjectItemProps {
+    key: string;
     name: string;
     field: FieldSpec;
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
     children?: React.ReactNode;
+    defaultValue?: undefined;
+    Field: React.FC<FieldProps>;
 }
 export default FieldObject;

package/FieldObject/index.js

@@ -5,8 +5,8 @@ import {
   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/react-core/FieldsetLegend";
+import { Fieldset, FieldsetCaption } from "@digigov/form/Fieldset";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 const FieldObject = ({
   name,
@@ -15,21 +15,27 @@ const FieldObject = ({
   control,
   register,
   reset,
+  resetField,
   formState,
-  error
+  error,
+  defaultValue,
+  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(
+  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm", marginBottom: 3 }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, { marginBottom: 3 }, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(
     FieldObjectItem,
     {
-      key: `${name}.${field.key}`,
-      name: `${name}.${field.key}`,
+      key: `${name}${field.key ? `.${field.key}` : ""}`,
+      name: `${name}${field.key ? `.${field.key}` : ""}`,
       control,
       register,
       reset,
+      resetField,
       field,
       error: error && error[field.key],
-      formState
+      formState,
+      defaultValue: defaultValue?.[field.key] || void 0,
+      Field
     }
   )));
 };
@@ -41,24 +47,37 @@ const FieldObjectItem = ({
   control,
   formState,
   reset,
-  register
+  resetField,
+  register,
+  defaultValue,
+  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
+  if (Field) {
+    if (!field.type) {
+      field.type = "string";
     }
-  );
+    return /* @__PURE__ */ React.createElement(Field, { ...field, name });
+  } else {
+    const customError = error ? error : formState?.errors[name];
+    return /* @__PURE__ */ React.createElement(
+      FieldBase,
+      {
+        ...calculatedField,
+        name,
+        Field,
+        control,
+        reset,
+        resetField,
+        register,
+        error: customError,
+        defaultValue
+      }
+    );
+  }
 };
 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 {\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/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  error,\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        />\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}\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    () =>\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      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,OAAO,YAAY,uBAAuB;AAE1C,SAAS,sBAAsB;AAC/B,SAAS,sBAAsB;AAUxB,MAAM,cAA0C,CAAC;AAAA,EACtD;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;AAAA,EACF,CACD,CACH;AAEJ;AAaA,MAAM,kBAAkD,CAAC;AAAA,EACvD;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,OAAO;AAAA;AAAA,EACT;AAEJ;AAEA,IAAO,sBAAQ;",
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { FieldProps, CalculatedField } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';\nimport { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  defaultValue?: undefined;\n  Field: React.FC<FieldProps>;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  resetField,\n  formState,\n  error,\n  defaultValue,\n  Field,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\" marginBottom={3}>\n          {t(label.primary)}\n        </FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption marginBottom={3}>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}${field.key ? `.${field.key}` : ''}`}\n          name={`${name}${field.key ? `.${field.key}` : ''}`}\n          control={control}\n          register={register}\n          reset={reset}\n          resetField={resetField}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n          defaultValue={defaultValue?.[field.key] || undefined}\n          Field={Field}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  key: string;\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n  defaultValue?: undefined;\n  Field: React.FC<FieldProps>;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  resetField,\n  register,\n  defaultValue,\n  Field,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n  if (Field) {\n    if (!field.type) {\n      field.type = 'string';\n    }\n    return <Field {...field} name={name} />;\n  } else {\n    const customError = error ? error : formState?.errors[name];\n    return (\n      <FieldBase\n        {...calculatedField}\n        name={name}\n        Field={Field}\n        control={control}\n        reset={reset}\n        resetField={resetField}\n        register={register}\n        error={customError}\n        defaultValue={defaultValue}\n      />\n    );\n  }\n};\n\nexport default FieldObject;\n"],
+  "mappings": "AAAA,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;AAaxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,IAAI,eAAe;AAE7B,SACE,oCAAC,gBACE,OAAO,WACN,oCAAC,kBAAe,MAAK,MAAK,cAAc,KACrC,EAAE,MAAM,OAAO,CAClB,GAED,OAAO,aACN,oCAAC,mBAAgB,cAAc,KAAI,EAAE,MAAM,SAAS,CAAE,GAEvD,OAAO,OAAO,IAAI,CAAC,UAClB;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,GAAG,KAAK,EAAE;AAAA,MAC/C,MAAM,GAAG,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,GAAG,KAAK,EAAE;AAAA,MAChD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA,MACA,cAAc,eAAe,MAAM,GAAG,KAAK;AAAA,MAC3C;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAiBA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,kBAAmC;AAAA,IACvC,MACE,eAAe,UAAU,OAAO,kBAAkB,sBAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AACA,MAAI,OAAO;AACT,QAAI,CAAC,MAAM,MAAM;AACf,YAAM,OAAO;AAAA,IACf;AACA,WAAO,oCAAC,SAAO,GAAG,OAAO,MAAY;AAAA,EACvC,OAAO;AACL,UAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,IAAO,sBAAQ;",
   "names": []
 }

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,9 +1,9 @@
 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

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,OAAO,WAAW;AAMlB,OAAO,cAAc;AACrB,OAAO,oBAAoB;AAC3B,OAAO,UAAU;AACjB,OAAO,UAAU;AACjB,OAAO,gBAAgB;AAEhB,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;",
+  "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,6 +1,5 @@
-/// <reference types="react" />
-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 {

package/FormBuilder/FormBuilder.stories.d.ts

@@ -1,8 +1,12 @@
 declare namespace _default {
     export let title: string;
     export { FormBuilder as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;
 export { Default } from "@digigov/form/FormBuilder/__stories__/Default";
+export { ErrorGrouping } from "@digigov/form/FormBuilder/__stories__/ErrorGrouping";
+export { AutoErrorGrouping } from "@digigov/form/FormBuilder/__stories__/AutoErrorGrouping";
 import FormBuilder from '@digigov/form/FormBuilder';

package/FormBuilder/__stories__/AutoErrorGrouping.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const AutoErrorGrouping: (_: any) => React.JSX.Element;
+export default AutoErrorGrouping;

package/FormBuilder/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;
 export default Default;

package/FormBuilder/__stories__/ErrorGrouping.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const ErrorGrouping: (_: any) => React.JSX.Element;
+export default ErrorGrouping;

package/FormBuilder/index.d.ts

@@ -1,3 +1,9 @@
-import { FormBuilder, useFormContext, useFormValues, FormBase } from '@digigov/form';
-export { useFormContext, useFormValues, FormBase };
+import React from 'react';
+import { useFormContext } from '@digigov/form/FormContext';
+import { FormBaseProps, FormBuilderProps } from '@digigov/form/types';
+declare const FormBase: React.ForwardRefExoticComponent<FormBaseProps & React.RefAttributes<HTMLFormElement>>;
+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 };