@digigov/form 2.0.0-834daea4 → 2.0.0-87b6232d

package/cjs/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                    tableCellActionsLabel={\n                      customField.extra?.tableCellActionsLabel\n                    }\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 = ({\n  labels,\n  disabled,\n  tableCellActionsLabel,\n}) => {\n  return (\n    <TableHead>\n      <TableRow>\n        {labels.map((label, index) => {\n          return <TableHeadCell key={index}>{label}</TableHeadCell>;\n        })}\n        {!disabled && (\n          <TableHeadCell>{tableCellActionsLabel ?? `\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B5\u03C2`}</TableHeadCell>\n        )}\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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8D;AAC9D,6BAMO;AAEP,yBAA4B;AAC5B,sBAAyB;AACzB,mBAMO;AACP,qBAQO;AACP,oBAAuB;AACvB,qBAAwC;AACxC,qBAAoB;AACpB,kBAAqB;AAyBd,MAAM,aAAwC,aAAAA,QAAM;AAAA,EACzD,SAASC,YACP;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,GACA,KACA;AACA,UAAM,CAAC,aAAa,cAAc,QAAI,uBAAS,KAAK;AACpD,UAAM,CAAC,cAAc,eAAe,QAAI,uBAAS,CAAC;AAClD,UAAM,EAAE,QAAQ,QAAQ,QAAQ,QAAQ,KAAK,QAAI,sCAAc;AAAA,MAC7D;AAAA,MACA;AAAA,IACF,CAAC;AACD,UAAM,EAAE,MAAM,OAAO,cAAc,QAAI,uBAAS;AAChD,UAAM,gBAAgB,OAAO,SAAS,IAAI,OAAO,SAAS,IAAI,OAAO;AACrE,UAAM,cAAc,cAChB,GAAG,IAAI,IAAI,aAAa,KACxB,GAAG,IAAI,IAAI,YAAY;AAC3B,gCAAU,MAAM;AACd,UAAI,aAAa;AACf,wBAAgB,aAAa;AAC7B,aAAK,SAAS,IAAI,EAAE;AAAA,MACtB;AAAA,IACF,GAAG,CAAC,WAAW,CAAC;AAEhB,UAAM,gBAAY,qBAAO,IAAI;AAC7B,QAAI,CAAC,OAAO;AACV,YAAMC,UAAS,UAAU,WAAW;AACpC,UAAI,OAAOA,YAAW,UAAU;AAC9B,kBAAU,UAAU,EAAE,GAAGA,QAAO;AAAA,MAClC,OAAO;AACL,kBAAU,UAAUA;AAAA,MACtB;AAAA,IACF;AACA,UAAM,SAAS,UAAU,IAAI;AAC7B,UAAM,UAAU;AAAA,MACd,GAAG,YAAY,OAAO;AAAA,MACtB,MAAM;AAAA,IACR;AACA,UAAM,eAAe,UAAU,WAAW,KAAK,QAAQ;AACvD,UAAM,oBACJ,OAAO,WAAW,KAAM,OAAO,WAAW,KAAK;AACjD,UAAM,cAAc,YAAY,OAAO,MAAM,OAAO,iBAChD,GAAG,gBAAgB,CAAC,KACpB;AACJ,WACE,6BAAAF,QAAA,2BAAAA,QAAA,gBACG,qBACC,6BAAAA,QAAA,cAAC,oBAAM,GAAG,YAAY,OAAO,MAAM,QAAQ,uBACxC,YAAY,OAAO,MAAM,QAAQ,aACpC,GAEF,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,OACE,YAAY,OAAO,MAAM,OAAO,SAChC,GAAG,YAAY,OAAO,MAAM,OAAO,KAAK,IAAI,WAAW;AAAA,QAEzD,MAAM,YAAY,OAAO;AAAA,QACzB;AAAA,QACA;AAAA,QACA;AAAA,QACA,cAAc,YAAY;AACxB,gBAAM,cAAc,MAAM;AAAA,YACxB,QAAQ,SAAS,WACb,QAAQ,MAAM,OAAO,IAAI,CAAC,EAAE,IAAI,MAAM,GAAG,WAAW,IAAI,GAAG,EAAE,IAC7D;AAAA,UACN;AACA,cAAI,CAAC,aAAa;AAChB,mBAAO,cAAc,UAAU,OAAO;AAAA,UACxC;AACA,cAAI,aAAa;AACf,kBAAM,YAAY,UAAU,WAAW;AACvC,gBAAI,aAAa;AACf,6BAAe,KAAK;AAAA,YACtB;AACA,gBAAI,cAAc,IAAI;AACpB,qBAAO,YAAY;AAAA,YACrB,OAAO;AACL,qBAAO,cAAc,SAAS;AAAA,YAChC;AACA,kBAAM;AAAA,UACR;AAAA,QACF;AAAA,QACA,QAAQ,MAAM;AACZ,cAAI,aAAa;AACf,2BAAe,KAAK;AACpB,mBAAO,YAAY;AACnB,kBAAM;AACN;AAAA,UACF;AACA,iBAAO,cAAc,UAAU,OAAO;AACtC,gBAAM,QAAW;AAAA,YACf,aAAa;AAAA,YACb,mBAAmB;AAAA,YACnB,aAAa;AAAA,YACb,iBAAiB;AAAA,YACjB,YAAY;AAAA,UACd,CAAC;AACD,gBAAM;AAAA,QACR;AAAA,QACA,MAAM,cAAc,WAAW;AAAA,QAC/B,aAAa,YAAY,OAAO,MAAM,OAAO,OAAO;AAAA,QACpD,aAAa,YAAY,OAAO,MAAM,OAAO,OAAO;AAAA,QACpD,WAAW,YAAY,OAAO,MAAM,OAAO,KAAK;AAAA,QAChD,WAAW,YAAY,OAAO,MAAM,OAAO,KAAK;AAAA,QAChD,aAAa,YAAY,OAAO,MAAM,OAAO,OAAO;AAAA,QACpD,aAAa,YAAY,OAAO,MAAM,OAAO,OAAO;AAAA,QACpD;AAAA,QACC,GAAG,cAAc,SAAS,IAAI,EAAE;AAAA;AAAA,MAEjC,6BAAAA,QAAA,cAAC,gCACE,SAAS,SAAS,WACjB,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,cAAc,gBAAgB;AAAA,UAC9B,OAAO,SAAS,MAAM,YAAY;AAAA,UAClC;AAAA,UACA;AAAA,UACA;AAAA,UACC,GAAG;AAAA,UACJ,KAAK;AAAA,UACL;AAAA;AAAA,MACF,IAEA,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM;AAAA,UACL,GAAG;AAAA,UACJ,OAAO,SAAS,MAAM,YAAY;AAAA,UAClC,KAAK;AAAA;AAAA,MACP,CAEJ;AAAA,IACF,GACC,CAAC,qBACA,6BAAAA,QAAA,cAAC,iCAAgB,GAAG,YAAY,OAAO,kBACrC,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,eAAe,YAAY,OAAO;AAAA;AAAA,MAEjC,CAAC,YAAY,OAAO,YACnB,CAAC,qBACD,SAAS,SACT,QAAQ,SAAS,KACf,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,uBACE,YAAY,OAAO;AAAA,UAErB,QACE,QAAQ,SAAS,WACb,QAAQ,MAAM,OAAO,IAAI,CAAC,EAAE,MAAM,MAAM,MAAM,OAAO,IACrD,CAAC,QAAQ,MAAM,OAAO;AAAA,UAE5B,UAAU,aAAa,aAAa;AAAA;AAAA,MACtC;AAAA,MAEJ,6BAAAA,QAAA,cAAC,gCACE,CAAC,qBACA,QAAQ,MAAM,CAAC,OAAO,UAAU;AAC9B,eACE,6BAAAA,QAAA;AAAA,UAAC;AAAA;AAAA,YACC,KAAK;AAAA,YACL,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,YACtB;AAAA,YACA,SAAS,UAAU;AAAA,YACnB,QAAQ,UAAU,OAAO,SAAS;AAAA,YAClC,MAAM;AAAA,YACN,MAAM,MAAM;AACV,8BAAgB,KAAK;AACrB,mBAAK,SAAS,IAAI,EAAE;AAAA,YACtB;AAAA,YACA,YAAY,aAAa,OAAO;AAAA,YAChC,WAAW,aAAa,OAAO;AAAA,YAC/B,cAAc,aAAa,OAAO;AAAA,YAClC,QAAQ,MAAM;AACZ,qBAAO,KAAK;AAAA,YACd;AAAA,YACA,QAAQ,YAAY,OAAO;AAAA,YAC3B;AAAA,YACA;AAAA,YACA,cACE,WAAW,OAAQ,YAAY,OAAO,UAAU;AAAA,YAElD,gBAAgB,YAAY,OAAO,YAAY;AAAA,YAC/C,UAAU,aAAa,aAAa;AAAA;AAAA,QACtC;AAAA,MAEJ,CAAC,CACL;AAAA,IACF,CACF,GAED,YAAY,OAAO,gBAAgB,aAClC,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,WACE,YAAY,OAAO,MAAM,QAAQ,qBAAqB,SAClD,4DACA;AAAA;AAAA,MAGN,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,MAAK;AAAA,UACL,MAAM,GAAG,IAAI;AAAA,UACb,OAAM;AAAA,UACN,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,UAC1C,SAAS,CAAC,OAAO;AACf,eAAG,eAAe;AAClB,gBAAI,aAAa,OAAO,IAAI,SAAS,UAAU;AAC7C,qBAAO,CAAC,CAAC;AAAA,YACX,OAAO;AACL,qBAAO,EAAE;AAAA,YACX;AACA,4BAAgB,gBAAgB,CAAC;AACjC,2BAAe,IAAI;AAAA,UACrB;AAAA,UACA,UACE,aAAa,aAAa,SAC1B,YAAY,OAAO,gBAAgB,aACnC,OAAO,WAAW,YAAY,OAAO,OAAO,OAAO;AAAA;AAAA,QAGpD,YAAY,OAAO,MAAM,QAAQ;AAAA,MACpC;AAAA,IACF,CAEJ;AAAA,EAEJ;AACF;AAEO,MAAM,iBAAiB,aAAAA,QAAM,WAAW,SAASG,gBACtD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GAiBA,KACA;AACA,QAAM,YAAQ,iCAAS;AAAA,IACrB;AAAA,IACA,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AACD,QAAM,WAAW,UAAU,UAAa,UAAU,QAAQ,UAAU;AACpE,SACE,6BAAAH,QAAA;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA,mBAAgB;AAAA;AAAA,IAEhB,6BAAAA,QAAA,cAAC,6BAAa,IAAG,iBACd,QACG,QACA,SAAS,SACP,uEACA,YAAY,kDACpB;AAAA,IACA,6BAAAA,QAAA,cAAC,iCACE,QAAQ,6BAAAA,QAAA,cAAC,wBAAM,IAAK,GACpB,QACH;AAAA,IACA,6BAAAA,QAAA,cAAC,gCACE,SAAS,SACR,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,OAAM;AAAA,QACL,GAAG;AAAA,QACJ,MAAK;AAAA,QACL,SAAS,CAAC,MAAM;AACd,YAAE,eAAe;AACjB,uBAAa;AAAA,QACf;AAAA,QACA;AAAA;AAAA,MAEC,aAAa;AAAA,IAChB,IAEA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,OAAM;AAAA,QACL,GAAG;AAAA,QACJ,MAAK;AAAA,QACL,SAAS,CAAC,MAAM;AACd,YAAE,eAAe;AACjB,uBAAa;AAAA,QACf;AAAA,QACA;AAAA;AAAA,MAEC,eAAe;AAAA,IAClB,GAEF,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,SAAQ;AAAA,QACR,MAAK;AAAA,QACJ,GAAG;AAAA,QACJ,SAAS,CAAC,MAAM;AACd,YAAE,eAAe;AACjB,iBAAO;AAAA,QACT;AAAA;AAAA,MAEC,eAAe;AAAA,IAClB,CACF;AAAA,EACF;AAEJ,CAAC;AAEM,MAAM,kBAAkB,CAAC;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,SACE,6BAAAA,QAAA,cAAC,gCACC,6BAAAA,QAAA,cAAC,+BACE,OAAO,IAAI,CAAC,OAAO,UAAU;AAC5B,WAAO,6BAAAA,QAAA,cAAC,gCAAc,KAAK,SAAQ,KAAM;AAAA,EAC3C,CAAC,GACA,CAAC,YACA,6BAAAA,QAAA,cAAC,oCAAe,yBAAyB,wDAAY,CAEzD,CACF;AAEJ;AAEO,MAAM,mBAAmB,CAAC;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,aAAa;AAAA,IACX,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,WAAW;AAAA,EACb;AACF,MAiBM;AACJ,MAAI,SAAS,UAAa,SAAS,MAAM;AACvC,WAAO;AAAA,EACT;AACA,MACE,OAAO,KAAK,IAAI,EAAE,WAAW,KAC5B,OAAO,KAAK,IAAI,EAAE,WAAW,KAAK,KAAK,IACxC;AACA,WAAO;AAAA,EACT;AACA,SAAO,KAAK;AACZ,QAAM,SACJ,OAAO,SAAS,WAAW,CAAC,IAAI,IAAI,OAAO,OAAO,QAAQ,CAAC,CAAC;AAC9D,QAAM,gBAAgB,WAAW,SAAS,WAAW,SAAS;AAC9D,SACE,6BAAAA,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,+BACE,QAAQ,MAAM,CAAC,OAAO,eAAe;AACpC,WACE,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL,SAAS;AAAA,QACT;AAAA,QACA,IAAI,WAAW,IAAI;AAAA,QACnB,IAAI,WAAW,IAAI;AAAA;AAAA,MAElB,YAAY,eAAe,KAC1B,6BAAAA,QAAA,cAAC,eAAAI,SAAA,EAAQ,MAAK,MAAK,WAAU,UAAO,gDACxB,QAAQ,CACpB;AAAA,MAEA,OAA+B,SAC9B,MAAM,QAAQ,KAAK,IAChB,MAAM,KAAK,IAAI,IACf,eACE,aAAa,KAAK,IAClB,UACN;AAAA,IACJ;AAAA,EAEJ,CAAC,GACA,aAAa,QACb,iBAAiB,QAAQ,mBAAmB,OAAQ,OACnD,6BAAAJ,QAAA,cAAC,gCAAc,SAAS,iBACtB,6BAAAA,QAAA,cAAC,wBAAO,GAAG,cACR,iBAAiB,QAChB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,SAAQ;AAAA,MACR,MAAK;AAAA,MACL,SAAS,MAAM;AACb,aAAK,IAAI;AAAA,MACX;AAAA;AAAA,IACD;AAAA,EAED,GAED,mBAAmB,QAClB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,SAAQ;AAAA,MACR,MAAK;AAAA,MACL,SAAS,MAAM,OAAO,IAAI;AAAA;AAAA,IAC3B;AAAA,EAED,CAEJ,CACF,CAEJ,GACC,YACC,6BAAAA,QAAA,cAAC,+BACC,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,SAAS,SAAS,SAAS;AAAA,MAC3B,SACE,aAAa,QACZ,iBAAiB,QAAQ,mBAAmB,OACzC,OAAO,SACP,OAAO,SAAS;AAAA;AAAA,IAGrB,YAAY,CAAC,YAAY,EAAE,WAAW,WACrC,6BAAAA,QAAA,cAAC,uBAAK,IAAI,IAAI,IAAI,KAAG,gEACR,KACV,CAAC,WACA,6BAAAA,QAAA,2BAAAA,QAAA,gBAAE,yCACQ,KACR,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,SAAQ;AAAA,QACR,SAAS,MAAM,KAAK,OAAO,QAAQ,CAAC;AAAA;AAAA,MACrC;AAAA,IAED,CACF,GAED,CAAC,WAAW,CAAC,UAAU,YACvB,CAAC,UACA,6BAAAA,QAAA,2BAAAA,QAAA,gBAAE,yCACQ,KACR,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,SAAQ;AAAA,QACR,SAAS,MAAM,KAAK,OAAO,QAAQ,CAAC;AAAA;AAAA,MACrC;AAAA,IAED,CACF,CAEJ;AAAA,EAEJ,CACF,CAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["React", "FormDialog", "values", "ArrayItemModal", "Heading"]
+}

package/cjs/FieldArray/index.js

@@ -34,71 +34,119 @@ module.exports = __toCommonJS(FieldArray_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
 var import_FieldBaseContainer = require("@digigov/form/Field/FieldBaseContainer");
+var import_FormDialog = require("@digigov/form/FieldArray/FormDialog");
 var import_FieldObject = require("@digigov/form/FieldObject");
 var import_Fieldset = require("@digigov/form/Fieldset");
-var import_Fieldset2 = require("@digigov/form/Fieldset");
 var import_Card = require("@digigov/ui/content/Card");
 var import_Button = require("@digigov/ui/form/Button");
-var import_Hint = require("@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 } = (0, import_react_hook_form.useFieldArray)({
+  const { append, remove } = (0, import_react_hook_form.useFieldArray)({
     control,
     name
   });
+  const fields = getValues(name) || [];
   return /* @__PURE__ */ import_react.default.createElement(
-    import_FieldBaseContainer.FieldBaseContainer,
+    import_react_hook_form.Controller,
     {
-      label,
-      layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
-      wrapper: "fieldset",
-      name
-    },
-    fields.length === 0 && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, customField.extra?.label.object?.nothing_added),
-    fields.map((field, index) => /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: "border", key: field.id }, /* @__PURE__ */ import_react.default.createElement(import_Fieldset2.Fieldset, null, /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ import_react.default.createElement(
-      import_FieldObject.FieldObject,
-      {
-        name: `${name}.${index}`,
-        error: Array.isArray(error) && error[index],
-        formState,
-        register,
-        control,
-        ...customField.extra?.of,
-        Field
-      }
-    ), /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        name: `${name}-object-remove`,
-        type: "button",
-        color: "warning",
-        onClick: () => remove(index)
-      },
-      customField.extra?.label.object?.delete
-    )))),
-    /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        type: "button",
-        name: `${name}-add-object`,
-        color: "secondary",
-        onClick: (ev) => {
-          ev.preventDefault();
-          append({});
-        }
+      render: ({ field }) => {
+        return /* @__PURE__ */ import_react.default.createElement(
+          import_FieldBaseContainer.FieldBaseContainer,
+          {
+            label,
+            layout,
+            register,
+            error: error?.message && error ? error : void 0,
+            hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
+            wrapper: "fieldset",
+            name,
+            labelSize: customField.extra?.labelSize
+          },
+          /* @__PURE__ */ import_react.default.createElement("div", { tabIndex: -1, ref: field.ref }),
+          customField.extra?.variant === "dialog" ? /* @__PURE__ */ import_react.default.createElement(
+            import_FormDialog.FormDialog,
+            {
+              name,
+              trigger,
+              register,
+              clearErrors,
+              control,
+              formState,
+              error,
+              getValues,
+              setValue,
+              layout,
+              label,
+              Field,
+              reset,
+              resetField,
+              sortable: customField.extra.sortable,
+              ...customField
+            }
+          ) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, fields.map((field2, index) => /* @__PURE__ */ import_react.default.createElement(
+            import_Card.Card,
+            {
+              variant: customField.extra?.border ? "border" : "divider",
+              key: field2.id
+            },
+            /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetLabel, null, customField.extra?.label.object.title, " ", !customField.extra?.noIndex && index + 1), /* @__PURE__ */ import_react.default.createElement(
+              import_FieldObject.FieldObject,
+              {
+                name: `${name}.${index}`,
+                error: Array.isArray(error) && error[index],
+                formState,
+                register,
+                control,
+                ...customField.extra?.of,
+                Field
+              }
+            ), /* @__PURE__ */ import_react.default.createElement(
+              import_Button.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__ */ import_react.default.createElement(
+            import_Button.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
+          ))
+        );
       },
-      customField.extra?.label.object?.add
-    )
+      control,
+      name
+    }
   );
 };
 var FieldArray_default = FieldArray;

package/cjs/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 { 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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA0D;AAC1D,gCAAmC;AAEnC,yBAA4B;AAC5B,sBAA8B;AAC9B,IAAAA,mBAAyB;AACzB,kBAAqB;AACrB,oBAAuB;AACvB,kBAAqB;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,QAAI,sCAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AAED,SACE,6BAAAC,QAAA;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,6BAAAA,QAAA,cAAC,wBAAM,YAAY,OAAO,MAAM,QAAQ,aAAc;AAAA,IAEvD,OAAO,IAAI,CAAC,OAAO,UAClB,6BAAAA,QAAA,cAAC,oBAAK,SAAQ,UAAS,KAAK,MAAM,MAChC,6BAAAA,QAAA,cAAC,iCACC,6BAAAA,QAAA,cAAC,qCACE,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,CACnD,GACA,6BAAAA,QAAA;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,6BAAAA,QAAA;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,6BAAAA,QAAA;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": ["import_Fieldset", "React"]
+  "sourcesContent": ["import React from 'react';\nimport {\n  Controller,\n  ErrorOption,\n  useFieldArray,\n  UseFormReturn,\n} 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\n  const fields = getValues(name) || [];\n  return (\n    <Controller\n      render={({ field }) => {\n        return (\n          <FieldBaseContainer\n            label={label}\n            layout={layout}\n            register={register}\n            error={error?.message && error ? error : undefined}\n            hasError={\n              formState.isSubmitted && !formState.isSubmitting && !!error\n            }\n            wrapper=\"fieldset\"\n            name={name}\n            labelSize={customField.extra?.labelSize}\n          >\n            <div tabIndex={-1} ref={field.ref} />\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}\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={\n                          customField.extra?.label.object?.deleteButtonVariant\n                        }\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      control={control}\n      name={name}\n    />\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAKO;AACP,gCAAmC;AAEnC,wBAA2B;AAC3B,yBAA4B;AAC5B,sBAAwC;AACxC,kBAAqB;AACrB,oBAAuB;AAehB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,OAAO,QAAI,sCAAc;AAAA,IACvC;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,SAAS,UAAU,IAAI,KAAK,CAAC;AACnC,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,eACE,6BAAAA,QAAA;AAAA,UAAC;AAAA;AAAA,YACC;AAAA,YACA;AAAA,YACA;AAAA,YACA,OAAO,OAAO,WAAW,QAAQ,QAAQ;AAAA,YACzC,UACE,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,YAExD,SAAQ;AAAA,YACR;AAAA,YACA,WAAW,YAAY,OAAO;AAAA;AAAA,UAE9B,6BAAAA,QAAA,cAAC,SAAI,UAAU,IAAI,KAAK,MAAM,KAAK;AAAA,UAElC,YAAY,OAAO,YAAY,WAC9B,6BAAAA,QAAA;AAAA,YAAC;AAAA;AAAA,cACC;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA,UAAU,YAAY,MAAM;AAAA,cAC3B,GAAG;AAAA;AAAA,UACN,IAEA,6BAAAA,QAAA,2BAAAA,QAAA,gBACG,OAAO,IAAI,CAACC,QAAO,UAClB,6BAAAD,QAAA;AAAA,YAAC;AAAA;AAAA,cACC,SAAS,YAAY,OAAO,SAAS,WAAW;AAAA,cAChD,KAAKC,OAAM;AAAA;AAAA,YAEX,6BAAAD,QAAA,cAAC,gCACC,6BAAAA,QAAA,cAAC,qCACE,YAAY,OAAO,MAAM,OAAO,OAAO,KACvC,CAAC,YAAY,OAAO,WAAW,QAAQ,CAC1C,GACA,6BAAAA,QAAA;AAAA,cAAC;AAAA;AAAA,gBACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,gBACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,gBAC1C;AAAA,gBACA;AAAA,gBACA;AAAA,gBACC,GAAG,YAAY,OAAO;AAAA,gBACvB;AAAA;AAAA,YACF,GACA,6BAAAA,QAAA;AAAA,cAAC;AAAA;AAAA,gBACC,MAAM,GAAG,IAAI;AAAA,gBACb,SACE,YAAY,OAAO,MAAM,QAAQ;AAAA,gBAEnC,MAAK;AAAA,gBACL,OAAM;AAAA,gBACN,SAAS,MAAM,OAAO,KAAK;AAAA,gBAC3B,UAAU,CAAC,aAAa;AAAA;AAAA,cAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,YACpC,CACF;AAAA,UACF,CACD,GACA,YAAY,YACX,6BAAAA,QAAA;AAAA,YAAC;AAAA;AAAA,cACC,MAAK;AAAA,cACL,MAAM,GAAG,IAAI;AAAA,cACb,OAAM;AAAA,cACN,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,cAC1C,SAAS,CAAC,OAAO;AACf,mBAAG,eAAe;AAClB,uBAAO,CAAC,CAAC;AAAA,cACX;AAAA,cACA,UAAU,CAAC,aAAa;AAAA;AAAA,YAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,UACpC,CAEJ;AAAA,QAEJ;AAAA,MAEJ;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["React", "field"]
 }

package/cjs/FieldObject/index.js

@@ -45,22 +45,26 @@ const FieldObject = ({
   control,
   register,
   reset,
+  resetField,
   formState,
   error,
+  defaultValue,
   Field
 }) => {
   const { t } = (0, import_i18n.useTranslation)();
-  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { size: "sm" }, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { size: "sm", marginBottom: 3 }, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, { marginBottom: 3 }, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ import_react.default.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,
+      defaultValue: defaultValue?.[field.key] || void 0,
       Field
     }
   )));
@@ -73,26 +77,37 @@ const FieldObjectItem = ({
   control,
   formState,
   reset,
+  resetField,
   register,
+  defaultValue,
   Field
 }) => {
   const calculatedField = (0, import_react.useMemo)(
     () => (0, import_calculateField.calculateField)(children, field, import_utils.FIELD_COMPONENTS, import_utils.ALTERNATIVE_COMPONENTS),
     [field]
   );
-  const customError = error ? error : formState?.errors[name];
-  return /* @__PURE__ */ import_react.default.createElement(
-    import_FieldBase.FieldBase,
-    {
-      ...calculatedField,
-      name,
-      Field,
-      control,
-      reset,
-      register,
-      error: customError
+  if (Field) {
+    if (!field.type) {
+      field.type = "string";
     }
-  );
+    return /* @__PURE__ */ import_react.default.createElement(Field, { ...field, name });
+  } else {
+    const customError = error ? error : formState?.errors[name];
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_FieldBase.FieldBase,
+      {
+        ...calculatedField,
+        name,
+        Field,
+        control,
+        reset,
+        resetField,
+        register,
+        error: customError,
+        defaultValue
+      }
+    );
+  }
 };
 var FieldObject_default = FieldObject;
 // Annotate the CommonJS export names for ESM import in node:

package/cjs/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/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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,mBAGO;AACP,4BAA+B;AAC/B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;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,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WACN,6BAAAA,QAAA,cAAC,wCAAe,MAAK,QAAM,EAAE,MAAM,OAAO,CAAE,GAE7C,OAAO,aACN,6BAAAA,QAAA,cAAC,uCAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;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,sBAAmC;AAAA,IACvC,UACE,sCAAe,UAAU,OAAO,+BAAkB,mCAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AAEA,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE,6BAAAA,QAAA;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;",
+  "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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,mBAGO;AACP,4BAA+B;AAC/B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;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,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WACN,6BAAAA,QAAA,cAAC,wCAAe,MAAK,MAAK,cAAc,KACrC,EAAE,MAAM,OAAO,CAClB,GAED,OAAO,aACN,6BAAAA,QAAA,cAAC,mCAAgB,cAAc,KAAI,EAAE,MAAM,SAAS,CAAE,GAEvD,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;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,sBAAmC;AAAA,IACvC,UACE,sCAAe,UAAU,OAAO,+BAAkB,mCAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AACA,MAAI,OAAO;AACT,QAAI,CAAC,MAAM,MAAM;AACf,YAAM,OAAO;AAAA,IACf;AACA,WAAO,6BAAAA,QAAA,cAAC,SAAO,GAAG,OAAO,MAAY;AAAA,EACvC,OAAO;AACL,UAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,WACE,6BAAAA,QAAA;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": ["React"]
 }

package/cjs/FormBuilder/index.js

@@ -37,13 +37,15 @@ module.exports = __toCommonJS(FormBuilder_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
 var import_Field = require("@digigov/form/Field");
+var import_ErrorGroup = require("@digigov/form/Field/ErrorGroup");
 var import_utils = require("@digigov/form/Field/utils");
-var import_Fieldset = require("@digigov/form/Fieldset");
+var import_FieldsetWithContext = require("@digigov/form/Fieldset/FieldsetWithContext");
 var import_FormContext = require("@digigov/form/FormContext");
 var import_utils2 = require("@digigov/form/utils");
 var import_validators = require("@digigov/form/validators");
 var import_Button = require("@digigov/ui/form/Button");
 var import_Form = require("@digigov/ui/form/Form");
+var import_useScreen = require("@digigov/ui/utils/hooks/useScreen");
 const FormBase = import_react.default.forwardRef(function FormBase2({
   onSubmit,
   children,
@@ -54,10 +56,11 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
   mode,
   initial,
   reValidateMode,
-  shouldFocusError,
+  shouldFocusError = true,
   criteriaMode,
   componentRegistry,
   grid,
+  errors,
   ...props
 }, ref) {
   const form = (0, import_react_hook_form.useForm)({
@@ -70,10 +73,20 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
   });
   const handleSubmit = (0, import_react.useCallback)(
     (data) => {
-      onSubmit && onSubmit(data);
+      if (onSubmit) {
+        form.reset(data);
+        onSubmit(data);
+      }
     },
     [onSubmit]
   );
+  (0, import_react.useEffect)(() => {
+    if (errors) {
+      for (const fieldName in errors) {
+        form.setError(fieldName, errors[fieldName], { shouldFocus: true });
+      }
+    }
+  }, [errors]);
   const submit = form.handleSubmit(handleSubmit);
   const ctx = {
     fieldsMap,
@@ -99,6 +112,36 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
   };
   return /* @__PURE__ */ import_react.default.createElement(import_FormContext.FormContext.Provider, { value: ctx }, /* @__PURE__ */ import_react.default.createElement(import_Form.Form, { grid, onSubmit: submit, ref, ...props }, children));
 });
+const DEFAULT_LAYOUT = {
+  xs: 12,
+  sm: 12,
+  md: 12,
+  lg: 12,
+  xl: 12
+};
+const BREAKPOINTS = ["xs", "sm", "md", "lg", "xl"];
+const groupFieldsByLayout = (fields) => {
+  return BREAKPOINTS.reduce((sizes, size) => {
+    sizes[size] = fields.reduce((acc, item) => {
+      const layoutValue = item.layout?.[size] || 12;
+      if (layoutValue === 0) {
+        return [...acc, item];
+      }
+      const lastElement = acc[acc.length - 1];
+      const currentSum = Array.isArray(lastElement) ? lastElement.reduce((sum, i) => sum + (i.layout?.[size] || 0), 0) : 0;
+      if (!Array.isArray(lastElement) || currentSum + layoutValue > 12) {
+        return layoutValue === 12 ? [...acc, item] : [...acc, [item]];
+      }
+      return [...acc.slice(0, -1), [...lastElement, item]];
+    }, []).map((item) => {
+      if (Array.isArray(item) && item.length === 1) {
+        return item[0];
+      }
+      return item;
+    });
+    return sizes;
+  }, {});
+};
 const useFormContext = () => {
   return (0, import_react.useContext)(import_FormContext.FormContext);
 };
@@ -122,6 +165,32 @@ const FormBuilder = import_react.default.forwardRef(function FormBuilder2({
   grid = false,
   ...props
 }, ref) {
+  const { screenSize } = (0, import_useScreen.useScreenSize)();
+  fields = fields.map((field) => {
+    const layout = field.layout;
+    if (!layout) {
+      return {
+        ...field,
+        layout: DEFAULT_LAYOUT
+      };
+    }
+    return {
+      ...field,
+      layout: BREAKPOINTS.reduce(
+        (expandedLayout, breakpoint, breakpointIndex) => {
+          if (field?.layout?.[breakpoint]) {
+            expandedLayout[breakpoint] = field?.layout[breakpoint];
+          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {
+            expandedLayout[breakpoint] = expandedLayout[BREAKPOINTS[breakpointIndex - 1]];
+          } else {
+            expandedLayout[breakpoint] = 12;
+          }
+          return expandedLayout;
+        },
+        {}
+      )
+    };
+  });
   const fieldsState = (0, import_react.useRef)(fields);
   const setFieldsState = (0, import_react.useCallback)((newFields) => {
     fieldsState.current = newFields;
@@ -151,9 +220,27 @@ const FormBuilder = import_react.default.forwardRef(function FormBuilder2({
     );
     if (auto) {
       if (fieldsets) {
-        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, { key: fieldset.key }));
+        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_FieldsetWithContext.FieldsetWithContext, { key: fieldset.key, name: fieldset.key }));
       } else if (fields) {
-        fieldChildren = fields.map((field) => /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: field.key, name: field.key }));
+        const fieldsByLayouts = groupFieldsByLayout(fields);
+        const fieldsByLayoutSize = fieldsByLayouts[screenSize];
+        fieldChildren = fieldsByLayoutSize.map((item, index) => {
+          if (Array.isArray(item)) {
+            return /* @__PURE__ */ import_react.default.createElement(
+              import_ErrorGroup.ErrorGroup,
+              {
+                key: index,
+                screenSize,
+                fieldOrder: item.map((field) => field.key)
+              },
+              item.map((f) => {
+                return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: f.key, name: f.key });
+              })
+            );
+          } else {
+            return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: item.key, name: item.key });
+          }
+        });
       }
     }
   }

package/cjs/FormBuilder/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FormBuilder/index.tsx"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport React, { useCallback, useContext, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/Field/utils';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FormBaseProps, FormData, FormBuilderProps } from '@digigov/form/types';\nimport { yupResolver } from '@digigov/form/utils';\nimport { useValidationSchema } from '@digigov/form/validators';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Form } from '@digigov/ui/form/Form';\n\nconst FormBase = React.forwardRef(function FormBase(\n  {\n    onSubmit,\n    children,\n    registerField,\n    fieldsMap,\n    fieldsetsMap,\n    resolver,\n    mode,\n    initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n    componentRegistry,\n    grid,\n    ...props\n  }: FormBaseProps,\n  ref: React.Ref<HTMLFormElement>\n) {\n  const form = useForm({\n    resolver,\n    mode,\n    defaultValues: initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n  });\n\n  const handleSubmit = useCallback(\n    (data: FormData): void => {\n      onSubmit && onSubmit(data);\n    },\n    [onSubmit]\n  );\n  const submit = form.handleSubmit(handleSubmit);\n  const ctx = {\n    fieldsMap,\n    fieldsetsMap,\n    control: form.control,\n    register: form.register,\n    watch: form.watch,\n    resetField: form.resetField,\n    registerField: registerField,\n    errors: form.formState.errors,\n    formState: form.formState,\n    reset: form.reset,\n    trigger: form.trigger,\n    getFieldState: form.getFieldState,\n    setValue: form.setValue,\n    clearErrors: form.clearErrors,\n    getValues: form.getValues,\n    unregister: form.unregister,\n    componentRegistry,\n    setError: form.setError,\n    formRef: ref,\n    submit,\n  };\n  return (\n    <FormContext.Provider value={ctx}>\n      <Form grid={grid} onSubmit={submit} ref={ref} {...props}>\n        {children}\n      </Form>\n    </FormContext.Provider>\n  );\n});\n\nconst useFormContext = () => {\n  return useContext(FormContext);\n};\nconst useFormValues = () => {\n  const ctx = useFormContext();\n  return ctx.getValues();\n};\nconst FormBuilder = React.forwardRef(function FormBuilder(\n  {\n    fields = [],\n    fieldsets,\n    initial = {},\n    onSubmit,\n    children,\n    reValidateMode = 'onSubmit',\n    mode = 'onSubmit',\n    shouldFocusError = true,\n    criteriaMode = 'all',\n    auto = false,\n    validatorRegistry,\n    componentRegistry,\n    grid = false,\n    ...props\n  }: FormBuilderProps,\n  ref: React.Ref<HTMLFormElement>\n): React.ReactElement {\n  const fieldsState = useRef(fields);\n  const setFieldsState = useCallback((newFields) => {\n    fieldsState.current = newFields;\n  }, []);\n  const schema = useValidationSchema(fieldsState, validatorRegistry);\n  const registerField = useCallback((field) => {\n    const fieldIndex = fieldsState.current.findIndex(\n      (f) => f.key === field.key\n    );\n    if (fieldIndex > -1) {\n      fieldsState.current[fieldIndex] = field;\n    } else {\n      fieldsState.current.push(field);\n    }\n    setFieldsState(fieldsState.current);\n  }, []);\n  let resolver;\n  let fieldsMap;\n  let fieldsetsMap;\n  let fieldChildren;\n  if (schema) {\n    resolver = yupResolver(schema);\n    fieldsMap = fields\n      ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {})\n      : {};\n    fieldsetsMap =\n      fieldsets &&\n      fieldsets.reduce(\n        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),\n        {}\n      );\n\n    if (auto) {\n      if (fieldsets) {\n        fieldChildren = fieldsets.map((fieldset) => (\n          <Fieldset key={fieldset.key} />\n        ));\n      } else if (fields) {\n        fieldChildren = fields.map((field) => (\n          <Field key={field.key} name={field.key} />\n        ));\n      }\n    }\n  }\n  return (\n    <FormBase\n      resolver={resolver}\n      fieldsetsMap={fieldsetsMap}\n      fieldsMap={fieldsMap}\n      registerField={registerField}\n      initial={initial}\n      reValidateMode={reValidateMode}\n      mode={mode}\n      shouldFocusError={shouldFocusError}\n      criteriaMode={criteriaMode}\n      onSubmit={onSubmit}\n      componentRegistry={componentRegistry}\n      ref={ref}\n      grid={grid}\n      {...props}\n    >\n      {fieldChildren}\n      {auto && <Button type=\"submit\">\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1</Button>}\n      {children}\n    </FormBase>\n  );\n});\nexport const ControlledFormBuilder = (props) => {\n  return (\n    <FormBuilder {...props} componentRegistry={CONTROLLED_FIELD_COMPONENTS} />\n  );\n};\nexport default FormBuilder;\n\nexport { useFormContext, useFormValues, FormBase };\n"],
-  "mappings": "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",
+  "sourcesContent": ["import React, { useCallback, useContext, useEffect, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { ErrorGroup } from '@digigov/form/Field/ErrorGroup';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/Field/utils';\nimport { FieldsetWithContext } from '@digigov/form/Fieldset/FieldsetWithContext';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FormBaseProps, FormData, FormBuilderProps } from '@digigov/form/types';\nimport { yupResolver } from '@digigov/form/utils';\nimport { useValidationSchema } from '@digigov/form/validators';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Form } from '@digigov/ui/form/Form';\nimport { useScreenSize } from '@digigov/ui/utils/hooks/useScreen';\n\nconst FormBase = React.forwardRef(function FormBase(\n  {\n    onSubmit,\n    children,\n    registerField,\n    fieldsMap,\n    fieldsetsMap,\n    resolver,\n    mode,\n    initial,\n    reValidateMode,\n    shouldFocusError = true,\n    criteriaMode,\n    componentRegistry,\n    grid,\n    errors,\n    ...props\n  }: FormBaseProps,\n  ref: React.Ref<HTMLFormElement>\n) {\n  const form = useForm({\n    resolver,\n    mode,\n    defaultValues: initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n  });\n\n  const handleSubmit = useCallback(\n    (data: FormData): void => {\n      if (onSubmit) {\n        form.reset(data);\n        onSubmit(data);\n      }\n    },\n    [onSubmit]\n  );\n  useEffect(() => {\n    if (errors) {\n      for (const fieldName in errors) {\n        form.setError(fieldName, errors[fieldName], { shouldFocus: true });\n      }\n    }\n  }, [errors]);\n  const submit = form.handleSubmit(handleSubmit);\n  const ctx = {\n    fieldsMap,\n    fieldsetsMap,\n    control: form.control,\n    register: form.register,\n    watch: form.watch,\n    resetField: form.resetField,\n    registerField: registerField,\n    errors: form.formState.errors,\n    formState: form.formState,\n    reset: form.reset,\n    trigger: form.trigger,\n    getFieldState: form.getFieldState,\n    setValue: form.setValue,\n    clearErrors: form.clearErrors,\n    getValues: form.getValues,\n    unregister: form.unregister,\n    componentRegistry,\n    setError: form.setError,\n    formRef: ref,\n    submit,\n  };\n\n  return (\n    <FormContext.Provider value={ctx}>\n      <Form grid={grid} onSubmit={submit} ref={ref} {...props}>\n        {children}\n      </Form>\n    </FormContext.Provider>\n  );\n});\n\nconst DEFAULT_LAYOUT = {\n  xs: 12,\n  sm: 12,\n  md: 12,\n  lg: 12,\n  xl: 12,\n};\n\nconst BREAKPOINTS = ['xs', 'sm', 'md', 'lg', 'xl'];\n\nconst groupFieldsByLayout = (fields) => {\n  return BREAKPOINTS.reduce((sizes, size) => {\n    sizes[size] = fields\n      .reduce((acc, item) => {\n        const layoutValue = item.layout?.[size] || 12;\n        if (layoutValue === 0) {\n          return [...acc, item];\n        }\n        const lastElement = acc[acc.length - 1];\n        const currentSum = Array.isArray(lastElement)\n          ? lastElement.reduce((sum, i) => sum + (i.layout?.[size] || 0), 0)\n          : 0;\n        if (!Array.isArray(lastElement) || currentSum + layoutValue > 12) {\n          return layoutValue === 12 ? [...acc, item] : [...acc, [item]];\n        }\n\n        return [...acc.slice(0, -1), [...lastElement, item]];\n      }, [])\n      .map((item) => {\n        if (Array.isArray(item) && item.length === 1) {\n          return item[0];\n        }\n        return item;\n      });\n    return sizes;\n  }, {});\n};\nconst useFormContext = () => {\n  return useContext(FormContext);\n};\nconst useFormValues = () => {\n  const ctx = useFormContext();\n  return ctx.getValues();\n};\nconst FormBuilder = React.forwardRef(function FormBuilder(\n  {\n    fields = [],\n    fieldsets,\n    initial = {},\n    onSubmit,\n    children,\n    reValidateMode = 'onSubmit',\n    mode = 'onSubmit',\n    shouldFocusError = true,\n    criteriaMode = 'all',\n    auto = false,\n    validatorRegistry,\n    componentRegistry,\n    grid = false,\n    ...props\n  }: FormBuilderProps,\n  ref: React.Ref<HTMLFormElement>\n): React.ReactElement {\n  const { screenSize } = useScreenSize();\n  fields = fields.map((field) => {\n    const layout = field.layout;\n    if (!layout) {\n      return {\n        ...field,\n        layout: DEFAULT_LAYOUT,\n      };\n    }\n    return {\n      ...field,\n      layout: BREAKPOINTS.reduce(\n        (expandedLayout, breakpoint, breakpointIndex) => {\n          if (field?.layout?.[breakpoint]) {\n            expandedLayout[breakpoint] = field?.layout[breakpoint];\n          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {\n            expandedLayout[breakpoint] =\n              expandedLayout[BREAKPOINTS[breakpointIndex - 1]];\n          } else {\n            expandedLayout[breakpoint] = 12;\n          }\n          return expandedLayout;\n        },\n        {}\n      ),\n    };\n  });\n\n  const fieldsState = useRef(fields);\n  const setFieldsState = useCallback((newFields) => {\n    fieldsState.current = newFields;\n  }, []);\n  const schema = useValidationSchema(fieldsState, validatorRegistry);\n  const registerField = useCallback((field) => {\n    const fieldIndex = fieldsState.current.findIndex(\n      (f) => f.key === field.key\n    );\n    if (fieldIndex > -1) {\n      fieldsState.current[fieldIndex] = field;\n    } else {\n      fieldsState.current.push(field);\n    }\n    setFieldsState(fieldsState.current);\n  }, []);\n  let resolver;\n  let fieldsMap;\n  let fieldsetsMap;\n  let fieldChildren;\n  if (schema) {\n    resolver = yupResolver(schema);\n    fieldsMap = fields\n      ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {})\n      : {};\n    fieldsetsMap =\n      fieldsets &&\n      fieldsets.reduce(\n        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),\n        {}\n      );\n\n    if (auto) {\n      if (fieldsets) {\n        fieldChildren = fieldsets.map((fieldset) => (\n          <FieldsetWithContext key={fieldset.key} name={fieldset.key} />\n        ));\n      } else if (fields) {\n        const fieldsByLayouts = groupFieldsByLayout(fields);\n        const fieldsByLayoutSize = fieldsByLayouts[screenSize];\n        fieldChildren = fieldsByLayoutSize.map((item, index) => {\n          if (Array.isArray(item)) {\n            return (\n              <ErrorGroup\n                key={index}\n                screenSize={screenSize}\n                fieldOrder={item.map((field) => field.key)}\n              >\n                {item.map((f) => {\n                  return <Field key={f.key} name={f.key} />;\n                })}\n              </ErrorGroup>\n            );\n          } else {\n            return <Field key={item.key} name={item.key} />;\n          }\n        });\n      }\n    }\n  }\n  return (\n    <FormBase\n      resolver={resolver}\n      fieldsetsMap={fieldsetsMap}\n      fieldsMap={fieldsMap}\n      registerField={registerField}\n      initial={initial}\n      reValidateMode={reValidateMode}\n      mode={mode}\n      shouldFocusError={shouldFocusError}\n      criteriaMode={criteriaMode}\n      onSubmit={onSubmit}\n      componentRegistry={componentRegistry}\n      ref={ref}\n      grid={grid}\n      {...props}\n    >\n      {fieldChildren}\n      {auto && <Button type=\"submit\">\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1</Button>}\n      {children}\n    </FormBase>\n  );\n});\nexport const ControlledFormBuilder = (props) => {\n  return (\n    <FormBuilder {...props} componentRegistry={CONTROLLED_FIELD_COMPONENTS} />\n  );\n};\nexport default FormBuilder;\n\nexport { useFormContext, useFormValues, FormBase };\n"],
+  "mappings": "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",
   "names": ["import_utils", "React", "FormBase", "FormBuilder"]
 }

package/cjs/FormContext/index.js

@@ -20,8 +20,8 @@ __export(FormContext_exports, {
   FormContext: () => FormContext
 });
 module.exports = __toCommonJS(FormContext_exports);
-var import_react2 = require("react");
-const FormContext = (0, import_react2.createContext)({
+var import_react = require("react");
+const FormContext = (0, import_react.createContext)({
   fieldsMap: {},
   fieldsetsMap: {}
 });

package/cjs/FormContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FormContext.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { createContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,IAAAA,gBAA8B;AAGvB,MAAM,kBAA+C,6BAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
-  "names": ["import_react"]
+  "sourcesContent": ["import React, { createContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAqC;AAG9B,MAAM,kBAA+C,4BAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
+  "names": []
 }