@digigov/form 2.0.0-b4cd6916 → 2.0.0-d0adc9fb

package/cjs/Fieldset/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport Hint from '@digigov/react-core/Hint';\nimport Grid from '@digigov/ui/layouts/Grid';\nimport NormalText from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,kCAAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAMlB,sBAAqB;AACrB,4BAA2B;AAC3B,kBAAiB;AACjB,kBAAiB;AACjB,wBAAuB;AAEhB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,6BAAAC,QAAA,cAAC,sBAAAC,SAAA,EAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,6BAAAD,QAAA,cAAC,YAAAE,SAAA,EAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,6BAAAF,QAAA,cAAC,YAAAG,SAAA,EAAK,MAAI,MAAC,IAAI,MACb,6BAAAH,QAAA,cAAC,kBAAAI,SAAA,MAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ,gBAAAL;",
-  "names": ["Fieldset", "React", "FieldsetLegend", "Hint", "Grid", "NormalText"]
+  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport { Fieldset } from '@digigov/react-core/Fieldset';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { Grid } from '@digigov/ui/layouts/Grid';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { NormalText } from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAMlB,sBAAyB;AACzB,4BAA+B;AAC/B,kBAAqB;AACrB,kBAAqB;AACrB,wBAA2B;AAEpB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,6BAAAA,QAAA,cAAC,wCAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,6BAAAA,QAAA,cAAC,oBAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,6BAAAA,QAAA,cAAC,oBAAK,MAAI,MAAC,IAAI,MACb,6BAAAA,QAAA,cAAC,oCAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ;",
+  "names": ["React"]
 }

package/cjs/Fieldset/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/types.tsx"],
-  "sourcesContent": ["import { FieldsetLegendProps } from '@digigov/react-core/FieldsetLegend';\nimport { HintProps } from '@digigov/react-core/Hint';\n\nexport interface FieldsetLabelProps extends FieldsetLegendProps {}\nexport interface FieldsetCaptionProps extends HintProps {}\nexport interface FieldsetBodyProps {\n  children?: React.ReactNode;\n}\n"],
+  "sourcesContent": ["import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';\nimport { HintProps } from '@digigov/ui/typography/Hint';\n\nexport interface FieldsetLabelProps extends FieldsetLegendProps {}\nexport interface FieldsetCaptionProps extends HintProps {}\nexport interface FieldsetBodyProps {\n  children?: React.ReactNode;\n}\n"],
   "mappings": ";;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/cjs/FormBuilder/index.js

@@ -36,14 +36,14 @@ __export(FormBuilder_exports, {
 module.exports = __toCommonJS(FormBuilder_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
-var import_Field = __toESM(require("@digigov/form/Field"));
+var import_Field = require("@digigov/form/Field");
 var import_utils = require("@digigov/form/Field/utils");
-var import_Fieldset = __toESM(require("@digigov/form/Fieldset"));
+var import_Fieldset = require("@digigov/form/Fieldset");
 var import_FormContext = require("@digigov/form/FormContext");
 var import_utils2 = require("@digigov/form/utils");
 var import_validators = require("@digigov/form/validators");
-var import_Form = require("@digigov/react-core/Form");
 var import_Button = require("@digigov/ui/form/Button");
+var import_Form = require("@digigov/ui/form/Form");
 const FormBase = import_react.default.forwardRef(function FormBase2({
   onSubmit,
   children,
@@ -70,7 +70,10 @@ const FormBase = import_react.default.forwardRef(function FormBase2({
   });
   const handleSubmit = (0, import_react.useCallback)(
     (data) => {
-      onSubmit && onSubmit(data);
+      if (onSubmit) {
+        form.reset(data);
+        onSubmit(data);
+      }
     },
     [onSubmit]
   );
@@ -151,9 +154,9 @@ const FormBuilder = import_react.default.forwardRef(function FormBuilder2({
     );
     if (auto) {
       if (fieldsets) {
-        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_Fieldset.default, { key: fieldset.key }));
+        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, { key: fieldset.key }));
       } else if (fields) {
-        fieldChildren = fields.map((field) => /* @__PURE__ */ import_react.default.createElement(import_Field.default, { key: field.key, name: field.key }));
+        fieldChildren = fields.map((field) => /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: field.key, name: field.key }));
       }
     }
   }

package/cjs/FormBuilder/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FormBuilder/index.tsx"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport 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 { Form } from '@digigov/react-core/Form';\nimport { Button } from '@digigov/ui/form/Button';\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      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": "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",
-  "names": ["import_utils", "React", "FormBase", "FormBuilder", "Fieldset", "Field"]
+  "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) {\n        form.reset(data);\n        onSubmit(data);\n      }\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": "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",
+  "names": ["import_utils", "React", "FormBase", "FormBuilder"]
 }

package/cjs/FormContext/index.js

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

package/cjs/FormContext.js.map

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

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

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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/MultiplicityField/add-objects.tsx"],
-  "sourcesContent": ["/* eslint-disable react/prop-types */\nimport React, { useEffect, useMemo } from 'react';\nimport {\n  ErrorOption,\n  FieldArrayWithId,\n  UseFieldArrayReturn,\n  useWatch,\n} from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { useField } from '@digigov/form/Field/utils/useField';\n\nimport FieldObject from '@digigov/form/FieldObject';\nimport type {\n  MultiplicityProps,\n  StashedObject,\n} from '@digigov/form/MultiplicityField/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport RadioConditional from '@digigov/react-core/RadioConditional';\nimport Button from '@digigov/ui/form/Button';\n\nexport interface AddObjectsProps\n  extends Omit<MultiplicityProps, 'key' | 'component'> {\n  fields: FieldArrayWithId[];\n  error?: ErrorOption;\n  append: UseFieldArrayReturn['append'];\n  remove: UseFieldArrayReturn['remove'];\n  stashedObjects: StashedObject[];\n  onStash: (arg0: StashedObject) => void;\n  children?: React.ReactNode;\n}\n\nexport const AddObjects: React.FC<AddObjectsProps> = ({\n  name,\n  fields,\n  formState,\n  extra,\n  append,\n  remove,\n  trigger,\n  clearErrors,\n  children,\n  setValue,\n  stashedObjects,\n  getValues,\n  onStash,\n  error,\n  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                        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        Field={Field}\n        error={\n          extra?.max - stashedObjects.length === 0 ||\n          extra?.length - stashedObjects.length === 0\n            ? error\n            : needsMoreError\n        }\n      />\n    </Fieldset>\n  );\n};\n\nexport default AddObjects;\n"],
-  "mappings": "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",
-  "names": ["React", "RadioConditional", "FieldObject", "Button", "Fieldset"]
+  "sourcesContent": ["import React, { useEffect, useMemo } from 'react';\nimport {\n  ErrorOption,\n  FieldArrayWithId,\n  UseFieldArrayReturn,\n  useWatch,\n} from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { useField } from '@digigov/form/Field/utils/useField';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport type {\n  MultiplicityProps,\n  StashedObject,\n} from '@digigov/form/MultiplicityField/types';\nimport { FieldSpec } from '@digigov/form/types';\nimport { Button } from '@digigov/ui/form/Button';\nimport { RadioConditional } from '@digigov/ui/form/RadioContainer';\n\nexport interface AddObjectsProps\n  extends Omit<MultiplicityProps, 'key' | 'component'> {\n  fields: FieldArrayWithId[];\n  error?: ErrorOption;\n  append: UseFieldArrayReturn['append'];\n  remove: UseFieldArrayReturn['remove'];\n  stashedObjects: StashedObject[];\n  onStash: (arg0: StashedObject) => void;\n  children?: React.ReactNode;\n}\n\nexport const AddObjects: React.FC<AddObjectsProps> = ({\n  name,\n  fields,\n  formState,\n  extra,\n  append,\n  remove,\n  trigger,\n  clearErrors,\n  children,\n  setValue,\n  stashedObjects,\n  getValues,\n  onStash,\n  error,\n  Field,\n}) => {\n  const currentIndex = fields.length > 0 ? fields.length - 1 : fields.length;\n  const currentName = `${name}.${currentIndex}`;\n  const radioField: FieldSpec = {\n    key: 'needs-more',\n    type: 'choice:single',\n    label: {\n      primary: extra?.label.question.title,\n    },\n    required: true,\n    validators: [\n      {\n        name: 'is-locked',\n        message: 'form.error.needs-more',\n        test: (data) => {\n          return data === 'no';\n        },\n      },\n    ],\n    extra: {\n      options: [\n        {\n          label: { primary: extra?.label.question.yes },\n          id: `radio-input-${name}-yes`,\n          value: 'yes',\n          selected: function RadioSelected() {\n            return (\n              <RadioConditional\n                hidden={\n                  needsMore !== 'yes' ||\n                  (extra?.max && extra?.max - stashedObjects.length === 0)\n                }\n              >\n                {needsMore === 'yes' && fields.length > 0 && (\n                  <>\n                    <FieldObject\n                      name={currentName}\n                      error={error && error[currentIndex]}\n                      register={register}\n                      formState={formState}\n                      control={control}\n                      {...extra?.of}\n                      label={\n                        extra?.label.question.objectLabel || extra?.of.label\n                      }\n                    />\n                    <Button\n                      color=\"secondary\"\n                      name={`${currentName}-add-object`}\n                      onClick={async (e) => {\n                        e.preventDefault();\n                        const nestedFields = extra?.of.extra.fields.map(\n                          (f) => `${currentName}.${f.key}`\n                        );\n                        const result = await trigger(nestedFields);\n                        if (result) {\n                          setValue('needs-more', '');\n                          onStash(getValues(currentName));\n                        }\n                      }}\n                    >\n                      {extra?.label.object.add}\n                    </Button>\n                  </>\n                )}\n              </RadioConditional>\n            );\n          },\n        },\n        {\n          label: { primary: extra?.label.question.no },\n          id: `radio-input-${name}-no`,\n          value: 'no',\n        },\n      ],\n    },\n  };\n\n  const {\n    field,\n    control,\n    register,\n    reset,\n    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": ["React"]
 }

package/cjs/MultiplicityField/index.js

@@ -34,15 +34,12 @@ __export(MultiplicityField_exports, {
 module.exports = __toCommonJS(MultiplicityField_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
-var import_FieldBaseContainer = __toESM(require("@digigov/form/Field/FieldBaseContainer"));
-var import_FieldObject = __toESM(require("@digigov/form/FieldObject"));
-var import_add_objects = __toESM(require("@digigov/form/MultiplicityField/add-objects"));
-var import_Button = require("@digigov/react-core/Button");
-var import_Card = require("@digigov/react-core/Card");
-var import_CardAction = require("@digigov/react-core/CardAction");
-var import_CardContent = require("@digigov/react-core/CardContent");
-var import_CardHeading = require("@digigov/react-core/CardHeading");
-var import_Heading = require("@digigov/react-core/Heading");
+var import_FieldBaseContainer = require("@digigov/form/Field/FieldBaseContainer");
+var import_FieldObject = require("@digigov/form/FieldObject");
+var import_add_objects = require("@digigov/form/MultiplicityField/add-objects");
+var import_Card = require("@digigov/ui/content/Card");
+var import_Button = require("@digigov/ui/form/Button");
+var import_Heading = require("@digigov/ui/typography/Heading");
 const Multiplicity = ({
   extra,
   name,
@@ -74,7 +71,7 @@ const Multiplicity = ({
     setStashedObjects(newStashedObjects);
   };
   return /* @__PURE__ */ import_react.default.createElement(
-    import_FieldBaseContainer.default,
+    import_FieldBaseContainer.FieldBaseContainer,
     {
       label,
       layout,
@@ -98,7 +95,7 @@ const Multiplicity = ({
       );
     })) : "",
     /* @__PURE__ */ import_react.default.createElement(
-      import_add_objects.default,
+      import_add_objects.AddObjects,
       {
         name,
         register,
@@ -133,8 +130,8 @@ const ListObject = ({
   // onEdit,
 }) => {
   const currentName = `${name}.${index}`;
-  return /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: extra?.border && "border" }, /* @__PURE__ */ import_react.default.createElement(import_CardHeading.CardHeading, null, extra?.label.object.title, " #", index + 1), /* @__PURE__ */ import_react.default.createElement(import_CardContent.CardContent, null, /* @__PURE__ */ import_react.default.createElement(
-    import_FieldObject.default,
+  return /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: extra?.border ? "border" : "divider" }, /* @__PURE__ */ import_react.default.createElement(import_Card.CardHeading, null, extra?.label.object.title, " #", index + 1), /* @__PURE__ */ import_react.default.createElement(import_Card.CardContent, null, /* @__PURE__ */ import_react.default.createElement(
+    import_FieldObject.FieldObject,
     {
       name: currentName,
       formState,
@@ -142,7 +139,7 @@ const ListObject = ({
       control,
       ...extra?.of
     }
-  )), /* @__PURE__ */ import_react.default.createElement(import_CardAction.CardAction, null, /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "button", variant: "link", onClick: () => onDelete(index) }, extra?.label.object.delete)));
+  )), /* @__PURE__ */ import_react.default.createElement(import_Card.CardAction, null, /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "button", variant: "link", onClick: () => onDelete(index) }, extra?.label.object.delete)));
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/cjs/MultiplicityField/index.js.map

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

package/cjs/MultiplicityField/types.js.map

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

package/cjs/Questions/Questions/index.js

@@ -54,7 +54,7 @@ const Questions = ({
   (0, import_react.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}`);
@@ -64,15 +64,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 = (0, import_getNextStep.getNextStep)(currentStep, steps, data);
     if (nextStep) {
-      onActiveStep && onActiveStep(nextStep);
+      if (onActiveStep) onActiveStep(nextStep);
       setCurrentStep(nextStep);
     } else {
       onSubmit(data);

package/cjs/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;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2C;AAC3C,yBAA4B;AAC5B,8BAAiC;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,QAAI,uBAAwB,EAAE,MAAM,GAAG,CAAC;AAC1E,8BAAU,MAAM;AACd,QAAI,CAAC,eAAe;AAClB,qBAAe,MAAM,CAAC,CAAC;AAAA,IACzB;AAAA,EACF,GAAG,CAAC,eAAe,KAAK,CAAC;AACzB,8BAAU,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,QAAI;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,eAAW,gCAAY,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,6BAAAC,QAAA;AAAA,IAAC,yCAAiB;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;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2C;AAC3C,yBAA4B;AAC5B,8BAAiC;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,QAAI,uBAAwB,EAAE,MAAM,GAAG,CAAC;AAC1E,8BAAU,MAAM;AACd,QAAI,CAAC,eAAe;AAClB,qBAAe,MAAM,CAAC,CAAC;AAAA,IACzB;AAAA,EACF,GAAG,CAAC,eAAe,KAAK,CAAC;AACzB,8BAAU,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,QAAI;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,eAAW,gCAAY,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,6BAAAC,QAAA;AAAA,IAAC,yCAAiB;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", "React"]
 }

package/cjs/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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAClC,mBAAsB;AACtB,sBAAyB;AACzB,yBAAwB;AACxB,mBAAkB;AAClB,8BAAiC;AACjC,8BAAiC;AAGjC,gCAEO;AACP,yBAMO;AACP,oBAAmB;AACnB,kBAA+B;AAExB,MAAM,kBAAsD,CAAC,UAAU;AAC5E,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,EAAE,YAAY,QAAI,yBAAW,wCAAgB;AACnD,QAAM,aAAS,0CAAiB,WAAW;AAC3C,QAAM,eACJ,YAAY,OAAO;AAAA,IACjB,CAAC,UAAwB,MAAM,QAAQ,YAAY,QAAQ;AAAA,EAC7D,KAAK,CAAC;AACR,SACE,6BAAAA,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,0BAAAC,SAAA,MACC,6BAAAD,QAAA,cAAC,kDACE,YAAY,QAAQ,SAAS,EAAE,YAAY,QAAQ,KAAK,CAC3D,CACF,GACA,6BAAAA,QAAA,cAAC,sCACE,MAAM,MAAM;AAAA,IACX,CAAC,MAAwC,QACvC,6BAAAA,QAAA,cAAC,sCAAgB,KAAK,OACpB,6BAAAA,QAAA,cAAC,6CACE,EAAE,aAAa,MAAM,OAAO,CAC/B,GACA,6BAAAA,QAAA,cAAC,+CACE,KAAK,aAAa,GAAG,CACxB,GACA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,MAAY,MAAM,aAAa,GAAG;AAAA;AAAA,MAE1C,EAAE,eAAe;AAAA,IACpB,CACF;AAAA,EAEJ,CACF,GACA,6BAAAA,QAAA,cAAC,mBAAAE,SAAA,EAAY,KAAI,WAAU,QAAgB,UAAU,MAAM,gBACzD,6BAAAF,QAAA,cAAC,gCACC,6BAAAA,QAAA,cAAC,aAAAG,SAAA,EAAM,OAAO,YAAY,QAAQ,QAAQ,OAAO,GAChD,OAAO,IAAI,CAAC,UACX,6BAAAH,QAAA,cAAC,sBAAM,KAAK,MAAM,KAAK,MAAM,MAAM,KAAK,CACzC,CACH,GACA,6BAAAA,QAAA,cAAC,cAAAI,SAAA,EAAO,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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAClC,mBAAsB;AACtB,sBAAyB;AACzB,yBAAwB;AACxB,mBAAkB;AAClB,8BAAiC;AACjC,8BAAiC;AAGjC,gCAEO;AACP,yBAMO;AACP,oBAAmB;AACnB,kBAA+B;AAExB,MAAM,kBAAsD,CAAC,UAAU;AAC5E,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,EAAE,YAAY,QAAI,yBAAW,wCAAgB;AACnD,QAAM,aAAS,0CAAiB,WAAW;AAC3C,QAAM,eACJ,YAAY,OAAO;AAAA,IACjB,CAAC,UAAwB,MAAM,QAAQ,YAAY,QAAQ;AAAA,EAC7D,KAAK,CAAC;AACR,SACE,6BAAAA,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,0BAAAC,SAAA,MACC,6BAAAD,QAAA,cAAC,kDACE,YAAY,QAAQ,SAAS,EAAE,YAAY,QAAQ,KAAK,CAC3D,CACF,GACA,6BAAAA,QAAA,cAAC,sCACE,MAAM,MAAM;AAAA,IACX,CAAC,MAAuC,QACtC,6BAAAA,QAAA,cAAC,sCAAgB,KAAK,OACpB,6BAAAA,QAAA,cAAC,6CACE,EAAE,aAAa,MAAM,OAAO,CAC/B,GACA,6BAAAA,QAAA,cAAC,+CACE,KAAK,aAAa,GAAG,CACxB,GACA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,MAAY,MAAM,aAAa,GAAG;AAAA;AAAA,MAE1C,EAAE,eAAe;AAAA,IACpB,CACF;AAAA,EAEJ,CACF,GACA,6BAAAA,QAAA,cAAC,mBAAAE,SAAA,EAAY,KAAI,WAAU,QAAgB,UAAU,MAAM,gBACzD,6BAAAF,QAAA,cAAC,gCACC,6BAAAA,QAAA,cAAC,aAAAG,SAAA,EAAM,OAAO,YAAY,QAAQ,QAAQ,OAAO,GAChD,OAAO,IAAI,CAAC,UACX,6BAAAH,QAAA,cAAC,sBAAM,KAAK,MAAM,KAAK,MAAM,MAAM,KAAK,CACzC,CACH,GACA,6BAAAA,QAAA,cAAC,cAAAI,SAAA,EAAO,MAAK,YAAU,EAAE,eAAe,CAAE,CAC5C,CACF;AAEJ;AAEA,IAAO,0BAAQ;",
   "names": ["React", "PageTitleContainer", "FormBuilder", "Label", "Button"]
 }

package/cjs/Questions/Step/StepTitle/index.js

@@ -35,13 +35,13 @@ __export(StepTitle_exports, {
 module.exports = __toCommonJS(StepTitle_exports);
 var import_react = __toESM(require("react"));
 var import_StepContext = require("@digigov/form/Questions/Step/StepContext");
-var import_Heading = __toESM(require("@digigov/react-core/Heading"));
-var import_HeadingCaption = __toESM(require("@digigov/react-core/HeadingCaption"));
-var import_PageTitleContainer = __toESM(require("@digigov/ui/app/PageTitleContainer"));
+var import_PageTitleContainer = require("@digigov/ui/app/PageTitleContainer");
 var import_i18n = require("@digigov/ui/i18n");
 var import_BackLink = require("@digigov/ui/navigation/BackLink");
+var import_Heading = require("@digigov/ui/typography/Heading");
+var import_HeadingCaption = require("@digigov/ui/typography/HeadingCaption");
 const StepTitleHeading = (props) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_Heading.default, null, props.children);
+  return /* @__PURE__ */ import_react.default.createElement(import_Heading.Heading, null, props.children);
 };
 const StepTitleBase = ({
   caption,
@@ -51,7 +51,7 @@ const StepTitleBase = ({
   children
 }) => {
   const { t } = (0, import_i18n.useTranslation)();
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_BackLink.BackLink, null, backButton || t("button.back")), /* @__PURE__ */ import_react.default.createElement(import_PageTitleContainer.default, null, children || /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_HeadingCaption.default, { size: "xl" }, caption && t(caption)), step && /* @__PURE__ */ import_react.default.createElement(import_PageTitleContainer.PageTitleCaption, null, step), /* @__PURE__ */ import_react.default.createElement(StepTitleHeading, null, title && t(title)))));
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_BackLink.BackLink, null, backButton || t("button.back")), /* @__PURE__ */ import_react.default.createElement(import_PageTitleContainer.PageTitleContainer, null, children || /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_HeadingCaption.HeadingCaption, { size: "xl" }, caption && t(caption)), step && /* @__PURE__ */ import_react.default.createElement(import_PageTitleContainer.PageTitleCaption, null, step), /* @__PURE__ */ import_react.default.createElement(StepTitleHeading, null, title && t(title)))));
 };
 const StepTitle = (props) => {
   const { caption, title, step, backButton } = (0, import_react.useContext)(import_StepContext.StepContext);

package/cjs/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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAClC,yBAA4B;AAC5B,qBAAsC;AACtC,4BAA2B;AAC3B,gCAEO;AACP,kBAA+B;AAC/B,sBAAyB;AAUlB,MAAM,mBAA2C,CAAC,UAAU;AACjE,SAAO,6BAAAA,QAAA,cAAC,eAAAC,SAAA,MAAS,MAAM,QAAS;AAClC;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA0B;AACxB,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,SACE,6BAAAD,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,gCAAU,cAAc,EAAE,aAAa,CAAE,GAC1C,6BAAAA,QAAA,cAAC,0BAAAE,SAAA,MACE,YACC,6BAAAF,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,sBAAAG,SAAA,EAAe,MAAK,QAAM,WAAW,EAAE,OAAO,CAAE,GAChD,QAAQ,6BAAAH,QAAA,cAAC,kDAAkB,IAAK,GACjC,6BAAAA,QAAA,cAAC,wBAAkB,SAAS,EAAE,KAAK,CAAE,CACvC,CAEJ,CACF;AAEJ;AAMO,MAAM,YAA0C,CAAC,UAAU;AAChE,QAAM,EAAE,SAAS,OAAO,MAAM,WAAW,QAAI,yBAAW,8BAAW;AACnE,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,MAAM;AAAA,EACT;AAEJ;AAEA,IAAO,oBAAQ;",
-  "names": ["React", "Heading", "PageTitleContainer", "HeadingCaption"]
+  "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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAClC,yBAA4B;AAC5B,gCAGO;AACP,kBAA+B;AAC/B,sBAAyB;AACzB,qBAAsC;AACtC,4BAA+B;AAUxB,MAAM,mBAA2C,CAAC,UAAU;AACjE,SAAO,6BAAAA,QAAA,cAAC,8BAAS,MAAM,QAAS;AAClC;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA0B;AACxB,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,SACE,6BAAAA,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,gCAAU,cAAc,EAAE,aAAa,CAAE,GAC1C,6BAAAA,QAAA,cAAC,oDACE,YACC,6BAAAA,QAAA,2BAAAA,QAAA,gBACE,6BAAAA,QAAA,cAAC,wCAAe,MAAK,QAAM,WAAW,EAAE,OAAO,CAAE,GAChD,QAAQ,6BAAAA,QAAA,cAAC,kDAAkB,IAAK,GACjC,6BAAAA,QAAA,cAAC,wBAAkB,SAAS,EAAE,KAAK,CAAE,CACvC,CAEJ,CACF;AAEJ;AAMO,MAAM,YAA0C,CAAC,UAAU;AAChE,QAAM,EAAE,SAAS,OAAO,MAAM,WAAW,QAAI,yBAAW,8BAAW;AACnE,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,MAAM;AAAA,EACT;AAEJ;AAEA,IAAO,oBAAQ;",
+  "names": ["React"]
 }

package/cjs/inputs/AutoCompleteInput/index.js

@@ -32,16 +32,15 @@ __export(AutoCompleteInput_exports, {
 });
 module.exports = __toCommonJS(AutoCompleteInput_exports);
 var import_react = __toESM(require("react"));
-var import_Hint = require("@digigov/react-core/Hint");
-var import_AutoComplete = __toESM(require("@digigov/ui/form/AutoComplete"));
-var import_Base = require("@digigov/react-core/Base");
+var import_AutoComplete = require("@digigov/ui/form/AutoComplete");
+var import_Hint = require("@digigov/ui/typography/Hint");
+var import_Base = require("@digigov/ui/utils/Base");
 const AutoCompleteInput = ({
   name,
   type,
   extra: { options },
   onChange,
   value,
-  error,
   ...props
 }) => {
   const suggest = (0, import_react.useCallback)(
@@ -55,14 +54,15 @@ const AutoCompleteInput = ({
     [options]
   );
   return /* @__PURE__ */ import_react.default.createElement(
-    import_AutoComplete.default,
+    import_AutoComplete.AutoComplete,
     {
       multiple: type === "choice:multiple" ? true : false,
       source: suggest,
       onConfirm: (value2) => {
         if (Array.isArray(value2)) {
           const selectedValues = value2.map((item) => item.value);
-          selectedValues.length > 0 ? onChange(selectedValues) : onChange(void 0);
+          if (selectedValues.length > 0) onChange(selectedValues);
+          else onChange(void 0);
         } else {
           onChange(value2.value);
         }
@@ -81,7 +81,8 @@ const AutoCompleteInput = ({
       ...{
         ...props,
         reset: void 0,
-        required: void 0
+        required: void 0,
+        Field: void 0
       },
       name,
       id: `${name}-id`,