@digigov/form 2.0.0-2445d5cb → 2.0.0-264e5fff

package/FieldArray/FormDialog/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+import type { ErrorOption, UseFormReturn } from 'react-hook-form';
+import type { FieldProps } from '@digigov/form/Field/types';
+export interface FormDialogProps extends FieldProps {
+    control: UseFormReturn['control'];
+    trigger: UseFormReturn['trigger'];
+    register: UseFormReturn['register'];
+    clearErrors: UseFormReturn['clearErrors'];
+    formState: UseFormReturn['formState'];
+    error?: ErrorOption;
+    getValues: UseFormReturn['getValues'];
+    setValue: UseFormReturn['setValue'];
+    reset: UseFormReturn['reset'];
+    resetField?: UseFormReturn['resetField'];
+    sortable: boolean;
+    Field: React.FC<FieldProps>;
+}
+export declare const FormDialog: React.ForwardRefExoticComponent<FormDialogProps & React.RefAttributes<HTMLButtonElement>>;
+export default FormDialog;

package/FieldArray/FormDialog/index.js

@@ -0,0 +1,234 @@
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState
+} from "react";
+import { useFieldArray } from "react-hook-form";
+import { ArrayDisplay } from "@digigov/form/FieldArray/FormDialog/ArrayDisplay";
+import { ArrayEditModal } from "@digigov/form/FieldArray/FormDialog/ArrayEditModal";
+import { useFormContext } from "@digigov/form/FormContext";
+import { useModal } from "@digigov/ui/app/Modal";
+import { Button } from "@digigov/ui/form/Button";
+import { Hint } from "@digigov/ui/typography/Hint";
+const FormDialog = 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 (ofField.type !== "object") {
+      ofField.name = ofField.key ?? fieldArrayName;
+      ofField.key = ofField.key ?? fieldArrayName;
+    }
+    const defaultValue = useMemo(() => {
+      if (isAppending) {
+        if (ofField.type === "object") return ofField.defaultValue;
+        else return { [ofField.name]: ofField.defaultValue };
+      }
+      if (ofField.type === "object") return getValues(ofField.name);
+      else return { [ofField.name]: fieldArrayValues?.[editingIndex] };
+    }, [
+      editingIndex,
+      fieldArrayValues,
+      getValues,
+      isAppending,
+      ofField.defaultValue,
+      ofField.name,
+      ofField.type
+    ]);
+    const hasCommitedValues = fields.length > 0 || !!fieldArrayValues?.length;
+    const title = useMemo(() => {
+      if (!customField.extra?.label.object.title) return null;
+      let title2 = customField.extra.label.object.title;
+      if (customField.extra.label.object.titleNumbering)
+        title2 += ` ${currentLength + 1}`;
+      return title2;
+    }, [
+      currentLength,
+      customField.extra?.label.object.title,
+      customField.extra?.label.object.titleNumbering
+    ]);
+    const focusReturnRef = useRef(null);
+    const closeModal = useCallback(() => {
+      close();
+      if (focusReturnRef.current) {
+        focusReturnRef.current.focus();
+        focusReturnRef.current = null;
+      }
+    }, [close]);
+    const { clearErrors, setError } = useFormContext();
+    const handleEditOrAppend = useCallback(
+      (data) => {
+        if (isAppending) {
+          setIsAppending(false);
+          if (ofField.type === "object") append(data);
+          else if (data) {
+            const submittedValue = data[ofField.key ?? fieldArrayName];
+            if (submittedValue) append(submittedValue);
+          }
+        } else {
+          clearErrors(`${fieldArrayName}.${editingIndex}`);
+          if (ofField.type === "object") update(editingIndex, data);
+          else if (data) {
+            const submittedValue = data[ofField.key ?? fieldArrayName];
+            if (submittedValue) update(editingIndex, submittedValue);
+          }
+        }
+        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,
+        title,
+        hint: customField.label?.secondary,
+        name: fieldArrayName,
+        defaultValue: defaultValue || void 0,
+        Field,
+        error: error?.[editingIndex] ? error[editingIndex] : void 0,
+        ...registerModal(`modal-${fieldArrayName}`)
+      }
+    ), hasCommitedValues && /* @__PURE__ */ React.createElement(
+      ArrayDisplay,
+      {
+        fieldArrayName,
+        fieldArrayValues,
+        ofField,
+        customField,
+        onEdit: handleOpenEditModal,
+        onRemove: handleRemove,
+        move: handleMove,
+        sortable,
+        error
+      }
+    ), customField.extra?.editVariant !== "display" && // add noAdd: necessary for dilosi's 'fixed' fieldsets
+    !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,
+          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
+      )
+    ));
+  }
+);
+FormDialog.displayName = "FormDialog";
+var FormDialog_default = FormDialog;
+export {
+  FormDialog,
+  FormDialog_default as default
+};
+//# sourceMappingURL=index.js.map

package/FieldArray/FormDialog/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/FieldArray/FormDialog/index.tsx"],
+  "sourcesContent": ["import React, {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n} from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { useFieldArray } from 'react-hook-form';\nimport type { FieldProps, FormData } from '@digigov/form/Field/types';\nimport { ArrayDisplay } from '@digigov/form/FieldArray/FormDialog/ArrayDisplay';\nimport { ArrayEditModal } from '@digigov/form/FieldArray/FormDialog/ArrayEditModal';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport { useModal } from '@digigov/ui/app/Modal';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface FormDialogProps extends FieldProps {\n  control: UseFormReturn['control'];\n  trigger: UseFormReturn['trigger'];\n  register: UseFormReturn['register'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  getValues: UseFormReturn['getValues'];\n  setValue: UseFormReturn['setValue'];\n  reset: UseFormReturn['reset'];\n  resetField?: UseFormReturn['resetField'];\n  sortable: boolean;\n  Field: React.FC<FieldProps>;\n}\n\nexport const FormDialog = React.forwardRef<HTMLButtonElement, FormDialogProps>(\n  (\n    {\n      name: fieldArrayName,\n      control,\n      error,\n      getValues,\n      Field,\n      sortable,\n      ...customField\n    },\n    ref\n  ) => {\n    const [isAppending, setIsAppending] = useState(false);\n    const [editingIndex, setEditingIndex] = useState(0);\n    const { fields, append, remove, update, move } = useFieldArray({\n      control,\n      name: fieldArrayName,\n    });\n    const { open, close, registerModal } = useModal();\n    const currentLength = fields.length;\n    const arrayItemName = isAppending\n      ? `${fieldArrayName}.${currentLength}`\n      : `${fieldArrayName}.${editingIndex}`;\n\n    useEffect(() => {\n      if (isAppending) {\n        open(`modal-${fieldArrayName}`);\n      }\n    }, [isAppending, fieldArrayName, open]);\n\n    const fieldArrayValues = getValues(fieldArrayName);\n    const ofField = useMemo(\n      () => ({\n        ...customField.extra?.of,\n        name: arrayItemName,\n      }),\n      [arrayItemName, customField.extra?.of]\n    );\n    if (ofField.type !== 'object') {\n      ofField.name = ofField.key ?? fieldArrayName;\n      ofField.key = ofField.key ?? fieldArrayName;\n    }\n\n    const defaultValue = useMemo(() => {\n      // If appending, use default value from field spec\n      if (isAppending) {\n        if (ofField.type === 'object') return ofField.defaultValue;\n        else return { [ofField.name]: ofField.defaultValue };\n      }\n\n      if (ofField.type === 'object') return getValues(ofField.name);\n      else return { [ofField.name]: fieldArrayValues?.[editingIndex] };\n    }, [\n      editingIndex,\n      fieldArrayValues,\n      getValues,\n      isAppending,\n      ofField.defaultValue,\n      ofField.name,\n      ofField.type,\n    ]);\n\n    const hasCommitedValues = fields.length > 0 || !!fieldArrayValues?.length;\n\n    const title = useMemo(() => {\n      if (!customField.extra?.label.object.title) return null;\n\n      let title = customField.extra.label.object.title;\n      if (customField.extra.label.object.titleNumbering)\n        title += ` ${currentLength + 1}`;\n\n      return title;\n    }, [\n      currentLength,\n      customField.extra?.label.object.title,\n      customField.extra?.label.object.titleNumbering,\n    ]);\n\n    const focusReturnRef = useRef<HTMLElement | null>(null);\n\n    /** Handle closing the modal and restoring focus */\n    const closeModal = useCallback(() => {\n      close();\n      // Return focus to the element that was focused before the modal opened\n      if (focusReturnRef.current) {\n        focusReturnRef.current.focus();\n        focusReturnRef.current = null;\n      }\n    }, [close]);\n\n    const { clearErrors, setError } = useFormContext();\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) {\n            const submittedValue = data[ofField.key ?? fieldArrayName];\n            if (submittedValue) append(submittedValue);\n          }\n        } else {\n          clearErrors(`${fieldArrayName}.${editingIndex}`);\n          if (ofField.type === 'object') update(editingIndex, data);\n          else if (data) {\n            const submittedValue = data[ofField.key ?? fieldArrayName];\n            if (submittedValue) update(editingIndex, submittedValue);\n          }\n        }\n        closeModal();\n      },\n      [\n        clearErrors,\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 handleOpenEditModal = 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    /** Handle removing an item from the array */\n    const handleRemove = useCallback(\n      (index: number) => {\n        remove(index);\n\n        if (error) {\n          // Re-index errors for subsequent items\n          for (let i = index; i < fields.length - 1; i++) {\n            // Clear current index errors\n            clearErrors(`${fieldArrayName}.${i}`);\n\n            // Shift next index errors down\n            if (error[i + 1]) {\n              Object.keys(error[i + 1]).forEach((fieldName) => {\n                setError(\n                  `${fieldArrayName}.${i}.${fieldName}`,\n                  error[i + 1][fieldName]\n                );\n              });\n            }\n          }\n          // Clear the last index since it's been shifted\n          clearErrors(`${fieldArrayName}.${fields.length - 1}`);\n        }\n      },\n      [clearErrors, error, fieldArrayName, fields.length, remove, setError]\n    );\n\n    const handleMove = useCallback(\n      (from: number, to: number) => {\n        if (error && (error[from] || error[to])) {\n          const temp = error[from];\n          error[from] = error[to];\n          error[to] = temp;\n        }\n\n        move(from, to);\n      },\n      [error, move]\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          Field={Field}\n          error={error?.[editingIndex] ? error[editingIndex] : undefined}\n          {...registerModal(`modal-${fieldArrayName}`)}\n        />\n        {hasCommitedValues && (\n          <ArrayDisplay\n            fieldArrayName={fieldArrayName}\n            fieldArrayValues={fieldArrayValues}\n            ofField={ofField}\n            customField={customField}\n            onEdit={handleOpenEditModal}\n            onRemove={handleRemove}\n            move={handleMove}\n            sortable={sortable}\n            error={error}\n          />\n        )}\n        {customField.extra?.editVariant !== 'display' && // add noAdd: necessary for dilosi's 'fixed' fieldsets\n          !customField.extra?.noAdd && (\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              {...customField?.extra?.label.object?.buttonGroup}\n            >\n              <Button\n                ref={ref}\n                type=\"button\"\n                name={`${fieldArrayName}-add-object`}\n                color=\"secondary\"\n                variant={customField.extra?.label.object?.addButtonVariant}\n                onClick={handleAddClick}\n                disabled={\n                  customField?.editable === false ||\n                  customField.extra?.editVariant === 'noinput' ||\n                  fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)\n                }\n              >\n                {customField.extra?.label.object?.add}\n              </Button>\n            </div>\n          )}\n      </>\n    );\n  }\n);\n\nFormDialog.displayName = 'FormDialog';\n\nexport default FormDialog;\n"],
+  "mappings": "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",
+  "names": ["title"]
+}

package/{inputs/inputsScenarios → FieldArray/FormDialog}/package.json

@@ -2,5 +2,5 @@
   "sideEffects": false,
   "module": "./index.js",
   "types": "./index.d.ts",
-  "main": "../../cjs/inputs/inputsScenarios/index.js"
+  "main": "../../cjs/FieldArray/FormDialog/index.js"
 }

package/FieldArray/__stories__/CardsWithError.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+export declare const CardsWithError: {
+    render: (args: any) => React.JSX.Element;
+    args: {
+        layout: string;
+    };
+    argTypes: {
+        layout: {
+            options: string[];
+            control: {
+                type: string;
+            };
+        };
+    };
+};

package/FieldArray/__stories__/Default.d.ts

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

package/FieldArray/__stories__/WithExactLength.d.ts

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

package/FieldArray/__stories__/WithModal.d.ts

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

package/FieldArray/index.d.ts

@@ -1,11 +1,20 @@
 import React from 'react';
-import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldProps } from '@digigov/form/Field/types';
+import type { ErrorOption, UseFormReturn } from 'react-hook-form';
+import type { FieldProps } from '@digigov/form/Field/types';
+import type { registerFieldFocus } from '@digigov/form/types';
 export interface FieldArrayProps extends FieldProps {
     control: UseFormReturn['control'];
+    trigger: UseFormReturn['trigger'];
     register: UseFormReturn['register'];
+    clearErrors: UseFormReturn['clearErrors'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    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,68 +1,87 @@
-import React from "react";
-import { useFieldArray } from "react-hook-form";
-import FieldContainer from "@digigov/form/Field/FieldBaseContainer";
-import FieldObject from "@digigov/form/FieldObject";
-import { FieldsetLabel } from "@digigov/form/Fieldset";
-import Fieldset from "@digigov/react-core/Fieldset";
-import { Card } from "@digigov/ui/content/Card";
-import { Button } from "@digigov/ui/form/Button";
-import { Hint } from "@digigov/ui/typography/Hint";
+import React, { useEffect, useRef } from "react";
+import { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
+import BaseFieldArray from "@digigov/form/FieldArray/BaseFieldArray";
+import { FormDialog } from "@digigov/form/FieldArray/FormDialog";
 const FieldArray = ({
   name,
+  trigger,
   register,
+  clearErrors,
   control,
   formState,
   error,
+  getValues,
+  setValue,
   layout,
+  reset,
+  resetField,
   label,
+  Field,
+  registerFieldFocus,
   ...customField
 }) => {
-  const { fields, append, remove } = useFieldArray({
-    control,
-    name
-  });
+  const buttonRef = useRef(null);
+  useEffect(() => {
+    let unregister = () => {
+    };
+    if (buttonRef.current) {
+      unregister = registerFieldFocus(name, buttonRef.current);
+    }
+    return () => {
+      unregister(name);
+    };
+  }, [name, registerFieldFocus]);
+  const hasItemErrors = !!error && Object.keys(error).some((key) => /^\d+$/.test(key));
+  useEffect(() => {
+    if (!hasItemErrors) clearErrors(name);
+  }, [clearErrors, hasItemErrors, name]);
   return /* @__PURE__ */ React.createElement(
-    FieldContainer,
+    FieldBaseContainer,
     {
       label,
       layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
+      register,
+      error: error?.message ? error : void 0,
+      hasError: !!error,
       wrapper: "fieldset",
-      name
+      name,
+      labelSize: customField.extra?.labelSize,
+      controlled: true
     },
-    fields.length === 0 && /* @__PURE__ */ React.createElement(Hint, null, customField.extra?.label.object?.nothing_added),
-    fields.map((field, index) => /* @__PURE__ */ React.createElement(Card, { variant: "border", key: field.id }, /* @__PURE__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ React.createElement(
-      FieldObject,
+    customField.extra?.variant === "dialog" ? /* @__PURE__ */ React.createElement(
+      FormDialog,
       {
-        name: `${name}.${index}`,
-        error: Array.isArray(error) && error[index],
-        formState,
+        ref: buttonRef,
+        name,
+        trigger,
         register,
+        clearErrors,
         control,
-        ...customField.extra?.of
+        formState,
+        error,
+        getValues,
+        setValue,
+        layout,
+        label,
+        Field,
+        reset,
+        resetField,
+        sortable: customField.extra.sortable,
+        ...customField
       }
-    ), /* @__PURE__ */ React.createElement(
-      Button,
+    ) : /* @__PURE__ */ React.createElement(
+      BaseFieldArray,
       {
-        name: `${name}-object-remove`,
-        type: "button",
-        color: "warning",
-        onClick: () => remove(index)
-      },
-      customField.extra?.label.object?.delete
-    )))),
-    /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        type: "button",
-        name: `${name}-add-object`,
-        color: "secondary",
-        onClick: (ev) => {
-          ev.preventDefault();
-          append({});
-        }
-      },
-      customField.extra?.label.object?.add
+        ref: buttonRef,
+        name,
+        register,
+        control,
+        formState,
+        error,
+        getValues,
+        Field,
+        ...customField
+      }
     )
   );
 };

package/FieldArray/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FieldArray/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport FieldContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport FieldObject from '@digigov/form/FieldObject';\nimport { FieldsetLabel } from '@digigov/form/Fieldset';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  register,\n  control,\n  formState,\n  error,\n  layout,\n  label,\n  ...customField\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n\n  return (\n    <FieldContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted &&\n        !formState.isSubmitting &&\n        error?.message &&\n        error\n          ? error\n          : undefined\n      }\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {fields.length === 0 && (\n        <Hint>{customField.extra?.label.object?.nothing_added}</Hint>\n      )}\n      {fields.map((field, index) => (\n        <Card variant=\"border\" key={field.id}>\n          <Fieldset>\n            <FieldsetLabel>\n              {customField.extra?.label.object.title} {index + 1}\n            </FieldsetLabel>\n            <FieldObject\n              name={`${name}.${index}`}\n              error={Array.isArray(error) && error[index]}\n              formState={formState}\n              register={register}\n              control={control}\n              {...customField.extra?.of}\n            />\n            <Button\n              name={`${name}-object-remove`}\n              type=\"button\"\n              color=\"warning\"\n              onClick={() => remove(index)}\n            >\n              {customField.extra?.label.object?.delete}\n            </Button>\n          </Fieldset>\n        </Card>\n      ))}\n\n      <Button\n        type=\"button\"\n        name={`${name}-add-object`}\n        color=\"secondary\"\n        onClick={(ev) => {\n          ev.preventDefault();\n          append({});\n        }}\n      >\n        {customField.extra?.label.object?.add}\n      </Button>\n    </FieldContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAsB,qBAAoC;AAC1D,OAAO,oBAAoB;AAE3B,OAAO,iBAAiB;AACxB,SAAS,qBAAqB;AAC9B,OAAO,cAAc;AACrB,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,YAAY;AAOd,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,IAAI,cAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AAED,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,OACE,UAAU,eACV,CAAC,UAAU,gBACX,OAAO,WACP,QACI,QACA;AAAA,MAEN,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,OAAO,WAAW,KACjB,oCAAC,YAAM,YAAY,OAAO,MAAM,QAAQ,aAAc;AAAA,IAEvD,OAAO,IAAI,CAAC,OAAO,UAClB,oCAAC,QAAK,SAAQ,UAAS,KAAK,MAAM,MAChC,oCAAC,gBACC,oCAAC,qBACE,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,CACnD,GACA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,QACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,QAC1C;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG,YAAY,OAAO;AAAA;AAAA,IACzB,GACA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI;AAAA,QACb,MAAK;AAAA,QACL,OAAM;AAAA,QACN,SAAS,MAAM,OAAO,KAAK;AAAA;AAAA,MAE1B,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CACF,CACF,CACD;AAAA,IAED;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA;AAAA,MAEC,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC;AAAA,EACF;AAEJ;AAEA,IAAO,qBAAQ;",
+  "sourcesContent": ["import React, { useEffect, useRef } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport type { FieldProps } from '@digigov/form/Field/types';\nimport BaseFieldArray from '@digigov/form/FieldArray/BaseFieldArray';\nimport { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport type { registerFieldFocus } from '@digigov/form/types';\n\nexport interface FieldArrayProps 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  Field: React.FC<FieldProps>;\n  registerFieldFocus: registerFieldFocus;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  trigger,\n  register,\n  clearErrors,\n  control,\n  formState,\n  error,\n  getValues,\n  setValue,\n  layout,\n  reset,\n  resetField,\n  label,\n  Field,\n  registerFieldFocus,\n  ...customField\n}) => {\n  /** The ref of the add-button */\n  const buttonRef = useRef<HTMLButtonElement | null>(null);\n\n  // Register the button to be focusable\n  useEffect(() => {\n    let unregister: (name: string) => void = () => {};\n    if (buttonRef.current) {\n      unregister = registerFieldFocus(name, buttonRef.current);\n    }\n\n    return () => {\n      unregister(name);\n    };\n  }, [name, registerFieldFocus]);\n\n  // Clear container error when there are no item errors\n  const hasItemErrors: boolean =\n    !!error && Object.keys(error).some((key) => /^\\d+$/.test(key));\n  useEffect(() => {\n    if (!hasItemErrors) clearErrors(name);\n  }, [clearErrors, hasItemErrors, name]);\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={error?.message ? error : undefined}\n      hasError={!!error}\n      wrapper=\"fieldset\"\n      name={name}\n      labelSize={customField.extra?.labelSize}\n      controlled={true}\n    >\n      {customField.extra?.variant === 'dialog' ? (\n        <FormDialog\n          ref={buttonRef}\n          name={name}\n          trigger={trigger}\n          register={register}\n          clearErrors={clearErrors}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          setValue={setValue}\n          layout={layout}\n          label={label}\n          Field={Field}\n          reset={reset}\n          resetField={resetField}\n          sortable={customField.extra.sortable}\n          {...customField}\n        />\n      ) : (\n        <BaseFieldArray\n          ref={buttonRef}\n          name={name}\n          register={register}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          Field={Field}\n          {...customField}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": "AAAA,OAAO,SAAS,WAAW,cAAc;AAEzC,SAAS,0BAA0B;AAEnC,OAAO,oBAAoB;AAC3B,SAAS,kBAAkB;AAiBpB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AAEJ,QAAM,YAAY,OAAiC,IAAI;AAGvD,YAAU,MAAM;AACd,QAAI,aAAqC,MAAM;AAAA,IAAC;AAChD,QAAI,UAAU,SAAS;AACrB,mBAAa,mBAAmB,MAAM,UAAU,OAAO;AAAA,IACzD;AAEA,WAAO,MAAM;AACX,iBAAW,IAAI;AAAA,IACjB;AAAA,EACF,GAAG,CAAC,MAAM,kBAAkB,CAAC;AAG7B,QAAM,gBACJ,CAAC,CAAC,SAAS,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,KAAK,GAAG,CAAC;AAC/D,YAAU,MAAM;AACd,QAAI,CAAC,cAAe,aAAY,IAAI;AAAA,EACtC,GAAG,CAAC,aAAa,eAAe,IAAI,CAAC;AAErC,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,OAAO,UAAU,QAAQ;AAAA,MAChC,UAAU,CAAC,CAAC;AAAA,MACZ,SAAQ;AAAA,MACR;AAAA,MACA,WAAW,YAAY,OAAO;AAAA,MAC9B,YAAY;AAAA;AAAA,IAEX,YAAY,OAAO,YAAY,WAC9B;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,UAAU,YAAY,MAAM;AAAA,QAC3B,GAAG;AAAA;AAAA,IACN,IAEA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
   "names": []
 }

package/FieldObject/index.d.ts

@@ -1,23 +1,30 @@
 import React from 'react';
-import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldProps } from '@digigov/form/Field/types';
-import { FieldSpec } from '@digigov/form/types';
+import type { ErrorOption, UseFormReturn } from 'react-hook-form';
+import type { FieldProps } from '@digigov/form/Field/types';
+import type { FieldSpec } from '@digigov/form/types';
 export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    defaultValue?: any;
+    Field: React.FC<FieldProps>;
 }
 export declare const FieldObject: React.FC<FieldObjectProps>;
 export interface FieldObjectItemProps {
+    key: string;
     name: string;
     field: FieldSpec;
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
     children?: React.ReactNode;
+    defaultValue?: undefined;
+    Field: React.FC<FieldProps>;
 }
 export default FieldObject;

package/FieldObject/index.js

@@ -1,12 +1,8 @@
 import React, { useMemo } from "react";
 import { FieldBase } from "@digigov/form/Field/FieldBase";
-import {
-  FIELD_COMPONENTS,
-  ALTERNATIVE_COMPONENTS
-} from "@digigov/form/Field/utils";
-import { calculateField } from "@digigov/form/Field/utils/calculateField";
-import Fieldset, { FieldsetCaption } from "@digigov/form/Fieldset";
-import { FieldsetLegend } from "@digigov/react-core/FieldsetLegend";
+import { resolveField } from "@digigov/form/Field/utils/resolveField";
+import { Fieldset, FieldsetCaption } from "@digigov/form/Fieldset";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 const FieldObject = ({
   name,
@@ -15,21 +11,27 @@ const FieldObject = ({
   control,
   register,
   reset,
+  resetField,
   formState,
-  error
+  error,
+  defaultValue,
+  Field
 }) => {
   const { t } = useTranslation();
-  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm" }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm", marginBottom: 3 }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, { marginBottom: 3 }, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(
     FieldObjectItem,
     {
-      key: `${name}.${field.key}`,
-      name: `${name}.${field.key}`,
+      key: `${name ? name + "." : ""}${field.key ? `${field.key}` : ""}`,
+      name: `${name ? name + "." : ""}${field.key ? `${field.key}` : ""}`,
       control,
       register,
       reset,
+      resetField,
       field,
       error: error && error[field.key],
-      formState
+      formState,
+      defaultValue: defaultValue?.[field.key] || void 0,
+      Field
     }
   )));
 };
@@ -41,24 +43,34 @@ const FieldObjectItem = ({
   control,
   formState,
   reset,
-  register
+  resetField,
+  register,
+  defaultValue,
+  Field
 }) => {
-  const calculatedField = useMemo(
-    () => calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),
-    [field]
-  );
-  const customError = error ? error : formState?.errors[name];
-  return /* @__PURE__ */ React.createElement(
-    FieldBase,
-    {
-      ...calculatedField,
-      name,
-      control,
-      reset,
-      register,
-      error: customError
+  const resolvedField = useMemo(() => resolveField(children, field), [field]);
+  if (Field) {
+    if (!field.type) {
+      field.type = "string";
     }
-  );
+    return /* @__PURE__ */ React.createElement(Field, { ...field, name });
+  } else {
+    const customError = error ? error : formState?.errors[name];
+    return /* @__PURE__ */ React.createElement(
+      FieldBase,
+      {
+        ...resolvedField,
+        name,
+        Field,
+        control,
+        reset,
+        resetField,
+        register,
+        error: customError,
+        defaultValue
+      }
+    );
+  }
 };
 var FieldObject_default = FieldObject;
 export {