@digigov/form 2.0.0-85c27c19 → 2.0.0-aefd0709

package/FormBuilder/index.js

@@ -1,11 +1,155 @@
-import {
-  FormBuilder,
-  useFormContext,
-  useFormValues,
-  FormBase
-} from "@digigov/form";
+import React, { useCallback, useContext, useRef } from "react";
+import { useForm } from "react-hook-form";
+import { Field } from "@digigov/form/Field";
+import { CONTROLLED_FIELD_COMPONENTS } from "@digigov/form/Field/utils";
+import { Fieldset } from "@digigov/form/Fieldset";
+import { FormContext } from "@digigov/form/FormContext";
+import { yupResolver } from "@digigov/form/utils";
+import { useValidationSchema } from "@digigov/form/validators";
+import { Button } from "@digigov/ui/form/Button";
+import { Form } from "@digigov/ui/form/Form";
+const FormBase = React.forwardRef(function FormBase2({
+  onSubmit,
+  children,
+  registerField,
+  fieldsMap,
+  fieldsetsMap,
+  resolver,
+  mode,
+  initial,
+  reValidateMode,
+  shouldFocusError,
+  criteriaMode,
+  componentRegistry,
+  grid,
+  ...props
+}, ref) {
+  const form = useForm({
+    resolver,
+    mode,
+    defaultValues: initial,
+    reValidateMode,
+    shouldFocusError,
+    criteriaMode
+  });
+  const handleSubmit = useCallback(
+    (data) => {
+      if (onSubmit) onSubmit(data);
+    },
+    [onSubmit]
+  );
+  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__ */ React.createElement(FormContext.Provider, { value: ctx }, /* @__PURE__ */ React.createElement(Form, { grid, onSubmit: submit, ref, ...props }, children));
+});
+const useFormContext = () => {
+  return useContext(FormContext);
+};
+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 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(Fieldset, { key: fieldset.key }));
+      } else if (fields) {
+        fieldChildren = fields.map((field) => /* @__PURE__ */ React.createElement(Field, { key: field.key, name: field.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 });
+};
 var FormBuilder_default = FormBuilder;
 export {
+  ControlledFormBuilder,
   FormBase,
   FormBuilder_default as default,
   useFormContext,

package/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,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,IAAO,sBAAQ;",
-  "names": []
+  "sourcesContent": ["import React, { useCallback, useContext, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/Field/utils';\nimport { Fieldset } from '@digigov/form/Fieldset';\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';\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,\n    criteriaMode,\n    componentRegistry,\n    grid,\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) onSubmit(data);\n    },\n    [onSubmit]\n  );\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  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 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 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          <Fieldset key={fieldset.key} />\n        ));\n      } else if (fields) {\n        fieldChildren = fields.map((field) => (\n          <Field key={field.key} name={field.key} />\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": "AAAA,OAAO,SAAS,aAAa,YAAY,cAAc;AACvD,SAAS,eAAe;AACxB,SAAS,aAAa;AACtB,SAAS,mCAAmC;AAC5C,SAAS,gBAAgB;AACzB,SAAS,mBAAmB;AAE5B,SAAS,mBAAmB;AAC5B,SAAS,2BAA2B;AACpC,SAAS,cAAc;AACvB,SAAS,YAAY;AAErB,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;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;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,eAAe;AAAA,IACnB,CAAC,SAAyB;AACxB,UAAI,SAAU,UAAS,IAAI;AAAA,IAC7B;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AACA,QAAM,SAAS,KAAK,aAAa,YAAY;AAC7C,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,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;AACA,SACE,oCAAC,YAAY,UAAZ,EAAqB,OAAO,OAC3B,oCAAC,QAAK,MAAY,UAAU,QAAQ,KAAW,GAAG,SAC/C,QACH,CACF;AAEJ,CAAC;AAED,MAAM,iBAAiB,MAAM;AAC3B,SAAO,WAAW,WAAW;AAC/B;AACA,MAAM,gBAAgB,MAAM;AAC1B,QAAM,MAAM,eAAe;AAC3B,SAAO,IAAI,UAAU;AACvB;AACA,MAAM,cAAc,MAAM,WAAW,SAASC,aAC5C;AAAA,EACE,SAAS,CAAC;AAAA,EACV;AAAA,EACA,UAAU,CAAC;AAAA,EACX;AAAA,EACA;AAAA,EACA,iBAAiB;AAAA,EACjB,OAAO;AAAA,EACP,mBAAmB;AAAA,EACnB,eAAe;AAAA,EACf,OAAO;AAAA,EACP;AAAA,EACA;AAAA,EACA,OAAO;AAAA,EACP,GAAG;AACL,GACA,KACoB;AACpB,QAAM,cAAc,OAAO,MAAM;AACjC,QAAM,iBAAiB,YAAY,CAAC,cAAc;AAChD,gBAAY,UAAU;AAAA,EACxB,GAAG,CAAC,CAAC;AACL,QAAM,SAAS,oBAAoB,aAAa,iBAAiB;AACjE,QAAM,gBAAgB,YAAY,CAAC,UAAU;AAC3C,UAAM,aAAa,YAAY,QAAQ;AAAA,MACrC,CAAC,MAAM,EAAE,QAAQ,MAAM;AAAA,IACzB;AACA,QAAI,aAAa,IAAI;AACnB,kBAAY,QAAQ,UAAU,IAAI;AAAA,IACpC,OAAO;AACL,kBAAY,QAAQ,KAAK,KAAK;AAAA,IAChC;AACA,mBAAe,YAAY,OAAO;AAAA,EACpC,GAAG,CAAC,CAAC;AACL,MAAI;AACJ,MAAI;AACJ,MAAI;AACJ,MAAI;AACJ,MAAI,QAAQ;AACV,eAAW,YAAY,MAAM;AAC7B,gBAAY,SACR,OAAO,OAAO,CAAC,KAAK,WAAW,EAAE,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,CAAC,IAClE,CAAC;AACL,mBACE,aACA,UAAU;AAAA,MACR,CAAC,KAAK,cAAc,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,GAAG,SAAS;AAAA,MACvD,CAAC;AAAA,IACH;AAEF,QAAI,MAAM;AACR,UAAI,WAAW;AACb,wBAAgB,UAAU,IAAI,CAAC,aAC7B,oCAAC,YAAS,KAAK,SAAS,KAAK,CAC9B;AAAA,MACH,WAAW,QAAQ;AACjB,wBAAgB,OAAO,IAAI,CAAC,UAC1B,oCAAC,SAAM,KAAK,MAAM,KAAK,MAAM,MAAM,KAAK,CACzC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACC,GAAG;AAAA;AAAA,IAEH;AAAA,IACA,QAAQ,oCAAC,UAAO,MAAK,YAAS,kDAAQ;AAAA,IACtC;AAAA,EACH;AAEJ,CAAC;AACM,MAAM,wBAAwB,CAAC,UAAU;AAC9C,SACE,oCAAC,eAAa,GAAG,OAAO,mBAAmB,6BAA6B;AAE5E;AACA,IAAO,sBAAQ;",
+  "names": ["FormBase", "FormBuilder"]
 }

package/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": "AACA,SAAS,qBAAqB;AAGvB,MAAM,cAA+C,cAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
+  "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,SAAgB,qBAAqB;AAG9B,MAAM,cAA+C,cAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
   "names": []
 }

package/MultiplicityField/add-objects/index.js

@@ -9,10 +9,10 @@ import {
 } from "@digigov/form/Field/utils";
 import { calculateField } from "@digigov/form/Field/utils/calculateField";
 import { useField } from "@digigov/form/Field/utils/useField";
-import FieldObject from "@digigov/form/FieldObject";
-import Fieldset from "@digigov/react-core/Fieldset";
-import RadioConditional from "@digigov/react-core/RadioConditional";
-import Button from "@digigov/ui/form/Button";
+import { FieldObject } from "@digigov/form/FieldObject";
+import { Fieldset } from "@digigov/form/Fieldset";
+import { Button } from "@digigov/ui/form/Button";
+import { RadioConditional } from "@digigov/ui/form/RadioContainer";
 const AddObjects = ({
   name,
   fields,
@@ -27,7 +27,8 @@ const AddObjects = ({
   stashedObjects,
   getValues,
   onStash,
-  error
+  error,
+  Field
 }) => {
   const currentIndex = fields.length > 0 ? fields.length - 1 : fields.length;
   const currentName = `${name}.${currentIndex}`;
@@ -81,8 +82,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
@@ -137,6 +140,7 @@ const AddObjects = ({
       control,
       register,
       reset,
+      Field,
       error: extra?.max - stashedObjects.length === 0 || extra?.length - stashedObjects.length === 0 ? error : needsMoreError
     }
   ));

package/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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",
+  "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    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        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.js

@@ -1,14 +1,16 @@
 import React, { useState } from "react";
 import { useFieldArray } from "react-hook-form";
-import FieldContainer from "@digigov/form/Field/FieldBaseContainer";
-import FieldObject from "@digigov/form/FieldObject";
-import AddObjects from "@digigov/form/MultiplicityField/add-objects";
-import { Button } from "@digigov/react-core/Button";
-import { Card } from "@digigov/react-core/Card";
-import { CardAction } from "@digigov/react-core/CardAction";
-import { CardContent } from "@digigov/react-core/CardContent";
-import { CardHeading } from "@digigov/react-core/CardHeading";
-import { Heading } from "@digigov/react-core/Heading";
+import { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
+import { FieldObject } from "@digigov/form/FieldObject";
+import { AddObjects } from "@digigov/form/MultiplicityField/add-objects";
+import {
+  Card,
+  CardHeading,
+  CardContent,
+  CardAction
+} from "@digigov/ui/content/Card";
+import { Button } from "@digigov/ui/form/Button";
+import { Heading } from "@digigov/ui/typography/Heading";
 const Multiplicity = ({
   extra,
   name,
@@ -22,7 +24,8 @@ const Multiplicity = ({
   layout,
   setValue,
   getValues,
-  unregister
+  unregister,
+  Field
 }) => {
   const { fields, append, remove } = useFieldArray({
     control,
@@ -39,7 +42,7 @@ const Multiplicity = ({
     setStashedObjects(newStashedObjects);
   };
   return /* @__PURE__ */ React.createElement(
-    FieldContainer,
+    FieldBaseContainer,
     {
       label,
       layout,
@@ -80,7 +83,8 @@ const Multiplicity = ({
         getValues,
         unregister,
         trigger,
-        clearErrors
+        clearErrors,
+        Field
       }
     )
   );

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 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,OAAO,SAAS,gBAAgB;AAChC,SAAS,qBAAoC;AAC7C,OAAO,oBAAoB;AAE3B,OAAO,iBAAiB;AACxB,OAAO,gBAAgB;AAKvB,SAAS,cAAc;AACvB,SAAS,YAAY;AACrB,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAC5B,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;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,SAAQ;AAAA,MACR;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;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 { 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      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        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;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,SAAQ;AAAA,MACR;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;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,6 +1,5 @@
 import { ErrorOption, UseFormReturn } from 'react-hook-form';
-import { FieldSpec } from '@digigov/form/Field/types';
-import { ControlledFieldProps } from '@digigov/form/Field/types';
+import { 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/index.js

@@ -22,7 +22,7 @@ const Questions = ({
   useEffect(() => {
     if (forceStepName !== currentStep.name) {
       const forceStep = steps.find(({ name: name2 }) => name2 === forceStepName);
-      forceStep && setCurrentStep(forceStep);
+      if (forceStep) setCurrentStep(forceStep);
     }
   }, [forceStepName]);
   const localData = isBrowser && localDraft && window.localStorage.getItem(`questions-${name}`);
@@ -32,15 +32,16 @@ const Questions = ({
   const submitStep = (stepName, stepData) => {
     data[stepName] = stepData;
     if (localDraft) {
-      isBrowser && window.localStorage.setItem(`questions-${name}`, JSON.stringify(data));
+      if (isBrowser)
+        window.localStorage.setItem(`questions-${name}`, JSON.stringify(data));
     }
     if (onChange) {
-      onChange && onChange(data);
+      onChange(data);
     }
     setData(data);
     const nextStep = getNextStep(currentStep, steps, data);
     if (nextStep) {
-      onActiveStep && onActiveStep(nextStep);
+      if (onActiveStep) onActiveStep(nextStep);
       setCurrentStep(nextStep);
     } else {
       onSubmit(data);

package/Questions/Questions.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Questions/Questions.tsx"],
-  "sourcesContent": ["import React, { useState, useEffect } from 'react';\nimport { getNextStep } from '@digigov/form/Questions/getNextStep';\nimport { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';\nimport { StepInterface } from '@digigov/form/Questions/Step/types';\nimport { QuestionsInterface } from '@digigov/form/Questions/types';\n\nconst isBrowser = typeof window !== 'undefined';\n\n/**\n * The Question component accepts question data as props\n * uses composable components to provide a wholesome UX\n *\n */\nexport const Questions: React.FC<QuestionsInterface> = ({\n  name,\n  steps,\n  initialData = {},\n  onChange,\n  onSubmit,\n  onActiveStep,\n  forceStepName,\n  localDraft = false,\n  children,\n}) => {\n  const [currentStep, setCurrentStep] = useState<StepInterface>({ name: '' });\n  useEffect(() => {\n    if (!forceStepName) {\n      setCurrentStep(steps[0]);\n    }\n  }, [forceStepName, steps]);\n  useEffect(() => {\n    if (forceStepName !== currentStep.name) {\n      const forceStep = steps.find(({ name }) => name === forceStepName);\n      forceStep && setCurrentStep(forceStep);\n    }\n  }, [forceStepName]);\n  const localData =\n    isBrowser && localDraft && window.localStorage.getItem(`questions-${name}`);\n  const [data, setData] = useState(\n    (localData && JSON.parse(localData)) || initialData\n  );\n  const submitStep = (stepName, stepData): void => {\n    data[stepName] = stepData;\n    if (localDraft) {\n      isBrowser &&\n        window.localStorage.setItem(`questions-${name}`, JSON.stringify(data));\n    }\n    if (onChange) {\n      onChange && onChange(data);\n    }\n    setData(data);\n    const nextStep = getNextStep(currentStep, steps, data);\n    if (nextStep) {\n      onActiveStep && onActiveStep(nextStep);\n      setCurrentStep(nextStep);\n    } else {\n      onSubmit(data);\n    }\n  };\n\n  return (\n    <QuestionsContext.Provider\n      value={{\n        steps,\n        currentStep,\n        submitStep,\n        data,\n        onActiveStep,\n      }}\n    >\n      {children}\n    </QuestionsContext.Provider>\n  );\n};\n"],
-  "mappings": "AAAA,OAAO,SAAS,UAAU,iBAAiB;AAC3C,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AAIjC,MAAM,YAAY,OAAO,WAAW;AAO7B,MAAM,YAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA,cAAc,CAAC;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb;AACF,MAAM;AACJ,QAAM,CAAC,aAAa,cAAc,IAAI,SAAwB,EAAE,MAAM,GAAG,CAAC;AAC1E,YAAU,MAAM;AACd,QAAI,CAAC,eAAe;AAClB,qBAAe,MAAM,CAAC,CAAC;AAAA,IACzB;AAAA,EACF,GAAG,CAAC,eAAe,KAAK,CAAC;AACzB,YAAU,MAAM;AACd,QAAI,kBAAkB,YAAY,MAAM;AACtC,YAAM,YAAY,MAAM,KAAK,CAAC,EAAE,MAAAA,MAAK,MAAMA,UAAS,aAAa;AACjE,mBAAa,eAAe,SAAS;AAAA,IACvC;AAAA,EACF,GAAG,CAAC,aAAa,CAAC;AAClB,QAAM,YACJ,aAAa,cAAc,OAAO,aAAa,QAAQ,aAAa,IAAI,EAAE;AAC5E,QAAM,CAAC,MAAM,OAAO,IAAI;AAAA,IACrB,aAAa,KAAK,MAAM,SAAS,KAAM;AAAA,EAC1C;AACA,QAAM,aAAa,CAAC,UAAU,aAAmB;AAC/C,SAAK,QAAQ,IAAI;AACjB,QAAI,YAAY;AACd,mBACE,OAAO,aAAa,QAAQ,aAAa,IAAI,IAAI,KAAK,UAAU,IAAI,CAAC;AAAA,IACzE;AACA,QAAI,UAAU;AACZ,kBAAY,SAAS,IAAI;AAAA,IAC3B;AACA,YAAQ,IAAI;AACZ,UAAM,WAAW,YAAY,aAAa,OAAO,IAAI;AACrD,QAAI,UAAU;AACZ,sBAAgB,aAAa,QAAQ;AACrC,qBAAe,QAAQ;AAAA,IACzB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF;AAEA,SACE;AAAA,IAAC,iBAAiB;AAAA,IAAjB;AAAA,MACC,OAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA;AAAA,IAEC;AAAA,EACH;AAEJ;",
+  "sourcesContent": ["import React, { useState, useEffect } from 'react';\nimport { getNextStep } from '@digigov/form/Questions/getNextStep';\nimport { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';\nimport { StepInterface } from '@digigov/form/Questions/Step/types';\nimport { QuestionsInterface } from '@digigov/form/Questions/types';\n\nconst isBrowser = typeof window !== 'undefined';\n\n/**\n * The Question component accepts question data as props\n * uses composable components to provide a wholesome UX\n *\n */\nexport const Questions: React.FC<QuestionsInterface> = ({\n  name,\n  steps,\n  initialData = {},\n  onChange,\n  onSubmit,\n  onActiveStep,\n  forceStepName,\n  localDraft = false,\n  children,\n}) => {\n  const [currentStep, setCurrentStep] = useState<StepInterface>({ name: '' });\n  useEffect(() => {\n    if (!forceStepName) {\n      setCurrentStep(steps[0]);\n    }\n  }, [forceStepName, steps]);\n  useEffect(() => {\n    if (forceStepName !== currentStep.name) {\n      const forceStep = steps.find(({ name }) => name === forceStepName);\n      if (forceStep) setCurrentStep(forceStep);\n    }\n  }, [forceStepName]);\n  const localData =\n    isBrowser && localDraft && window.localStorage.getItem(`questions-${name}`);\n  const [data, setData] = useState(\n    (localData && JSON.parse(localData)) || initialData\n  );\n  const submitStep = (stepName, stepData): void => {\n    data[stepName] = stepData;\n    if (localDraft) {\n      if (isBrowser)\n        window.localStorage.setItem(`questions-${name}`, JSON.stringify(data));\n    }\n    if (onChange) {\n      onChange(data);\n    }\n    setData(data);\n    const nextStep = getNextStep(currentStep, steps, data);\n    if (nextStep) {\n      if (onActiveStep) onActiveStep(nextStep);\n      setCurrentStep(nextStep);\n    } else {\n      onSubmit(data);\n    }\n  };\n\n  return (\n    <QuestionsContext.Provider\n      value={{\n        steps,\n        currentStep,\n        submitStep,\n        data,\n        onActiveStep,\n      }}\n    >\n      {children}\n    </QuestionsContext.Provider>\n  );\n};\n"],
+  "mappings": "AAAA,OAAO,SAAS,UAAU,iBAAiB;AAC3C,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AAIjC,MAAM,YAAY,OAAO,WAAW;AAO7B,MAAM,YAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA,cAAc,CAAC;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb;AACF,MAAM;AACJ,QAAM,CAAC,aAAa,cAAc,IAAI,SAAwB,EAAE,MAAM,GAAG,CAAC;AAC1E,YAAU,MAAM;AACd,QAAI,CAAC,eAAe;AAClB,qBAAe,MAAM,CAAC,CAAC;AAAA,IACzB;AAAA,EACF,GAAG,CAAC,eAAe,KAAK,CAAC;AACzB,YAAU,MAAM;AACd,QAAI,kBAAkB,YAAY,MAAM;AACtC,YAAM,YAAY,MAAM,KAAK,CAAC,EAAE,MAAAA,MAAK,MAAMA,UAAS,aAAa;AACjE,UAAI,UAAW,gBAAe,SAAS;AAAA,IACzC;AAAA,EACF,GAAG,CAAC,aAAa,CAAC;AAClB,QAAM,YACJ,aAAa,cAAc,OAAO,aAAa,QAAQ,aAAa,IAAI,EAAE;AAC5E,QAAM,CAAC,MAAM,OAAO,IAAI;AAAA,IACrB,aAAa,KAAK,MAAM,SAAS,KAAM;AAAA,EAC1C;AACA,QAAM,aAAa,CAAC,UAAU,aAAmB;AAC/C,SAAK,QAAQ,IAAI;AACjB,QAAI,YAAY;AACd,UAAI;AACF,eAAO,aAAa,QAAQ,aAAa,IAAI,IAAI,KAAK,UAAU,IAAI,CAAC;AAAA,IACzE;AACA,QAAI,UAAU;AACZ,eAAS,IAAI;AAAA,IACf;AACA,YAAQ,IAAI;AACZ,UAAM,WAAW,YAAY,aAAa,OAAO,IAAI;AACrD,QAAI,UAAU;AACZ,UAAI,aAAc,cAAa,QAAQ;AACvC,qBAAe,QAAQ;AAAA,IACzB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF;AAEA,SACE;AAAA,IAAC,iBAAiB;AAAA,IAAjB;AAAA,MACC,OAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA;AAAA,IAEC;AAAA,EACH;AAEJ;",
   "names": ["name"]
 }

package/Questions/QuestionsContext.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { QuestionsContextInterface } from '@digigov/form/Questions/types';
 export declare const QuestionsContext: import("react").Context<QuestionsContextInterface>;

package/Questions/Step/StepArrayReview.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Questions/Step/StepArrayReview.tsx"],
-  "sourcesContent": ["import React, { useContext } from 'react';\nimport { Field } from '@digigov/form/Field';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport FormBuilder from '@digigov/form/FormBuilder';\nimport Label from '@digigov/form/inputs/Label';\nimport { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';\nimport { getAddMoreFields } from '@digigov/form/Questions/Step/getAddMoreFields';\nimport { StepArrayReviewInterface } from '@digigov/form/Questions/Step/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport PageTitleContainer, {\n  PageTitleHeading,\n} from '@digigov/ui/app/PageTitleContainer';\nimport {\n  SummaryList,\n  SummaryListItem,\n  SummaryListItemKey,\n  SummaryListItemValue,\n  SummaryListItemAction,\n} from '@digigov/ui/content/SummaryList';\nimport Button from '@digigov/ui/form/Button';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const StepArrayReview: React.FC<StepArrayReviewInterface> = (props) => {\n  const { t } = useTranslation();\n  const { currentStep } = useContext(QuestionsContext);\n  const fields = getAddMoreFields(currentStep);\n  const primaryField =\n    currentStep.fields.find(\n      (field: { key: any }) => field.key === currentStep.review?.primaryFieldKey\n    ) || {};\n  return (\n    <>\n      <PageTitleContainer>\n        <PageTitleHeading>\n          {currentStep.review?.title && t(currentStep.review?.title)}\n        </PageTitleHeading>\n      </PageTitleContainer>\n      <SummaryList>\n        {props.array.map(\n          (item: { [x: string]: React.ReactNode }, idx: number) => (\n            <SummaryListItem key={idx}>\n              <SummaryListItemKey>\n                {t(primaryField.label.primary)}\n              </SummaryListItemKey>\n              <SummaryListItemValue>\n                {item[primaryField.key]}\n              </SummaryListItemValue>\n              <SummaryListItemAction\n                onClick={(): void => props.handleDelete(idx)}\n              >\n                {t('button.delete')}\n              </SummaryListItemAction>\n            </SummaryListItem>\n          )\n        )}\n      </SummaryList>\n      <FormBuilder key=\"addmore\" fields={fields} onSubmit={props.handleSubmit}>\n        <Fieldset>\n          <Label label={currentStep.review?.addMore.title} />\n          {fields.map((field: FieldSpec) => (\n            <Field key={field.key} name={field.key} />\n          ))}\n        </Fieldset>\n        <Button type=\"submit\">{t('button.submit')}</Button>\n      </FormBuilder>\n    </>\n  );\n};\n\nexport default StepArrayReview;\n"],
-  "mappings": "AAAA,OAAO,SAAS,kBAAkB;AAClC,SAAS,aAAa;AACtB,SAAS,gBAAgB;AACzB,OAAO,iBAAiB;AACxB,OAAO,WAAW;AAClB,SAAS,wBAAwB;AACjC,SAAS,wBAAwB;AAGjC,OAAO;AAAA,EACL;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,YAAY;AACnB,SAAS,sBAAsB;AAExB,MAAM,kBAAsD,CAAC,UAAU;AAC5E,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,EAAE,YAAY,IAAI,WAAW,gBAAgB;AACnD,QAAM,SAAS,iBAAiB,WAAW;AAC3C,QAAM,eACJ,YAAY,OAAO;AAAA,IACjB,CAAC,UAAwB,MAAM,QAAQ,YAAY,QAAQ;AAAA,EAC7D,KAAK,CAAC;AACR,SACE,0DACE,oCAAC,0BACC,oCAAC,wBACE,YAAY,QAAQ,SAAS,EAAE,YAAY,QAAQ,KAAK,CAC3D,CACF,GACA,oCAAC,mBACE,MAAM,MAAM;AAAA,IACX,CAAC,MAAwC,QACvC,oCAAC,mBAAgB,KAAK,OACpB,oCAAC,0BACE,EAAE,aAAa,MAAM,OAAO,CAC/B,GACA,oCAAC,4BACE,KAAK,aAAa,GAAG,CACxB,GACA;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,MAAY,MAAM,aAAa,GAAG;AAAA;AAAA,MAE1C,EAAE,eAAe;AAAA,IACpB,CACF;AAAA,EAEJ,CACF,GACA,oCAAC,eAAY,KAAI,WAAU,QAAgB,UAAU,MAAM,gBACzD,oCAAC,gBACC,oCAAC,SAAM,OAAO,YAAY,QAAQ,QAAQ,OAAO,GAChD,OAAO,IAAI,CAAC,UACX,oCAAC,SAAM,KAAK,MAAM,KAAK,MAAM,MAAM,KAAK,CACzC,CACH,GACA,oCAAC,UAAO,MAAK,YAAU,EAAE,eAAe,CAAE,CAC5C,CACF;AAEJ;AAEA,IAAO,0BAAQ;",
+  "sourcesContent": ["import React, { useContext } from 'react';\nimport { Field } from '@digigov/form/Field';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport FormBuilder from '@digigov/form/FormBuilder';\nimport Label from '@digigov/form/inputs/Label';\nimport { QuestionsContext } from '@digigov/form/Questions/QuestionsContext';\nimport { getAddMoreFields } from '@digigov/form/Questions/Step/getAddMoreFields';\nimport { StepArrayReviewInterface } from '@digigov/form/Questions/Step/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport PageTitleContainer, {\n  PageTitleHeading,\n} from '@digigov/ui/app/PageTitleContainer';\nimport {\n  SummaryList,\n  SummaryListItem,\n  SummaryListItemKey,\n  SummaryListItemValue,\n  SummaryListItemAction,\n} from '@digigov/ui/content/SummaryList';\nimport Button from '@digigov/ui/form/Button';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const StepArrayReview: React.FC<StepArrayReviewInterface> = (props) => {\n  const { t } = useTranslation();\n  const { currentStep } = useContext(QuestionsContext);\n  const fields = getAddMoreFields(currentStep);\n  const primaryField =\n    currentStep.fields.find(\n      (field: { key: any }) => field.key === currentStep.review?.primaryFieldKey\n    ) || {};\n  return (\n    <>\n      <PageTitleContainer>\n        <PageTitleHeading>\n          {currentStep.review?.title && t(currentStep.review?.title)}\n        </PageTitleHeading>\n      </PageTitleContainer>\n      <SummaryList>\n        {props.array.map(\n          (item: Record<string, React.ReactNode>, idx: number) => (\n            <SummaryListItem key={idx}>\n              <SummaryListItemKey>\n                {t(primaryField.label.primary)}\n              </SummaryListItemKey>\n              <SummaryListItemValue>\n                {item[primaryField.key]}\n              </SummaryListItemValue>\n              <SummaryListItemAction\n                onClick={(): void => props.handleDelete(idx)}\n              >\n                {t('button.delete')}\n              </SummaryListItemAction>\n            </SummaryListItem>\n          )\n        )}\n      </SummaryList>\n      <FormBuilder key=\"addmore\" fields={fields} onSubmit={props.handleSubmit}>\n        <Fieldset>\n          <Label label={currentStep.review?.addMore.title} />\n          {fields.map((field: FieldSpec) => (\n            <Field key={field.key} name={field.key} />\n          ))}\n        </Fieldset>\n        <Button type=\"submit\">{t('button.submit')}</Button>\n      </FormBuilder>\n    </>\n  );\n};\n\nexport default StepArrayReview;\n"],
+  "mappings": "AAAA,OAAO,SAAS,kBAAkB;AAClC,SAAS,aAAa;AACtB,SAAS,gBAAgB;AACzB,OAAO,iBAAiB;AACxB,OAAO,WAAW;AAClB,SAAS,wBAAwB;AACjC,SAAS,wBAAwB;AAGjC,OAAO;AAAA,EACL;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,YAAY;AACnB,SAAS,sBAAsB;AAExB,MAAM,kBAAsD,CAAC,UAAU;AAC5E,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,EAAE,YAAY,IAAI,WAAW,gBAAgB;AACnD,QAAM,SAAS,iBAAiB,WAAW;AAC3C,QAAM,eACJ,YAAY,OAAO;AAAA,IACjB,CAAC,UAAwB,MAAM,QAAQ,YAAY,QAAQ;AAAA,EAC7D,KAAK,CAAC;AACR,SACE,0DACE,oCAAC,0BACC,oCAAC,wBACE,YAAY,QAAQ,SAAS,EAAE,YAAY,QAAQ,KAAK,CAC3D,CACF,GACA,oCAAC,mBACE,MAAM,MAAM;AAAA,IACX,CAAC,MAAuC,QACtC,oCAAC,mBAAgB,KAAK,OACpB,oCAAC,0BACE,EAAE,aAAa,MAAM,OAAO,CAC/B,GACA,oCAAC,4BACE,KAAK,aAAa,GAAG,CACxB,GACA;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,MAAY,MAAM,aAAa,GAAG;AAAA;AAAA,MAE1C,EAAE,eAAe;AAAA,IACpB,CACF;AAAA,EAEJ,CACF,GACA,oCAAC,eAAY,KAAI,WAAU,QAAgB,UAAU,MAAM,gBACzD,oCAAC,gBACC,oCAAC,SAAM,OAAO,YAAY,QAAQ,QAAQ,OAAO,GAChD,OAAO,IAAI,CAAC,UACX,oCAAC,SAAM,KAAK,MAAM,KAAK,MAAM,MAAM,KAAK,CACzC,CACH,GACA,oCAAC,UAAO,MAAK,YAAU,EAAE,eAAe,CAAE,CAC5C,CACF;AAEJ;AAEA,IAAO,0BAAQ;",
   "names": []
 }

package/Questions/Step/StepContext.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StepInterface } from '@digigov/form/Questions/Step/types';
 export declare const StepContext: import("react").Context<StepInterface>;
 export default StepContext;

package/Questions/Step/StepTitle/index.js

@@ -1,12 +1,13 @@
 import React, { useContext } from "react";
 import { StepContext } from "@digigov/form/Questions/Step/StepContext";
-import Heading from "@digigov/react-core/Heading";
-import HeadingCaption from "@digigov/react-core/HeadingCaption";
-import PageTitleContainer, {
+import {
+  PageTitleContainer,
   PageTitleCaption
 } from "@digigov/ui/app/PageTitleContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 import { BackLink } from "@digigov/ui/navigation/BackLink";
+import { Heading } from "@digigov/ui/typography/Heading";
+import { HeadingCaption } from "@digigov/ui/typography/HeadingCaption";
 const StepTitleHeading = (props) => {
   return /* @__PURE__ */ React.createElement(Heading, null, props.children);
 };

package/Questions/Step/StepTitle.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { HeadingProps } from '@digigov/react-core/Heading';
+import { HeadingProps } from '@digigov/ui/typography/Heading';
 export interface StepTitleInterface {
     title?: string;
     backButton?: string;

package/Questions/Step/StepTitle.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Questions/Step/StepTitle.tsx"],
-  "sourcesContent": ["import React, { useContext } from 'react';\nimport { StepContext } from '@digigov/form/Questions/Step/StepContext';\nimport Heading, { HeadingProps } from '@digigov/react-core/Heading';\nimport HeadingCaption from '@digigov/react-core/HeadingCaption';\nimport PageTitleContainer, {\n  PageTitleCaption,\n} from '@digigov/ui/app/PageTitleContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { BackLink } from '@digigov/ui/navigation/BackLink';\n\nexport interface StepTitleInterface {\n  title?: string;\n  backButton?: string;\n  caption?: string;\n  step?: string;\n  children?: React.ReactNode;\n}\n\nexport const StepTitleHeading: React.FC<HeadingProps> = (props) => {\n  return <Heading>{props.children}</Heading>;\n};\n\nexport const StepTitleBase: React.FC<StepTitleInterface> = ({\n  caption,\n  step,\n  title,\n  backButton,\n  children,\n}): React.ReactElement => {\n  const { t } = useTranslation();\n  return (\n    <>\n      <BackLink>{backButton || t('button.back')}</BackLink>\n      <PageTitleContainer>\n        {children || (\n          <>\n            <HeadingCaption size=\"xl\">{caption && t(caption)}</HeadingCaption>\n            {step && <PageTitleCaption>{step}</PageTitleCaption>}\n            <StepTitleHeading>{title && t(title)}</StepTitleHeading>\n          </>\n        )}\n      </PageTitleContainer>\n    </>\n  );\n};\n\n/**\n * The StepTitle component accepts a title, a caption and a step indicator\n * about the Step asked to the User\n */\nexport const StepTitle: React.FC<StepTitleInterface> = (props) => {\n  const { caption, title, step, backButton } = useContext(StepContext);\n  return (\n    <StepTitleBase\n      backButton={backButton}\n      caption={caption}\n      step={step}\n      title={title}\n    >\n      {props.children}\n    </StepTitleBase>\n  );\n};\n\nexport default StepTitle;\n"],
-  "mappings": "AAAA,OAAO,SAAS,kBAAkB;AAClC,SAAS,mBAAmB;AAC5B,OAAO,aAA+B;AACtC,OAAO,oBAAoB;AAC3B,OAAO;AAAA,EACL;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AAUlB,MAAM,mBAA2C,CAAC,UAAU;AACjE,SAAO,oCAAC,eAAS,MAAM,QAAS;AAClC;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA0B;AACxB,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,SACE,0DACE,oCAAC,gBAAU,cAAc,EAAE,aAAa,CAAE,GAC1C,oCAAC,0BACE,YACC,0DACE,oCAAC,kBAAe,MAAK,QAAM,WAAW,EAAE,OAAO,CAAE,GAChD,QAAQ,oCAAC,wBAAkB,IAAK,GACjC,oCAAC,wBAAkB,SAAS,EAAE,KAAK,CAAE,CACvC,CAEJ,CACF;AAEJ;AAMO,MAAM,YAA0C,CAAC,UAAU;AAChE,QAAM,EAAE,SAAS,OAAO,MAAM,WAAW,IAAI,WAAW,WAAW;AACnE,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,MAAM;AAAA,EACT;AAEJ;AAEA,IAAO,oBAAQ;",
+  "sourcesContent": ["import React, { useContext } from 'react';\nimport { StepContext } from '@digigov/form/Questions/Step/StepContext';\nimport {\n  PageTitleContainer,\n  PageTitleCaption,\n} from '@digigov/ui/app/PageTitleContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { BackLink } from '@digigov/ui/navigation/BackLink';\nimport { Heading, HeadingProps } from '@digigov/ui/typography/Heading';\nimport { HeadingCaption } from '@digigov/ui/typography/HeadingCaption';\n\nexport interface StepTitleInterface {\n  title?: string;\n  backButton?: string;\n  caption?: string;\n  step?: string;\n  children?: React.ReactNode;\n}\n\nexport const StepTitleHeading: React.FC<HeadingProps> = (props) => {\n  return <Heading>{props.children}</Heading>;\n};\n\nexport const StepTitleBase: React.FC<StepTitleInterface> = ({\n  caption,\n  step,\n  title,\n  backButton,\n  children,\n}): React.ReactElement => {\n  const { t } = useTranslation();\n  return (\n    <>\n      <BackLink>{backButton || t('button.back')}</BackLink>\n      <PageTitleContainer>\n        {children || (\n          <>\n            <HeadingCaption size=\"xl\">{caption && t(caption)}</HeadingCaption>\n            {step && <PageTitleCaption>{step}</PageTitleCaption>}\n            <StepTitleHeading>{title && t(title)}</StepTitleHeading>\n          </>\n        )}\n      </PageTitleContainer>\n    </>\n  );\n};\n\n/**\n * The StepTitle component accepts a title, a caption and a step indicator\n * about the Step asked to the User\n */\nexport const StepTitle: React.FC<StepTitleInterface> = (props) => {\n  const { caption, title, step, backButton } = useContext(StepContext);\n  return (\n    <StepTitleBase\n      backButton={backButton}\n      caption={caption}\n      step={step}\n      title={title}\n    >\n      {props.children}\n    </StepTitleBase>\n  );\n};\n\nexport default StepTitle;\n"],
+  "mappings": "AAAA,OAAO,SAAS,kBAAkB;AAClC,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AACzB,SAAS,eAA6B;AACtC,SAAS,sBAAsB;AAUxB,MAAM,mBAA2C,CAAC,UAAU;AACjE,SAAO,oCAAC,eAAS,MAAM,QAAS;AAClC;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA0B;AACxB,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,SACE,0DACE,oCAAC,gBAAU,cAAc,EAAE,aAAa,CAAE,GAC1C,oCAAC,0BACE,YACC,0DACE,oCAAC,kBAAe,MAAK,QAAM,WAAW,EAAE,OAAO,CAAE,GAChD,QAAQ,oCAAC,wBAAkB,IAAK,GACjC,oCAAC,wBAAkB,SAAS,EAAE,KAAK,CAAE,CACvC,CAEJ,CACF;AAEJ;AAMO,MAAM,YAA0C,CAAC,UAAU;AAChE,QAAM,EAAE,SAAS,OAAO,MAAM,WAAW,IAAI,WAAW,WAAW;AACnE,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,MAAM;AAAA,EACT;AAEJ;AAEA,IAAO,oBAAQ;",
   "names": []
 }

package/Questions/Step/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { LabelProps } from '@digigov/form/inputs/Label';
 export type StepType = 'object' | 'array';
 export type StepReviewAnswersType = 'positive' | 'negative';

package/Questions/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StepInterface } from '@digigov/form/Questions/Step/types';
 export interface QuestionsInterface {
     name: string;

package/cjs/Field/FieldBase/index.js

@@ -75,6 +75,7 @@ const FieldBase = (props) => {
               Component,
               {
                 ...field,
+                control,
                 ref: void 0,
                 defaultValue,
                 extra,

package/cjs/Field/FieldBase.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/FieldBase.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { Controller } from 'react-hook-form';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = (props) => {\n  const {\n    required,\n    name,\n    component: Component,\n    wrapper,\n    control,\n    type,\n    controlled = false,\n    enabled = true,\n    editable,\n    defaultValue,\n    label,\n    extra = {},\n    layout,\n    error,\n    register,\n    ...componentProps\n  } = props;\n  if (!enabled) {\n    return null;\n  }\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        error={error}\n        wrapper={wrapper}\n        name={name}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                ref={undefined}\n                defaultValue={defaultValue}\n                extra={extra}\n                error={!!error}\n                type={type}\n                aria-required={!!required}\n                aria-describedby={error && `${name}-error`}\n                required={required}\n                disabled={editable === false}\n                {...componentProps}\n              />\n            );\n          }}\n        />\n      </FieldBaseContainer>\n    );\n  }\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      error={error}\n      wrapper={wrapper}\n      name={name}\n    >\n      {Component?.render ? (\n        <Component\n          {...register(name)}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          ref={undefined}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA2B;AAC3B,gCAA+B;AAGxB,MAAM,YAAsC,CAAC,UAAU;AAC5D,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,IACb,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ,CAAC;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AACJ,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AACA,MAAI,YAAY;AACd,WACE,6BAAAA,QAAA;AAAA,MAAC,0BAAAC;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,MAEA,6BAAAD,QAAA;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE,6BAAAA,QAAA;AAAA,cAAC;AAAA;AAAA,gBACE,GAAG;AAAA,gBACJ,KAAK;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA,OAAO,CAAC,CAAC;AAAA,gBACT;AAAA,gBACA,iBAAe,CAAC,CAAC;AAAA,gBACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,gBAClC;AAAA,gBACA,UAAU,aAAa;AAAA,gBACtB,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE,6BAAAA,QAAA;AAAA,IAAC,0BAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,WAAW,SACV,6BAAAD,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACtB,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB,KAAK;AAAA,QACJ,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
+  "sourcesContent": ["import React from 'react';\nimport { Controller } from 'react-hook-form';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = (props) => {\n  const {\n    required,\n    name,\n    component: Component,\n    wrapper,\n    control,\n    type,\n    controlled = false,\n    enabled = true,\n    editable,\n    defaultValue,\n    label,\n    extra = {},\n    layout,\n    error,\n    register,\n    ...componentProps\n  } = props;\n  if (!enabled) {\n    return null;\n  }\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        error={error}\n        wrapper={wrapper}\n        name={name}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                control={control}\n                ref={undefined}\n                defaultValue={defaultValue}\n                extra={extra}\n                error={!!error}\n                type={type}\n                aria-required={!!required}\n                aria-describedby={error && `${name}-error`}\n                required={required}\n                disabled={editable === false}\n                {...componentProps}\n              />\n            );\n          }}\n        />\n      </FieldBaseContainer>\n    );\n  }\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      error={error}\n      wrapper={wrapper}\n      name={name}\n    >\n      {Component?.render ? (\n        <Component\n          {...register(name)}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          ref={undefined}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA2B;AAC3B,gCAA+B;AAGxB,MAAM,YAAsC,CAAC,UAAU;AAC5D,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,IACb,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ,CAAC;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AACJ,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AACA,MAAI,YAAY;AACd,WACE,6BAAAA,QAAA;AAAA,MAAC,0BAAAC;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,MAEA,6BAAAD,QAAA;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE,6BAAAA,QAAA;AAAA,cAAC;AAAA;AAAA,gBACE,GAAG;AAAA,gBACJ;AAAA,gBACA,KAAK;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA,OAAO,CAAC,CAAC;AAAA,gBACT;AAAA,gBACA,iBAAe,CAAC,CAAC;AAAA,gBACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,gBAClC;AAAA,gBACA,UAAU,aAAa;AAAA,gBACtB,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE,6BAAAA,QAAA;AAAA,IAAC,0BAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,WAAW,SACV,6BAAAD,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACtB,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB,KAAK;AAAA,QACJ,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
   "names": ["React", "FieldBaseContainer"]
 }