@digigov/form 2.0.0-a402a664 → 2.0.0-a64dc016

package/FieldArray/FormDialog/index.js

@@ -1,397 +1,199 @@
-import React, { useEffect, useRef, useState } from "react";
-import {
-  useFieldArray,
-  useWatch
-} 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 } from "@digigov/ui/form/Button";
-import { Grid, Stack } from "@digigov/ui/layouts";
-import Heading from "@digigov/ui/typography/Heading";
-import { Hint } from "@digigov/ui/typography/Hint";
-const FormDialog = React.forwardRef(
-  function FormDialog2({
-    name,
-    trigger,
-    register,
-    control,
-    formState,
-    error,
-    getValues,
-    Field,
-    reset,
-    sortable,
-    ...customField
-  }, ref) {
+import react, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useFieldArray } from "react-hook-form";
+import { ArrayDisplay } from "./ArrayDisplay/index.js";
+import { ArrayEditModal } from "./ArrayEditModal.js";
+import { useFormContext } from "../../FormContext.js";
+import { useModal } from "@digigov/ui/app/Modal/index.js";
+import { Button } from "@digigov/ui/form/Button/index.js";
+import { Hint } from "@digigov/ui/typography/Hint/index.js";
+const FormDialog = /*#__PURE__*/ react.forwardRef(({ name: fieldArrayName, control, error, getValues, Field, sortable, ...customField }, ref)=>{
     const [isAppending, setIsAppending] = useState(false);
-    const [currentIndex, setCurrentIndex] = useState(0);
+    const [editingIndex, setEditingIndex] = useState(0);
     const { fields, append, remove, update, move } = useFieldArray({
-      control,
-      name
+        control,
+        name: fieldArrayName
     });
     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;
-      }
+    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 ('object' !== ofField.type) {
+        ofField.name = ofField.key ?? fieldArrayName;
+        ofField.key = ofField.key ?? fieldArrayName;
     }
-    const values = getValues(name);
-    const ofField = {
-      ...customField.extra?.of,
-      name: currentName
-    };
-    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__ */ React.createElement(React.Fragment, null, noValuesCommitted && /* @__PURE__ */ React.createElement(Hint, { ...customField.extra?.label.object?.nothing_added_props }, customField.extra?.label.object?.nothing_added), /* @__PURE__ */ React.createElement(
-      ArrayItemModal,
-      {
-        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);
+    const defaultValue = useMemo(()=>{
+        if (isAppending) if ('object' === ofField.type) return ofField.defaultValue;
+        else return {
+            [ofField.name]: ofField.defaultValue
+        };
+        if ('object' === ofField.type) return getValues(ofField.name);
+        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 title = customField.extra.label.object.title;
+        if (customField.extra.label.object.titleNumbering) title += ` ${currentLength + 1}`;
+        return title;
+    }, [
+        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 { clearErrors, setError } = useFormContext();
+    const handleEditOrAppend = useCallback((data)=>{
+        if (isAppending) {
+            setIsAppending(false);
+            if ('object' === ofField.type) append(data);
+            else if (data) {
+                const submittedValue = data[ofField.key ?? fieldArrayName];
+                if (submittedValue) append(submittedValue);
             }
-            if (newValues === "") {
-              remove(currentIndex);
-            } else {
-              update(currentIndex, newValues);
+        } else {
+            clearErrors(`${fieldArrayName}.${editingIndex}`);
+            if ('object' === ofField.type) update(editingIndex, data);
+            else if (data) {
+                const submittedValue = data[ofField.key ?? fieldArrayName];
+                if (submittedValue) update(editingIndex, submittedValue);
             }
-            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();
-        },
-        type: isAppending ? "append" : "edit",
+        }
+        closeModal();
+    }, [
+        clearErrors,
+        append,
+        closeModal,
+        editingIndex,
+        fieldArrayName,
+        isAppending,
+        ofField.key,
+        ofField.type,
+        update
+    ]);
+    const handleCancel = useCallback(()=>{
+        if (isAppending) setIsAppending(false);
+        closeModal();
+    }, [
+        closeModal,
+        isAppending
+    ]);
+    const handleOpenEditModal = 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;
+        setIsAppending(true);
+    }, []);
+    const handleRemove = useCallback((index)=>{
+        remove(index);
+        if (error) {
+            for(let i = index; i < fields.length - 1; i++){
+                clearErrors(`${fieldArrayName}.${i}`);
+                if (error[i + 1]) Object.keys(error[i + 1]).forEach((fieldName)=>{
+                    setError(`${fieldArrayName}.${i}.${fieldName}`, error[i + 1][fieldName]);
+                });
+            }
+            clearErrors(`${fieldArrayName}.${fields.length - 1}`);
+        }
+    }, [
+        clearErrors,
+        error,
+        fieldArrayName,
+        fields.length,
+        remove,
+        setError
+    ]);
+    const handleMove = useCallback((from, to)=>{
+        if (error && (error[from] || error[to])) {
+            const temp = error[from];
+            error[from] = error[to];
+            error[to] = temp;
+        }
+        move(from, to);
+    }, [
+        error,
+        move
+    ]);
+    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, {
+        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,
-        control,
-        ...registerModal(`modal-${name}`)
-      },
-      /* @__PURE__ */ React.createElement(Fieldset, null, ofField?.type === "object" ? /* @__PURE__ */ React.createElement(
-        FieldObject,
-        {
-          defaultValue: defaultValue || void 0,
-          error: error && error[currentIndex],
-          formState,
-          register,
-          control,
-          ...ofField,
-          key: currentName,
-          Field
-        }
-      ) : /* @__PURE__ */ React.createElement(
-        Field,
-        {
-          name: currentName,
-          ...ofField,
-          error: error && error[currentIndex],
-          key: currentName
-        }
-      ))
-    ), !noValuesCommitted && /* @__PURE__ */ React.createElement(TableContainer, { ...customField.extra?.tableContainer }, /* @__PURE__ */ React.createElement(
-      Table,
-      {
-        ref,
-        verticalAlign: customField.extra?.verticalAlign
-      },
-      !customField.extra?.noHeader && !noValuesCommitted && ofField?.extra && values?.length > 0 && /* @__PURE__ */ React.createElement(
-        ArrayItemHeader,
-        {
-          labels: ofField.type === "object" ? ofField.extra.fields.map(({ label }) => label.primary) : [ofField.label.primary],
-          disabled: customField?.editable === false
-        }
-      ),
-      /* @__PURE__ */ React.createElement(TableBody, null, !noValuesCommitted && values?.map?.((field, index) => {
-        return /* @__PURE__ */ React.createElement(
-          ArrayItemDisplay,
-          {
-            key: index,
-            name: `${name}.${index}`,
-            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__ */ 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,
-        {
-          type: "button",
-          name: `${name}-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);
-          },
-          disabled: customField?.editable === false || customField.extra?.editVariant === "noinput" || fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)
-        },
-        customField.extra?.label.object?.add
-      )
-    ));
-  }
-);
-const ArrayItemModal = React.forwardRef(function ArrayItemModal2({
-  type,
-  currentName,
-  title,
-  hint,
-  defaultValue,
-  editOrAppend,
-  cancel,
-  control,
-  addTitle,
-  editLabel,
-  editProps,
-  appendLabel,
-  appendProps,
-  cancelLabel,
-  cancelProps,
-  children,
-  ...props
-}, ref) {
-  const value = useWatch({
-    control,
-    name: currentName,
-    defaultValue
-  });
-  const disabled = value === void 0 || value === null || value === "";
-  return /* @__PURE__ */ React.createElement(
-    Modal,
-    {
-      ...props,
-      ref,
-      "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" : addTitle || "\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,
-        type: "button",
-        onClick: (e) => {
-          e.preventDefault();
-          editOrAppend();
-        },
-        disabled
-      },
-      editLabel || "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7"
-    ) : /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        color: "primary",
-        ...appendProps,
-        type: "button",
-        onClick: (e) => {
-          e.preventDefault();
-          editOrAppend();
-        },
-        disabled
-      },
-      appendLabel || "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"
-    ), /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        variant: "link",
+        ofField: ofField,
+        title: title,
+        hint: customField.label?.secondary,
+        name: fieldArrayName,
+        defaultValue: defaultValue || void 0,
+        Field: Field,
+        error: error?.[editingIndex] ? error[editingIndex] : void 0,
+        ...registerModal(`modal-${fieldArrayName}`)
+    }), hasCommitedValues && /*#__PURE__*/ react.createElement(ArrayDisplay, {
+        fieldArrayName: fieldArrayName,
+        fieldArrayValues: fieldArrayValues,
+        ofField: ofField,
+        customField: customField,
+        onEdit: handleOpenEditModal,
+        onRemove: handleRemove,
+        move: handleMove,
+        sortable: sortable,
+        error: error
+    }), customField.extra?.editVariant !== 'display' && !customField.extra?.noAdd && /*#__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' : '',
+        ...customField?.extra?.label.object?.buttonGroup
+    }, /*#__PURE__*/ react.createElement(Button, {
+        ref: ref,
         type: "button",
-        ...cancelProps,
-        onClick: (e) => {
-          e.preventDefault();
-          cancel();
-        }
-      },
-      cancelLabel || "\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7"
-    ))
-  );
+        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)));
 });
-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,
-  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__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(TableRow, null, values?.map?.((value, valueIndex) => {
-    return /* @__PURE__ */ React.createElement(
-      TableDataCell,
-      {
-        key: valueIndex,
-        variant: borderVariant,
-        wordBreak,
-        pb: sortable ? 0 : void 0,
-        pt: sortable ? 4 : void 0
-      },
-      sortable && valueIndex === 0 && /* @__PURE__ */ React.createElement(Heading, { 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__ */ React.createElement(TableDataCell, { variant: borderVariant }, /* @__PURE__ */ React.createElement(Stack, { ...stackProps }, 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"
-  )))), sortable && /* @__PURE__ */ React.createElement(TableRow, null, /* @__PURE__ */ React.createElement(
-    TableDataCell,
-    {
-      variant: isLast ? "none" : "border",
-      colSpan: disabled === true || disabledEdit === true && disabledDelete === true ? values.length : values.length + 1
-    },
-    sortable && !disabled && !(isFirst && isLast) && /* @__PURE__ */ React.createElement(Grid, { xs: 12, mt: 2 }, "\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7", " ", !isFirst && /* @__PURE__ */ React.createElement(React.Fragment, null, "\u03C0\u03C1\u03BF\u03C2 \u03C4\u03B1", " ", /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        type: "button",
-        variant: "link",
-        onClick: () => move(index, index - 1)
-      },
-      "\u03C0\u03AC\u03BD\u03C9"
-    )), !isFirst && !isLast && " \u03AE ", !isLast && /* @__PURE__ */ React.createElement(React.Fragment, null, "\u03C0\u03C1\u03BF\u03C2 \u03C4\u03B1", " ", /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        type: "button",
-        variant: "link",
-        onClick: () => move(index, index + 1)
-      },
-      "\u03BA\u03AC\u03C4\u03C9"
-    )))
-  )));
-};
-var FormDialog_default = FormDialog;
-export {
-  ArrayItemDisplay,
-  ArrayItemHeader,
-  ArrayItemModal,
-  FormDialog,
-  FormDialog_default as default
-};
-//# sourceMappingURL=FormDialog.js.map
+FormDialog.displayName = 'FormDialog';
+const FieldArray_FormDialog = FormDialog;
+export { FormDialog, FieldArray_FormDialog as default };

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 '../Field/types.js';
+import type { registerFieldFocus } from '../types.js';
 export interface FieldArrayProps extends FieldProps {
     control: UseFormReturn['control'];
     trigger: UseFormReturn['trigger'];
@@ -13,6 +14,7 @@ export interface FieldArrayProps extends FieldProps {
     reset: UseFormReturn['reset'];
     resetField?: UseFormReturn['resetField'];
     Field: React.FC<FieldProps>;
+    registerFieldFocus: registerFieldFocus;
 }
 export declare const FieldArray: React.FC<FieldArrayProps>;
 export default FieldArray;