@digigov/form 2.0.0-061795a7 → 2.0.0-0b806366

package/FieldObject/index.d.ts

@@ -1,23 +1,26 @@
 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'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
-    defaultValue?: undefined;
+    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;

package/FieldObject/index.js

@@ -1,76 +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,
-  formState,
-  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(
-    FieldObjectItem,
-    {
-      key: `${name}${field.key ? `.${field.key}` : ""}`,
-      name: `${name}${field.key ? `.${field.key}` : ""}`,
-      control,
-      register,
-      reset,
-      field,
-      error: error && error[field.key],
-      formState,
-      defaultValue,
-      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,
-  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,
+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
+        });
+    }
     {
-      ...calculatedField,
-      name,
-      Field,
-      control,
-      reset,
-      register,
-      error: customError,
-      defaultValue
+        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
+        });
     }
-  );
-};
-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,7 +1,7 @@
 import React from 'react';
-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 useFormContext: () => import("@digigov/form/types").FormContextProps;
 declare const useFormValues: () => import("react-hook-form").FieldValues;
 declare const FormBuilder: React.ForwardRefExoticComponent<FormBuilderProps & React.RefAttributes<HTMLFormElement>>;
 export declare const ControlledFormBuilder: (props: any) => React.JSX.Element;