@digigov/form 2.0.0-76ec20a0 → 2.0.0-7d765d3c

package/FieldArray/FormDialog/index.js

@@ -1,279 +1,173 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { useFieldArray } from "react-hook-form";
-import { FieldObject } from "@digigov/form/FieldObject";
-import { Fieldset } from "@digigov/form/Fieldset";
-import {
-  Modal,
-  ModalAction,
-  ModalContent,
-  ModalHeading,
-  useModal
-} from "@digigov/ui/app/Modal";
-import {
-  Table,
-  TableBody,
-  TableContainer,
-  TableDataCell,
-  TableHead,
-  TableHeadCell,
-  TableRow
-} from "@digigov/ui/content";
-import { Button, ButtonGroup } from "@digigov/ui/form/Button";
+import { ArrayItemDisplay } from "@digigov/form/FieldArray/FormDialog/ArrayItemDisplay";
+import { ArrayItemHeader } from "@digigov/form/FieldArray/FormDialog/ArrayItemHeader";
+import { ArrayItemModal } from "@digigov/form/FieldArray/FormDialog/ArrayItemModal";
+import { useModal } from "@digigov/ui/app/Modal";
+import { Table, TableBody, TableContainer } from "@digigov/ui/content";
+import { Button } from "@digigov/ui/form/Button";
 import { Hint } from "@digigov/ui/typography/Hint";
-const FormDialog = ({
-  name,
-  trigger,
-  register,
-  control,
-  formState,
-  error,
-  getValues,
-  Field,
-  reset,
-  ...customField
-}) => {
-  const [isAppending, setIsAppending] = useState(false);
-  const [currentIndex, setCurrentIndex] = useState(0);
-  const { fields, append, remove, update } = useFieldArray({
+const FormDialog = React.forwardRef(
+  function FormDialog2({
+    name: fieldArrayName,
     control,
-    name
-  });
-  const { open, close, registerModal } = useModal();
-  const currentLength = fields.length > 0 ? fields.length - 1 : fields.length;
-  const currentName = isAppending ? `${name}.${currentLength}` : `${name}.${currentIndex}`;
-  useEffect(() => {
-    if (isAppending) {
-      setCurrentIndex(currentLength);
-      open(`modal-${name}`);
-    }
-  }, [isAppending]);
-  const valuesRef = useRef(null);
-  if (!error) {
-    const values2 = getValues(currentName);
-    if (typeof values2 === "object") {
-      valuesRef.current = { ...values2 };
-    } else {
-      valuesRef.current = values2;
+    error,
+    getValues,
+    Field,
+    sortable,
+    ...customField
+  }, ref) {
+    const [isAppending, setIsAppending] = useState(false);
+    const [editingIndex, setEditingIndex] = useState(0);
+    const { fields, append, remove, update, move } = useFieldArray({
+      control,
+      name: fieldArrayName
+    });
+    const { open, close, registerModal } = useModal();
+    const currentLength = fields.length;
+    const arrayItemName = isAppending ? `${fieldArrayName}.${currentLength}` : `${fieldArrayName}.${editingIndex}`;
+    useEffect(() => {
+      if (isAppending) {
+        open(`modal-${fieldArrayName}`);
+      }
+    }, [isAppending, fieldArrayName, open]);
+    const fieldArrayValues = getValues(fieldArrayName);
+    const ofField = {
+      ...customField.extra?.of,
+      name: arrayItemName
+    };
+    if (ofField.type !== "object") {
+      ofField.name = ofField.key ?? fieldArrayName;
+      ofField.key = ofField.key ?? fieldArrayName;
     }
-  }
-  const values = getValues(name);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
-    ArrayItemModal,
-    {
-      title: customField.extra?.label.object.title && `${customField.extra?.label.object.title} ${currentLength + 1}`,
-      hint: customField.label?.secondary,
-      name,
-      editOrAppend: async () => {
-        const hasNoErrors = await trigger(
-          customField.extra?.of.extra ? customField.extra?.of.extra.fields.map(
-            ({ key }) => `${currentName}.${key}`
-          ) : currentName
-        );
-        if (hasNoErrors) {
-          const newValues = getValues(currentName);
+    const defaultValue = useMemo(() => {
+      if (isAppending) {
+        if (ofField.type === "object") return ofField.defaultValue;
+        else return { [ofField.name]: ofField.defaultValue };
+      }
+      if (ofField.type === "object") return getValues(ofField.name);
+      else return { [ofField.name]: fieldArrayValues?.[editingIndex] };
+    }, [
+      editingIndex,
+      fieldArrayValues,
+      getValues,
+      isAppending,
+      ofField.defaultValue,
+      ofField.name,
+      ofField.type
+    ]);
+    const noValuesCommitted = fields.length === 0;
+    const title = useMemo(() => {
+      if (!customField.extra?.label.object.title) return null;
+      let title2 = customField.extra.label.object.title;
+      if (customField.extra.label.object.titleNumbering)
+        title2 += ` ${currentLength + 1}`;
+      return title2;
+    }, [
+      currentLength,
+      customField.extra?.label.object.title,
+      customField.extra?.label.object.titleNumbering
+    ]);
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, noValuesCommitted && /* @__PURE__ */ React.createElement(Hint, { ...customField.extra?.label.object?.nothing_added_props }, customField.extra?.label.object?.nothing_added), /* @__PURE__ */ React.createElement(
+      ArrayItemModal,
+      {
+        editOrAppend: (data) => {
           if (isAppending) {
             setIsAppending(false);
-          }
-          if (customField?.extra?.of?.extra) {
-            update(currentIndex, newValues);
+            if (ofField.type === "object") append(data);
+            else if (data) append(data[ofField.key ?? fieldArrayName]);
           } else {
-            update(currentIndex, newValues);
+            if (ofField.type === "object") update(editingIndex, data);
+            else if (data)
+              update(editingIndex, data[ofField.key ?? fieldArrayName]);
           }
           close();
-        }
-      },
-      cancel: () => {
-        if (isAppending) {
-          setIsAppending(false);
-          remove(currentIndex);
+        },
+        cancel: () => {
+          if (isAppending) {
+            setIsAppending(false);
+          }
           close();
-          return;
-        }
-        update(currentIndex, valuesRef.current);
-        reset(void 0, {
-          keepTouched: true,
-          keepDefaultValues: true,
-          keepIsValid: true,
-          keepIsSubmitted: true,
-          keepValues: true
-        });
-        close();
-      },
-      type: isAppending ? "append" : "edit",
-      appendLabel: customField.extra?.label.object.append.label,
-      appendProps: customField.extra?.label.object.append.props,
-      editLabel: customField.extra?.label.object.edit.label,
-      editProps: customField.extra?.label.object.edit.props,
-      cancelLabel: customField.extra?.label.object.cancel.label,
-      cancelProps: customField.extra?.label.object.cancel.props,
-      ...registerModal(`modal-${name}`)
-    },
-    /* @__PURE__ */ React.createElement(Fieldset, null, customField.extra?.of?.type === "object" ? /* @__PURE__ */ React.createElement(
-      FieldObject,
-      {
-        defaultValue: getValues(currentName) || void 0,
-        name: currentName,
-        error: error && error[currentIndex],
-        formState,
-        register,
-        control,
-        ...customField.extra?.of,
-        Field
-      }
-    ) : /* @__PURE__ */ React.createElement(
-      Field,
-      {
-        name: currentName,
-        ...customField.extra?.of,
-        error: error && error[currentIndex],
-        key: currentName
+        },
+        type: isAppending ? "append" : "edit",
+        appendLabel: customField.extra?.label.object.append.label,
+        appendProps: customField.extra?.label.object.append.props,
+        editLabel: customField.extra?.label.object.edit.label,
+        editProps: customField.extra?.label.object.edit.props,
+        cancelLabel: customField.extra?.label.object.cancel.label,
+        cancelProps: customField.extra?.label.object.cancel.props,
+        ofField,
+        title,
+        hint: customField.label?.secondary,
+        name: fieldArrayName,
+        defaultValue: defaultValue || void 0,
+        arrayItemName,
+        Field,
+        error: error && error[editingIndex],
+        currentIndex: editingIndex,
+        ...registerModal(`modal-${fieldArrayName}`)
       }
-    ))
-  ), /* @__PURE__ */ React.createElement(TableContainer, null, /* @__PURE__ */ React.createElement(Table, null, !customField.extra?.noHeader && customField.extra?.of?.extra && /* @__PURE__ */ React.createElement(
-    ArrayItemHeader,
-    {
-      labels: customField.extra?.of.extra.fields.map(
-        ({ label }) => label.primary
-      ),
-      disabled: customField.extra?.editable === false
-    }
-  ), /* @__PURE__ */ React.createElement(TableBody, null, values?.map((field, index) => {
-    return /* @__PURE__ */ React.createElement(
-      ArrayItemDisplay,
+    ), !noValuesCommitted && /* @__PURE__ */ React.createElement(TableContainer, { ...customField.extra?.tableContainer }, /* @__PURE__ */ React.createElement(Table, { verticalAlign: customField.extra?.verticalAlign }, !customField.extra?.noHeader && !noValuesCommitted && ofField?.extra && fieldArrayValues?.length > 0 && /* @__PURE__ */ React.createElement(
+      ArrayItemHeader,
       {
-        key: index,
-        name: `${name}.${index}`,
-        data: field,
-        edit: () => {
-          setCurrentIndex(index);
-          open(`modal-${name}`);
-        },
-        remove: () => {
-          remove(index);
-        },
-        disabledEdit: customField.extra?.noEdit ?? false,
-        disabledDelete: customField.extra?.noDelete ?? false,
-        disabled: customField.extra?.editable ?? false
+        labels: ofField.type === "object" ? ofField.extra.fields.map(({ label }) => label.primary) : [ofField.label.primary],
+        disabled: customField?.editable === false
       }
-    );
-  })))), /* @__PURE__ */ React.createElement(
-    "div",
-    {
-      className: customField.extra?.label.object?.addButtonVariant === "link" ? "px-2 py-2 bg-gray-200 border-t border-b border-gray-400" : ""
-    },
-    /* @__PURE__ */ React.createElement(
-      Button,
+    ), /* @__PURE__ */ React.createElement(TableBody, null, !noValuesCommitted && fieldArrayValues?.map?.((field, index) => {
+      return /* @__PURE__ */ React.createElement(
+        ArrayItemDisplay,
+        {
+          key: index,
+          name: `${fieldArrayName}.${index}`,
+          index,
+          isFirst: index === 0,
+          isLast: index === fieldArrayValues.length - 1,
+          data: field,
+          edit: () => {
+            setEditingIndex(index);
+            open(`modal-${fieldArrayName}`);
+          },
+          stackProps: customField?.extra?.stackProps,
+          wordBreak: customField?.extra?.wordBreak,
+          valueDisplay: customField?.extra?.valueDisplay,
+          remove: () => {
+            remove(index);
+          },
+          border: customField.extra?.border,
+          move,
+          sortable,
+          disabledEdit: sortable ? true : customField.extra?.noEdit ?? false,
+          disabledDelete: customField.extra?.noDelete ?? false,
+          disabled: customField?.editable === false
+        }
+      );
+    })))), customField.extra?.editVariant !== "display" && /* @__PURE__ */ React.createElement(
+      "div",
       {
-        type: "button",
-        name: `${name}-add-object`,
-        color: "secondary",
-        variant: customField.extra?.label.object?.addButtonVariant,
-        onClick: (ev) => {
-          ev.preventDefault();
-          if (customField.extra?.of?.extra) {
-            append({});
-          } else {
-            append("");
-          }
-          setCurrentIndex(currentLength + 1);
-          setIsAppending(true);
-        },
-        disabled: !customField?.editable
+        className: customField.extra?.label.object?.addButtonVariant === "link" ? "px-2 py-2 bg-gray-200 border-t border-b border-gray-400" : ""
       },
-      customField.extra?.label.object?.add
-    )
-  ));
-};
-const ArrayItemModal = ({
-  type,
-  name,
-  title,
-  hint,
-  editOrAppend,
-  cancel,
-  editLabel,
-  editProps,
-  appendLabel,
-  appendProps,
-  cancelLabel,
-  cancelProps,
-  children,
-  ...props
-}) => {
-  return /* @__PURE__ */ React.createElement(Modal, { ...props, "aria-labelledby": "modal-label" }, /* @__PURE__ */ React.createElement(ModalHeading, { id: "modal-label" }, title ? title : type === "edit" ? "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1" : "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"), /* @__PURE__ */ React.createElement(ModalContent, null, hint && /* @__PURE__ */ React.createElement(Hint, null, hint), children), /* @__PURE__ */ React.createElement(ModalAction, null, type === "edit" ? /* @__PURE__ */ React.createElement(
-    Button,
-    {
-      color: "secondary",
-      ...editProps,
-      onClick: async (e) => {
-        e.preventDefault();
-        editOrAppend(name);
-      }
-    },
-    editLabel || "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7"
-  ) : /* @__PURE__ */ React.createElement(
-    Button,
-    {
-      color: "primary",
-      ...appendProps,
-      onClick: async (e) => {
-        e.preventDefault();
-        editOrAppend(name);
-      }
-    },
-    appendLabel || "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"
-  ), /* @__PURE__ */ React.createElement(
-    Button,
-    {
-      variant: "link",
-      ...cancelProps,
-      onClick: (e) => {
-        e.preventDefault();
-        cancel(name);
-      }
-    },
-    cancelLabel || "\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7"
-  )));
-};
-const ArrayItemHeader = ({ labels, disabled }) => {
-  return /* @__PURE__ */ React.createElement(TableHead, null, /* @__PURE__ */ React.createElement(TableRow, null, labels.map((label, index) => {
-    return /* @__PURE__ */ React.createElement(TableHeadCell, { key: index }, label);
-  }), !disabled && /* @__PURE__ */ React.createElement(TableHeadCell, null, "\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B5\u03C2")));
-};
-const ArrayItemDisplay = ({
-  name,
-  data,
-  edit,
-  remove,
-  disabledEdit,
-  disabledDelete,
-  disabled
-}) => {
-  if (Object.keys(data).length === 0 || Object.keys(data).length === 1 && data.id) {
-    return null;
+      /* @__PURE__ */ React.createElement(
+        Button,
+        {
+          ref,
+          type: "button",
+          name: `${fieldArrayName}-add-object`,
+          color: "secondary",
+          variant: customField.extra?.label.object?.addButtonVariant,
+          onClick: (ev) => {
+            ev.preventDefault();
+            setIsAppending(true);
+          },
+          disabled: customField?.editable === false || customField.extra?.editVariant === "noinput" || fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)
+        },
+        customField.extra?.label.object?.add
+      )
+    ));
   }
-  delete data.id;
-  const values = typeof data === "string" ? [data] : Object.values(data);
-  return /* @__PURE__ */ React.createElement(TableRow, null, values.map((value, index) => {
-    return /* @__PURE__ */ React.createElement(TableDataCell, { key: index }, value || "");
-  }), disabled === true || disabledEdit === true && disabledDelete === true ? null : /* @__PURE__ */ React.createElement(TableDataCell, null, /* @__PURE__ */ React.createElement(ButtonGroup, null, disabledEdit !== true && /* @__PURE__ */ React.createElement(
-    Button,
-    {
-      variant: "link",
-      type: "button",
-      onClick: () => {
-        edit(name);
-      }
-    },
-    "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"
-  ), disabledDelete !== true && /* @__PURE__ */ React.createElement(Button, { variant: "link", type: "button", onClick: () => remove(name) }, "\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE"))));
-};
+);
 var FormDialog_default = FormDialog;
 export {
-  ArrayItemDisplay,
-  ArrayItemHeader,
-  ArrayItemModal,
   FormDialog,
   FormDialog_default as default
 };
-//# sourceMappingURL=FormDialog.js.map
+//# sourceMappingURL=index.js.map

package/FieldArray/FormDialog/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/FieldArray/FormDialog/index.tsx"],
+  "sourcesContent": ["import React, { useEffect, useMemo, useState } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { useFieldArray } from 'react-hook-form';\nimport type { FieldProps, FormData } from '@digigov/form/Field/types';\nimport { ArrayItemDisplay } from '@digigov/form/FieldArray/FormDialog/ArrayItemDisplay';\nimport { ArrayItemHeader } from '@digigov/form/FieldArray/FormDialog/ArrayItemHeader';\nimport { ArrayItemModal } from '@digigov/form/FieldArray/FormDialog/ArrayItemModal';\nimport { useModal } from '@digigov/ui/app/Modal';\nimport { Table, TableBody, TableContainer } from '@digigov/ui/content';\nimport { Button } from '@digigov/ui/form/Button';\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 const FormDialog = React.forwardRef<HTMLButtonElement, FormDialogProps>(\n  function FormDialog(\n    {\n      name: fieldArrayName,\n      control,\n      error,\n      getValues,\n      Field,\n      sortable,\n      ...customField\n    },\n    ref\n  ) {\n    const [isAppending, setIsAppending] = useState(false);\n    const [editingIndex, setEditingIndex] = useState(0);\n    const { fields, append, remove, update, move } = useFieldArray({\n      control,\n      name: fieldArrayName,\n    });\n    const { open, close, registerModal } = useModal();\n    const currentLength = fields.length;\n    const arrayItemName = isAppending\n      ? `${fieldArrayName}.${currentLength}`\n      : `${fieldArrayName}.${editingIndex}`;\n\n    useEffect(() => {\n      if (isAppending) {\n        open(`modal-${fieldArrayName}`);\n      }\n    }, [isAppending, fieldArrayName, open]);\n\n    const fieldArrayValues = getValues(fieldArrayName);\n    const ofField = {\n      ...customField.extra?.of,\n      name: arrayItemName,\n    };\n    if (ofField.type !== 'object') {\n      ofField.name = ofField.key ?? fieldArrayName;\n      ofField.key = ofField.key ?? fieldArrayName;\n    }\n\n    const defaultValue = useMemo(() => {\n      // If appending, use default value from field spec\n      if (isAppending) {\n        if (ofField.type === 'object') return ofField.defaultValue;\n        else return { [ofField.name]: ofField.defaultValue };\n      }\n\n      if (ofField.type === 'object') return getValues(ofField.name);\n      else return { [ofField.name]: fieldArrayValues?.[editingIndex] };\n    }, [\n      editingIndex,\n      fieldArrayValues,\n      getValues,\n      isAppending,\n      ofField.defaultValue,\n      ofField.name,\n      ofField.type,\n    ]);\n\n    const noValuesCommitted = fields.length === 0;\n\n    const title = useMemo(() => {\n      if (!customField.extra?.label.object.title) return null;\n\n      let title = customField.extra.label.object.title;\n      if (customField.extra.label.object.titleNumbering)\n        title += ` ${currentLength + 1}`;\n\n      return title;\n    }, [\n      currentLength,\n      customField.extra?.label.object.title,\n      customField.extra?.label.object.titleNumbering,\n    ]);\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          editOrAppend={(data: FormData) => {\n            if (isAppending) {\n              setIsAppending(false);\n              if (ofField.type === 'object') append(data);\n              else if (data) append(data[ofField.key ?? fieldArrayName]);\n            } else {\n              if (ofField.type === 'object') update(editingIndex, data);\n              else if (data)\n                update(editingIndex, data[ofField.key ?? fieldArrayName]);\n            }\n            close();\n          }}\n          cancel={() => {\n            if (isAppending) {\n              setIsAppending(false);\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          ofField={ofField}\n          title={title}\n          hint={customField.label?.secondary}\n          name={fieldArrayName}\n          defaultValue={defaultValue || undefined}\n          arrayItemName={arrayItemName}\n          Field={Field}\n          error={error && error[editingIndex]}\n          currentIndex={editingIndex}\n          {...registerModal(`modal-${fieldArrayName}`)}\n        />\n        {!noValuesCommitted && (\n          <TableContainer {...customField.extra?.tableContainer}>\n            <Table verticalAlign={customField.extra?.verticalAlign}>\n              {!customField.extra?.noHeader &&\n                !noValuesCommitted &&\n                ofField?.extra &&\n                fieldArrayValues?.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                  fieldArrayValues?.map?.((field, index) => {\n                    return (\n                      <ArrayItemDisplay\n                        key={index}\n                        name={`${fieldArrayName}.${index}`}\n                        index={index}\n                        isFirst={index === 0}\n                        isLast={index === fieldArrayValues.length - 1}\n                        data={field}\n                        edit={() => {\n                          setEditingIndex(index);\n                          open(`modal-${fieldArrayName}`);\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              ref={ref}\n              type=\"button\"\n              name={`${fieldArrayName}-add-object`}\n              color=\"secondary\"\n              variant={customField.extra?.label.object?.addButtonVariant}\n              onClick={(ev) => {\n                ev.preventDefault();\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 default FormDialog;\n"],
+  "mappings": "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",
+  "names": ["FormDialog", "title"]
+}

package/FieldArray/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
-import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldProps } from '@digigov/form/Field/types';
+import type { ErrorOption, UseFormReturn } from 'react-hook-form';
+import type { FieldProps } from '@digigov/form/Field/types';
+import type { registerFieldFocus } from '@digigov/form/types';
 export interface FieldArrayProps extends FieldProps {
     control: UseFormReturn['control'];
     trigger: UseFormReturn['trigger'];
@@ -11,7 +12,9 @@ export interface FieldArrayProps extends FieldProps {
     getValues: UseFormReturn['getValues'];
     setValue: UseFormReturn['setValue'];
     reset: UseFormReturn['reset'];
+    resetField?: UseFormReturn['resetField'];
     Field: React.FC<FieldProps>;
+    registerFieldFocus: registerFieldFocus;
 }
 export declare const FieldArray: React.FC<FieldArrayProps>;
 export default FieldArray;

package/FieldArray/index.js

@@ -1,12 +1,7 @@
-import React from "react";
-import { useFieldArray } from "react-hook-form";
+import React, { useEffect, useRef } from "react";
 import { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
+import BaseFieldArray from "@digigov/form/FieldArray/BaseFieldArray";
 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,
@@ -19,28 +14,40 @@ const FieldArray = ({
   setValue,
   layout,
   reset,
+  resetField,
   label,
   Field,
+  registerFieldFocus,
   ...customField
 }) => {
-  const { fields, append, remove } = useFieldArray({
-    control,
-    name
-  });
+  const buttonRef = useRef(null);
+  useEffect(() => {
+    let unregister = () => {
+    };
+    if (buttonRef.current) {
+      unregister = registerFieldFocus(name, buttonRef.current);
+    }
+    return () => {
+      unregister(name);
+    };
+  }, [name, registerFieldFocus]);
   return /* @__PURE__ */ React.createElement(
     FieldBaseContainer,
     {
       label,
       layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
+      register,
+      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, { ...customField.extra?.label.object?.nothing_added_props }, customField.extra?.label.object?.nothing_added),
     customField.extra?.variant === "dialog" ? /* @__PURE__ */ React.createElement(
       FormDialog,
       {
+        ref: buttonRef,
         name,
         trigger,
         register,
@@ -54,52 +61,24 @@ const FieldArray = ({
         label,
         Field,
         reset,
+        resetField,
+        sortable: customField.extra.sortable,
         ...customField
       }
-    ) : /* @__PURE__ */ React.createElement(React.Fragment, null, fields.map((field, index) => /* @__PURE__ */ React.createElement(
-      Card,
+    ) : /* @__PURE__ */ React.createElement(
+      BaseFieldArray,
       {
-        variant: customField.extra?.border ? "border" : "divider",
-        key: field.id
-      },
-      /* @__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
-      ))
-    )), /* @__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
-    ))
+        ref: buttonRef,
+        name,
+        register,
+        control,
+        formState,
+        error,
+        getValues,
+        Field,
+        ...customField
+      }
+    )
   );
 };
 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 { 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';\nimport { Hint } from '@digigov/ui/typography/Hint';\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  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  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      hasError={formState.isSubmitted && !formState.isSubmitting && !!error}\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {fields.length === 0 && (\n        <Hint {...customField.extra?.label.object?.nothing_added_props}>\n          {customField.extra?.label.object?.nothing_added}\n        </Hint>\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          {...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={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          <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    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAsB,qBAAoC;AAC1D,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,eAAe,gBAAgB;AACxC,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,YAAY;AAcd,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,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,UAAU,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,MAChE,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,OAAO,WAAW,KACjB,oCAAC,QAAM,GAAG,YAAY,OAAO,MAAM,QAAQ,uBACxC,YAAY,OAAO,MAAM,QAAQ,aACpC;AAAA,IAED,YAAY,OAAO,YAAY,WAC9B;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN,IAEA,0DACG,OAAO,IAAI,CAAC,OAAO,UAClB;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,YAAY,OAAO,SAAS,WAAW;AAAA,QAChD,KAAK,MAAM;AAAA;AAAA,MAEX,oCAAC,gBACC,oCAAC,qBACE,YAAY,OAAO,MAAM,OAAO,OAAO,KACvC,CAAC,YAAY,OAAO,WAAW,QAAQ,CAC1C,GACA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,UACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,UAC1C;AAAA,UACA;AAAA,UACA;AAAA,UACC,GAAG,YAAY,OAAO;AAAA,UACvB;AAAA;AAAA,MACF,GACA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM,GAAG,IAAI;AAAA,UACb,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,UAC1C,MAAK;AAAA,UACL,OAAM;AAAA,UACN,SAAS,MAAM,OAAO,KAAK;AAAA,UAC3B,UAAU,CAAC,aAAa;AAAA;AAAA,QAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,MACpC,CACF;AAAA,IACF,CACD,GACD;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,QAC1C,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA,QACA,UAAU,CAAC,aAAa;AAAA;AAAA,MAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CACF;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
+  "sourcesContent": ["import React, { useEffect, useRef } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport type { FieldProps } from '@digigov/form/Field/types';\nimport BaseFieldArray from '@digigov/form/FieldArray/BaseFieldArray';\nimport { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport type { registerFieldFocus } from '@digigov/form/types';\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  registerFieldFocus: registerFieldFocus;\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  registerFieldFocus,\n  ...customField\n}) => {\n  /** The ref of the add-button */\n  const buttonRef = useRef<HTMLButtonElement | null>(null);\n\n  // Register the button to be focusable\n  useEffect(() => {\n    let unregister: (name: string) => void = () => {};\n    if (buttonRef.current) {\n      unregister = registerFieldFocus(name, buttonRef.current);\n    }\n\n    return () => {\n      unregister(name);\n    };\n  }, [name, registerFieldFocus]);\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\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          ref={buttonRef}\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        <BaseFieldArray\n          ref={buttonRef}\n          name={name}\n          register={register}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          Field={Field}\n          {...customField}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": "AAAA,OAAO,SAAS,WAAW,cAAc;AAEzC,SAAS,0BAA0B;AAEnC,OAAO,oBAAoB;AAC3B,SAAS,kBAAkB;AAiBpB,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;AAAA,EACA,GAAG;AACL,MAAM;AAEJ,QAAM,YAAY,OAAiC,IAAI;AAGvD,YAAU,MAAM;AACd,QAAI,aAAqC,MAAM;AAAA,IAAC;AAChD,QAAI,UAAU,SAAS;AACrB,mBAAa,mBAAmB,MAAM,UAAU,OAAO;AAAA,IACzD;AAEA,WAAO,MAAM;AACX,iBAAW,IAAI;AAAA,IACjB;AAAA,EACF,GAAG,CAAC,MAAM,kBAAkB,CAAC;AAE7B,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,OAAO,WAAW,QAAQ,QAAQ;AAAA,MACzC,UAAU,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,MAChE,SAAQ;AAAA,MACR;AAAA,MACA,WAAW,YAAY,OAAO;AAAA,MAC9B,YAAY;AAAA;AAAA,IAEX,YAAY,OAAO,YAAY,WAC9B;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,UAAU,YAAY,MAAM;AAAA,QAC3B,GAAG;AAAA;AAAA,IACN,IAEA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
   "names": []
 }