@digigov/form 2.0.0-a402a664 → 2.0.0-a64dc016

package/FieldArray/index.js

@@ -1,115 +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";
-const FieldArray = ({
-  name,
-  trigger,
-  register,
-  clearErrors,
-  control,
-  formState,
-  error,
-  getValues,
-  setValue,
-  layout,
-  reset,
-  resetField,
-  label,
-  Field,
-  ...customField
-}) => {
-  const { append, remove } = useFieldArray({
-    control,
-    name
-  });
-  const fields = getValues(name) || [];
-  return /* @__PURE__ */ React.createElement(
-    FieldBaseContainer,
-    {
-      label,
-      layout,
-      register,
-      error: error?.message && error ? error : void 0,
-      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
-      wrapper: "fieldset",
-      name,
-      labelSize: customField.extra?.labelSize,
-      controlled: true
-    },
-    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,
-        resetField,
+        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 || index
-      },
-      /* @__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
-      ))
-    )), customField.editable && /* @__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 };

package/FieldObject/index.d.ts

@@ -1,7 +1,7 @@
 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 '../Field/types.js';
+import type { FieldSpec } from '../types.js';
 export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
@@ -9,7 +9,7 @@ export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
     resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
-    defaultValue?: undefined;
+    defaultValue?: any;
     Field: React.FC<FieldProps>;
 }
 export declare const FieldObject: React.FC<FieldObjectProps>;

package/FieldObject/index.js

@@ -1,87 +1,55 @@
-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/ui/form/FieldContainer";
-import { useTranslation } from "@digigov/ui/i18n";
-const FieldObject = ({
-  name,
-  label,
-  extra,
-  control,
-  register,
-  reset,
-  resetField,
-  formState,
-  error,
-  defaultValue,
-  Field
-}) => {
-  const { t } = useTranslation();
-  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 ? `.${field.key}` : ""}`,
-      name: `${name}${field.key ? `.${field.key}` : ""}`,
-      control,
-      register,
-      reset,
-      resetField,
-      field,
-      error: error && error[field.key],
-      formState,
-      defaultValue: defaultValue?.[field.key] || void 0,
-      Field
-    }
-  )));
+import react, { useMemo } from "react";
+import { FieldBase } from "../Field/FieldBase.js";
+import { resolveField } from "../Field/utils/resolveField.js";
+import { Fieldset, FieldsetCaption } from "../Fieldset/index.js";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer/index.js";
+import { useTranslation } from "@digigov/ui/i18n/index.js";
+const FieldObject = ({ name, label, extra, control, register, reset, resetField, formState, error, defaultValue, Field })=>{
+    const { t } = useTranslation();
+    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 ? name + '.' : ''}${field.key ? `${field.key}` : ''}`,
+            name: `${name ? name + '.' : ''}${field.key ? `${field.key}` : ''}`,
+            control: control,
+            register: register,
+            reset: reset,
+            resetField: resetField,
+            field: field,
+            error: error && error[field.key],
+            formState: formState,
+            defaultValue: defaultValue?.[field.key] || void 0,
+            Field: Field
+        })));
 };
-const FieldObjectItem = ({
-  name,
-  children,
-  field,
-  error,
-  control,
-  formState,
-  reset,
-  resetField,
-  register,
-  defaultValue,
-  Field
-}) => {
-  const calculatedField = useMemo(
-    () => calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),
-    [field]
-  );
-  if (Field) {
-    if (!field.type) {
-      field.type = "string";
+const FieldObjectItem = ({ name, children, field, error, control, formState, reset, resetField, register, defaultValue, Field })=>{
+    const resolvedField = useMemo(()=>resolveField(children, field), [
+        field
+    ]);
+    if (Field) {
+        if (!field.type) field.type = 'string';
+        return /*#__PURE__*/ react.createElement(Field, {
+            ...field,
+            name: name
+        });
+    }
+    {
+        const customError = error ? error : formState?.errors[name];
+        return /*#__PURE__*/ react.createElement(FieldBase, {
+            ...resolvedField,
+            name: name,
+            Field: Field,
+            control: control,
+            reset: reset,
+            resetField: resetField,
+            register: register,
+            error: customError,
+            defaultValue: defaultValue
+        });
     }
-    return /* @__PURE__ */ React.createElement(Field, { ...field, name });
-  } else {
-    const customError = error ? error : formState?.errors[name];
-    return /* @__PURE__ */ React.createElement(
-      FieldBase,
-      {
-        ...calculatedField,
-        name,
-        Field,
-        control,
-        reset,
-        resetField,
-        register,
-        error: customError,
-        defaultValue
-      }
-    );
-  }
-};
-var FieldObject_default = FieldObject;
-export {
-  FieldObject,
-  FieldObject_default as default
 };
-//# sourceMappingURL=index.js.map
+const src_FieldObject = FieldObject;
+export { FieldObject, src_FieldObject as default };

package/Fieldset/FieldsetWithContext.js

@@ -0,0 +1,27 @@
+import react, { useContext, useMemo } from "react";
+import Field from "../Field/index.js";
+import { Fieldset, FieldsetBody, FieldsetCaption, FieldsetLabel } from "./index.js";
+import { FormContext } from "../FormContext.js";
+import { useTranslation } from "@digigov/ui/i18n/index.js";
+const FieldsetWithContext = ({ name })=>{
+    const { label, body, fields } = useFieldset(name);
+    const { t } = useTranslation();
+    return useMemo(()=>/*#__PURE__*/ react.createElement(Fieldset, null, label?.primary && /*#__PURE__*/ react.createElement(FieldsetLabel, null, t(label.primary)), label?.secondary && /*#__PURE__*/ react.createElement(FieldsetCaption, null, t(label.secondary)), body && /*#__PURE__*/ react.createElement(FieldsetBody, null, body), fields.map((field)=>/*#__PURE__*/ react.createElement(Field, {
+                key: field,
+                name: field
+            }))), [
+        label?.primary,
+        label?.secondary,
+        body,
+        fields
+    ]);
+};
+const useFieldset = (name)=>{
+    const { fieldsetsMap } = useContext(FormContext);
+    if (fieldsetsMap && fieldsetsMap[name]) return useMemo(()=>fieldsetsMap[name], [
+        name
+    ]);
+    if (!fieldsetsMap) throw new Error("Fieldsets is not defined");
+    throw new Error(`No fieldset with name ${name} found`);
+};
+export { FieldsetWithContext };

package/Fieldset/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FieldsetLabelProps, FieldsetCaptionProps, FieldsetBodyProps } from '@digigov/form/Fieldset/types';
+import type { FieldsetLabelProps, FieldsetCaptionProps, FieldsetBodyProps } from './types.js';
 import { Fieldset } from '@digigov/react-core/Fieldset';
 export declare const FieldsetLabel: React.FC<FieldsetLabelProps>;
 export declare const FieldsetCaption: React.FC<FieldsetCaptionProps>;

package/Fieldset/index.js

@@ -1,30 +1,18 @@
-import React from "react";
-import { Fieldset } from "@digigov/react-core/Fieldset";
-import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
-import { Grid } from "@digigov/ui/layouts/Grid";
-import { Hint } from "@digigov/ui/typography/Hint";
-import { NormalText } from "@digigov/ui/typography/NormalText";
-const FieldsetLabel = ({
-  children,
-  ...props
-}) => {
-  return /* @__PURE__ */ React.createElement(FieldsetLegend, { heading: true, size: "xl", ...props }, children);
-};
-const FieldsetCaption = ({
-  children,
-  ...props
-}) => {
-  return /* @__PURE__ */ React.createElement(Hint, { ...props }, children);
-};
-const FieldsetBody = ({ children }) => {
-  return /* @__PURE__ */ React.createElement(Grid, { item: true, xs: 12 }, /* @__PURE__ */ React.createElement(NormalText, null, children));
-};
-var Fieldset_default = Fieldset;
-export {
-  Fieldset,
-  FieldsetBody,
-  FieldsetCaption,
-  FieldsetLabel,
-  Fieldset_default as default
-};
-//# sourceMappingURL=index.js.map
+import react from "react";
+import { Fieldset } from "@digigov/react-core/Fieldset/index.js";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer/index.js";
+import { Grid } from "@digigov/ui/layouts/Grid/index.js";
+import { Hint } from "@digigov/ui/typography/Hint/index.js";
+import { NormalText } from "@digigov/ui/typography/NormalText/index.js";
+const FieldsetLabel = ({ children, ...props })=>/*#__PURE__*/ react.createElement(FieldsetLegend, {
+        heading: true,
+        size: "xl",
+        ...props
+    }, children);
+const FieldsetCaption = ({ children, ...props })=>/*#__PURE__*/ react.createElement(Hint, props, children);
+const FieldsetBody = ({ children })=>/*#__PURE__*/ react.createElement(Grid, {
+        item: true,
+        xs: 12
+    }, /*#__PURE__*/ react.createElement(NormalText, null, children));
+const src_Fieldset = Fieldset;
+export { Fieldset, FieldsetBody, FieldsetCaption, FieldsetLabel, src_Fieldset as default };

package/Fieldset/types.d.ts

@@ -1,5 +1,5 @@
-import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
-import { HintProps } from '@digigov/ui/typography/Hint';
+import type { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
+import type { HintProps } from '@digigov/ui/typography/Hint';
 export interface FieldsetLabelProps extends FieldsetLegendProps {
 }
 export interface FieldsetCaptionProps extends HintProps {

package/FormBuilder/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { useFormContext } from '@digigov/form/FormContext';
-import { FormBaseProps, FormBuilderProps } from '@digigov/form/types';
+import { useFormContext } from '../FormContext.js';
+import type { FormBaseProps, FormBuilderProps } from '../types.js';
 declare const FormBase: React.ForwardRefExoticComponent<FormBaseProps & React.RefAttributes<HTMLFormElement>>;
 declare const useFormValues: () => import("react-hook-form").FieldValues;
 declare const FormBuilder: React.ForwardRefExoticComponent<FormBuilderProps & React.RefAttributes<HTMLFormElement>>;