@digigov/form 2.0.0-36b707c1 → 2.0.0-44e7106a

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,
@@ -57,6 +54,7 @@ const Multiplicity = ({
   setValue,
   getValues,
   unregister,
+  resetField,
   Field
 }) => {
   const { fields, append, remove } = (0, import_react_hook_form.useFieldArray)({
@@ -74,13 +72,15 @@ const Multiplicity = ({
     setStashedObjects(newStashedObjects);
   };
   return /* @__PURE__ */ import_react.default.createElement(
-    import_FieldBaseContainer.default,
+    import_FieldBaseContainer.FieldBaseContainer,
     {
       label,
       layout,
       error: formState.isSubmitted && !formState.isSubmitting && error?.message ? error : void 0,
+      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
       wrapper: "fieldset",
-      name
+      name,
+      register
     },
     stashedObjects.length > 0 ? /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_Heading.Heading, { size: "md" }, extra?.label.object.title_added), stashedObjects.map((_Object, index) => {
       return /* @__PURE__ */ import_react.default.createElement(
@@ -98,7 +98,7 @@ const Multiplicity = ({
       );
     })) : "",
     /* @__PURE__ */ import_react.default.createElement(
-      import_add_objects.default,
+      import_add_objects.AddObjects,
       {
         name,
         register,
@@ -115,6 +115,7 @@ const Multiplicity = ({
         getValues,
         unregister,
         trigger,
+        resetField,
         clearErrors,
         Field
       }
@@ -133,8 +134,8 @@ const ListObject = ({
   // onEdit,
 }) => {
   const currentName = `${name}.${index}`;
-  return /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: extra?.border && "border" }, /* @__PURE__ */ import_react.default.createElement(import_CardHeading.CardHeading, null, extra?.label.object.title, " #", index + 1), /* @__PURE__ */ import_react.default.createElement(import_CardContent.CardContent, null, /* @__PURE__ */ import_react.default.createElement(
-    import_FieldObject.default,
+  return /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: extra?.border && "border" }, /* @__PURE__ */ import_react.default.createElement(import_Card.CardHeading, null, extra?.label.object.title, " #", index + 1), /* @__PURE__ */ import_react.default.createElement(import_Card.CardContent, null, /* @__PURE__ */ import_react.default.createElement(
+    import_FieldObject.FieldObject,
     {
       name: currentName,
       formState,
@@ -142,7 +143,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  resetField,\n  Field,\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n  const [stashedObjects, setStashedObjects] = useState<StashedObject[]>([]);\n  const handleStash = (data) => {\n    setStashedObjects([...stashedObjects, data]);\n  };\n  const handleDelete = (index) => {\n    remove(index);\n    // creating a new array to maintain immutability\n    const newStashedObjects = [...stashedObjects];\n    newStashedObjects.splice(index, 1);\n    setStashedObjects(newStashedObjects);\n  };\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted && !formState.isSubmitting && error?.message\n          ? error\n          : undefined\n      }\n      hasError={formState.isSubmitted && !formState.isSubmitting && !!error}\n      wrapper=\"fieldset\"\n      name={name}\n      register={register}\n    >\n      {stashedObjects.length > 0 ? (\n        <div>\n          <Heading size=\"md\">{extra?.label.object.title_added}</Heading>\n          {stashedObjects.map((_Object, index) => {\n            return (\n              <ListObject\n                key={`${name}.${index}`}\n                index={index}\n                name={name}\n                extra={extra}\n                control={control}\n                register={register}\n                formState={formState}\n                onDelete={handleDelete}\n              />\n            );\n          })}\n        </div>\n      ) : (\n        ''\n      )}\n      <AddObjects\n        name={name}\n        register={register}\n        control={control}\n        fields={fields}\n        formState={formState}\n        error={error}\n        stashedObjects={stashedObjects}\n        extra={extra}\n        append={append}\n        remove={remove}\n        onStash={handleStash}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        trigger={trigger}\n        resetField={resetField}\n        clearErrors={clearErrors}\n        Field={Field}\n      />\n    </FieldBaseContainer>\n  );\n};\n\nexport default Multiplicity;\n\nexport interface ListObjectProps {\n  index: number;\n  name: string;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  onDelete: (index: number) => void;\n  extra?: Record<string, any>;\n}\n\nexport const ListObject: React.FC<ListObjectProps> = ({\n  index,\n  name,\n  extra,\n  control,\n  register,\n  onDelete,\n  formState,\n  // onEdit,\n}) => {\n  const currentName = `${name}.${index}`;\n  return (\n    <Card variant={extra?.border && 'border'}>\n      <CardHeading>\n        {extra?.label.object.title} #{index + 1}\n      </CardHeading>\n      <CardContent>\n        <FieldObject\n          name={currentName}\n          formState={formState}\n          register={register}\n          control={control}\n          {...extra?.of}\n        />\n      </CardContent>\n      <CardAction>\n        <Button type=\"button\" variant=\"link\" onClick={() => onDelete(index)}>\n          {extra?.label.object.delete}\n        </Button>\n      </CardAction>\n    </Card>\n  );\n};\n"],
+  "mappings": "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",
+  "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  resetField?: UseFormReturn['resetField'];\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`,

package/cjs/inputs/AutoCompleteInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/inputs/AutoCompleteInput/index.tsx"],
-  "sourcesContent": ["import React, { useCallback } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport { Hint } from '@digigov/react-core/Hint';\nimport UIAutoComplete, {\n  AutoCompleteProps as UIAutoCompleteProps,\n} from '@digigov/ui/form/AutoComplete';\nimport { Base } from '@digigov/react-core/Base';\n\nexport interface AutoCompleteInputExtra\n  extends Omit<\n    UIAutoCompleteProps,\n    | 'source'\n    | 'id'\n    | 'templates'\n    | 'defaultValue'\n    | 'onConfirm'\n    | 'dropdownArrow'\n  > {\n  options: Array<FieldOptionProps>;\n}\n\nexport interface AutoCompleteInputProps\n  extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'extra'> {\n  extra: AutoCompleteInputExtra;\n  value: string;\n  onChange: (v: string | string[] | undefined) => void;\n}\n\nexport const AutoCompleteInput: React.FC<AutoCompleteInputProps> = ({\n  name,\n  type,\n  extra: { options },\n  onChange,\n  value,\n  error,\n  ...props\n}) => {\n  const suggest = useCallback(function suggest(\n    query: string,\n    syncResults: (options: any[]) => void\n  ): void {\n    syncResults(\n      query\n        ? options.filter(function (option) {\n          return (\n            `${option.value} ${option.label?.primary || ''} ${option.label?.secondary || ''\n              }`\n              .toLowerCase()\n              .indexOf(query.toLowerCase()) !== -1\n          );\n        })\n        : options\n    );\n  },\n    [options]);\n\n  return (\n    <UIAutoComplete\n      multiple={type === 'choice:multiple' ? true : false}\n      source={suggest}\n      onConfirm={(value) => {\n        if (Array.isArray(value)) {\n          const selectedValues = value.map(item => item.value);\n          selectedValues.length > 0 ? onChange(selectedValues) : onChange(undefined);\n        } else {\n          onChange(value.value);\n        }\n      }}\n      templates={{\n        suggestion({ label, value }) {\n          return (\n            <Base as=\"div\">\n              {(label && label.primary && label.primary) || value}\n              {label && label.secondary && <Hint>{label.secondary}</Hint>}\n            </Base>\n          );\n        },\n        inputValue: (option) => {\n          if (!option) {\n            return '';\n          }\n          return option.label.primary || option.value;\n        },\n      }}\n      {...{\n        ...props,\n        reset: undefined,\n        required: undefined,\n      }}\n      name={name}\n      id={`${name}-id`}\n      defaultValue={value}\n    />\n  );\n};\n\nexport default AutoCompleteInput;"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAmC;AAGnC,kBAAqB;AACrB,0BAEO;AACP,kBAAqB;AAsBd,MAAM,oBAAsD,CAAC;AAAA,EAClE;AAAA,EACA;AAAA,EACA,OAAO,EAAE,QAAQ;AAAA,EACjB;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,cAAU;AAAA,IAAY,SAASA,SACnC,OACA,aACM;AACN;AAAA,QACE,QACI,QAAQ,OAAO,SAAU,QAAQ;AACjC,iBACE,GAAG,OAAO,KAAK,IAAI,OAAO,OAAO,WAAW,EAAE,IAAI,OAAO,OAAO,aAAa,EAC3E,GACC,YAAY,EACZ,QAAQ,MAAM,YAAY,CAAC,MAAM;AAAA,QAExC,CAAC,IACC;AAAA,MACN;AAAA,IACF;AAAA,IACE,CAAC,OAAO;AAAA,EAAC;AAEX,SACE,6BAAAC,QAAA;AAAA,IAAC,oBAAAC;AAAA,IAAA;AAAA,MACC,UAAU,SAAS,oBAAoB,OAAO;AAAA,MAC9C,QAAQ;AAAA,MACR,WAAW,CAACC,WAAU;AACpB,YAAI,MAAM,QAAQA,MAAK,GAAG;AACxB,gBAAM,iBAAiBA,OAAM,IAAI,UAAQ,KAAK,KAAK;AACnD,yBAAe,SAAS,IAAI,SAAS,cAAc,IAAI,SAAS,MAAS;AAAA,QAC3E,OAAO;AACL,mBAASA,OAAM,KAAK;AAAA,QACtB;AAAA,MACF;AAAA,MACA,WAAW;AAAA,QACT,WAAW,EAAE,OAAO,OAAAA,OAAM,GAAG;AAC3B,iBACE,6BAAAF,QAAA,cAAC,oBAAK,IAAG,SACL,SAAS,MAAM,WAAW,MAAM,WAAYE,QAC7C,SAAS,MAAM,aAAa,6BAAAF,QAAA,cAAC,wBAAM,MAAM,SAAU,CACtD;AAAA,QAEJ;AAAA,QACA,YAAY,CAAC,WAAW;AACtB,cAAI,CAAC,QAAQ;AACX,mBAAO;AAAA,UACT;AACA,iBAAO,OAAO,MAAM,WAAW,OAAO;AAAA,QACxC;AAAA,MACF;AAAA,MACC,GAAG;AAAA,QACF,GAAG;AAAA,QACH,OAAO;AAAA,QACP,UAAU;AAAA,MACZ;AAAA,MACA;AAAA,MACA,IAAI,GAAG,IAAI;AAAA,MACX,cAAc;AAAA;AAAA,EAChB;AAEJ;AAEA,IAAO,4BAAQ;",
-  "names": ["suggest", "React", "UIAutoComplete", "value"]
+  "sourcesContent": ["import React, { useCallback } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport {\n  AutoComplete,\n  AutoCompleteProps as UIAutoCompleteProps,\n} from '@digigov/ui/form/AutoComplete';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Base } from '@digigov/ui/utils/Base';\nexport interface AutoCompleteInputExtra\n  extends Omit<\n    UIAutoCompleteProps,\n    | 'source'\n    | 'id'\n    | 'templates'\n    | 'defaultValue'\n    | 'onConfirm'\n    | 'dropdownArrow'\n  > {\n  options: FieldOptionProps[];\n}\n\nexport interface AutoCompleteInputProps\n  extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'extra'> {\n  extra: AutoCompleteInputExtra;\n  value: string;\n  onChange: (v: string | string[] | undefined) => void;\n}\n\nexport const AutoCompleteInput: React.FC<AutoCompleteInputProps> = ({\n  name,\n  type,\n  extra: { options },\n  onChange,\n  value,\n  ...props\n}) => {\n  const suggest = useCallback(\n    function suggest(\n      query: string,\n      syncResults: (options: any[]) => void\n    ): void {\n      syncResults(\n        query\n          ? options.filter(function (option) {\n              return (\n                `${option.value} ${option.label?.primary || ''} ${\n                  option.label?.secondary || ''\n                }`\n                  .toLowerCase()\n                  .indexOf(query.toLowerCase()) !== -1\n              );\n            })\n          : options\n      );\n    },\n    [options]\n  );\n\n  return (\n    <AutoComplete\n      multiple={type === 'choice:multiple' ? true : false}\n      source={suggest}\n      onConfirm={(value) => {\n        if (Array.isArray(value)) {\n          const selectedValues = value.map((item) => item.value);\n          if (selectedValues.length > 0) onChange(selectedValues);\n          else onChange(undefined);\n        } else {\n          onChange(value.value);\n        }\n      }}\n      templates={{\n        suggestion({ label, value }) {\n          return (\n            <Base as=\"div\">\n              {(label && label.primary && label.primary) || value}\n              {label && label.secondary && <Hint>{label.secondary}</Hint>}\n            </Base>\n          );\n        },\n        inputValue: (option) => {\n          if (!option) {\n            return '';\n          }\n          return option.label.primary || option.value;\n        },\n      }}\n      {...{\n        ...props,\n        reset: undefined,\n        required: undefined,\n        Field: undefined,\n      }}\n      name={name}\n      id={`${name}-id`}\n      defaultValue={value}\n    />\n  );\n};\n\nexport default AutoCompleteInput;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAmC;AAGnC,0BAGO;AACP,kBAAqB;AACrB,kBAAqB;AAqBd,MAAM,oBAAsD,CAAC;AAAA,EAClE;AAAA,EACA;AAAA,EACA,OAAO,EAAE,QAAQ;AAAA,EACjB;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,cAAU;AAAA,IACd,SAASA,SACP,OACA,aACM;AACN;AAAA,QACE,QACI,QAAQ,OAAO,SAAU,QAAQ;AAC/B,iBACE,GAAG,OAAO,KAAK,IAAI,OAAO,OAAO,WAAW,EAAE,IAC5C,OAAO,OAAO,aAAa,EAC7B,GACG,YAAY,EACZ,QAAQ,MAAM,YAAY,CAAC,MAAM;AAAA,QAExC,CAAC,IACD;AAAA,MACN;AAAA,IACF;AAAA,IACA,CAAC,OAAO;AAAA,EACV;AAEA,SACE,6BAAAC,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,UAAU,SAAS,oBAAoB,OAAO;AAAA,MAC9C,QAAQ;AAAA,MACR,WAAW,CAACC,WAAU;AACpB,YAAI,MAAM,QAAQA,MAAK,GAAG;AACxB,gBAAM,iBAAiBA,OAAM,IAAI,CAAC,SAAS,KAAK,KAAK;AACrD,cAAI,eAAe,SAAS,EAAG,UAAS,cAAc;AAAA,cACjD,UAAS,MAAS;AAAA,QACzB,OAAO;AACL,mBAASA,OAAM,KAAK;AAAA,QACtB;AAAA,MACF;AAAA,MACA,WAAW;AAAA,QACT,WAAW,EAAE,OAAO,OAAAA,OAAM,GAAG;AAC3B,iBACE,6BAAAD,QAAA,cAAC,oBAAK,IAAG,SACL,SAAS,MAAM,WAAW,MAAM,WAAYC,QAC7C,SAAS,MAAM,aAAa,6BAAAD,QAAA,cAAC,wBAAM,MAAM,SAAU,CACtD;AAAA,QAEJ;AAAA,QACA,YAAY,CAAC,WAAW;AACtB,cAAI,CAAC,QAAQ;AACX,mBAAO;AAAA,UACT;AACA,iBAAO,OAAO,MAAM,WAAW,OAAO;AAAA,QACxC;AAAA,MACF;AAAA,MACC,GAAG;AAAA,QACF,GAAG;AAAA,QACH,OAAO;AAAA,QACP,UAAU;AAAA,QACV,OAAO;AAAA,MACT;AAAA,MACA;AAAA,MACA,IAAI,GAAG,IAAI;AAAA,MACX,cAAc;AAAA;AAAA,EAChB;AAEJ;AAEA,IAAO,4BAAQ;",
+  "names": ["suggest", "React", "value"]
 }

package/cjs/inputs/Checkboxes/index.js

@@ -32,11 +32,9 @@ __export(Checkboxes_exports, {
 });
 module.exports = __toCommonJS(Checkboxes_exports);
 var import_react = __toESM(require("react"));
-var import_Checkbox = __toESM(require("@digigov/react-core/Checkbox"));
-var import_CheckboxConditional = require("@digigov/react-core/CheckboxConditional");
-var import_CheckboxItem = __toESM(require("@digigov/react-core/CheckboxItem"));
-var import_Hint = __toESM(require("@digigov/react-core/Hint"));
+var import_Checkbox = require("@digigov/ui/form/Checkbox");
 var import_i18n = require("@digigov/ui/i18n");
+var import_Hint = require("@digigov/ui/typography/Hint");
 const Checkboxes = ({
   name,
   onChange,
@@ -66,7 +64,7 @@ const Checkboxes = ({
   const [checked, setChecked] = (0, import_react.useState)(
     Array(options.length).fill(false)
   );
-  return /* @__PURE__ */ import_react.default.createElement(import_Checkbox.default, { className }, options.map(
+  return /* @__PURE__ */ import_react.default.createElement(import_Checkbox.Checkbox, { className }, options.map(
     ({
       label,
       value: v,
@@ -75,10 +73,11 @@ const Checkboxes = ({
       selected,
       ...option
     }, index) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, { key: index }, /* @__PURE__ */ import_react.default.createElement(
-      import_CheckboxItem.default,
+      import_Checkbox.CheckboxItem,
       {
         key: `${name}.${index}`,
         name: `${name}.${v}`,
+        id: `${name}.${v}`,
         value: v,
         disabled: disabled || optionDisabled,
         checked: value?.includes(v),
@@ -88,6 +87,7 @@ const Checkboxes = ({
           ...props,
           reset: void 0,
           defaultValue: void 0,
+          error: void 0,
           onBlur: void 0,
           required: void 0,
           "aria-describedby": void 0,
@@ -95,8 +95,8 @@ const Checkboxes = ({
         }
       },
       label && label.primary && t(label.primary) || value,
-      label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.default, null, t(label.secondary))
-    ), !!checked[index] && show && Field && /* @__PURE__ */ import_react.default.createElement(import_CheckboxConditional.CheckboxConditional, null, show.map((fieldName) => /* @__PURE__ */ import_react.default.createElement(Field, { name: fieldName, key: fieldName }))), selected && selected())
+      label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, t(label.secondary))
+    ), !!checked[index] && show && Field && /* @__PURE__ */ import_react.default.createElement(import_Checkbox.CheckboxConditional, null, show.map((fieldName) => /* @__PURE__ */ import_react.default.createElement(Field, { name: fieldName, key: fieldName }))), selected && selected())
   ));
 };
 var Checkboxes_default = Checkboxes;

package/cjs/inputs/Checkboxes/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/inputs/Checkboxes/index.tsx"],
-  "sourcesContent": ["import React, { useState } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport CoreCheckboxes from '@digigov/react-core/Checkbox';\nimport { CheckboxConditional } from '@digigov/react-core/CheckboxConditional';\nimport CheckboxItem from '@digigov/react-core/CheckboxItem';\nimport Hint from '@digigov/react-core/Hint';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: Array<FieldOptionProps>;\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n}\n\nexport const Checkboxes: React.FC<CheckboxesProps> = ({\n  name,\n  onChange,\n  value,\n  extra: { options, className },\n  disabled,\n  Field,\n  ...props\n}) => {\n  if (!value) value = [];\n  const handleChange =\n    (optionValue, idx, show) =>\n      (evt): void => {\n        let newValue;\n        if (evt.currentTarget.checked) {\n          // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n          // @ts-ignore\n          newValue = value.concat([optionValue]);\n        } else {\n          // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n          // @ts-ignore\n          newValue = value.filter((val) => val !== optionValue);\n        }\n        if (show && show.length > 0) {\n          setChecked((items) =>\n            items.map((item, index) => (index === idx ? !item : item))\n          );\n        }\n\n        // reset value to undefined instead of an empty array\n        // so the error state mechanism can throw validation errors\n        if (newValue.length === 0) newValue = undefined;\n        onChange(newValue);\n      };\n  const { t } = useTranslation();\n  const [checked, setChecked] = useState(\n    Array<boolean>(options.length).fill(false)\n  );\n  return (\n    <CoreCheckboxes className={className}>\n      {options.map(\n        (\n          {\n            label,\n            value: v,\n            show,\n            disabled: optionDisabled,\n            selected,\n            ...option\n          },\n          index\n        ) => (\n          <React.Fragment key={index}>\n            <CheckboxItem\n              key={`${name}.${index}`}\n              name={`${name}.${v}`}\n              value={v}\n              disabled={disabled || optionDisabled}\n              checked={value?.includes(v)}\n              onChange={handleChange(v, index, show)}\n              {...option}\n              {...{\n                ...props,\n                reset: undefined,\n                defaultValue: undefined,\n                onBlur: undefined,\n                required: undefined,\n                'aria-describedby': undefined,\n                type: 'checkbox',\n              }}\n            >\n              {(label && label.primary && t(label.primary)) || value}\n              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            </CheckboxItem>\n\n            {!!checked[index] && show && Field && (\n              <CheckboxConditional>\n                {show.map((fieldName) => (\n                  <Field name={fieldName} key={fieldName} />\n                ))}\n              </CheckboxConditional>\n            )}\n            {selected && selected()}\n          </React.Fragment>\n        )\n      )}\n    </CoreCheckboxes>\n  );\n};\n\nexport default Checkboxes;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAGhC,sBAA2B;AAC3B,iCAAoC;AACpC,0BAAyB;AACzB,kBAAiB;AACjB,kBAA+B;AAYxB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO,EAAE,SAAS,UAAU;AAAA,EAC5B;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,QAAM,eACJ,CAAC,aAAa,KAAK,SACjB,CAAC,QAAc;AACb,QAAI;AACJ,QAAI,IAAI,cAAc,SAAS;AAG7B,iBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,IACvC,OAAO;AAGL,iBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,IACtD;AACA,QAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,QAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,MAC3D;AAAA,IACF;AAIA,QAAI,SAAS,WAAW,EAAG,YAAW;AACtC,aAAS,QAAQ;AAAA,EACnB;AACJ,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,CAAC,SAAS,UAAU,QAAI;AAAA,IAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,EAC3C;AACA,SACE,6BAAAA,QAAA,cAAC,gBAAAC,SAAA,EAAe,aACb,QAAQ;AAAA,IACP,CACE;AAAA,MACE;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA,GAAG;AAAA,IACL,GACA,UAEA,6BAAAD,QAAA,cAAC,aAAAA,QAAM,UAAN,EAAe,KAAK,SACnB,6BAAAA,QAAA;AAAA,MAAC,oBAAAE;AAAA,MAAA;AAAA,QACC,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,QACrB,MAAM,GAAG,IAAI,IAAI,CAAC;AAAA,QAClB,OAAO;AAAA,QACP,UAAU,YAAY;AAAA,QACtB,SAAS,OAAO,SAAS,CAAC;AAAA,QAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,QACpC,GAAG;AAAA,QACH,GAAG;AAAA,UACF,GAAG;AAAA,UACH,OAAO;AAAA,UACP,cAAc;AAAA,UACd,QAAQ;AAAA,UACR,UAAU;AAAA,UACV,oBAAoB;AAAA,UACpB,MAAM;AAAA,QACR;AAAA;AAAA,MAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,MAChD,SAAS,MAAM,aAAa,6BAAAF,QAAA,cAAC,YAAAG,SAAA,MAAM,EAAE,MAAM,SAAS,CAAE;AAAA,IACzD,GAEC,CAAC,CAAC,QAAQ,KAAK,KAAK,QAAQ,SAC3B,6BAAAH,QAAA,cAAC,sDACE,KAAK,IAAI,CAAC,cACT,6BAAAA,QAAA,cAAC,SAAM,MAAM,WAAW,KAAK,WAAW,CACzC,CACH,GAED,YAAY,SAAS,CACxB;AAAA,EAEJ,CACF;AAEJ;AAEA,IAAO,qBAAQ;",
-  "names": ["React", "CoreCheckboxes", "CheckboxItem", "Hint"]
+  "sourcesContent": ["import React, { useState } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport {\n  Checkbox,\n  CheckboxItem,\n  CheckboxConditional,\n} from '@digigov/ui/form/Checkbox';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: FieldOptionProps[];\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n}\n\nexport const Checkboxes: React.FC<CheckboxesProps> = ({\n  name,\n  onChange,\n  value,\n  extra: { options, className },\n  disabled,\n  Field,\n  ...props\n}) => {\n  if (!value) value = [];\n  const handleChange =\n    (optionValue, idx, show) =>\n    (evt): void => {\n      let newValue;\n      if (evt.currentTarget.checked) {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.concat([optionValue]);\n      } else {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.filter((val) => val !== optionValue);\n      }\n      if (show && show.length > 0) {\n        setChecked((items) =>\n          items.map((item, index) => (index === idx ? !item : item))\n        );\n      }\n\n      // reset value to undefined instead of an empty array\n      // so the error state mechanism can throw validation errors\n      if (newValue.length === 0) newValue = undefined;\n      onChange(newValue);\n    };\n  const { t } = useTranslation();\n  const [checked, setChecked] = useState(\n    Array<boolean>(options.length).fill(false)\n  );\n  return (\n    <Checkbox className={className}>\n      {options.map(\n        (\n          {\n            label,\n            value: v,\n            show,\n            disabled: optionDisabled,\n            selected,\n            ...option\n          },\n          index\n        ) => (\n          <React.Fragment key={index}>\n            <CheckboxItem\n              key={`${name}.${index}`}\n              name={`${name}.${v}`}\n              id={`${name}.${v}`}\n              value={v}\n              disabled={disabled || optionDisabled}\n              checked={value?.includes(v)}\n              onChange={handleChange(v, index, show)}\n              {...option}\n              {...{\n                ...props,\n                reset: undefined,\n                defaultValue: undefined,\n                error: undefined,\n                onBlur: undefined,\n                required: undefined,\n                'aria-describedby': undefined,\n                type: 'checkbox',\n              }}\n            >\n              {(label && label.primary && t(label.primary)) || value}\n              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            </CheckboxItem>\n\n            {!!checked[index] && show && Field && (\n              <CheckboxConditional>\n                {show.map((fieldName) => (\n                  <Field name={fieldName} key={fieldName} />\n                ))}\n              </CheckboxConditional>\n            )}\n            {selected && selected()}\n          </React.Fragment>\n        )\n      )}\n    </Checkbox>\n  );\n};\n\nexport default Checkboxes;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAGhC,sBAIO;AACP,kBAA+B;AAC/B,kBAAqB;AAYd,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO,EAAE,SAAS,UAAU;AAAA,EAC5B;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,QAAM,eACJ,CAAC,aAAa,KAAK,SACnB,CAAC,QAAc;AACb,QAAI;AACJ,QAAI,IAAI,cAAc,SAAS;AAG7B,iBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,IACvC,OAAO;AAGL,iBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,IACtD;AACA,QAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,QAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,MAC3D;AAAA,IACF;AAIA,QAAI,SAAS,WAAW,EAAG,YAAW;AACtC,aAAS,QAAQ;AAAA,EACnB;AACF,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,CAAC,SAAS,UAAU,QAAI;AAAA,IAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,EAC3C;AACA,SACE,6BAAAA,QAAA,cAAC,4BAAS,aACP,QAAQ;AAAA,IACP,CACE;AAAA,MACE;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA,GAAG;AAAA,IACL,GACA,UAEA,6BAAAA,QAAA,cAAC,aAAAA,QAAM,UAAN,EAAe,KAAK,SACnB,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,QACrB,MAAM,GAAG,IAAI,IAAI,CAAC;AAAA,QAClB,IAAI,GAAG,IAAI,IAAI,CAAC;AAAA,QAChB,OAAO;AAAA,QACP,UAAU,YAAY;AAAA,QACtB,SAAS,OAAO,SAAS,CAAC;AAAA,QAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,QACpC,GAAG;AAAA,QACH,GAAG;AAAA,UACF,GAAG;AAAA,UACH,OAAO;AAAA,UACP,cAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UACR,UAAU;AAAA,UACV,oBAAoB;AAAA,UACpB,MAAM;AAAA,QACR;AAAA;AAAA,MAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,MAChD,SAAS,MAAM,aAAa,6BAAAA,QAAA,cAAC,wBAAM,EAAE,MAAM,SAAS,CAAE;AAAA,IACzD,GAEC,CAAC,CAAC,QAAQ,KAAK,KAAK,QAAQ,SAC3B,6BAAAA,QAAA,cAAC,2CACE,KAAK,IAAI,CAAC,cACT,6BAAAA,QAAA,cAAC,SAAM,MAAM,WAAW,KAAK,WAAW,CACzC,CACH,GAED,YAAY,SAAS,CACxB;AAAA,EAEJ,CACF;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["React"]
 }

package/cjs/inputs/DateInput/index.js

@@ -34,52 +34,61 @@ module.exports = __toCommonJS(DateInput_exports);
 var import_react = __toESM(require("react"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
-var import_DateInputContainer = __toESM(require("@digigov/react-core/DateInputContainer"));
-var import_DateInputItem = __toESM(require("@digigov/react-core/DateInputItem"));
+var import_FormBuilder = require("@digigov/form/FormBuilder");
+var import_DateInputContainer = require("@digigov/ui/form/DateInputContainer");
 var import_i18n = require("@digigov/ui/i18n");
 import_dayjs.default.extend(import_customParseFormat.default);
-function useDate(value, onChange) {
+function useDate(name, value, form) {
   const [year, month, day] = (0, import_react.useMemo)(() => {
     if (!value || value.length === 0) {
-      onChange("");
+      update("");
       return ["", "", ""];
     }
     const [day2, month2, year2] = value.split("/");
     return [year2, month2, day2];
   }, [value]);
+  function update(value2) {
+    form.setValue(name, value2, { shouldValidate: false });
+  }
   function set(year2, month2, day2) {
     const value2 = `${day2 || ""}/${month2 || ""}/${year2 || ""}`;
     if (!year2 && !month2 && !day2) {
-      onChange(null);
+      update("");
     } else {
-      onChange(value2);
+      update(value2);
     }
   }
   function setYear(evt) {
-    const val = evt.target.value;
+    const val = evt.target.value.trim();
     set(val, month, day);
   }
   function setMonth(evt, cast) {
-    let val = evt.target.value;
+    let val = evt.target.value.trim();
     if (cast && val && val.length === 1) {
       val = "0" + val;
     }
     set(year, val, day);
   }
   function setDay(evt, cast) {
-    let val = evt.target.value;
+    let val = evt.target.value.trim();
     if (cast && val && val.length === 1) {
       val = "0" + val;
     }
     set(year, month, val);
   }
+  function trigger() {
+    if (form.formState.isSubmitted) {
+      form.trigger(name);
+    }
+  }
   return {
     day,
     month,
     year,
     setYear,
     setMonth,
-    setDay
+    setDay,
+    trigger
   };
 }
 const VALID_FORMATS = ["DD/MM/YYYY"];
@@ -91,9 +100,9 @@ const makeDate = (val) => {
   return "";
 };
 const DatePart = ({ label, ...props }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_DateInputItem.default, { ...props }, label);
+  return /* @__PURE__ */ import_react.default.createElement(import_DateInputContainer.DateInputItem, { ...props }, label);
 };
-const DateInput = ({ name, type, ...props }) => {
+const DateInput = ({ name, ...props }) => {
   const { t } = (0, import_i18n.useTranslation)();
   const [initial] = (0, import_react.useState)(props.value);
   const value = (0, import_react.useMemo)(() => {
@@ -102,16 +111,18 @@ const DateInput = ({ name, type, ...props }) => {
     }
     return props.value;
   }, [props.value, initial]);
-  const date = useDate(value || makeDate(props.defaultValue), props.onChange);
-  return /* @__PURE__ */ import_react.default.createElement(import_DateInputContainer.default, null, /* @__PURE__ */ import_react.default.createElement(
+  const form = (0, import_FormBuilder.useFormContext)();
+  const date = useDate(name, value || makeDate(props.defaultValue), form);
+  return /* @__PURE__ */ import_react.default.createElement(import_DateInputContainer.DateInputContainer, null, /* @__PURE__ */ import_react.default.createElement(
     DatePart,
     {
       label: t("form.label.day"),
       onChange: date.setDay,
-      onBlur: (e) => date.setDay(e, true),
+      onBlur: date.trigger,
       value: date.day,
       width: 2,
       name: `${name}-day`,
+      id: `${name}-day`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
@@ -122,10 +133,11 @@ const DateInput = ({ name, type, ...props }) => {
     {
       label: t("form.label.month"),
       onChange: date.setMonth,
-      onBlur: (e) => date.setMonth(e, true),
+      onBlur: date.trigger,
       value: date.month,
       width: 2,
       name: `${name}-month`,
+      id: `${name}-month`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
@@ -136,9 +148,11 @@ const DateInput = ({ name, type, ...props }) => {
     {
       label: t("form.label.year"),
       onChange: date.setYear,
+      onBlur: date.trigger,
       value: date.year,
       width: 4,
       name: `${name}-year`,
+      id: `${name}-year`,
       maxLength: "4",
       disabled: props.disabled,
       "aria-required": props["aria-required"],