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

package/cjs/FieldArray/FormDialog/ArrayEditModal/index.js

@@ -0,0 +1,177 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ArrayEditModal_exports = {};
+__export(ArrayEditModal_exports, {
+  ArrayEditModal: () => ArrayEditModal
+});
+module.exports = __toCommonJS(ArrayEditModal_exports);
+var import_react = __toESM(require("react"));
+var import_react_dom = require("react-dom");
+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_FormContext = require("@digigov/form/FormContext");
+var import_utils = require("@digigov/form/utils");
+var import_validators = require("@digigov/form/validators");
+var import_Modal = require("@digigov/ui/app/Modal");
+var import_Button = require("@digigov/ui/form/Button");
+var import_Hint = require("@digigov/ui/typography/Hint");
+const ArrayEditModal = import_react.default.forwardRef(function ArrayEditModal2({
+  type,
+  title,
+  hint,
+  defaultValue,
+  editOrAppend,
+  cancel,
+  addTitle,
+  editLabel,
+  editProps,
+  appendLabel,
+  appendProps,
+  cancelLabel,
+  cancelProps,
+  ofField,
+  error,
+  Field,
+  currentIndex,
+  ...modalProps
+}, ref) {
+  const parentCtx = (0, import_FormContext.useFormContext)();
+  const schema = (0, import_validators.useValidationSchema)(
+    ofField.type === "object" && ofField.extra.fields ? Object.values(ofField.extra.fields) : [ofField]
+  );
+  const resolver = (0, import_react.useMemo)(() => {
+    if (!schema) return;
+    return (0, import_utils.yupResolver)(schema);
+  }, [schema]);
+  const form = (0, import_react_hook_form.useForm)({
+    resolver,
+    mode: "onSubmit",
+    reValidateMode: "onSubmit",
+    shouldFocusError: true,
+    criteriaMode: "all"
+  });
+  const { reset, setValue } = form;
+  (0, import_react.useEffect)(() => {
+    if (modalProps.open) {
+      reset(void 0);
+      if (defaultValue) {
+        Object.entries(defaultValue).forEach(([key, value]) => {
+          setValue(key, value);
+        });
+      }
+      if (type === "append" && ofField?.type === "object" && ofField.extra?.fields) {
+        ofField.extra.fields.forEach((field) => {
+          if (defaultValue && defaultValue[field.key] !== void 0) return;
+          switch (field.type) {
+            case "array":
+              setValue(field.key, []);
+              break;
+            case "object":
+              setValue(field.key, {});
+              break;
+            default:
+              setValue(field.key, "");
+          }
+        });
+      }
+    }
+  }, [modalProps.open, defaultValue, reset, setValue, type, ofField]);
+  const onSubmit = (0, import_react.useCallback)(
+    (data) => {
+      editOrAppend(data);
+    },
+    [editOrAppend]
+  );
+  const handleSubmitWithoutPropagation = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    return form.handleSubmit(onSubmit)(e);
+  };
+  const formRef = (0, import_react.useRef)(null);
+  const ctx = {
+    ...parentCtx,
+    control: form.control,
+    register: form.register,
+    watch: form.watch,
+    resetField: form.resetField,
+    registerField: () => {
+    },
+    // If we use parent registerField, validation breaks
+    registerFieldFocus: () => {
+      return () => {
+      };
+    },
+    errors: form.formState.errors,
+    formState: form.formState,
+    reset: form.reset,
+    trigger: form.trigger,
+    getFieldState: form.getFieldState,
+    setValue: form.setValue,
+    clearErrors: form.clearErrors,
+    getValues: form.getValues,
+    getValuesFromParentForm: parentCtx.getValues,
+    unregister: form.unregister,
+    setError: form.setError,
+    formRef,
+    submit: form.handleSubmit(onSubmit)
+  };
+  return /* @__PURE__ */ import_react.default.createElement(ModalPortal, { ...modalProps, ref, "aria-labelledby": "modal-label" }, /* @__PURE__ */ import_react.default.createElement(import_FormContext.FormContext.Provider, { value: ctx }, /* @__PURE__ */ import_react.default.createElement("form", { onSubmit: handleSubmitWithoutPropagation, ref: formRef }, /* @__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), /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, ofField?.type === "object" ? /* @__PURE__ */ import_react.default.createElement(
+    import_FieldObject.FieldObject,
+    {
+      ...ofField,
+      defaultValue: defaultValue || void 0,
+      error: error && error[currentIndex],
+      formState: form.formState,
+      register: form.register,
+      control: form.control,
+      name: void 0,
+      Field
+    }
+  ) : /* @__PURE__ */ import_react.default.createElement(Field, { error: error && error[currentIndex], ...ofField }))), /* @__PURE__ */ import_react.default.createElement(import_Modal.ModalAction, null, type === "edit" ? /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { color: "secondary", ...editProps, type: "submit" }, editLabel || "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7") : /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { color: "primary", ...appendProps, type: "submit" }, 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 ModalPortal = (props) => {
+  return (0, import_react_dom.createPortal)(/* @__PURE__ */ import_react.default.createElement(import_Modal.Modal, { ...props }), document.body);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ArrayEditModal
+});
+//# sourceMappingURL=ArrayEditModal.js.map

package/cjs/FieldArray/FormDialog/ArrayEditModal.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/FieldArray/FormDialog/ArrayEditModal.tsx"],
+  "sourcesContent": ["import React, { useCallback, useEffect, useMemo, useRef } from 'react';\nimport { createPortal } from 'react-dom';\nimport type { ErrorOption, UseFormProps } from 'react-hook-form';\nimport { useForm } from 'react-hook-form';\nimport type {\n  FieldProps,\n  FieldSpec,\n  FormData,\n} from '@digigov/form/Field/types';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport { FormContext, useFormContext } from '@digigov/form/FormContext';\nimport { yupResolver } from '@digigov/form/utils';\nimport { useValidationSchema } from '@digigov/form/validators';\nimport type { ModalProps } from '@digigov/ui/app/Modal';\nimport {\n  Modal,\n  ModalAction,\n  ModalContent,\n  ModalHeading,\n} from '@digigov/ui/app/Modal';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface ArrayEditModalProps extends Omit<ModalProps, 'children'> {\n  type: 'append' | 'edit';\n  name: string;\n  title?: string;\n  hint?: string;\n  editOrAppend: (data: FormData) => void;\n  cancel: () => void;\n  addTitle?: string;\n  editLabel?: string;\n  editProps?: any;\n  appendLabel?: string;\n  appendProps?: any;\n  cancelLabel?: string;\n  cancelProps?: any;\n  ofField?: any;\n  arrayItemName: string;\n  defaultValue?: any;\n  Field: React.FC<FieldProps>;\n  error?: ErrorOption;\n  currentIndex: number;\n}\n\nexport const ArrayEditModal = React.forwardRef<\n  HTMLDivElement,\n  ArrayEditModalProps\n>(function ArrayEditModal(\n  {\n    type,\n    title,\n    hint,\n    defaultValue,\n    editOrAppend,\n    cancel,\n    addTitle,\n    editLabel,\n    editProps,\n    appendLabel,\n    appendProps,\n    cancelLabel,\n    cancelProps,\n    ofField,\n    error,\n    Field,\n    currentIndex,\n    ...modalProps\n  },\n  ref\n) {\n  const parentCtx = useFormContext();\n  const schema = useValidationSchema(\n    ofField.type === 'object' && ofField.extra.fields\n      ? Object.values(ofField.extra.fields)\n      : [ofField]\n  );\n\n  const resolver: UseFormProps['resolver'] = useMemo(() => {\n    if (!schema) return;\n\n    return yupResolver(schema);\n  }, [schema]);\n\n  const form = useForm({\n    resolver,\n    mode: 'onSubmit',\n    reValidateMode: 'onSubmit',\n    shouldFocusError: true,\n    criteriaMode: 'all',\n  });\n\n  const { reset, setValue } = form;\n\n  // Reset form and set default values when modal opens\n  useEffect(() => {\n    if (modalProps.open) {\n      // Reset form first to clear any previous values\n      reset(undefined);\n\n      // Set default values if they exist\n      if (defaultValue) {\n        Object.entries(defaultValue).forEach(([key, value]) => {\n          setValue(key, value);\n        });\n      }\n\n      if (\n        type === 'append' &&\n        ofField?.type === 'object' &&\n        ofField.extra?.fields\n      ) {\n        // For append mode, set empty values for all fields in case no defaultValue is provided\n        ofField.extra.fields.forEach((field: FieldSpec) => {\n          if (defaultValue && defaultValue[field.key] !== undefined) return;\n          switch (field.type) {\n            case 'array':\n              setValue(field.key, []);\n              break;\n            case 'object':\n              setValue(field.key, {});\n              break;\n            default:\n              // TODO: This replicates legacy behaviour. Maybe reconsider this?\n              setValue(field.key, '');\n          }\n        });\n      }\n    }\n  }, [modalProps.open, defaultValue, reset, setValue, type, ofField]);\n\n  const onSubmit = useCallback(\n    (data: FormData): void => {\n      editOrAppend(data);\n    },\n    [editOrAppend]\n  );\n\n  const handleSubmitWithoutPropagation = (e: React.FormEvent) => {\n    e.preventDefault();\n    e.stopPropagation();\n    return form.handleSubmit(onSubmit)(e);\n  };\n\n  const formRef = useRef(null);\n\n  const ctx = {\n    ...parentCtx,\n    control: form.control,\n    register: form.register,\n    watch: form.watch,\n    resetField: form.resetField,\n    registerField: () => {}, // If we use parent registerField, validation breaks\n    registerFieldFocus: () => {\n      return () => {};\n    },\n    errors: form.formState.errors,\n    formState: form.formState,\n    reset: form.reset,\n    trigger: form.trigger,\n    getFieldState: form.getFieldState,\n    setValue: form.setValue,\n    clearErrors: form.clearErrors,\n    getValues: form.getValues,\n    getValuesFromParentForm: parentCtx.getValues,\n    unregister: form.unregister,\n    setError: form.setError,\n    formRef,\n    submit: form.handleSubmit(onSubmit),\n  };\n\n  return (\n    <ModalPortal {...modalProps} ref={ref} aria-labelledby=\"modal-label\">\n      <FormContext.Provider value={ctx}>\n        <form onSubmit={handleSubmitWithoutPropagation} ref={formRef}>\n          <ModalHeading id=\"modal-label\">\n            {title\n              ? title\n              : type === 'edit'\n                ? '\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1'\n                : addTitle || '\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7'}\n          </ModalHeading>\n          <ModalContent>\n            {hint && <Hint>{hint}</Hint>}\n            <Fieldset>\n              {ofField?.type === 'object' ? (\n                <FieldObject\n                  {...ofField}\n                  defaultValue={defaultValue || undefined}\n                  error={error && error[currentIndex]}\n                  formState={form.formState}\n                  register={form.register}\n                  control={form.control}\n                  name={undefined}\n                  Field={Field}\n                />\n              ) : (\n                <Field error={error && error[currentIndex]} {...ofField} />\n              )}\n            </Fieldset>\n          </ModalContent>\n          <ModalAction>\n            {type === 'edit' ? (\n              <Button color=\"secondary\" {...editProps} type=\"submit\">\n                {editLabel || '\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7'}\n              </Button>\n            ) : (\n              <Button color=\"primary\" {...appendProps} type=\"submit\">\n                {appendLabel || '\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7'}\n              </Button>\n            )}\n            <Button\n              variant=\"link\"\n              type=\"button\"\n              {...cancelProps}\n              onClick={(e) => {\n                e.preventDefault();\n                cancel();\n              }}\n            >\n              {cancelLabel || '\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7'}\n            </Button>\n          </ModalAction>\n        </form>\n      </FormContext.Provider>\n    </ModalPortal>\n  );\n});\n\nconst ModalPortal = (props: ModalProps) => {\n  return createPortal(<Modal {...props} />, document.body);\n};\n"],
+  "mappings": "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",
+  "names": ["React", "ArrayEditModal"]
+}

package/cjs/FieldArray/FormDialog/index.js

@@ -27,275 +27,194 @@ 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_Hint = require("@digigov/ui/typography/Hint");
-const FormDialog = ({
-  name,
-  trigger,
-  register,
-  control,
-  formState,
-  error,
-  getValues,
-  Field,
-  reset,
-  ...customField
-}) => {
-  const [isAppending, setIsAppending] = (0, import_react.useState)(false);
-  const [currentIndex, setCurrentIndex] = (0, import_react.useState)(0);
-  const { fields, append, remove, update } = (0, import_react_hook_form.useFieldArray)({
+const FormDialog = import_react.default.forwardRef(
+  ({
+    name: fieldArrayName,
     control,
-    name
-  });
-  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}`;
-  (0, import_react.useEffect)(() => {
-    if (isAppending) {
-      setCurrentIndex(currentLength);
-      open(`modal-${name}`);
-    }
-  }, [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;
+    error,
+    getValues,
+    Field,
+    sortable,
+    ...customField
+  }, ref) => {
+    const [isAppending, setIsAppending] = (0, import_react.useState)(false);
+    const [editingIndex, setEditingIndex] = (0, import_react.useState)(0);
+    const { fields, append, remove, update, move } = (0, import_react_hook_form.useFieldArray)({
+      control,
+      name: fieldArrayName
+    });
+    const { open, close, registerModal } = (0, import_Modal.useModal)();
+    const currentLength = fields.length;
+    const arrayItemName = isAppending ? `${fieldArrayName}.${currentLength}` : `${fieldArrayName}.${editingIndex}`;
+    (0, import_react.useEffect)(() => {
+      if (isAppending) {
+        open(`modal-${fieldArrayName}`);
+      }
+    }, [isAppending, fieldArrayName, open]);
+    const fieldArrayValues = getValues(fieldArrayName);
+    const ofField = (0, import_react.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__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.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 = (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);
-          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__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, customField.extra?.of?.type === "object" ? /* @__PURE__ */ import_react.default.createElement(
-      import_FieldObject.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 = (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;
       }
-    ) : /* @__PURE__ */ import_react.default.createElement(
-      Field,
+      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,
       {
-        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__ */ import_react.default.createElement(import_content.TableContainer, null, /* @__PURE__ */ import_react.default.createElement(import_content.Table, null, !customField.extra?.noHeader && customField.extra?.of?.extra && /* @__PURE__ */ import_react.default.createElement(
-    ArrayItemHeader,
-    {
-      labels: customField.extra?.of.extra.fields.map(
-        ({ label }) => label.primary
-      ),
-      disabled: customField.extra?.editable === false
-    }
-  ), /* @__PURE__ */ import_react.default.createElement(import_content.TableBody, null, values?.map((field, index) => {
-    return /* @__PURE__ */ import_react.default.createElement(
-      ArrayItemDisplay,
+    ), hasCommitedValues && /* @__PURE__ */ import_react.default.createElement(
+      import_ArrayDisplay.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__ */ 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" : ""
-    },
-    /* @__PURE__ */ import_react.default.createElement(
-      import_Button.Button,
+    ), customField.extra?.editVariant !== "display" && /* @__PURE__ */ import_react.default.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__ */ import_react.default.createElement(import_Modal.Modal, { ...props, "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" : "\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,
-      onClick: async (e) => {
-        e.preventDefault();
-        editOrAppend(name);
-      }
-    },
-    editLabel || "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7"
-  ) : /* @__PURE__ */ import_react.default.createElement(
-    import_Button.Button,
-    {
-      color: "primary",
-      ...appendProps,
-      onClick: async (e) => {
-        e.preventDefault();
-        editOrAppend(name);
-      }
-    },
-    appendLabel || "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"
-  ), /* @__PURE__ */ import_react.default.createElement(
-    import_Button.Button,
-    {
-      variant: "link",
-      ...cancelProps,
-      onClick: (e) => {
-        e.preventDefault();
-        cancel(name);
-      }
-    },
-    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,
-  edit,
-  remove,
-  disabledEdit,
-  disabledDelete,
-  disabled
-}) => {
-  if (Object.keys(data).length === 0 || Object.keys(data).length === 1 && data.id) {
-    return null;
+      /* @__PURE__ */ import_react.default.createElement(
+        import_Button.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__ */ import_react.default.createElement(import_content.TableRow, null, values.map((value, index) => {
-    return /* @__PURE__ */ import_react.default.createElement(import_content.TableDataCell, { key: index }, value || "");
-  }), disabled === true || disabledEdit === true && disabledDelete === true ? null : /* @__PURE__ */ import_react.default.createElement(import_content.TableDataCell, null, /* @__PURE__ */ import_react.default.createElement(import_Button.ButtonGroup, null, 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"))));
-};
+);
+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