@digigov/form 2.0.0-8e254888 → 2.0.0-a0ac149e

package/FieldArray/FormDialog/index.js

@@ -1,279 +1,193 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  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 { ArrayDisplay } from "@digigov/form/FieldArray/FormDialog/ArrayDisplay";
+import { ArrayEditModal } from "@digigov/form/FieldArray/FormDialog/ArrayEditModal";
+import { useModal } from "@digigov/ui/app/Modal";
+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(
+  ({
+    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 = useMemo(
+      () => ({
+        ...customField.extra?.of,
+        name: arrayItemName
+      }),
+      [arrayItemName, customField.extra?.of]
+    );
+    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);
-          if (isAppending) {
-            setIsAppending(false);
-          }
-          if (customField?.extra?.of?.extra) {
-            update(currentIndex, newValues);
-          } else {
-            update(currentIndex, newValues);
-          }
-          close();
-        }
-      },
-      cancel: () => {
+    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 hasCommitedValues = fields.length > 0 || !!fieldArrayValues?.length;
+    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
+    ]);
+    const focusReturnRef = useRef(null);
+    const closeModal = useCallback(() => {
+      close();
+      if (focusReturnRef.current) {
+        focusReturnRef.current.focus();
+        focusReturnRef.current = null;
+      }
+    }, [close]);
+    const handleEditOrAppend = useCallback(
+      (data) => {
         if (isAppending) {
           setIsAppending(false);
-          remove(currentIndex);
-          close();
-          return;
+          if (ofField.type === "object") append(data);
+          else if (data) append(data[ofField.key ?? fieldArrayName]);
+        } else {
+          if (ofField.type === "object") update(editingIndex, data);
+          else if (data)
+            update(editingIndex, data[ofField.key ?? fieldArrayName]);
         }
-        update(currentIndex, valuesRef.current);
-        reset(void 0, {
-          keepTouched: true,
-          keepDefaultValues: true,
-          keepIsValid: true,
-          keepIsSubmitted: true,
-          keepValues: true
-        });
-        close();
+        closeModal();
       },
-      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
+      [
+        append,
+        closeModal,
+        editingIndex,
+        fieldArrayName,
+        isAppending,
+        ofField.key,
+        ofField.type,
+        update
+      ]
+    );
+    const handleCancel = useCallback(() => {
+      if (isAppending) setIsAppending(false);
+      closeModal();
+    }, [closeModal, isAppending]);
+    const handleEdit = useCallback(
+      (index) => {
+        if (document.activeElement instanceof HTMLElement) {
+          focusReturnRef.current = document.activeElement;
+        }
+        setEditingIndex(index);
+        open(`modal-${fieldArrayName}`);
+      },
+      [fieldArrayName, open]
+    );
+    const handleAddClick = useCallback((ev) => {
+      ev.preventDefault();
+      if (document.activeElement instanceof HTMLElement) {
+        focusReturnRef.current = document.activeElement;
       }
-    ) : /* @__PURE__ */ React.createElement(
-      Field,
+      setIsAppending(true);
+    }, []);
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, !hasCommitedValues && /* @__PURE__ */ React.createElement(Hint, { ...customField.extra?.label.object?.nothing_added_props }, customField.extra?.label.object?.nothing_added), /* @__PURE__ */ React.createElement(
+      ArrayEditModal,
       {
-        name: currentName,
-        ...customField.extra?.of,
-        error: error && error[currentIndex],
-        key: currentName
+        editOrAppend: handleEditOrAppend,
+        cancel: handleCancel,
+        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,
+    ), hasCommitedValues && /* @__PURE__ */ React.createElement(
+      ArrayDisplay,
       {
-        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
+        fieldArrayName,
+        fieldArrayValues,
+        ofField,
+        customField,
+        onEdit: handleEdit,
+        onRemove: remove,
+        move,
+        sortable
       }
-    );
-  })))), /* @__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,
+    ), 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" ? "my-2 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: handleAddClick,
+          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"))));
-};
+);
+FormDialog.displayName = "FormDialog";
 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, {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n} 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 { ArrayDisplay } from '@digigov/form/FieldArray/FormDialog/ArrayDisplay';\nimport { ArrayEditModal } from '@digigov/form/FieldArray/FormDialog/ArrayEditModal';\nimport { useModal } from '@digigov/ui/app/Modal';\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  (\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 = useMemo(\n      () => ({\n        ...customField.extra?.of,\n        name: arrayItemName,\n      }),\n      [arrayItemName, customField.extra?.of]\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 hasCommitedValues = fields.length > 0 || !!fieldArrayValues?.length;\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    const focusReturnRef = useRef<HTMLElement | null>(null);\n\n    /** Handle closing the modal and restoring focus */\n    const closeModal = useCallback(() => {\n      close();\n      // Return focus to the element that was focused before the modal opened\n      if (focusReturnRef.current) {\n        focusReturnRef.current.focus();\n        focusReturnRef.current = null;\n      }\n    }, [close]);\n\n    /** Handle modal form submission */\n    const handleEditOrAppend = useCallback(\n      (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        closeModal();\n      },\n      [\n        append,\n        closeModal,\n        editingIndex,\n        fieldArrayName,\n        isAppending,\n        ofField.key,\n        ofField.type,\n        update,\n      ]\n    );\n\n    /** Handle cancelling the modal operation */\n    const handleCancel = useCallback(() => {\n      if (isAppending) setIsAppending(false);\n      closeModal();\n    }, [closeModal, isAppending]);\n\n    /** Handle opening the modal to edit an existing item */\n    const handleEdit = useCallback(\n      (index: number) => {\n        // Store the currently focused element to restore focus later\n        if (document.activeElement instanceof HTMLElement) {\n          focusReturnRef.current = document.activeElement;\n        }\n        setEditingIndex(index);\n        open(`modal-${fieldArrayName}`);\n      },\n      [fieldArrayName, open]\n    );\n\n    /** Handle opening the modal to add a new item */\n    const handleAddClick = useCallback((ev: React.MouseEvent) => {\n      ev.preventDefault();\n      // Store the currently focused element to restore focus later\n      if (document.activeElement instanceof HTMLElement) {\n        focusReturnRef.current = document.activeElement;\n      }\n      setIsAppending(true);\n    }, []);\n\n    return (\n      <>\n        {!hasCommitedValues && (\n          <Hint {...customField.extra?.label.object?.nothing_added_props}>\n            {customField.extra?.label.object?.nothing_added}\n          </Hint>\n        )}\n        <ArrayEditModal\n          editOrAppend={handleEditOrAppend}\n          cancel={handleCancel}\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        {hasCommitedValues && (\n          <ArrayDisplay\n            fieldArrayName={fieldArrayName}\n            fieldArrayValues={fieldArrayValues}\n            ofField={ofField}\n            customField={customField}\n            onEdit={handleEdit}\n            onRemove={remove}\n            move={move}\n            sortable={sortable}\n          />\n        )}\n        {customField.extra?.editVariant !== 'display' && (\n          <div\n            className={\n              customField.extra?.label.object?.addButtonVariant === 'link'\n                ? 'my-2 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={handleAddClick}\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\nFormDialog.displayName = 'FormDialog';\n\nexport default FormDialog;\n"],
+  "mappings": "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",
+  "names": ["title"]
+}

package/FieldArray/__stories__/Default.d.ts

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

package/FieldArray/__stories__/WithExactLength.d.ts

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

package/FieldArray/__stories__/WithModal.d.ts

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

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;