@digigov/form 2.0.0-13876dba → 2.0.0-16fbe090

package/FieldArray/FormDialog/index.js

@@ -1,279 +1,199 @@
-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 { 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({
-    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;
+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 [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 ('object' !== ofField.type) {
+        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();
+    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;
         }
-      },
-      cancel: () => {
+    }, [
+        close
+    ]);
+    const { clearErrors, setError } = useFormContext();
+    const handleEditOrAppend = useCallback((data)=>{
         if (isAppending) {
-          setIsAppending(false);
-          remove(currentIndex);
-          close();
-          return;
+            setIsAppending(false);
+            if ('object' === ofField.type) append(data);
+            else if (data) {
+                const submittedValue = data[ofField.key ?? fieldArrayName];
+                if (submittedValue) append(submittedValue);
+            }
+        } 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);
+            }
         }
-        update(currentIndex, valuesRef.current);
-        reset(void 0, {
-          keepTouched: true,
-          keepDefaultValues: true,
-          keepIsValid: true,
-          keepIsSubmitted: true,
-          keepValues: true
-        });
-        close();
-      },
-      type: isAppending ? "append" : "edit",
-      appendLabel: customField.extra?.label.object.append.label,
-      appendProps: customField.extra?.label.object.append.props,
-      editLabel: customField.extra?.label.object.edit.label,
-      editProps: customField.extra?.label.object.edit.props,
-      cancelLabel: customField.extra?.label.object.cancel.label,
-      cancelProps: customField.extra?.label.object.cancel.props,
-      ...registerModal(`modal-${name}`)
-    },
-    /* @__PURE__ */ React.createElement(Fieldset, null, customField.extra?.of?.type === "object" ? /* @__PURE__ */ React.createElement(
-      FieldObject,
-      {
-        defaultValue: getValues(currentName) || void 0,
-        name: currentName,
-        error: error && error[currentIndex],
-        formState,
-        register,
-        control,
-        ...customField.extra?.of,
-        Field
-      }
-    ) : /* @__PURE__ */ React.createElement(
-      Field,
-      {
-        name: currentName,
-        ...customField.extra?.of,
-        error: error && error[currentIndex],
-        key: currentName
-      }
-    ))
-  ), /* @__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,
-      {
-        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
-      }
-    );
-  })))), /* @__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,
-      {
+        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,
+        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' ? 'my-2 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",
-        name: `${name}-add-object`,
+        name: `${fieldArrayName}-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
-      },
-      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;
-  }
-  delete data.id;
-  const values = typeof data === "string" ? [data] : Object.values(data);
-  return /* @__PURE__ */ React.createElement(TableRow, null, values.map((value, index) => {
-    return /* @__PURE__ */ React.createElement(TableDataCell, { key: index }, value || "");
-  }), disabled === true || disabledEdit === true && disabledDelete === true ? null : /* @__PURE__ */ React.createElement(TableDataCell, null, /* @__PURE__ */ React.createElement(ButtonGroup, null, disabledEdit !== true && /* @__PURE__ */ React.createElement(
-    Button,
-    {
-      variant: "link",
-      type: "button",
-      onClick: () => {
-        edit(name);
-      }
-    },
-    "\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1"
-  ), disabledDelete !== true && /* @__PURE__ */ React.createElement(Button, { variant: "link", type: "button", onClick: () => remove(name) }, "\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE"))));
-};
-var FormDialog_default = FormDialog;
-export {
-  ArrayItemDisplay,
-  ArrayItemHeader,
-  ArrayItemModal,
-  FormDialog,
-  FormDialog_default as default
-};
-//# sourceMappingURL=FormDialog.js.map
+        onClick: handleAddClick,
+        disabled: customField?.editable === false || customField.extra?.editVariant === 'noinput' || fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)
+    }, customField.extra?.label.object?.add)));
+});
+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'];
@@ -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,110 +1,66 @@
-import React from "react";
-import { useFieldArray } from "react-hook-form";
-import { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
-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,
-  register,
-  clearErrors,
-  control,
-  formState,
-  error,
-  getValues,
-  setValue,
-  layout,
-  reset,
-  label,
-  Field,
-  ...customField
-}) => {
-  const { fields, append, remove } = useFieldArray({
-    control,
-    name
-  });
-  return /* @__PURE__ */ React.createElement(
-    FieldBaseContainer,
-    {
-      label,
-      layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
-      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
-      wrapper: "fieldset",
-      name
-    },
-    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,
-      {
+import react, { useEffect, useRef } from "react";
+import { FieldBaseContainer } from "../Field/FieldBaseContainer.js";
+import BaseFieldArray from "./BaseFieldArray.js";
+import { FormDialog } from "./FormDialog/index.js";
+const FieldArray = ({ name, trigger, register, clearErrors, control, formState, error, getValues, setValue, layout, reset, resetField, label, Field, registerFieldFocus, ...customField })=>{
+    const buttonRef = useRef(null);
+    useEffect(()=>{
+        let unregister = ()=>{};
+        if (buttonRef.current) unregister = registerFieldFocus(name, buttonRef.current);
+        return ()=>{
+            unregister(name);
+        };
+    }, [
         name,
-        trigger,
-        register,
+        registerFieldFocus
+    ]);
+    const hasItemErrors = !!error && Object.keys(error).some((key)=>/^\d+$/.test(key));
+    useEffect(()=>{
+        if (!hasItemErrors) clearErrors(name);
+    }, [
         clearErrors,
-        control,
-        formState,
-        error,
-        getValues,
-        setValue,
-        layout,
-        label,
-        Field,
-        reset,
+        hasItemErrors,
+        name
+    ]);
+    return /*#__PURE__*/ react.createElement(FieldBaseContainer, {
+        label: label,
+        layout: layout,
+        register: register,
+        error: error?.message ? error : void 0,
+        hasError: !!error,
+        wrapper: "fieldset",
+        name: name,
+        labelSize: customField.extra?.labelSize,
+        controlled: true
+    }, customField.extra?.variant === 'dialog' ? /*#__PURE__*/ react.createElement(FormDialog, {
+        ref: buttonRef,
+        name: name,
+        trigger: trigger,
+        register: register,
+        clearErrors: clearErrors,
+        control: control,
+        formState: formState,
+        error: error,
+        getValues: getValues,
+        setValue: setValue,
+        layout: layout,
+        label: label,
+        Field: Field,
+        reset: reset,
+        resetField: resetField,
+        sortable: customField.extra.sortable,
         ...customField
-      }
-    ) : /* @__PURE__ */ React.createElement(React.Fragment, null, fields.map((field, index) => /* @__PURE__ */ React.createElement(
-      Card,
-      {
-        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
-    ))
-  );
-};
-var FieldArray_default = FieldArray;
-export {
-  FieldArray,
-  FieldArray_default as default
+    }) : /*#__PURE__*/ react.createElement(BaseFieldArray, {
+        ref: buttonRef,
+        name: name,
+        register: register,
+        control: control,
+        formState: formState,
+        error: error,
+        getValues: getValues,
+        Field: Field,
+        ...customField
+    }));
 };
-//# sourceMappingURL=index.js.map
+const src_FieldArray = FieldArray;
+export { FieldArray, src_FieldArray as default };