@digigov/form 2.0.0-85c27c19 → 2.0.0-87b6232d

package/cjs/FormBuilder/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,19 +16,264 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var FormBuilder_exports = {};
 __export(FormBuilder_exports, {
-  FormBase: () => import_form.FormBase,
+  ControlledFormBuilder: () => ControlledFormBuilder,
+  FormBase: () => FormBase,
   default: () => FormBuilder_default,
-  useFormContext: () => import_form.useFormContext,
-  useFormValues: () => import_form.useFormValues
+  useFormContext: () => useFormContext,
+  useFormValues: () => useFormValues
 });
 module.exports = __toCommonJS(FormBuilder_exports);
-var import_form = require("@digigov/form");
-var FormBuilder_default = import_form.FormBuilder;
+var import_react = __toESM(require("react"));
+var import_react_hook_form = require("react-hook-form");
+var import_Field = require("@digigov/form/Field");
+var import_ErrorGroup = require("@digigov/form/Field/ErrorGroup");
+var import_utils = require("@digigov/form/Field/utils");
+var import_FieldsetWithContext = require("@digigov/form/Fieldset/FieldsetWithContext");
+var import_FormContext = require("@digigov/form/FormContext");
+var import_utils2 = require("@digigov/form/utils");
+var import_validators = require("@digigov/form/validators");
+var import_Button = require("@digigov/ui/form/Button");
+var import_Form = require("@digigov/ui/form/Form");
+var import_useScreen = require("@digigov/ui/utils/hooks/useScreen");
+const FormBase = import_react.default.forwardRef(function FormBase2({
+  onSubmit,
+  children,
+  registerField,
+  fieldsMap,
+  fieldsetsMap,
+  resolver,
+  mode,
+  initial,
+  reValidateMode,
+  shouldFocusError = true,
+  criteriaMode,
+  componentRegistry,
+  grid,
+  errors,
+  ...props
+}, ref) {
+  const form = (0, import_react_hook_form.useForm)({
+    resolver,
+    mode,
+    defaultValues: initial,
+    reValidateMode,
+    shouldFocusError,
+    criteriaMode
+  });
+  const handleSubmit = (0, import_react.useCallback)(
+    (data) => {
+      if (onSubmit) {
+        form.reset(data);
+        onSubmit(data);
+      }
+    },
+    [onSubmit]
+  );
+  (0, import_react.useEffect)(() => {
+    if (errors) {
+      for (const fieldName in errors) {
+        form.setError(fieldName, errors[fieldName], { shouldFocus: true });
+      }
+    }
+  }, [errors]);
+  const submit = form.handleSubmit(handleSubmit);
+  const ctx = {
+    fieldsMap,
+    fieldsetsMap,
+    control: form.control,
+    register: form.register,
+    watch: form.watch,
+    resetField: form.resetField,
+    registerField,
+    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,
+    unregister: form.unregister,
+    componentRegistry,
+    setError: form.setError,
+    formRef: ref,
+    submit
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_FormContext.FormContext.Provider, { value: ctx }, /* @__PURE__ */ import_react.default.createElement(import_Form.Form, { grid, onSubmit: submit, ref, ...props }, children));
+});
+const DEFAULT_LAYOUT = {
+  xs: 12,
+  sm: 12,
+  md: 12,
+  lg: 12,
+  xl: 12
+};
+const BREAKPOINTS = ["xs", "sm", "md", "lg", "xl"];
+const groupFieldsByLayout = (fields) => {
+  return BREAKPOINTS.reduce((sizes, size) => {
+    sizes[size] = fields.reduce((acc, item) => {
+      const layoutValue = item.layout?.[size] || 12;
+      if (layoutValue === 0) {
+        return [...acc, item];
+      }
+      const lastElement = acc[acc.length - 1];
+      const currentSum = Array.isArray(lastElement) ? lastElement.reduce((sum, i) => sum + (i.layout?.[size] || 0), 0) : 0;
+      if (!Array.isArray(lastElement) || currentSum + layoutValue > 12) {
+        return layoutValue === 12 ? [...acc, item] : [...acc, [item]];
+      }
+      return [...acc.slice(0, -1), [...lastElement, item]];
+    }, []).map((item) => {
+      if (Array.isArray(item) && item.length === 1) {
+        return item[0];
+      }
+      return item;
+    });
+    return sizes;
+  }, {});
+};
+const useFormContext = () => {
+  return (0, import_react.useContext)(import_FormContext.FormContext);
+};
+const useFormValues = () => {
+  const ctx = useFormContext();
+  return ctx.getValues();
+};
+const FormBuilder = import_react.default.forwardRef(function FormBuilder2({
+  fields = [],
+  fieldsets,
+  initial = {},
+  onSubmit,
+  children,
+  reValidateMode = "onSubmit",
+  mode = "onSubmit",
+  shouldFocusError = true,
+  criteriaMode = "all",
+  auto = false,
+  validatorRegistry,
+  componentRegistry,
+  grid = false,
+  ...props
+}, ref) {
+  const { screenSize } = (0, import_useScreen.useScreenSize)();
+  fields = fields.map((field) => {
+    const layout = field.layout;
+    if (!layout) {
+      return {
+        ...field,
+        layout: DEFAULT_LAYOUT
+      };
+    }
+    return {
+      ...field,
+      layout: BREAKPOINTS.reduce(
+        (expandedLayout, breakpoint, breakpointIndex) => {
+          if (field?.layout?.[breakpoint]) {
+            expandedLayout[breakpoint] = field?.layout[breakpoint];
+          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {
+            expandedLayout[breakpoint] = expandedLayout[BREAKPOINTS[breakpointIndex - 1]];
+          } else {
+            expandedLayout[breakpoint] = 12;
+          }
+          return expandedLayout;
+        },
+        {}
+      )
+    };
+  });
+  const fieldsState = (0, import_react.useRef)(fields);
+  const setFieldsState = (0, import_react.useCallback)((newFields) => {
+    fieldsState.current = newFields;
+  }, []);
+  const schema = (0, import_validators.useValidationSchema)(fieldsState, validatorRegistry);
+  const registerField = (0, import_react.useCallback)((field) => {
+    const fieldIndex = fieldsState.current.findIndex(
+      (f) => f.key === field.key
+    );
+    if (fieldIndex > -1) {
+      fieldsState.current[fieldIndex] = field;
+    } else {
+      fieldsState.current.push(field);
+    }
+    setFieldsState(fieldsState.current);
+  }, []);
+  let resolver;
+  let fieldsMap;
+  let fieldsetsMap;
+  let fieldChildren;
+  if (schema) {
+    resolver = (0, import_utils2.yupResolver)(schema);
+    fieldsMap = fields ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {}) : {};
+    fieldsetsMap = fieldsets && fieldsets.reduce(
+      (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),
+      {}
+    );
+    if (auto) {
+      if (fieldsets) {
+        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_FieldsetWithContext.FieldsetWithContext, { key: fieldset.key, name: fieldset.key }));
+      } else if (fields) {
+        const fieldsByLayouts = groupFieldsByLayout(fields);
+        const fieldsByLayoutSize = fieldsByLayouts[screenSize];
+        fieldChildren = fieldsByLayoutSize.map((item, index) => {
+          if (Array.isArray(item)) {
+            return /* @__PURE__ */ import_react.default.createElement(
+              import_ErrorGroup.ErrorGroup,
+              {
+                key: index,
+                screenSize,
+                fieldOrder: item.map((field) => field.key)
+              },
+              item.map((f) => {
+                return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: f.key, name: f.key });
+              })
+            );
+          } else {
+            return /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: item.key, name: item.key });
+          }
+        });
+      }
+    }
+  }
+  return /* @__PURE__ */ import_react.default.createElement(
+    FormBase,
+    {
+      resolver,
+      fieldsetsMap,
+      fieldsMap,
+      registerField,
+      initial,
+      reValidateMode,
+      mode,
+      shouldFocusError,
+      criteriaMode,
+      onSubmit,
+      componentRegistry,
+      ref,
+      grid,
+      ...props
+    },
+    fieldChildren,
+    auto && /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
+    children
+  );
+});
+const ControlledFormBuilder = (props) => {
+  return /* @__PURE__ */ import_react.default.createElement(FormBuilder, { ...props, componentRegistry: import_utils.CONTROLLED_FIELD_COMPONENTS });
+};
+var FormBuilder_default = FormBuilder;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ControlledFormBuilder,
   FormBase,
   useFormContext,
   useFormValues

package/cjs/FormBuilder/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FormBuilder/index.tsx"],
-  "sourcesContent": ["import {\n  FormBuilder,\n  useFormContext,\n  useFormValues,\n  FormBase,\n} from '@digigov/form';\nexport { useFormContext, useFormValues, FormBase };\nexport default FormBuilder;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAKO;AAEP,IAAO,sBAAQ;",
-  "names": []
+  "sourcesContent": ["import React, { useCallback, useContext, useEffect, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { ErrorGroup } from '@digigov/form/Field/ErrorGroup';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/Field/utils';\nimport { FieldsetWithContext } from '@digigov/form/Fieldset/FieldsetWithContext';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FormBaseProps, FormData, FormBuilderProps } from '@digigov/form/types';\nimport { yupResolver } from '@digigov/form/utils';\nimport { useValidationSchema } from '@digigov/form/validators';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Form } from '@digigov/ui/form/Form';\nimport { useScreenSize } from '@digigov/ui/utils/hooks/useScreen';\n\nconst FormBase = React.forwardRef(function FormBase(\n  {\n    onSubmit,\n    children,\n    registerField,\n    fieldsMap,\n    fieldsetsMap,\n    resolver,\n    mode,\n    initial,\n    reValidateMode,\n    shouldFocusError = true,\n    criteriaMode,\n    componentRegistry,\n    grid,\n    errors,\n    ...props\n  }: FormBaseProps,\n  ref: React.Ref<HTMLFormElement>\n) {\n  const form = useForm({\n    resolver,\n    mode,\n    defaultValues: initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n  });\n\n  const handleSubmit = useCallback(\n    (data: FormData): void => {\n      if (onSubmit) {\n        form.reset(data);\n        onSubmit(data);\n      }\n    },\n    [onSubmit]\n  );\n  useEffect(() => {\n    if (errors) {\n      for (const fieldName in errors) {\n        form.setError(fieldName, errors[fieldName], { shouldFocus: true });\n      }\n    }\n  }, [errors]);\n  const submit = form.handleSubmit(handleSubmit);\n  const ctx = {\n    fieldsMap,\n    fieldsetsMap,\n    control: form.control,\n    register: form.register,\n    watch: form.watch,\n    resetField: form.resetField,\n    registerField: registerField,\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    unregister: form.unregister,\n    componentRegistry,\n    setError: form.setError,\n    formRef: ref,\n    submit,\n  };\n\n  return (\n    <FormContext.Provider value={ctx}>\n      <Form grid={grid} onSubmit={submit} ref={ref} {...props}>\n        {children}\n      </Form>\n    </FormContext.Provider>\n  );\n});\n\nconst DEFAULT_LAYOUT = {\n  xs: 12,\n  sm: 12,\n  md: 12,\n  lg: 12,\n  xl: 12,\n};\n\nconst BREAKPOINTS = ['xs', 'sm', 'md', 'lg', 'xl'];\n\nconst groupFieldsByLayout = (fields) => {\n  return BREAKPOINTS.reduce((sizes, size) => {\n    sizes[size] = fields\n      .reduce((acc, item) => {\n        const layoutValue = item.layout?.[size] || 12;\n        if (layoutValue === 0) {\n          return [...acc, item];\n        }\n        const lastElement = acc[acc.length - 1];\n        const currentSum = Array.isArray(lastElement)\n          ? lastElement.reduce((sum, i) => sum + (i.layout?.[size] || 0), 0)\n          : 0;\n        if (!Array.isArray(lastElement) || currentSum + layoutValue > 12) {\n          return layoutValue === 12 ? [...acc, item] : [...acc, [item]];\n        }\n\n        return [...acc.slice(0, -1), [...lastElement, item]];\n      }, [])\n      .map((item) => {\n        if (Array.isArray(item) && item.length === 1) {\n          return item[0];\n        }\n        return item;\n      });\n    return sizes;\n  }, {});\n};\nconst useFormContext = () => {\n  return useContext(FormContext);\n};\nconst useFormValues = () => {\n  const ctx = useFormContext();\n  return ctx.getValues();\n};\nconst FormBuilder = React.forwardRef(function FormBuilder(\n  {\n    fields = [],\n    fieldsets,\n    initial = {},\n    onSubmit,\n    children,\n    reValidateMode = 'onSubmit',\n    mode = 'onSubmit',\n    shouldFocusError = true,\n    criteriaMode = 'all',\n    auto = false,\n    validatorRegistry,\n    componentRegistry,\n    grid = false,\n    ...props\n  }: FormBuilderProps,\n  ref: React.Ref<HTMLFormElement>\n): React.ReactElement {\n  const { screenSize } = useScreenSize();\n  fields = fields.map((field) => {\n    const layout = field.layout;\n    if (!layout) {\n      return {\n        ...field,\n        layout: DEFAULT_LAYOUT,\n      };\n    }\n    return {\n      ...field,\n      layout: BREAKPOINTS.reduce(\n        (expandedLayout, breakpoint, breakpointIndex) => {\n          if (field?.layout?.[breakpoint]) {\n            expandedLayout[breakpoint] = field?.layout[breakpoint];\n          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {\n            expandedLayout[breakpoint] =\n              expandedLayout[BREAKPOINTS[breakpointIndex - 1]];\n          } else {\n            expandedLayout[breakpoint] = 12;\n          }\n          return expandedLayout;\n        },\n        {}\n      ),\n    };\n  });\n\n  const fieldsState = useRef(fields);\n  const setFieldsState = useCallback((newFields) => {\n    fieldsState.current = newFields;\n  }, []);\n  const schema = useValidationSchema(fieldsState, validatorRegistry);\n  const registerField = useCallback((field) => {\n    const fieldIndex = fieldsState.current.findIndex(\n      (f) => f.key === field.key\n    );\n    if (fieldIndex > -1) {\n      fieldsState.current[fieldIndex] = field;\n    } else {\n      fieldsState.current.push(field);\n    }\n    setFieldsState(fieldsState.current);\n  }, []);\n  let resolver;\n  let fieldsMap;\n  let fieldsetsMap;\n  let fieldChildren;\n  if (schema) {\n    resolver = yupResolver(schema);\n    fieldsMap = fields\n      ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {})\n      : {};\n    fieldsetsMap =\n      fieldsets &&\n      fieldsets.reduce(\n        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),\n        {}\n      );\n\n    if (auto) {\n      if (fieldsets) {\n        fieldChildren = fieldsets.map((fieldset) => (\n          <FieldsetWithContext key={fieldset.key} name={fieldset.key} />\n        ));\n      } else if (fields) {\n        const fieldsByLayouts = groupFieldsByLayout(fields);\n        const fieldsByLayoutSize = fieldsByLayouts[screenSize];\n        fieldChildren = fieldsByLayoutSize.map((item, index) => {\n          if (Array.isArray(item)) {\n            return (\n              <ErrorGroup\n                key={index}\n                screenSize={screenSize}\n                fieldOrder={item.map((field) => field.key)}\n              >\n                {item.map((f) => {\n                  return <Field key={f.key} name={f.key} />;\n                })}\n              </ErrorGroup>\n            );\n          } else {\n            return <Field key={item.key} name={item.key} />;\n          }\n        });\n      }\n    }\n  }\n  return (\n    <FormBase\n      resolver={resolver}\n      fieldsetsMap={fieldsetsMap}\n      fieldsMap={fieldsMap}\n      registerField={registerField}\n      initial={initial}\n      reValidateMode={reValidateMode}\n      mode={mode}\n      shouldFocusError={shouldFocusError}\n      criteriaMode={criteriaMode}\n      onSubmit={onSubmit}\n      componentRegistry={componentRegistry}\n      ref={ref}\n      grid={grid}\n      {...props}\n    >\n      {fieldChildren}\n      {auto && <Button type=\"submit\">\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1</Button>}\n      {children}\n    </FormBase>\n  );\n});\nexport const ControlledFormBuilder = (props) => {\n  return (\n    <FormBuilder {...props} componentRegistry={CONTROLLED_FIELD_COMPONENTS} />\n  );\n};\nexport default FormBuilder;\n\nexport { useFormContext, useFormValues, FormBase };\n"],
+  "mappings": "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",
+  "names": ["import_utils", "React", "FormBase", "FormBuilder"]
 }

package/cjs/FormContext/index.js

@@ -20,8 +20,8 @@ __export(FormContext_exports, {
   FormContext: () => FormContext
 });
 module.exports = __toCommonJS(FormContext_exports);
-var import_react2 = require("react");
-const FormContext = (0, import_react2.createContext)({
+var import_react = require("react");
+const FormContext = (0, import_react.createContext)({
   fieldsMap: {},
   fieldsetsMap: {}
 });

package/cjs/FormContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FormContext.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { createContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,IAAAA,gBAA8B;AAGvB,MAAM,kBAA+C,6BAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
-  "names": ["import_react"]
+  "sourcesContent": ["import React, { createContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAqC;AAG9B,MAAM,kBAA+C,4BAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
+  "names": []
 }

package/cjs/MultiplicityField/add-objects/index.js

@@ -37,10 +37,10 @@ var import_FieldBase = require("@digigov/form/Field/FieldBase");
 var import_utils = require("@digigov/form/Field/utils");
 var import_calculateField = require("@digigov/form/Field/utils/calculateField");
 var import_useField = require("@digigov/form/Field/utils/useField");
-var import_FieldObject = __toESM(require("@digigov/form/FieldObject"));
-var import_Fieldset = __toESM(require("@digigov/react-core/Fieldset"));
-var import_RadioConditional = __toESM(require("@digigov/react-core/RadioConditional"));
-var import_Button = __toESM(require("@digigov/ui/form/Button"));
+var import_FieldObject = require("@digigov/form/FieldObject");
+var import_Fieldset = require("@digigov/form/Fieldset");
+var import_Button = require("@digigov/ui/form/Button");
+var import_RadioContainer = require("@digigov/ui/form/RadioContainer");
 const AddObjects = ({
   name,
   fields,
@@ -55,7 +55,8 @@ const AddObjects = ({
   stashedObjects,
   getValues,
   onStash,
-  error
+  error,
+  Field
 }) => {
   const currentIndex = fields.length > 0 ? fields.length - 1 : fields.length;
   const currentName = `${name}.${currentIndex}`;
@@ -83,12 +84,12 @@ const AddObjects = ({
           value: "yes",
           selected: function RadioSelected() {
             return /* @__PURE__ */ import_react.default.createElement(
-              import_RadioConditional.default,
+              import_RadioContainer.RadioConditional,
               {
                 hidden: needsMore !== "yes" || extra?.max && extra?.max - stashedObjects.length === 0
               },
               needsMore === "yes" && fields.length > 0 && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
-                import_FieldObject.default,
+                import_FieldObject.FieldObject,
                 {
                   name: currentName,
                   error: error && error[currentIndex],
@@ -99,7 +100,7 @@ const AddObjects = ({
                   label: extra?.label.question.objectLabel || extra?.of.label
                 }
               ), /* @__PURE__ */ import_react.default.createElement(
-                import_Button.default,
+                import_Button.Button,
                 {
                   color: "secondary",
                   name: `${currentName}-add-object`,
@@ -109,8 +110,10 @@ const AddObjects = ({
                       (f) => `${currentName}.${f.key}`
                     );
                     const result = await trigger(nestedFields);
-                    result && setValue("needs-more", "");
-                    result && onStash(getValues(currentName));
+                    if (result) {
+                      setValue("needs-more", "");
+                      onStash(getValues(currentName));
+                    }
                   }
                 },
                 extra?.label.object.add
@@ -131,6 +134,7 @@ const AddObjects = ({
     control,
     register,
     reset,
+    resetField,
     error: needsMoreError
   } = (0, import_useField.useField)(radioField.key, radioField?.type ? radioField : null);
   const calculatedField = (0, import_react.useMemo)(
@@ -157,7 +161,7 @@ const AddObjects = ({
   } else if (extra?.max) {
     calculatedField.label.secondary = ` \u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03B9 ${stashedObjects.length} \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2 \u03BA\u03B1\u03B9 \u03C3\u03B1\u03C2 \u03B1\u03C0\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5\u03BD ${extra.max - stashedObjects.length} \u03B5\u03C0\u03B9\u03C0\u03BB\u03AD\u03BF\u03BD \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.default, null, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, /* @__PURE__ */ import_react.default.createElement(
     import_FieldBase.FieldBase,
     {
       ...calculatedField,
@@ -165,6 +169,8 @@ const AddObjects = ({
       control,
       register,
       reset,
+      resetField,
+      Field,
       error: extra?.max - stashedObjects.length === 0 || extra?.length - stashedObjects.length === 0 ? error : needsMoreError
     }
   ));

package/cjs/MultiplicityField/add-objects.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/MultiplicityField/add-objects.tsx"],
-  "sourcesContent": ["/* eslint-disable react/prop-types */\nimport React, { useEffect, useMemo } from 'react';\nimport {\n  ErrorOption,\n  FieldArrayWithId,\n  UseFieldArrayReturn,\n  useWatch,\n} from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { useField } from '@digigov/form/Field/utils/useField';\n\nimport FieldObject from '@digigov/form/FieldObject';\nimport type {\n  MultiplicityProps,\n  StashedObject,\n} from '@digigov/form/MultiplicityField/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport RadioConditional from '@digigov/react-core/RadioConditional';\nimport Button from '@digigov/ui/form/Button';\n\nexport interface AddObjectsProps\n  extends Omit<MultiplicityProps, 'key' | 'component'> {\n  fields: FieldArrayWithId[];\n  error?: ErrorOption;\n  append: UseFieldArrayReturn['append'];\n  remove: UseFieldArrayReturn['remove'];\n  stashedObjects: StashedObject[];\n  onStash: (arg0: StashedObject) => void;\n  children?: React.ReactNode;\n}\n\nexport const AddObjects: React.FC<AddObjectsProps> = ({\n  name,\n  fields,\n  formState,\n  extra,\n  append,\n  remove,\n  trigger,\n  clearErrors,\n  children,\n  setValue,\n  stashedObjects,\n  getValues,\n  onStash,\n  error,\n}) => {\n  const currentIndex = fields.length > 0 ? fields.length - 1 : fields.length;\n  const currentName = `${name}.${currentIndex}`;\n  const radioField: FieldSpec = {\n    key: 'needs-more',\n    type: 'choice:single',\n    label: {\n      primary: extra?.label.question.title,\n    },\n    required: true,\n    validators: [\n      {\n        name: 'is-locked',\n        message: 'form.error.needs-more',\n        test: (data) => {\n          return data === 'no';\n        },\n      },\n    ],\n    extra: {\n      options: [\n        {\n          label: { primary: extra?.label.question.yes },\n          id: `radio-input-${name}-yes`,\n          value: 'yes',\n          selected: function RadioSelected() {\n            return (\n              <RadioConditional\n                hidden={\n                  needsMore !== 'yes' ||\n                  (extra?.max && extra?.max - stashedObjects.length === 0)\n                }\n              >\n                {needsMore === 'yes' && fields.length > 0 && (\n                  <>\n                    <FieldObject\n                      name={currentName}\n                      error={error && error[currentIndex]}\n                      register={register}\n                      formState={formState}\n                      control={control}\n                      {...extra?.of}\n                      label={\n                        extra?.label.question.objectLabel || extra?.of.label\n                      }\n                    />\n                    <Button\n                      color=\"secondary\"\n                      name={`${currentName}-add-object`}\n                      onClick={async (e) => {\n                        e.preventDefault();\n                        const nestedFields = extra?.of.extra.fields.map(\n                          (f) => `${currentName}.${f.key}`\n                        );\n                        const result = await trigger(nestedFields);\n                        result && setValue('needs-more', '');\n                        result && onStash(getValues(currentName));\n                      }}\n                    >\n                      {extra?.label.object.add}\n                    </Button>\n                  </>\n                )}\n              </RadioConditional>\n            );\n          },\n        },\n        {\n          label: { primary: extra?.label.question.no },\n          id: `radio-input-${name}-no`,\n          value: 'no',\n        },\n      ],\n    },\n  };\n\n  const {\n    field,\n    control,\n    register,\n    reset,\n    error: needsMoreError,\n  } = useField(radioField.key, radioField?.type ? radioField : null);\n\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n  const needsMore = useWatch({ name: field.key, control });\n\n  useEffect(() => {\n    if (needsMore === 'yes') {\n      append({ afm: '', firstName: '', lastName: '' });\n    }\n    if (needsMore === 'no' && stashedObjects.length < fields.length) {\n      remove(currentIndex);\n    }\n    if (needsMore === '') clearErrors('needs-more');\n  }, [needsMore]);\n\n  // TODO: Refactor types so that label is always required, the following\n  // assignment is a temp fix for typescript build to run\n  calculatedField.label = calculatedField.label || {};\n  if (extra?.length) {\n    calculatedField.label.secondary = `\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03B9 ${\n      stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2 \u03BA\u03B1\u03B9 \u03C3\u03B1\u03C2 \u03B1\u03C0\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5\u03BD \u03B1\u03BA\u03CC\u03BC\u03B1 ${\n      extra.length - stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;\n  } else if (extra?.min && extra?.max) {\n    calculatedField.label.secondary = `\u03A4\u03BF \u03C0\u03B5\u03B4\u03AF\u03BF \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03AD\u03C7\u03B5\u03B9 \u03B1\u03BA\u03CC\u03BC\u03B1 ${\n      extra?.min - stashedObjects.length\n    } \u03BA\u03B1\u03B9 \u03C4\u03BF \u03BC\u03AD\u03B3\u03B9\u03C3\u03C4\u03BF ${\n      extra?.max\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2. \u03A0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03C4\u03B5 \u03BC\u03B9\u03B1 \u03B1\u03BA\u03CC\u03BC\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03B3\u03BF\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B7\u03BD \u03B1\u03C0\u03AC\u03BD\u03C4\u03B7\u03C3\u03B7 \u00AB\u039D\u03B1\u03B9\u00BB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;\n  } else if (extra?.min) {\n    calculatedField.label.secondary = `\u03A4\u03BF \u03C0\u03B5\u03B4\u03AF\u03BF \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03AD\u03C7\u03B5\u03B9 \u03B1\u03BA\u03CC\u03BC\u03B1 ${\n      extra?.min - stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2. \u03A0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03C4\u03B5 \u03BC\u03B9\u03B1 \u03B1\u03BA\u03CC\u03BC\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03B3\u03BF\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B7\u03BD \u03B1\u03C0\u03AC\u03BD\u03C4\u03B7\u03C3\u03B7 \u00AB\u039D\u03B1\u03B9\u00BB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;\n  } else if (extra?.max) {\n    calculatedField.label.secondary = ` \u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03B9 ${\n      stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2 \u03BA\u03B1\u03B9 \u03C3\u03B1\u03C2 \u03B1\u03C0\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5\u03BD ${\n      extra.max - stashedObjects.length\n    } \u03B5\u03C0\u03B9\u03C0\u03BB\u03AD\u03BF\u03BD \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;\n  }\n  return (\n    <Fieldset>\n      <FieldBase\n        {...calculatedField}\n        name={calculatedField.key}\n        control={control}\n        register={register}\n        reset={reset}\n        error={\n          extra?.max - stashedObjects.length === 0 ||\n          extra?.length - stashedObjects.length === 0\n            ? error\n            : needsMoreError\n        }\n      />\n    </Fieldset>\n  );\n};\n\nexport default AddObjects;\n"],
-  "mappings": "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",
-  "names": ["React", "RadioConditional", "FieldObject", "Button", "Fieldset"]
+  "sourcesContent": ["import React, { useEffect, useMemo } from 'react';\nimport {\n  ErrorOption,\n  FieldArrayWithId,\n  UseFieldArrayReturn,\n  useWatch,\n} from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { useField } from '@digigov/form/Field/utils/useField';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport type {\n  MultiplicityProps,\n  StashedObject,\n} from '@digigov/form/MultiplicityField/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport { Button } from '@digigov/ui/form/Button';\nimport { RadioConditional } from '@digigov/ui/form/RadioContainer';\n\nexport interface AddObjectsProps\n  extends Omit<MultiplicityProps, 'key' | 'component'> {\n  fields: FieldArrayWithId[];\n  error?: ErrorOption;\n  append: UseFieldArrayReturn['append'];\n  remove: UseFieldArrayReturn['remove'];\n  stashedObjects: StashedObject[];\n  onStash: (arg0: StashedObject) => void;\n  children?: React.ReactNode;\n}\n\nexport const AddObjects: React.FC<AddObjectsProps> = ({\n  name,\n  fields,\n  formState,\n  extra,\n  append,\n  remove,\n  trigger,\n  clearErrors,\n  children,\n  setValue,\n  stashedObjects,\n  getValues,\n  onStash,\n  error,\n  Field,\n}) => {\n  const currentIndex = fields.length > 0 ? fields.length - 1 : fields.length;\n  const currentName = `${name}.${currentIndex}`;\n  const radioField: FieldSpec = {\n    key: 'needs-more',\n    type: 'choice:single',\n    label: {\n      primary: extra?.label.question.title,\n    },\n    required: true,\n    validators: [\n      {\n        name: 'is-locked',\n        message: 'form.error.needs-more',\n        test: (data) => {\n          return data === 'no';\n        },\n      },\n    ],\n    extra: {\n      options: [\n        {\n          label: { primary: extra?.label.question.yes },\n          id: `radio-input-${name}-yes`,\n          value: 'yes',\n          selected: function RadioSelected() {\n            return (\n              <RadioConditional\n                hidden={\n                  needsMore !== 'yes' ||\n                  (extra?.max && extra?.max - stashedObjects.length === 0)\n                }\n              >\n                {needsMore === 'yes' && fields.length > 0 && (\n                  <>\n                    <FieldObject\n                      name={currentName}\n                      error={error && error[currentIndex]}\n                      register={register}\n                      formState={formState}\n                      control={control}\n                      {...extra?.of}\n                      label={\n                        extra?.label.question.objectLabel || extra?.of.label\n                      }\n                    />\n                    <Button\n                      color=\"secondary\"\n                      name={`${currentName}-add-object`}\n                      onClick={async (e) => {\n                        e.preventDefault();\n                        const nestedFields = extra?.of.extra.fields.map(\n                          (f) => `${currentName}.${f.key}`\n                        );\n                        const result = await trigger(nestedFields);\n                        if (result) {\n                          setValue('needs-more', '');\n                          onStash(getValues(currentName));\n                        }\n                      }}\n                    >\n                      {extra?.label.object.add}\n                    </Button>\n                  </>\n                )}\n              </RadioConditional>\n            );\n          },\n        },\n        {\n          label: { primary: extra?.label.question.no },\n          id: `radio-input-${name}-no`,\n          value: 'no',\n        },\n      ],\n    },\n  };\n\n  const {\n    field,\n    control,\n    register,\n    reset,\n    resetField,\n    error: needsMoreError,\n  } = useField(radioField.key, radioField?.type ? radioField : null);\n\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n  const needsMore = useWatch({ name: field.key, control });\n\n  useEffect(() => {\n    if (needsMore === 'yes') {\n      append({ afm: '', firstName: '', lastName: '' });\n    }\n    if (needsMore === 'no' && stashedObjects.length < fields.length) {\n      remove(currentIndex);\n    }\n    if (needsMore === '') clearErrors('needs-more');\n  }, [needsMore]);\n\n  // TODO: Refactor types so that label is always required, the following\n  // assignment is a temp fix for typescript build to run\n  calculatedField.label = calculatedField.label || {};\n  if (extra?.length) {\n    calculatedField.label.secondary = `\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03B9 ${\n      stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2 \u03BA\u03B1\u03B9 \u03C3\u03B1\u03C2 \u03B1\u03C0\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5\u03BD \u03B1\u03BA\u03CC\u03BC\u03B1 ${\n      extra.length - stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;\n  } else if (extra?.min && extra?.max) {\n    calculatedField.label.secondary = `\u03A4\u03BF \u03C0\u03B5\u03B4\u03AF\u03BF \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03AD\u03C7\u03B5\u03B9 \u03B1\u03BA\u03CC\u03BC\u03B1 ${\n      extra?.min - stashedObjects.length\n    } \u03BA\u03B1\u03B9 \u03C4\u03BF \u03BC\u03AD\u03B3\u03B9\u03C3\u03C4\u03BF ${\n      extra?.max\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2. \u03A0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03C4\u03B5 \u03BC\u03B9\u03B1 \u03B1\u03BA\u03CC\u03BC\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03B3\u03BF\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B7\u03BD \u03B1\u03C0\u03AC\u03BD\u03C4\u03B7\u03C3\u03B7 \u00AB\u039D\u03B1\u03B9\u00BB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;\n  } else if (extra?.min) {\n    calculatedField.label.secondary = `\u03A4\u03BF \u03C0\u03B5\u03B4\u03AF\u03BF \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03AD\u03C7\u03B5\u03B9 \u03B1\u03BA\u03CC\u03BC\u03B1 ${\n      extra?.min - stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2. \u03A0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03C4\u03B5 \u03BC\u03B9\u03B1 \u03B1\u03BA\u03CC\u03BC\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03B3\u03BF\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B7\u03BD \u03B1\u03C0\u03AC\u03BD\u03C4\u03B7\u03C3\u03B7 \u00AB\u039D\u03B1\u03B9\u00BB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;\n  } else if (extra?.max) {\n    calculatedField.label.secondary = ` \u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03B9 ${\n      stashedObjects.length\n    } \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2 \u03BA\u03B1\u03B9 \u03C3\u03B1\u03C2 \u03B1\u03C0\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5\u03BD ${\n      extra.max - stashedObjects.length\n    } \u03B5\u03C0\u03B9\u03C0\u03BB\u03AD\u03BF\u03BD \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;\n  }\n  return (\n    <Fieldset>\n      <FieldBase\n        {...calculatedField}\n        name={calculatedField.key}\n        control={control}\n        register={register}\n        reset={reset}\n        resetField={resetField}\n        Field={Field}\n        error={\n          extra?.max - stashedObjects.length === 0 ||\n          extra?.length - stashedObjects.length === 0\n            ? error\n            : needsMoreError\n        }\n      />\n    </Fieldset>\n  );\n};\n\nexport default AddObjects;\n"],
+  "mappings": "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",
+  "names": ["React"]
 }

package/cjs/MultiplicityField/index.js

@@ -34,15 +34,12 @@ __export(MultiplicityField_exports, {
 module.exports = __toCommonJS(MultiplicityField_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
-var import_FieldBaseContainer = __toESM(require("@digigov/form/Field/FieldBaseContainer"));
-var import_FieldObject = __toESM(require("@digigov/form/FieldObject"));
-var import_add_objects = __toESM(require("@digigov/form/MultiplicityField/add-objects"));
-var import_Button = require("@digigov/react-core/Button");
-var import_Card = require("@digigov/react-core/Card");
-var import_CardAction = require("@digigov/react-core/CardAction");
-var import_CardContent = require("@digigov/react-core/CardContent");
-var import_CardHeading = require("@digigov/react-core/CardHeading");
-var import_Heading = require("@digigov/react-core/Heading");
+var import_FieldBaseContainer = require("@digigov/form/Field/FieldBaseContainer");
+var import_FieldObject = require("@digigov/form/FieldObject");
+var import_add_objects = require("@digigov/form/MultiplicityField/add-objects");
+var import_Card = require("@digigov/ui/content/Card");
+var import_Button = require("@digigov/ui/form/Button");
+var import_Heading = require("@digigov/ui/typography/Heading");
 const Multiplicity = ({
   extra,
   name,
@@ -56,7 +53,8 @@ const Multiplicity = ({
   layout,
   setValue,
   getValues,
-  unregister
+  unregister,
+  Field
 }) => {
   const { fields, append, remove } = (0, import_react_hook_form.useFieldArray)({
     control,
@@ -73,11 +71,13 @@ const Multiplicity = ({
     setStashedObjects(newStashedObjects);
   };
   return /* @__PURE__ */ import_react.default.createElement(
-    import_FieldBaseContainer.default,
+    import_FieldBaseContainer.FieldBaseContainer,
     {
       label,
       layout,
+      register,
       error: formState.isSubmitted && !formState.isSubmitting && error?.message ? error : void 0,
+      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
       wrapper: "fieldset",
       name
     },
@@ -97,7 +97,7 @@ const Multiplicity = ({
       );
     })) : "",
     /* @__PURE__ */ import_react.default.createElement(
-      import_add_objects.default,
+      import_add_objects.AddObjects,
       {
         name,
         register,
@@ -114,7 +114,8 @@ const Multiplicity = ({
         getValues,
         unregister,
         trigger,
-        clearErrors
+        clearErrors,
+        Field
       }
     )
   );
@@ -131,8 +132,8 @@ const ListObject = ({
   // onEdit,
 }) => {
   const currentName = `${name}.${index}`;
-  return /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: extra?.border && "border" }, /* @__PURE__ */ import_react.default.createElement(import_CardHeading.CardHeading, null, extra?.label.object.title, " #", index + 1), /* @__PURE__ */ import_react.default.createElement(import_CardContent.CardContent, null, /* @__PURE__ */ import_react.default.createElement(
-    import_FieldObject.default,
+  return /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: extra?.border && "border" }, /* @__PURE__ */ import_react.default.createElement(import_Card.CardHeading, null, extra?.label.object.title, " #", index + 1), /* @__PURE__ */ import_react.default.createElement(import_Card.CardContent, null, /* @__PURE__ */ import_react.default.createElement(
+    import_FieldObject.FieldObject,
     {
       name: currentName,
       formState,
@@ -140,7 +141,7 @@ const ListObject = ({
       control,
       ...extra?.of
     }
-  )), /* @__PURE__ */ import_react.default.createElement(import_CardAction.CardAction, null, /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "button", variant: "link", onClick: () => onDelete(index) }, extra?.label.object.delete)));
+  )), /* @__PURE__ */ import_react.default.createElement(import_Card.CardAction, null, /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "button", variant: "link", onClick: () => onDelete(index) }, extra?.label.object.delete)));
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/cjs/MultiplicityField/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/MultiplicityField/index.tsx"],
-  "sourcesContent": ["import React, { useState } from 'react';\nimport { useFieldArray, UseFormReturn } from 'react-hook-form';\nimport FieldContainer from '@digigov/form/Field/FieldBaseContainer';\n\nimport FieldObject from '@digigov/form/FieldObject';\nimport AddObjects from '@digigov/form/MultiplicityField/add-objects';\nimport {\n  MultiplicityProps,\n  StashedObject,\n} from '@digigov/form/MultiplicityField/types';\nimport { Button } from '@digigov/react-core/Button';\nimport { Card } from '@digigov/react-core/Card';\nimport { CardAction } from '@digigov/react-core/CardAction';\nimport { CardContent } from '@digigov/react-core/CardContent';\nimport { CardHeading } from '@digigov/react-core/CardHeading';\nimport { Heading } from '@digigov/react-core/Heading';\n\n// epeidh einai forwardRef to ref mas to dinei xwrista apo ta props\nexport const Multiplicity: React.FC<MultiplicityProps> = ({\n  extra,\n  name,\n  control,\n  error,\n  register,\n  trigger,\n  clearErrors,\n  formState,\n  label,\n  layout,\n  setValue,\n  getValues,\n  unregister,\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n  const [stashedObjects, setStashedObjects] = useState<StashedObject[]>([]);\n  const handleStash = (data) => {\n    setStashedObjects([...stashedObjects, data]);\n  };\n  const handleDelete = (index) => {\n    remove(index);\n    // creating a new array to maintain immutability\n    const newStashedObjects = [...stashedObjects];\n    newStashedObjects.splice(index, 1);\n    setStashedObjects(newStashedObjects);\n  };\n  return (\n    <FieldContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted && !formState.isSubmitting && error?.message\n          ? error\n          : undefined\n      }\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {stashedObjects.length > 0 ? (\n        <div>\n          <Heading size=\"md\">{extra?.label.object.title_added}</Heading>\n          {stashedObjects.map((_Object, index) => {\n            return (\n              <ListObject\n                key={`${name}.${index}`}\n                index={index}\n                name={name}\n                extra={extra}\n                control={control}\n                register={register}\n                formState={formState}\n                onDelete={handleDelete}\n              />\n            );\n          })}\n        </div>\n      ) : (\n        ''\n      )}\n      <AddObjects\n        name={name}\n        register={register}\n        control={control}\n        fields={fields}\n        formState={formState}\n        error={error}\n        stashedObjects={stashedObjects}\n        extra={extra}\n        append={append}\n        remove={remove}\n        onStash={handleStash}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        trigger={trigger}\n        clearErrors={clearErrors}\n      />\n    </FieldContainer>\n  );\n};\n\nexport default Multiplicity;\n\nexport interface ListObjectProps {\n  index: number;\n  name: string;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  onDelete: (index: number) => void;\n  extra?: Record<string, any>;\n}\n\nexport const ListObject: React.FC<ListObjectProps> = ({\n  index,\n  name,\n  extra,\n  control,\n  register,\n  onDelete,\n  formState,\n  // onEdit,\n}) => {\n  const currentName = `${name}.${index}`;\n  return (\n    <Card variant={extra?.border && 'border'}>\n      <CardHeading>\n        {extra?.label.object.title} #{index + 1}\n      </CardHeading>\n      <CardContent>\n        <FieldObject\n          name={currentName}\n          formState={formState}\n          register={register}\n          control={control}\n          {...extra?.of}\n        />\n      </CardContent>\n      <CardAction>\n        <Button type=\"button\" variant=\"link\" onClick={() => onDelete(index)}>\n          {extra?.label.object.delete}\n        </Button>\n      </CardAction>\n    </Card>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAChC,6BAA6C;AAC7C,gCAA2B;AAE3B,yBAAwB;AACxB,yBAAuB;AAKvB,oBAAuB;AACvB,kBAAqB;AACrB,wBAA2B;AAC3B,yBAA4B;AAC5B,yBAA4B;AAC5B,qBAAwB;AAGjB,MAAM,eAA4C,CAAC;AAAA,EACxD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,QAAI,sCAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,CAAC,gBAAgB,iBAAiB,QAAI,uBAA0B,CAAC,CAAC;AACxE,QAAM,cAAc,CAAC,SAAS;AAC5B,sBAAkB,CAAC,GAAG,gBAAgB,IAAI,CAAC;AAAA,EAC7C;AACA,QAAM,eAAe,CAAC,UAAU;AAC9B,WAAO,KAAK;AAEZ,UAAM,oBAAoB,CAAC,GAAG,cAAc;AAC5C,sBAAkB,OAAO,OAAO,CAAC;AACjC,sBAAkB,iBAAiB;AAAA,EACrC;AACA,SACE,6BAAAA,QAAA;AAAA,IAAC,0BAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,OACE,UAAU,eAAe,CAAC,UAAU,gBAAgB,OAAO,UACvD,QACA;AAAA,MAEN,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,eAAe,SAAS,IACvB,6BAAAD,QAAA,cAAC,aACC,6BAAAA,QAAA,cAAC,0BAAQ,MAAK,QAAM,OAAO,MAAM,OAAO,WAAY,GACnD,eAAe,IAAI,CAAC,SAAS,UAAU;AACtC,aACE,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,UACrB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,UAAU;AAAA;AAAA,MACZ;AAAA,IAEJ,CAAC,CACH,IAEA;AAAA,IAEF,6BAAAA,QAAA;AAAA,MAAC,mBAAAE;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EACF;AAEJ;AAEA,IAAO,4BAAQ;AAYR,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAEF,MAAM;AACJ,QAAM,cAAc,GAAG,IAAI,IAAI,KAAK;AACpC,SACE,6BAAAF,QAAA,cAAC,oBAAK,SAAS,OAAO,UAAU,YAC9B,6BAAAA,QAAA,cAAC,sCACE,OAAO,MAAM,OAAO,OAAM,MAAG,QAAQ,CACxC,GACA,6BAAAA,QAAA,cAAC,sCACC,6BAAAA,QAAA;AAAA,IAAC,mBAAAG;AAAA,IAAA;AAAA,MACC,MAAM;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACC,GAAG,OAAO;AAAA;AAAA,EACb,CACF,GACA,6BAAAH,QAAA,cAAC,oCACC,6BAAAA,QAAA,cAAC,wBAAO,MAAK,UAAS,SAAQ,QAAO,SAAS,MAAM,SAAS,KAAK,KAC/D,OAAO,MAAM,OAAO,MACvB,CACF,CACF;AAEJ;",
-  "names": ["React", "FieldContainer", "AddObjects", "FieldObject"]
+  "sourcesContent": ["import React, { useState } from 'react';\nimport { useFieldArray, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { AddObjects } from '@digigov/form/MultiplicityField/add-objects';\nimport {\n  MultiplicityProps,\n  StashedObject,\n} from '@digigov/form/MultiplicityField/types';\nimport {\n  Card,\n  CardHeading,\n  CardContent,\n  CardAction,\n} from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Heading } from '@digigov/ui/typography/Heading';\n\n// epeidh einai forwardRef to ref mas to dinei xwrista apo ta props\nexport const Multiplicity: React.FC<MultiplicityProps> = ({\n  extra,\n  name,\n  control,\n  error,\n  register,\n  trigger,\n  clearErrors,\n  formState,\n  label,\n  layout,\n  setValue,\n  getValues,\n  unregister,\n  Field,\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n  const [stashedObjects, setStashedObjects] = useState<StashedObject[]>([]);\n  const handleStash = (data) => {\n    setStashedObjects([...stashedObjects, data]);\n  };\n  const handleDelete = (index) => {\n    remove(index);\n    // creating a new array to maintain immutability\n    const newStashedObjects = [...stashedObjects];\n    newStashedObjects.splice(index, 1);\n    setStashedObjects(newStashedObjects);\n  };\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={\n        formState.isSubmitted && !formState.isSubmitting && error?.message\n          ? error\n          : undefined\n      }\n      hasError={formState.isSubmitted && !formState.isSubmitting && !!error}\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {stashedObjects.length > 0 ? (\n        <div>\n          <Heading size=\"md\">{extra?.label.object.title_added}</Heading>\n          {stashedObjects.map((_Object, index) => {\n            return (\n              <ListObject\n                key={`${name}.${index}`}\n                index={index}\n                name={name}\n                extra={extra}\n                control={control}\n                register={register}\n                formState={formState}\n                onDelete={handleDelete}\n              />\n            );\n          })}\n        </div>\n      ) : (\n        ''\n      )}\n      <AddObjects\n        name={name}\n        register={register}\n        control={control}\n        fields={fields}\n        formState={formState}\n        error={error}\n        stashedObjects={stashedObjects}\n        extra={extra}\n        append={append}\n        remove={remove}\n        onStash={handleStash}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        trigger={trigger}\n        clearErrors={clearErrors}\n        Field={Field}\n      />\n    </FieldBaseContainer>\n  );\n};\n\nexport default Multiplicity;\n\nexport interface ListObjectProps {\n  index: number;\n  name: string;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  onDelete: (index: number) => void;\n  extra?: Record<string, any>;\n}\n\nexport const ListObject: React.FC<ListObjectProps> = ({\n  index,\n  name,\n  extra,\n  control,\n  register,\n  onDelete,\n  formState,\n  // onEdit,\n}) => {\n  const currentName = `${name}.${index}`;\n  return (\n    <Card variant={extra?.border && 'border'}>\n      <CardHeading>\n        {extra?.label.object.title} #{index + 1}\n      </CardHeading>\n      <CardContent>\n        <FieldObject\n          name={currentName}\n          formState={formState}\n          register={register}\n          control={control}\n          {...extra?.of}\n        />\n      </CardContent>\n      <CardAction>\n        <Button type=\"button\" variant=\"link\" onClick={() => onDelete(index)}>\n          {extra?.label.object.delete}\n        </Button>\n      </CardAction>\n    </Card>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAChC,6BAA6C;AAC7C,gCAAmC;AACnC,yBAA4B;AAC5B,yBAA2B;AAK3B,kBAKO;AACP,oBAAuB;AACvB,qBAAwB;AAGjB,MAAM,eAA4C,CAAC;AAAA,EACxD;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;AACF,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,QAAI,sCAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,CAAC,gBAAgB,iBAAiB,QAAI,uBAA0B,CAAC,CAAC;AACxE,QAAM,cAAc,CAAC,SAAS;AAC5B,sBAAkB,CAAC,GAAG,gBAAgB,IAAI,CAAC;AAAA,EAC7C;AACA,QAAM,eAAe,CAAC,UAAU;AAC9B,WAAO,KAAK;AAEZ,UAAM,oBAAoB,CAAC,GAAG,cAAc;AAC5C,sBAAkB,OAAO,OAAO,CAAC;AACjC,sBAAkB,iBAAiB;AAAA,EACrC;AACA,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OACE,UAAU,eAAe,CAAC,UAAU,gBAAgB,OAAO,UACvD,QACA;AAAA,MAEN,UAAU,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,MAChE,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,eAAe,SAAS,IACvB,6BAAAA,QAAA,cAAC,aACC,6BAAAA,QAAA,cAAC,0BAAQ,MAAK,QAAM,OAAO,MAAM,OAAO,WAAY,GACnD,eAAe,IAAI,CAAC,SAAS,UAAU;AACtC,aACE,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,UACrB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,UAAU;AAAA;AAAA,MACZ;AAAA,IAEJ,CAAC,CACH,IAEA;AAAA,IAEF,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EACF;AAEJ;AAEA,IAAO,4BAAQ;AAYR,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAEF,MAAM;AACJ,QAAM,cAAc,GAAG,IAAI,IAAI,KAAK;AACpC,SACE,6BAAAA,QAAA,cAAC,oBAAK,SAAS,OAAO,UAAU,YAC9B,6BAAAA,QAAA,cAAC,+BACE,OAAO,MAAM,OAAO,OAAM,MAAG,QAAQ,CACxC,GACA,6BAAAA,QAAA,cAAC,+BACC,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,MAAM;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACC,GAAG,OAAO;AAAA;AAAA,EACb,CACF,GACA,6BAAAA,QAAA,cAAC,8BACC,6BAAAA,QAAA,cAAC,wBAAO,MAAK,UAAS,SAAQ,QAAO,SAAS,MAAM,SAAS,KAAK,KAC/D,OAAO,MAAM,OAAO,MACvB,CACF,CACF;AAEJ;",
+  "names": ["React"]
 }

package/cjs/MultiplicityField/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/MultiplicityField/types.ts"],
-  "sourcesContent": ["import { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldSpec } from '@digigov/form/Field/types';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\n\nexport interface MultiplicityProps\n  extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'error' | 'extra'> {\n  name: string;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  error?: ErrorOption;\n  extra?: Record<string, any>;\n  label?: FieldSpec['label'];\n  layout?: FieldSpec['layout'];\n}\n\nexport type StashedObject = Record<string, any>;\n"],
+  "sourcesContent": ["import { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldSpec, ControlledFieldProps } from '@digigov/form/Field/types';\n\nexport interface MultiplicityProps\n  extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'error' | 'extra'> {\n  name: string;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  error?: ErrorOption;\n  extra?: Record<string, any>;\n  label?: FieldSpec['label'];\n  layout?: FieldSpec['layout'];\n}\n\nexport type StashedObject = Record<string, any>;\n"],
   "mappings": ";;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }