@digigov/form 2.0.0-599965f0 → 2.0.0-5e7a6790

package/FormBuilder/index.js

@@ -1,10 +1,11 @@
-import React, { useCallback, useEffect, useRef } from "react";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { useForm } from "react-hook-form";
 import { Field } from "@digigov/form/Field";
 import { ErrorGroup } from "@digigov/form/Field/ErrorGroup";
-import { CONTROLLED_FIELD_COMPONENTS } from "@digigov/form/Field/utils";
 import { FieldsetWithContext } from "@digigov/form/Fieldset/FieldsetWithContext";
 import { FormContext, useFormContext } from "@digigov/form/FormContext";
+import useFieldFocusManager from "@digigov/form/hooks/useFieldFocusManager";
+import { CONTROLLED_FIELD_COMPONENTS } from "@digigov/form/inputs/registry";
 import { yupResolver } from "@digigov/form/utils";
 import { useValidationSchema } from "@digigov/form/validators";
 import { Button } from "@digigov/ui/form/Button";
@@ -32,7 +33,7 @@ const FormBase = React.forwardRef(function FormBase2({
     mode,
     defaultValues: initial,
     reValidateMode,
-    shouldFocusError,
+    shouldFocusError: false,
     criteriaMode
   });
   const handleSubmit = useCallback(
@@ -43,14 +44,21 @@ const FormBase = React.forwardRef(function FormBase2({
     },
     [onSubmit]
   );
+  const { setError } = form;
   useEffect(() => {
     if (errors) {
       for (const fieldName in errors) {
-        form.setError(fieldName, errors[fieldName]);
+        setError(fieldName, errors[fieldName]);
       }
     }
-  }, [errors]);
-  const submit = form.handleSubmit(handleSubmit);
+  }, [errors, setError]);
+  const { registerCustomFocusableElement: registerFieldFocus, focusOnError } = useFieldFocusManager({
+    control: form.control,
+    subscribe: form.subscribe,
+    enabled: shouldFocusError,
+    setFocus: form.setFocus
+  });
+  const submit = form.handleSubmit(handleSubmit, focusOnError);
   const ctx = {
     fieldsMap,
     fieldsetsMap,
@@ -59,6 +67,7 @@ const FormBase = React.forwardRef(function FormBase2({
     watch: form.watch,
     resetField: form.resetField,
     registerField,
+    registerFieldFocus,
     errors: form.formState.errors,
     formState: form.formState,
     reset: form.reset,
@@ -75,6 +84,144 @@ const FormBase = React.forwardRef(function FormBase2({
   };
   return /* @__PURE__ */ React.createElement(FormContext.Provider, { value: ctx }, /* @__PURE__ */ React.createElement(Form, { grid, onSubmit: submit, ref, ...props }, children));
 });
+const useFormValues = () => {
+  const ctx = useFormContext();
+  return ctx.getValues();
+};
+const FormBuilder = React.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 } = useScreenSize();
+    const transformedFields = useMemo(
+      () => 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;
+            },
+            {}
+          )
+        };
+      }),
+      [fields]
+    );
+    const fieldsState = useRef(transformedFields);
+    const setFieldsState = useCallback((newFields) => {
+      fieldsState.current = newFields;
+    }, []);
+    const registerField = 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);
+      },
+      [setFieldsState]
+    );
+    const schema = useValidationSchema(fieldsState, validatorRegistry);
+    const resolver = useMemo(() => {
+      if (!schema) return;
+      return yupResolver(schema);
+    }, [schema]);
+    const fieldsMap = useMemo(() => {
+      if (!schema || !transformedFields) return {};
+      return transformedFields.reduce(
+        (map, field) => ({ ...map, [field.key]: field }),
+        {}
+      );
+    }, [schema, transformedFields]);
+    const fieldsetsMap = useMemo(() => {
+      if (!schema || !fieldsets) return;
+      return fieldsets.reduce(
+        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),
+        {}
+      );
+    }, [fieldsets, schema]);
+    const fieldChildren = useMemo(() => {
+      if (!schema || !auto) return;
+      if (fieldsets) {
+        return fieldsets.map((fieldset) => /* @__PURE__ */ React.createElement(FieldsetWithContext, { key: fieldset.key, name: fieldset.key }));
+      }
+      if (transformedFields) {
+        const fieldsByLayouts = groupFieldsByLayout(transformedFields);
+        const fieldsByLayoutSize = fieldsByLayouts[screenSize];
+        return fieldsByLayoutSize.map((item, index) => {
+          if (Array.isArray(item)) {
+            return /* @__PURE__ */ React.createElement(
+              ErrorGroup,
+              {
+                key: index,
+                screenSize,
+                fieldOrder: item.map((field) => field.key)
+              },
+              item.map((f) => {
+                return /* @__PURE__ */ React.createElement(Field, { key: f.key, name: f.key });
+              })
+            );
+          } else {
+            return /* @__PURE__ */ React.createElement(Field, { key: item.key, name: item.key });
+          }
+        });
+      }
+    }, [auto, fieldsets, schema, screenSize, transformedFields]);
+    return /* @__PURE__ */ React.createElement(
+      FormBase,
+      {
+        resolver,
+        fieldsetsMap,
+        fieldsMap,
+        registerField,
+        initial,
+        reValidateMode,
+        mode,
+        shouldFocusError,
+        criteriaMode,
+        onSubmit,
+        componentRegistry,
+        ref,
+        grid,
+        ...props
+      },
+      fieldChildren,
+      auto && /* @__PURE__ */ React.createElement(Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
+      children
+    );
+  }
+);
 const DEFAULT_LAYOUT = {
   xs: 12,
   sm: 12,
@@ -83,7 +230,7 @@ const DEFAULT_LAYOUT = {
   xl: 12
 };
 const BREAKPOINTS = ["xs", "sm", "md", "lg", "xl"];
-const groupFieldsByLayout = (fields) => {
+function groupFieldsByLayout(fields) {
   return BREAKPOINTS.reduce((sizes, size) => {
     sizes[size] = fields.reduce((acc, item) => {
       const layoutValue = item.layout?.[size] || 12;
@@ -104,129 +251,7 @@ const groupFieldsByLayout = (fields) => {
     });
     return sizes;
   }, {});
-};
-const useFormValues = () => {
-  const ctx = useFormContext();
-  return ctx.getValues();
-};
-const FormBuilder = React.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 } = 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 = useRef(fields);
-  const setFieldsState = useCallback((newFields) => {
-    fieldsState.current = newFields;
-  }, []);
-  const schema = useValidationSchema(fieldsState, validatorRegistry);
-  const registerField = 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 = 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__ */ React.createElement(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__ */ React.createElement(
-              ErrorGroup,
-              {
-                key: index,
-                screenSize,
-                fieldOrder: item.map((field) => field.key)
-              },
-              item.map((f) => {
-                return /* @__PURE__ */ React.createElement(Field, { key: f.key, name: f.key });
-              })
-            );
-          } else {
-            return /* @__PURE__ */ React.createElement(Field, { key: item.key, name: item.key });
-          }
-        });
-      }
-    }
-  }
-  return /* @__PURE__ */ React.createElement(
-    FormBase,
-    {
-      resolver,
-      fieldsetsMap,
-      fieldsMap,
-      registerField,
-      initial,
-      reValidateMode,
-      mode,
-      shouldFocusError,
-      criteriaMode,
-      onSubmit,
-      componentRegistry,
-      ref,
-      grid,
-      ...props
-    },
-    fieldChildren,
-    auto && /* @__PURE__ */ React.createElement(Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
-    children
-  );
-});
+}
 const ControlledFormBuilder = (props) => {
   return /* @__PURE__ */ React.createElement(FormBuilder, { ...props, componentRegistry: CONTROLLED_FIELD_COMPONENTS });
 };

package/FormBuilder/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FormBuilder/index.tsx"],
-  "sourcesContent": ["import React, { useCallback, 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, useFormContext } 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        onSubmit(data);\n      }\n    },\n    [onSubmit]\n  );\n  useEffect(() => {\n    if (errors) {\n      for (const fieldName in errors) {\n        form.setError(fieldName, errors[fieldName]);\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 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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",
+  "sourcesContent": ["import React, { useCallback, useEffect, useMemo, useRef } from 'react';\nimport type { UseFormProps } from 'react-hook-form';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { ErrorGroup } from '@digigov/form/Field/ErrorGroup';\nimport { FieldsetWithContext } from '@digigov/form/Fieldset/FieldsetWithContext';\nimport { FormContext, useFormContext } from '@digigov/form/FormContext';\nimport useFieldFocusManager from '@digigov/form/hooks/useFieldFocusManager';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/inputs/registry';\nimport type {\n  FormBaseProps,\n  FormData,\n  FormBuilderProps,\n} 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: false,\n    criteriaMode,\n  });\n\n  const handleSubmit = useCallback(\n    (data: FormData): void => {\n      if (onSubmit) {\n        onSubmit(data);\n      }\n    },\n    [onSubmit]\n  );\n\n  const { setError } = form;\n\n  useEffect(() => {\n    if (errors) {\n      for (const fieldName in errors) {\n        setError(fieldName, errors[fieldName]);\n      }\n    }\n  }, [errors, setError]);\n\n  const { registerCustomFocusableElement: registerFieldFocus, focusOnError } =\n    useFieldFocusManager({\n      control: form.control,\n      subscribe: form.subscribe,\n      enabled: shouldFocusError,\n      setFocus: form.setFocus,\n    });\n\n  const submit = form.handleSubmit(handleSubmit, focusOnError);\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    registerFieldFocus,\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 useFormValues = () => {\n  const ctx = useFormContext();\n  return ctx.getValues();\n};\n\nconst FormBuilder = React.forwardRef<HTMLFormElement, FormBuilderProps>(\n  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    },\n    ref\n  ) {\n    const { screenSize } = useScreenSize();\n\n    const transformedFields = useMemo(\n      () =>\n        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      [fields]\n    );\n\n    const fieldsState = useRef(transformedFields);\n    const setFieldsState = useCallback((newFields) => {\n      fieldsState.current = newFields;\n    }, []);\n\n    const registerField = useCallback(\n      (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      [setFieldsState]\n    );\n\n    const schema = useValidationSchema(fieldsState, validatorRegistry);\n\n    const resolver: UseFormProps['resolver'] = useMemo(() => {\n      if (!schema) return;\n\n      return yupResolver(schema);\n    }, [schema]);\n\n    const fieldsMap = useMemo(() => {\n      if (!schema || !transformedFields) return {};\n\n      return transformedFields.reduce(\n        (map, field) => ({ ...map, [field.key]: field }),\n        {}\n      );\n    }, [schema, transformedFields]);\n    const fieldsetsMap = useMemo(() => {\n      if (!schema || !fieldsets) return;\n\n      return fieldsets.reduce(\n        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),\n        {}\n      );\n    }, [fieldsets, schema]);\n\n    const fieldChildren = useMemo(() => {\n      if (!schema || !auto) return;\n\n      if (fieldsets) {\n        return fieldsets.map((fieldset) => (\n          <FieldsetWithContext key={fieldset.key} name={fieldset.key} />\n        ));\n      }\n\n      if (transformedFields) {\n        const fieldsByLayouts = groupFieldsByLayout(transformedFields);\n        const fieldsByLayoutSize = fieldsByLayouts[screenSize];\n        return 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    }, [auto, fieldsets, schema, screenSize, transformedFields]);\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  }\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\nfunction 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}\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": "AAAA,OAAO,SAAS,aAAa,WAAW,SAAS,cAAc;AAE/D,SAAS,eAAe;AACxB,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAC3B,SAAS,2BAA2B;AACpC,SAAS,aAAa,sBAAsB;AAC5C,OAAO,0BAA0B;AACjC,SAAS,mCAAmC;AAM5C,SAAS,mBAAmB;AAC5B,SAAS,2BAA2B;AACpC,SAAS,cAAc;AACvB,SAAS,YAAY;AACrB,SAAS,qBAAqB;AAE9B,MAAM,WAAW,MAAM,WAAW,SAASA,UACzC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,mBAAmB;AAAA,EACnB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,GACA,KACA;AACA,QAAM,OAAO,QAAQ;AAAA,IACnB;AAAA,IACA;AAAA,IACA,eAAe;AAAA,IACf;AAAA,IACA,kBAAkB;AAAA,IAClB;AAAA,EACF,CAAC;AAED,QAAM,eAAe;AAAA,IACnB,CAAC,SAAyB;AACxB,UAAI,UAAU;AACZ,iBAAS,IAAI;AAAA,MACf;AAAA,IACF;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AAEA,QAAM,EAAE,SAAS,IAAI;AAErB,YAAU,MAAM;AACd,QAAI,QAAQ;AACV,iBAAW,aAAa,QAAQ;AAC9B,iBAAS,WAAW,OAAO,SAAS,CAAC;AAAA,MACvC;AAAA,IACF;AAAA,EACF,GAAG,CAAC,QAAQ,QAAQ,CAAC;AAErB,QAAM,EAAE,gCAAgC,oBAAoB,aAAa,IACvE,qBAAqB;AAAA,IACnB,SAAS,KAAK;AAAA,IACd,WAAW,KAAK;AAAA,IAChB,SAAS;AAAA,IACT,UAAU,KAAK;AAAA,EACjB,CAAC;AAEH,QAAM,SAAS,KAAK,aAAa,cAAc,YAAY;AAC3D,QAAM,MAAM;AAAA,IACV;AAAA,IACA;AAAA,IACA,SAAS,KAAK;AAAA,IACd,UAAU,KAAK;AAAA,IACf,OAAO,KAAK;AAAA,IACZ,YAAY,KAAK;AAAA,IACjB;AAAA,IACA;AAAA,IACA,QAAQ,KAAK,UAAU;AAAA,IACvB,WAAW,KAAK;AAAA,IAChB,OAAO,KAAK;AAAA,IACZ,SAAS,KAAK;AAAA,IACd,eAAe,KAAK;AAAA,IACpB,UAAU,KAAK;AAAA,IACf,aAAa,KAAK;AAAA,IAClB,WAAW,KAAK;AAAA,IAChB,YAAY,KAAK;AAAA,IACjB;AAAA,IACA,UAAU,KAAK;AAAA,IACf,SAAS;AAAA,IACT;AAAA,EACF;AAEA,SACE,oCAAC,YAAY,UAAZ,EAAqB,OAAO,OAC3B,oCAAC,QAAK,MAAY,UAAU,QAAQ,KAAW,GAAG,SAC/C,QACH,CACF;AAEJ,CAAC;AAED,MAAM,gBAAgB,MAAM;AAC1B,QAAM,MAAM,eAAe;AAC3B,SAAO,IAAI,UAAU;AACvB;AAEA,MAAM,cAAc,MAAM;AAAA,EACxB,SAASC,aACP;AAAA,IACE,SAAS,CAAC;AAAA,IACV;AAAA,IACA,UAAU,CAAC;AAAA,IACX;AAAA,IACA;AAAA,IACA,iBAAiB;AAAA,IACjB,OAAO;AAAA,IACP,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA,OAAO;AAAA,IACP,GAAG;AAAA,EACL,GACA,KACA;AACA,UAAM,EAAE,WAAW,IAAI,cAAc;AAErC,UAAM,oBAAoB;AAAA,MACxB,MACE,OAAO,IAAI,CAAC,UAAU;AACpB,cAAM,SAAS,MAAM;AACrB,YAAI,CAAC,QAAQ;AACX,iBAAO;AAAA,YACL,GAAG;AAAA,YACH,QAAQ;AAAA,UACV;AAAA,QACF;AACA,eAAO;AAAA,UACL,GAAG;AAAA,UACH,QAAQ,YAAY;AAAA,YAClB,CAAC,gBAAgB,YAAY,oBAAoB;AAC/C,kBAAI,OAAO,SAAS,UAAU,GAAG;AAC/B,+BAAe,UAAU,IAAI,OAAO,OAAO,UAAU;AAAA,cACvD,WAAW,eAAe,YAAY,kBAAkB,CAAC,CAAC,GAAG;AAC3D,+BAAe,UAAU,IACvB,eAAe,YAAY,kBAAkB,CAAC,CAAC;AAAA,cACnD,OAAO;AACL,+BAAe,UAAU,IAAI;AAAA,cAC/B;AACA,qBAAO;AAAA,YACT;AAAA,YACA,CAAC;AAAA,UACH;AAAA,QACF;AAAA,MACF,CAAC;AAAA,MACH,CAAC,MAAM;AAAA,IACT;AAEA,UAAM,cAAc,OAAO,iBAAiB;AAC5C,UAAM,iBAAiB,YAAY,CAAC,cAAc;AAChD,kBAAY,UAAU;AAAA,IACxB,GAAG,CAAC,CAAC;AAEL,UAAM,gBAAgB;AAAA,MACpB,CAAC,UAAU;AACT,cAAM,aAAa,YAAY,QAAQ;AAAA,UACrC,CAAC,MAAM,EAAE,QAAQ,MAAM;AAAA,QACzB;AACA,YAAI,aAAa,IAAI;AACnB,sBAAY,QAAQ,UAAU,IAAI;AAAA,QACpC,OAAO;AACL,sBAAY,QAAQ,KAAK,KAAK;AAAA,QAChC;AACA,uBAAe,YAAY,OAAO;AAAA,MACpC;AAAA,MACA,CAAC,cAAc;AAAA,IACjB;AAEA,UAAM,SAAS,oBAAoB,aAAa,iBAAiB;AAEjE,UAAM,WAAqC,QAAQ,MAAM;AACvD,UAAI,CAAC,OAAQ;AAEb,aAAO,YAAY,MAAM;AAAA,IAC3B,GAAG,CAAC,MAAM,CAAC;AAEX,UAAM,YAAY,QAAQ,MAAM;AAC9B,UAAI,CAAC,UAAU,CAAC,kBAAmB,QAAO,CAAC;AAE3C,aAAO,kBAAkB;AAAA,QACvB,CAAC,KAAK,WAAW,EAAE,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,MAAM;AAAA,QAC9C,CAAC;AAAA,MACH;AAAA,IACF,GAAG,CAAC,QAAQ,iBAAiB,CAAC;AAC9B,UAAM,eAAe,QAAQ,MAAM;AACjC,UAAI,CAAC,UAAU,CAAC,UAAW;AAE3B,aAAO,UAAU;AAAA,QACf,CAAC,KAAK,cAAc,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,GAAG,SAAS;AAAA,QACvD,CAAC;AAAA,MACH;AAAA,IACF,GAAG,CAAC,WAAW,MAAM,CAAC;AAEtB,UAAM,gBAAgB,QAAQ,MAAM;AAClC,UAAI,CAAC,UAAU,CAAC,KAAM;AAEtB,UAAI,WAAW;AACb,eAAO,UAAU,IAAI,CAAC,aACpB,oCAAC,uBAAoB,KAAK,SAAS,KAAK,MAAM,SAAS,KAAK,CAC7D;AAAA,MACH;AAEA,UAAI,mBAAmB;AACrB,cAAM,kBAAkB,oBAAoB,iBAAiB;AAC7D,cAAM,qBAAqB,gBAAgB,UAAU;AACrD,eAAO,mBAAmB,IAAI,CAAC,MAAM,UAAU;AAC7C,cAAI,MAAM,QAAQ,IAAI,GAAG;AACvB,mBACE;AAAA,cAAC;AAAA;AAAA,gBACC,KAAK;AAAA,gBACL;AAAA,gBACA,YAAY,KAAK,IAAI,CAAC,UAAU,MAAM,GAAG;AAAA;AAAA,cAExC,KAAK,IAAI,CAAC,MAAM;AACf,uBAAO,oCAAC,SAAM,KAAK,EAAE,KAAK,MAAM,EAAE,KAAK;AAAA,cACzC,CAAC;AAAA,YACH;AAAA,UAEJ,OAAO;AACL,mBAAO,oCAAC,SAAM,KAAK,KAAK,KAAK,MAAM,KAAK,KAAK;AAAA,UAC/C;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF,GAAG,CAAC,MAAM,WAAW,QAAQ,YAAY,iBAAiB,CAAC;AAE3D,WACE;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;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,MAEH;AAAA,MACA,QAAQ,oCAAC,UAAO,MAAK,YAAS,kDAAQ;AAAA,MACtC;AAAA,IACH;AAAA,EAEJ;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;AAEA,MAAM,cAAc,CAAC,MAAM,MAAM,MAAM,MAAM,IAAI;AAEjD,SAAS,oBAAoB,QAAQ;AACnC,SAAO,YAAY,OAAO,CAAC,OAAO,SAAS;AACzC,UAAM,IAAI,IAAI,OACX,OAAO,CAAC,KAAK,SAAS;AACrB,YAAM,cAAc,KAAK,SAAS,IAAI,KAAK;AAC3C,UAAI,gBAAgB,GAAG;AACrB,eAAO,CAAC,GAAG,KAAK,IAAI;AAAA,MACtB;AACA,YAAM,cAAc,IAAI,IAAI,SAAS,CAAC;AACtC,YAAM,aAAa,MAAM,QAAQ,WAAW,IACxC,YAAY,OAAO,CAAC,KAAK,MAAM,OAAO,EAAE,SAAS,IAAI,KAAK,IAAI,CAAC,IAC/D;AACJ,UAAI,CAAC,MAAM,QAAQ,WAAW,KAAK,aAAa,cAAc,IAAI;AAChE,eAAO,gBAAgB,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;AAAA,MAC9D;AAEA,aAAO,CAAC,GAAG,IAAI,MAAM,GAAG,EAAE,GAAG,CAAC,GAAG,aAAa,IAAI,CAAC;AAAA,IACrD,GAAG,CAAC,CAAC,EACJ,IAAI,CAAC,SAAS;AACb,UAAI,MAAM,QAAQ,IAAI,KAAK,KAAK,WAAW,GAAG;AAC5C,eAAO,KAAK,CAAC;AAAA,MACf;AACA,aAAO;AAAA,IACT,CAAC;AACH,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACP;AAEO,MAAM,wBAAwB,CAAC,UAAU;AAC9C,SACE,oCAAC,eAAa,GAAG,OAAO,mBAAmB,6BAA6B;AAE5E;AACA,IAAO,sBAAQ;",
   "names": ["FormBase", "FormBuilder"]
 }

package/FormContext.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
-import { FormContextProps } from '@digigov/form/types';
+import type React from 'react';
+import type { FormContextProps } from '@digigov/form/types';
 export declare const FormContext: React.Context<FormContextProps>;
 export declare const useFormContext: () => FormContextProps;

package/FormContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/FormContext.tsx"],
-  "sourcesContent": ["import React, { createContext, useContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n\nexport const useFormContext = () => {\n  return useContext(FormContext);\n};\n"],
-  "mappings": "AAAA,SAAgB,eAAe,kBAAkB;AAG1C,MAAM,cAA+C,cAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;AAEd,MAAM,iBAAiB,MAAM;AAClC,SAAO,WAAW,WAAW;AAC/B;",
+  "sourcesContent": ["import type React from 'react';\nimport { createContext, useContext } from 'react';\nimport type { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n\nexport const useFormContext = () => {\n  return useContext(FormContext);\n};\n"],
+  "mappings": "AACA,SAAS,eAAe,kBAAkB;AAGnC,MAAM,cAA+C,cAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;AAEd,MAAM,iBAAiB,MAAM;AAClC,SAAO,WAAW,WAAW;AAC/B;",
   "names": []
 }

package/MultiplicityField/add-objects/index.js

@@ -1,13 +1,7 @@
 import React, { useEffect, useMemo } from "react";
-import {
-  useWatch
-} from "react-hook-form";
+import { useWatch } from "react-hook-form";
 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 { resolveField } from "@digigov/form/Field/utils/resolveField";
 import { useField } from "@digigov/form/Field/utils/useField";
 import { FieldObject } from "@digigov/form/FieldObject";
 import { Fieldset } from "@digigov/form/Fieldset";
@@ -109,10 +103,7 @@ const AddObjects = ({
     reset,
     error: needsMoreError
   } = useField(radioField.key, radioField?.type ? radioField : null);
-  const calculatedField = useMemo(
-    () => calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),
-    [field]
-  );
+  const resolvedField = useMemo(() => resolveField(children, field), [field]);
   const needsMore = useWatch({ name: field.key, control });
   useEffect(() => {
     if (needsMore === "yes") {
@@ -123,21 +114,21 @@ const AddObjects = ({
     }
     if (needsMore === "") clearErrors("needs-more");
   }, [needsMore]);
-  calculatedField.label = calculatedField.label || {};
+  resolvedField.label = resolvedField.label || {};
   if (extra?.length) {
-    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 \u03B1\u03BA\u03CC\u03BC\u03B1 ${extra.length - stashedObjects.length} \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;
+    resolvedField.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 \u03B1\u03BA\u03CC\u03BC\u03B1 ${extra.length - stashedObjects.length} \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03C2.`;
   } else if (extra?.min && extra?.max) {
-    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 ${extra?.min - stashedObjects.length} \u03BA\u03B1\u03B9 \u03C4\u03BF \u03BC\u03AD\u03B3\u03B9\u03C3\u03C4\u03BF ${extra?.max} \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 \xAB\u039D\u03B1\u03B9\xBB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;
+    resolvedField.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 ${extra?.min - stashedObjects.length} \u03BA\u03B1\u03B9 \u03C4\u03BF \u03BC\u03AD\u03B3\u03B9\u03C3\u03C4\u03BF ${extra?.max} \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 \xAB\u039D\u03B1\u03B9\xBB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;
   } else if (extra?.min) {
-    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 ${extra?.min - stashedObjects.length} \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 \xAB\u039D\u03B1\u03B9\xBB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;
+    resolvedField.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 ${extra?.min - stashedObjects.length} \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 \xAB\u039D\u03B1\u03B9\xBB \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7.`;
   } 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.`;
+    resolvedField.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__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(
     FieldBase,
     {
-      ...calculatedField,
-      name: calculatedField.key,
+      ...resolvedField,
+      name: resolvedField.key,
       control,
       register,
       reset,

package/MultiplicityField/add-objects.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ErrorOption, FieldArrayWithId, UseFieldArrayReturn } from 'react-hook-form';
+import type { ErrorOption, FieldArrayWithId, UseFieldArrayReturn } from 'react-hook-form';
 import type { MultiplicityProps, StashedObject } from '@digigov/form/MultiplicityField/types';
 export interface AddObjectsProps extends Omit<MultiplicityProps, 'key' | 'component'> {
     fields: FieldArrayWithId[];

package/MultiplicityField/add-objects.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/MultiplicityField/add-objects.tsx"],
-  "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  resetField,\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    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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",
+  "sourcesContent": ["import React, { useEffect, useMemo } from 'react';\nimport type {\n  ErrorOption,\n  FieldArrayWithId,\n  UseFieldArrayReturn,\n} from 'react-hook-form';\nimport { useWatch } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { resolveField } from '@digigov/form/Field/utils/resolveField';\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 type { 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  resetField,\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    error: needsMoreError,\n  } = useField(radioField.key, radioField?.type ? radioField : null);\n\n  const resolvedField = useMemo(() => resolveField(children, field), [field]);\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  resolvedField.label = resolvedField.label || {};\n  if (extra?.length) {\n    resolvedField.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    resolvedField.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    resolvedField.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    resolvedField.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        {...resolvedField}\n        name={resolvedField.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": []
 }

package/MultiplicityField/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { UseFormReturn } from 'react-hook-form';
-import { MultiplicityProps } from '@digigov/form/MultiplicityField/types';
+import type { UseFormReturn } from 'react-hook-form';
+import type { MultiplicityProps } from '@digigov/form/MultiplicityField/types';
 export declare const Multiplicity: React.FC<MultiplicityProps>;
 export default Multiplicity;
 export interface ListObjectProps {

package/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 { 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  resetField,\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      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      register={register}\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        resetField={resetField}\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,OAAO,SAAS,gBAAgB;AAChC,SAAS,qBAAoC;AAC7C,SAAS,0BAA0B;AACnC,SAAS,mBAAmB;AAC5B,SAAS,kBAAkB;AAK3B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,eAAe;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;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,IAAI,cAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,CAAC,gBAAgB,iBAAiB,IAAI,SAA0B,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;AAAA,IAAC;AAAA;AAAA,MACC;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,MACA;AAAA;AAAA,IAEC,eAAe,SAAS,IACvB,oCAAC,aACC,oCAAC,WAAQ,MAAK,QAAM,OAAO,MAAM,OAAO,WAAY,GACnD,eAAe,IAAI,CAAC,SAAS,UAAU;AACtC,aACE;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;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,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,oCAAC,QAAK,SAAS,OAAO,UAAU,YAC9B,oCAAC,mBACE,OAAO,MAAM,OAAO,OAAM,MAAG,QAAQ,CACxC,GACA,oCAAC,mBACC;AAAA,IAAC;AAAA;AAAA,MACC,MAAM;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACC,GAAG,OAAO;AAAA;AAAA,EACb,CACF,GACA,oCAAC,kBACC,oCAAC,UAAO,MAAK,UAAS,SAAQ,QAAO,SAAS,MAAM,SAAS,KAAK,KAC/D,OAAO,MAAM,OAAO,MACvB,CACF,CACF;AAEJ;",
+  "sourcesContent": ["import React, { useState } from 'react';\nimport type { UseFormReturn } from 'react-hook-form';\nimport { useFieldArray } 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 type {\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  resetField,\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      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      register={register}\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        resetField={resetField}\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,OAAO,SAAS,gBAAgB;AAEhC,SAAS,qBAAqB;AAC9B,SAAS,0BAA0B;AACnC,SAAS,mBAAmB;AAC5B,SAAS,kBAAkB;AAK3B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,eAAe;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;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,IAAI,cAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,CAAC,gBAAgB,iBAAiB,IAAI,SAA0B,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;AAAA,IAAC;AAAA;AAAA,MACC;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,MACA;AAAA;AAAA,IAEC,eAAe,SAAS,IACvB,oCAAC,aACC,oCAAC,WAAQ,MAAK,QAAM,OAAO,MAAM,OAAO,WAAY,GACnD,eAAe,IAAI,CAAC,SAAS,UAAU;AACtC,aACE;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;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,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,oCAAC,QAAK,SAAS,OAAO,UAAU,YAC9B,oCAAC,mBACE,OAAO,MAAM,OAAO,OAAM,MAAG,QAAQ,CACxC,GACA,oCAAC,mBACC;AAAA,IAAC;AAAA;AAAA,MACC,MAAM;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACC,GAAG,OAAO;AAAA;AAAA,EACb,CACF,GACA,oCAAC,kBACC,oCAAC,UAAO,MAAK,UAAS,SAAQ,QAAO,SAAS,MAAM,SAAS,KAAK,KAC/D,OAAO,MAAM,OAAO,MACvB,CACF,CACF;AAEJ;",
   "names": []
 }

package/MultiplicityField/types.d.ts

@@ -1,5 +1,5 @@
-import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldSpec, ControlledFieldProps } from '@digigov/form/Field/types';
+import type { ErrorOption, UseFormReturn } from 'react-hook-form';
+import type { FieldSpec, ControlledFieldProps } from '@digigov/form/Field/types';
 export interface MultiplicityProps extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'error' | 'extra'> {
     name: string;
     control: UseFormReturn['control'];

package/Questions/Questions.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { QuestionsInterface } from '@digigov/form/Questions/types';
+import type { QuestionsInterface } from '@digigov/form/Questions/types';
 /**
  * The Question component accepts question data as props
  * uses composable components to provide a wholesome UX