@digigov/form 2.0.0-87b6232d → 2.0.0-8bbad051

package/FieldArray/FormDialog/ArrayEditModal/index.js

@@ -0,0 +1,158 @@
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import { createPortal } from "react-dom";
+import { useForm } from "react-hook-form";
+import { FieldObject } from "@digigov/form/FieldObject";
+import { Fieldset } from "@digigov/form/Fieldset";
+import { FormContext, useFormContext } from "@digigov/form/FormContext";
+import { yupResolver } from "@digigov/form/utils";
+import { useValidationSchema } from "@digigov/form/validators";
+import {
+  Modal,
+  ModalAction,
+  ModalContent,
+  ModalHeading
+} from "@digigov/ui/app/Modal";
+import { Button } from "@digigov/ui/form/Button";
+import { Hint } from "@digigov/ui/typography/Hint";
+const ArrayEditModal = React.forwardRef(function ArrayEditModal2({
+  type,
+  title,
+  hint,
+  defaultValue,
+  editOrAppend,
+  cancel,
+  addTitle,
+  editLabel,
+  editProps,
+  appendLabel,
+  appendProps,
+  cancelLabel,
+  cancelProps,
+  ofField,
+  error: customErrors,
+  Field,
+  ...modalProps
+}, ref) {
+  const parentCtx = useFormContext();
+  const schema = useValidationSchema(
+    ofField.type === "object" && ofField.extra.fields ? Object.values(ofField.extra.fields) : [ofField]
+  );
+  const resolver = useMemo(() => {
+    if (!schema) return;
+    return yupResolver(schema);
+  }, [schema]);
+  const parentFormOptions = parentCtx.control._options;
+  const form = useForm({
+    resolver,
+    mode: parentFormOptions.mode,
+    reValidateMode: parentFormOptions.reValidateMode,
+    shouldFocusError: true,
+    // TODO: Consider using our own focus manager
+    criteriaMode: parentFormOptions.criteriaMode
+  });
+  const { reset, setValue, setError } = form;
+  useEffect(() => {
+    if (modalProps.open) {
+      reset(void 0);
+      if (type === "edit" && customErrors) {
+        for (const [key, error] of Object.entries(customErrors)) {
+          setError(
+            key,
+            typeof error === "string" ? { message: error } : error
+          );
+        }
+      }
+      if (defaultValue) {
+        Object.entries(defaultValue).forEach(([key, value]) => {
+          setValue(key, value);
+        });
+      }
+      if (type === "append" && ofField?.type === "object" && ofField.extra?.fields) {
+        ofField.extra.fields.forEach((field) => {
+          if (defaultValue && defaultValue[field.key] !== void 0) return;
+          switch (field.type) {
+            case "array":
+              setValue(field.key, []);
+              break;
+            case "object":
+              setValue(field.key, {});
+              break;
+            default:
+              setValue(field.key, "");
+          }
+        });
+      }
+    }
+  }, [modalProps.open, defaultValue, reset, setValue, type, ofField]);
+  const onSubmit = useCallback(
+    (data) => {
+      editOrAppend(data);
+    },
+    [editOrAppend]
+  );
+  const handleSubmitWithoutPropagation = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    return form.handleSubmit(onSubmit)(e);
+  };
+  const formRef = useRef(null);
+  const ctx = {
+    ...parentCtx,
+    control: form.control,
+    register: form.register,
+    watch: form.watch,
+    resetField: form.resetField,
+    registerField: () => {
+    },
+    // If we use parent registerField, validation breaks
+    registerFieldFocus: () => {
+      return () => {
+      };
+    },
+    errors: form.formState.errors,
+    formState: form.formState,
+    reset: form.reset,
+    trigger: form.trigger,
+    getFieldState: form.getFieldState,
+    setValue: form.setValue,
+    clearErrors: form.clearErrors,
+    getValues: form.getValues,
+    getValuesFromParentForm: parentCtx.getValues,
+    unregister: form.unregister,
+    setError: form.setError,
+    formRef,
+    submit: form.handleSubmit(onSubmit)
+  };
+  return /* @__PURE__ */ React.createElement(ModalPortal, { ...modalProps, ref, "aria-labelledby": "modal-label" }, /* @__PURE__ */ React.createElement(FormContext.Provider, { value: ctx }, /* @__PURE__ */ React.createElement("form", { onSubmit: handleSubmitWithoutPropagation, ref: formRef }, /* @__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), /* @__PURE__ */ React.createElement(Fieldset, null, ofField?.type === "object" ? /* @__PURE__ */ React.createElement(
+    FieldObject,
+    {
+      ...ofField,
+      defaultValue: defaultValue || void 0,
+      formState: form.formState,
+      register: form.register,
+      control: form.control,
+      name: void 0,
+      Field,
+      error: customErrors
+    }
+  ) : /* @__PURE__ */ React.createElement(Field, { error: customErrors, ...ofField }))), /* @__PURE__ */ React.createElement(ModalAction, null, type === "edit" ? /* @__PURE__ */ React.createElement(Button, { color: "secondary", ...editProps, type: "submit" }, editLabel || "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7") : /* @__PURE__ */ React.createElement(Button, { color: "primary", ...appendProps, type: "submit" }, appendLabel || "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7"), /* @__PURE__ */ React.createElement(
+    Button,
+    {
+      variant: "link",
+      type: "button",
+      ...cancelProps,
+      onClick: (e) => {
+        e.preventDefault();
+        cancel();
+      }
+    },
+    cancelLabel || "\u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7"
+  )))));
+});
+const ModalPortal = (props) => {
+  return createPortal(/* @__PURE__ */ React.createElement(Modal, { ...props }), document.body);
+};
+export {
+  ArrayEditModal
+};
+//# sourceMappingURL=ArrayEditModal.js.map

package/FieldArray/FormDialog/ArrayEditModal/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "main": "../../../cjs/FieldArray/FormDialog/ArrayEditModal/index.js"
+}

package/FieldArray/FormDialog/ArrayEditModal.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+import type { ErrorOption } from 'react-hook-form';
+import type { FieldProps, FormData } from '@digigov/form/Field/types';
+import type { ModalProps } from '@digigov/ui/app/Modal';
+export interface ArrayEditModalProps extends Omit<ModalProps, 'children'> {
+    type: 'append' | 'edit';
+    name: string;
+    title?: string;
+    hint?: string;
+    editOrAppend: (data: FormData) => void;
+    cancel: () => void;
+    addTitle?: string;
+    editLabel?: string;
+    editProps?: any;
+    appendLabel?: string;
+    appendProps?: any;
+    cancelLabel?: string;
+    cancelProps?: any;
+    ofField?: any;
+    defaultValue?: any;
+    Field: React.FC<FieldProps>;
+    error?: ErrorOption;
+}
+export declare const ArrayEditModal: React.ForwardRefExoticComponent<Omit<ArrayEditModalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;

package/FieldArray/FormDialog/ArrayEditModal.js.map

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

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;