@digigov/form 2.0.0-555d1027 → 2.0.0-5e7a6790

package/cjs/FieldArray/FormDialog/index.js

@@ -27,114 +27,136 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var FormDialog_exports = {};
 __export(FormDialog_exports, {
-  ArrayItemDisplay: () => ArrayItemDisplay,
-  ArrayItemHeader: () => ArrayItemHeader,
-  ArrayItemModal: () => ArrayItemModal,
   FormDialog: () => FormDialog,
   default: () => FormDialog_default
 });
 module.exports = __toCommonJS(FormDialog_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
-var import_FieldObject = require("@digigov/form/FieldObject");
-var import_Fieldset = require("@digigov/form/Fieldset");
+var import_ArrayDisplay = require("@digigov/form/FieldArray/FormDialog/ArrayDisplay");
+var import_ArrayEditModal = require("@digigov/form/FieldArray/FormDialog/ArrayEditModal");
 var import_Modal = require("@digigov/ui/app/Modal");
-var import_content = require("@digigov/ui/content");
 var import_Button = require("@digigov/ui/form/Button");
-var import_layouts = require("@digigov/ui/layouts");
-var import_Heading = __toESM(require("@digigov/ui/typography/Heading"));
 var import_Hint = require("@digigov/ui/typography/Hint");
 const FormDialog = import_react.default.forwardRef(
-  function FormDialog2({
-    name,
-    trigger,
-    register,
+  ({
+    name: fieldArrayName,
     control,
-    formState,
     error,
     getValues,
     Field,
-    reset,
     sortable,
     ...customField
-  }, ref) {
+  }, ref) => {
     const [isAppending, setIsAppending] = (0, import_react.useState)(false);
-    const [currentIndex, setCurrentIndex] = (0, import_react.useState)(0);
+    const [editingIndex, setEditingIndex] = (0, import_react.useState)(0);
     const { fields, append, remove, update, move } = (0, import_react_hook_form.useFieldArray)({
       control,
-      name
+      name: fieldArrayName
     });
     const { open, close, registerModal } = (0, import_Modal.useModal)();
-    const currentLength = fields.length > 0 ? fields.length - 1 : fields.length;
-    const currentName = isAppending ? `${name}.${currentLength}` : `${name}.${currentIndex}`;
+    const currentLength = fields.length;
+    const arrayItemName = isAppending ? `${fieldArrayName}.${currentLength}` : `${fieldArrayName}.${editingIndex}`;
     (0, import_react.useEffect)(() => {
       if (isAppending) {
-        setCurrentIndex(currentLength);
-        open(`modal-${name}`);
+        open(`modal-${fieldArrayName}`);
       }
-    }, [isAppending]);
-    const valuesRef = (0, import_react.useRef)(null);
-    if (!error) {
-      const values2 = getValues(currentName);
-      if (typeof values2 === "object") {
-        valuesRef.current = { ...values2 };
-      } else {
-        valuesRef.current = values2;
-      }
-    }
-    const values = getValues(name);
+    }, [isAppending, fieldArrayName, open]);
+    const fieldArrayValues = getValues(fieldArrayName);
     const ofField = {
       ...customField.extra?.of,
-      name: currentName
+      name: arrayItemName
     };
-    const defaultValue = getValues(currentName) || ofField.defaultValue;
-    const noValuesCommitted = fields.length === 0 || fields.length === 1 && isAppending;
-    const titleNumber = customField.extra?.label.object.titleNumbering ? `${currentLength + 1}` : "";
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, noValuesCommitted && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, { ...customField.extra?.label.object?.nothing_added_props }, customField.extra?.label.object?.nothing_added), /* @__PURE__ */ import_react.default.createElement(
-      ArrayItemModal,
+    if (ofField.type !== "object") {
+      ofField.name = ofField.key ?? fieldArrayName;
+      ofField.key = ofField.key ?? fieldArrayName;
+    }
+    const defaultValue = (0, import_react.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 = (0, import_react.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 = (0, import_react.useRef)(null);
+    const closeModal = (0, import_react.useCallback)(() => {
+      close();
+      if (focusReturnRef.current) {
+        focusReturnRef.current.focus();
+        focusReturnRef.current = null;
+      }
+    }, [close]);
+    const handleEditOrAppend = (0, import_react.useCallback)(
+      (data) => {
+        if (isAppending) {
+          setIsAppending(false);
+          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]);
+        }
+        closeModal();
+      },
+      [
+        append,
+        closeModal,
+        editingIndex,
+        fieldArrayName,
+        isAppending,
+        ofField.key,
+        ofField.type,
+        update
+      ]
+    );
+    const handleCancel = (0, import_react.useCallback)(() => {
+      if (isAppending) setIsAppending(false);
+      closeModal();
+    }, [closeModal, isAppending]);
+    const handleEdit = (0, import_react.useCallback)(
+      (index) => {
+        if (document.activeElement instanceof HTMLElement) {
+          focusReturnRef.current = document.activeElement;
+        }
+        setEditingIndex(index);
+        open(`modal-${fieldArrayName}`);
+      },
+      [fieldArrayName, open]
+    );
+    const handleAddClick = (0, import_react.useCallback)((ev) => {
+      ev.preventDefault();
+      if (document.activeElement instanceof HTMLElement) {
+        focusReturnRef.current = document.activeElement;
+      }
+      setIsAppending(true);
+    }, []);
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !hasCommitedValues && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, { ...customField.extra?.label.object?.nothing_added_props }, customField.extra?.label.object?.nothing_added), /* @__PURE__ */ import_react.default.createElement(
+      import_ArrayEditModal.ArrayEditModal,
       {
-        title: customField.extra?.label.object.title && `${customField.extra?.label.object.title} ${titleNumber}`,
-        hint: customField.label?.secondary,
-        name,
-        defaultValue,
-        currentName,
-        editOrAppend: async () => {
-          const hasNoErrors = await trigger(
-            ofField.type === "object" ? ofField.extra.fields.map(({ key }) => `${currentName}.${key}`) : currentName
-          );
-          if (!hasNoErrors) {
-            update(currentIndex, valuesRef.current);
-          }
-          if (hasNoErrors) {
-            const newValues = getValues(currentName);
-            if (isAppending) {
-              setIsAppending(false);
-            }
-            if (newValues === "") {
-              remove(currentIndex);
-            } else {
-              update(currentIndex, newValues);
-            }
-            close();
-          }
-        },
-        cancel: () => {
-          if (isAppending) {
-            setIsAppending(false);
-            remove(currentIndex);
-            close();
-            return;
-          }
-          update(currentIndex, valuesRef.current);
-          reset(void 0, {
-            keepTouched: true,
-            keepDefaultValues: true,
-            keepIsValid: true,
-            keepIsSubmitted: true,
-            keepValues: true
-          });
-          close();
-        },
+        editOrAppend: handleEditOrAppend,
+        cancel: handleCancel,
         type: isAppending ? "append" : "edit",
         appendLabel: customField.extra?.label.object.append.label,
         appendProps: customField.extra?.label.object.append.props,
@@ -142,95 +164,43 @@ const FormDialog = import_react.default.forwardRef(
         editProps: customField.extra?.label.object.edit.props,
         cancelLabel: customField.extra?.label.object.cancel.label,
         cancelProps: customField.extra?.label.object.cancel.props,
-        control,
-        ...registerModal(`modal-${name}`)
-      },
-      /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, ofField?.type === "object" ? /* @__PURE__ */ import_react.default.createElement(
-        import_FieldObject.FieldObject,
-        {
-          defaultValue: defaultValue || void 0,
-          error: error && error[currentIndex],
-          formState,
-          register,
-          control,
-          ...ofField,
-          key: currentName,
-          Field
-        }
-      ) : /* @__PURE__ */ import_react.default.createElement(
+        ofField,
+        title,
+        hint: customField.label?.secondary,
+        name: fieldArrayName,
+        defaultValue: defaultValue || void 0,
+        arrayItemName,
         Field,
-        {
-          name: currentName,
-          ...ofField,
-          error: error && error[currentIndex],
-          key: currentName
-        }
-      ))
-    ), !noValuesCommitted && /* @__PURE__ */ import_react.default.createElement(import_content.TableContainer, { ...customField.extra?.tableContainer }, /* @__PURE__ */ import_react.default.createElement(
-      import_content.Table,
+        error: error && error[editingIndex],
+        currentIndex: editingIndex,
+        ...registerModal(`modal-${fieldArrayName}`)
+      }
+    ), hasCommitedValues && /* @__PURE__ */ import_react.default.createElement(
+      import_ArrayDisplay.ArrayDisplay,
       {
-        ref,
-        verticalAlign: customField.extra?.verticalAlign
-      },
-      !customField.extra?.noHeader && !noValuesCommitted && ofField?.extra && values?.length > 0 && /* @__PURE__ */ import_react.default.createElement(
-        ArrayItemHeader,
-        {
-          labels: ofField.type === "object" ? ofField.extra.fields.map(({ label }) => label.primary) : [ofField.label.primary],
-          disabled: customField?.editable === false
-        }
-      ),
-      /* @__PURE__ */ import_react.default.createElement(import_content.TableBody, null, !noValuesCommitted && values?.map?.((field, index) => {
-        return /* @__PURE__ */ import_react.default.createElement(
-          ArrayItemDisplay,
-          {
-            key: index,
-            name: `${name}.${index}`,
-            register,
-            index,
-            isFirst: index === 0,
-            isLast: index === values.length - 1,
-            data: field,
-            edit: () => {
-              setCurrentIndex(index);
-              open(`modal-${name}`);
-            },
-            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__ */ import_react.default.createElement(
+        fieldArrayName,
+        fieldArrayValues,
+        ofField,
+        customField,
+        onEdit: handleEdit,
+        onRemove: remove,
+        move,
+        sortable
+      }
+    ), customField.extra?.editVariant !== "display" && /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        className: customField.extra?.label.object?.addButtonVariant === "link" ? "px-2 py-2 bg-gray-200 border-t border-b border-gray-400" : ""
+        className: customField.extra?.label.object?.addButtonVariant === "link" ? "my-2 px-2 py-2 bg-gray-200 border-t border-b border-gray-400" : ""
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_Button.Button,
         {
+          ref,
           type: "button",
-          name: `${name}-add-object`,
+          name: `${fieldArrayName}-add-object`,
           color: "secondary",
           variant: customField.extra?.label.object?.addButtonVariant,
-          onClick: (ev) => {
-            ev.preventDefault();
-            if (customField?.extra?.of?.type === "object") {
-              append({});
-            } else {
-              append("");
-            }
-            setCurrentIndex(currentLength + 1);
-            setIsAppending(true);
-          },
+          onClick: handleAddClick,
           disabled: customField?.editable === false || customField.extra?.editVariant === "noinput" || fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)
         },
         customField.extra?.label.object?.add
@@ -238,181 +208,10 @@ const FormDialog = import_react.default.forwardRef(
     ));
   }
 );
-const ArrayItemModal = import_react.default.forwardRef(function ArrayItemModal2({
-  type,
-  currentName,
-  title,
-  hint,
-  defaultValue,
-  editOrAppend,
-  cancel,
-  control,
-  addTitle,
-  editLabel,
-  editProps,
-  appendLabel,
-  appendProps,
-  cancelLabel,
-  cancelProps,
-  children,
-  ...props
-}, ref) {
-  const value = (0, import_react_hook_form.useWatch)({
-    control,
-    name: currentName,
-    defaultValue
-  });
-  const disabled = value === void 0 || value === null || value === "";
-  return /* @__PURE__ */ import_react.default.createElement(
-    import_Modal.Modal,
-    {
-      ...props,
-      ref,
-      "aria-labelledby": "modal-label"
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_Modal.ModalHeading, { id: "modal-label" }, title ? title : type === "edit" ? "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1" : addTitle || "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"),
-    /* @__PURE__ */ import_react.default.createElement(import_Modal.ModalContent, null, hint && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, hint), children),
-    /* @__PURE__ */ import_react.default.createElement(import_Modal.ModalAction, null, type === "edit" ? /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        color: "secondary",
-        ...editProps,
-        type: "button",
-        onClick: (e) => {
-          e.preventDefault();
-          editOrAppend();
-        },
-        disabled
-      },
-      editLabel || "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7"
-    ) : /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        color: "primary",
-        ...appendProps,
-        type: "button",
-        onClick: (e) => {
-          e.preventDefault();
-          editOrAppend();
-        },
-        disabled
-      },
-      appendLabel || "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"
-    ), /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        variant: "link",
-        type: "button",
-        ...cancelProps,
-        onClick: (e) => {
-          e.preventDefault();
-          cancel();
-        }
-      },
-      cancelLabel || "\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7"
-    ))
-  );
-});
-const ArrayItemHeader = ({ labels, disabled }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_content.TableHead, null, /* @__PURE__ */ import_react.default.createElement(import_content.TableRow, null, labels.map((label, index) => {
-    return /* @__PURE__ */ import_react.default.createElement(import_content.TableHeadCell, { key: index }, label);
-  }), !disabled && /* @__PURE__ */ import_react.default.createElement(import_content.TableHeadCell, null, "\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B5\u03C2")));
-};
-const ArrayItemDisplay = ({
-  name,
-  data,
-  register,
-  edit,
-  remove,
-  disabledEdit,
-  disabledDelete,
-  disabled,
-  sortable,
-  index,
-  isFirst,
-  isLast,
-  move,
-  valueDisplay,
-  border = true,
-  wordBreak = "break-all",
-  stackProps = {
-    spacing: 4,
-    alignItems: "flex-end",
-    justifyContent: "flex-end",
-    direction: "column"
-  }
-}) => {
-  if (data === void 0 || data === null) {
-    return null;
-  }
-  if (Object.keys(data).length === 0 || Object.keys(data).length === 1 && data.id) {
-    return null;
-  }
-  delete data.id;
-  const values = typeof data === "string" ? [data] : Object.values(data || {});
-  const borderVariant = border === false || sortable ? "none" : "border";
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_content.TableRow, { ...register(name) }, values?.map?.((value, valueIndex) => {
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_content.TableDataCell,
-      {
-        key: valueIndex,
-        variant: borderVariant,
-        wordBreak,
-        pb: sortable ? 0 : void 0,
-        pt: sortable ? 4 : void 0
-      },
-      sortable && valueIndex === 0 && /* @__PURE__ */ import_react.default.createElement(import_Heading.default, { size: "sm", className: "mb-2" }, "\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE #", index + 1),
-      value?.name || (Array.isArray(value) ? value.join("\n") : valueDisplay ? valueDisplay(value) : value) || ""
-    );
-  }), disabled === true || disabledEdit === true && disabledDelete === true ? null : /* @__PURE__ */ import_react.default.createElement(import_content.TableDataCell, { variant: borderVariant }, /* @__PURE__ */ import_react.default.createElement(import_layouts.Stack, { ...stackProps }, disabledEdit !== true && /* @__PURE__ */ import_react.default.createElement(
-    import_Button.Button,
-    {
-      variant: "link",
-      type: "button",
-      onClick: () => {
-        edit(name);
-      }
-    },
-    "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"
-  ), disabledDelete !== true && /* @__PURE__ */ import_react.default.createElement(
-    import_Button.Button,
-    {
-      variant: "link",
-      type: "button",
-      onClick: () => remove(name)
-    },
-    "\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE"
-  )))), sortable && /* @__PURE__ */ import_react.default.createElement(import_content.TableRow, null, /* @__PURE__ */ import_react.default.createElement(
-    import_content.TableDataCell,
-    {
-      variant: isLast ? "none" : "border",
-      colSpan: disabled === true || disabledEdit === true && disabledDelete === true ? values.length : values.length + 1
-    },
-    sortable && !disabled && !(isFirst && isLast) && /* @__PURE__ */ import_react.default.createElement(import_layouts.Grid, { xs: 12, mt: 2 }, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7", " ", !isFirst && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, "\u03C0\u03C1\u03BF\u03C2 \u03C4\u03B1", " ", /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        type: "button",
-        variant: "link",
-        onClick: () => move(index, index - 1)
-      },
-      "\u03C0\u03AC\u03BD\u03C9"
-    )), !isFirst && !isLast && " \u03AE ", !isLast && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, "\u03C0\u03C1\u03BF\u03C2 \u03C4\u03B1", " ", /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
-      {
-        type: "button",
-        variant: "link",
-        onClick: () => move(index, index + 1)
-      },
-      "\u03BA\u03AC\u03C4\u03C9"
-    )))
-  )));
-};
+FormDialog.displayName = "FormDialog";
 var FormDialog_default = FormDialog;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ArrayItemDisplay,
-  ArrayItemHeader,
-  ArrayItemModal,
   FormDialog
 });
-//# sourceMappingURL=FormDialog.js.map
+//# sourceMappingURL=index.js.map

package/cjs/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 = {\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 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": ["React", "title"]
+}

package/cjs/FieldArray/index.js

@@ -32,13 +32,9 @@ __export(FieldArray_exports, {
 });
 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_BaseFieldArray = __toESM(require("@digigov/form/FieldArray/BaseFieldArray"));
 var import_FormDialog = require("@digigov/form/FieldArray/FormDialog");
-var import_FieldObject = require("@digigov/form/FieldObject");
-var import_Fieldset = require("@digigov/form/Fieldset");
-var import_Card = require("@digigov/ui/content/Card");
-var import_Button = require("@digigov/ui/form/Button");
 const FieldArray = ({
   name,
   trigger,
@@ -54,13 +50,20 @@ const FieldArray = ({
   resetField,
   label,
   Field,
+  registerFieldFocus,
   ...customField
 }) => {
-  const { append, remove } = (0, import_react_hook_form.useFieldArray)({
-    control,
-    name
-  });
-  const fields = getValues(name) || [];
+  const buttonRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    let unregister = () => {
+    };
+    if (buttonRef.current) {
+      unregister = registerFieldFocus(name, buttonRef.current);
+    }
+    return () => {
+      unregister(name);
+    };
+  }, [name, registerFieldFocus]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_FieldBaseContainer.FieldBaseContainer,
     {
@@ -77,6 +80,7 @@ const FieldArray = ({
     customField.extra?.variant === "dialog" ? /* @__PURE__ */ import_react.default.createElement(
       import_FormDialog.FormDialog,
       {
+        ref: buttonRef,
         name,
         trigger,
         register,
@@ -94,50 +98,20 @@ const FieldArray = ({
         sortable: customField.extra.sortable,
         ...customField
       }
-    ) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, fields.map((field, index) => /* @__PURE__ */ import_react.default.createElement(
-      import_Card.Card,
+    ) : /* @__PURE__ */ import_react.default.createElement(
+      import_BaseFieldArray.default,
       {
-        variant: customField.extra?.border ? "border" : "divider",
-        key: field.id || index
-      },
-      /* @__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
-    ))
+        ref: buttonRef,
+        name,
+        register,
+        control,
+        formState,
+        error,
+        getValues,
+        Field,
+        ...customField
+      }
+    )
   );
 };
 var FieldArray_default = FieldArray;