@digigov/form 2.0.0-a402a664 → 2.0.0-abd768eb

package/inputs/DateInput/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from "react";
+import React, { useMemo, useEffect } from "react";
 import dayjs from "dayjs";
 import customParseFormat from "dayjs/plugin/customParseFormat";
 import { useFormContext } from "@digigov/form/FormContext";
@@ -11,7 +11,6 @@ dayjs.extend(customParseFormat);
 function useDate(name, value, form) {
   const [year, month, day] = useMemo(() => {
     if (!value || value.length === 0) {
-      update("");
       return ["", "", ""];
     }
     const [day2, month2, year2] = value.split("/");
@@ -74,21 +73,32 @@ const DatePart = ({ label, ...props }) => {
 };
 const DateInput = ({ name, ...props }) => {
   const { t } = useTranslation();
-  const [initial] = useState(props.value);
-  const value = useMemo(() => {
-    if (initial === props.value) {
-      return makeDate(props.value);
-    }
-    return props.value;
-  }, [props.value, initial]);
   const form = useFormContext();
-  const date = useDate(name, value || makeDate(props.defaultValue), form);
+  useEffect(() => {
+    const initialValue = form.getValues(name);
+    if (initialValue === void 0 && props.defaultValue) {
+      form.setValue(name, makeDate(props.defaultValue), {
+        shouldValidate: false
+      });
+    } else {
+      form.setValue(name, makeDate(initialValue), {
+        shouldValidate: false
+      });
+    }
+  }, []);
+  const value = form.getValues(name);
+  const date = useDate(name, value, form);
   return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
     DatePart,
     {
       label: t("form.label.day"),
       onChange: date.setDay,
-      onBlur: date.trigger,
+      onBlur: (e) => {
+        if (date.day && date.day.length === 1) {
+          date.setDay(e, true);
+        }
+        date.trigger();
+      },
       value: date.day,
       width: 2,
       name: `${name}-day`,
@@ -103,7 +113,12 @@ const DateInput = ({ name, ...props }) => {
     {
       label: t("form.label.month"),
       onChange: date.setMonth,
-      onBlur: date.trigger,
+      onBlur: (e) => {
+        if (date.month && date.month.length === 1) {
+          date.setMonth(e, true);
+        }
+        date.trigger();
+      },
       value: date.month,
       width: 2,
       name: `${name}-month`,

package/inputs/DateInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/DateInput/index.tsx"],
-  "sourcesContent": ["import React, { useMemo, useState } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport {\n  DateInputContainer,\n  DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    max?: string;\n    min?: string;\n  };\n}\n\nfunction useDate(name, value, form) {\n  const [year, month, day] = useMemo(() => {\n    if (!value || value.length === 0) {\n      update('');\n      return ['', '', ''];\n    }\n    const [day, month, year] = value.split('/');\n    return [year, month, day];\n  }, [value]);\n\n  function update(value) {\n    form.setValue(name, value, { shouldValidate: false });\n  }\n\n  function set(year, month, day) {\n    const value = `${day || ''}/${month || ''}/${year || ''}`;\n    if (!year && !month && !day) {\n      update('');\n    } else {\n      update(value);\n    }\n  }\n\n  function setYear(evt) {\n    const val = evt.target.value.trim();\n    set(val, month, day);\n  }\n\n  function setMonth(evt, cast) {\n    let val = evt.target.value.trim();\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, val, day);\n  }\n\n  function setDay(evt, cast) {\n    let val = evt.target.value.trim();\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, val);\n  }\n\n  function trigger() {\n    if (form.formState.isSubmitted) {\n      form.trigger(name);\n    }\n  }\n\n  return {\n    day,\n    month,\n    year,\n    setYear,\n    setMonth,\n    setDay,\n    trigger,\n  };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY'];\n\nconst makeDate = (val) => {\n  const date = dayjs(val, VALID_FORMATS, true);\n  if (date.isValid()) {\n    return date.format('DD/MM/YYYY');\n  }\n  return '';\n};\n\nconst DatePart = ({ label, ...props }) => {\n  return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateInput = ({ name, ...props }) => {\n  const { t } = useTranslation();\n  const [initial] = useState(props.value);\n  const value = useMemo(() => {\n    if (initial === props.value) {\n      return makeDate(props.value);\n    }\n    return props.value;\n  }, [props.value, initial]);\n\n  const form = useFormContext();\n  const date = useDate(name, value || makeDate(props.defaultValue), form);\n\n  return (\n    <DateInputContainer>\n      <DatePart\n        label={t('form.label.day')}\n        onChange={date.setDay}\n        onBlur={date.trigger}\n        value={date.day}\n        width={2}\n        name={`${name}-day`}\n        id={`${name}-day`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!date.day ? props.error : false}\n      />\n      <DatePart\n        label={t('form.label.month')}\n        onChange={date.setMonth}\n        onBlur={date.trigger}\n        value={date.month}\n        width={2}\n        name={`${name}-month`}\n        id={`${name}-month`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!date.month ? props.error : false}\n      />\n      <DatePart\n        label={t('form.label.year')}\n        onChange={date.setYear}\n        onBlur={date.trigger}\n        value={date.year}\n        width={4}\n        name={`${name}-year`}\n        id={`${name}-year`}\n        maxLength=\"4\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!date.year ? props.error : false}\n      />\n    </DateInputContainer>\n  );\n};\n\nexport default DateInput;\n"],
-  "mappings": "AAAA,OAAO,SAAS,SAAS,gBAAgB;AACzC,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAE9B,SAAS,sBAAsB;AAC/B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,MAAM,OAAO,iBAAiB;AAS9B,SAAS,QAAQ,MAAM,OAAO,MAAM;AAClC,QAAM,CAAC,MAAM,OAAO,GAAG,IAAI,QAAQ,MAAM;AACvC,QAAI,CAAC,SAAS,MAAM,WAAW,GAAG;AAChC,aAAO,EAAE;AACT,aAAO,CAAC,IAAI,IAAI,EAAE;AAAA,IACpB;AACA,UAAM,CAACA,MAAKC,QAAOC,KAAI,IAAI,MAAM,MAAM,GAAG;AAC1C,WAAO,CAACA,OAAMD,QAAOD,IAAG;AAAA,EAC1B,GAAG,CAAC,KAAK,CAAC;AAEV,WAAS,OAAOG,QAAO;AACrB,SAAK,SAAS,MAAMA,QAAO,EAAE,gBAAgB,MAAM,CAAC;AAAA,EACtD;AAEA,WAAS,IAAID,OAAMD,QAAOD,MAAK;AAC7B,UAAMG,SAAQ,GAAGH,QAAO,EAAE,IAAIC,UAAS,EAAE,IAAIC,SAAQ,EAAE;AACvD,QAAI,CAACA,SAAQ,CAACD,UAAS,CAACD,MAAK;AAC3B,aAAO,EAAE;AAAA,IACX,OAAO;AACL,aAAOG,MAAK;AAAA,IACd;AAAA,EACF;AAEA,WAAS,QAAQ,KAAK;AACpB,UAAM,MAAM,IAAI,OAAO,MAAM,KAAK;AAClC,QAAI,KAAK,OAAO,GAAG;AAAA,EACrB;AAEA,WAAS,SAAS,KAAK,MAAM;AAC3B,QAAI,MAAM,IAAI,OAAO,MAAM,KAAK;AAChC,QAAI,QAAQ,OAAO,IAAI,WAAW,GAAG;AACnC,YAAM,MAAM;AAAA,IACd;AACA,QAAI,MAAM,KAAK,GAAG;AAAA,EACpB;AAEA,WAAS,OAAO,KAAK,MAAM;AACzB,QAAI,MAAM,IAAI,OAAO,MAAM,KAAK;AAChC,QAAI,QAAQ,OAAO,IAAI,WAAW,GAAG;AACnC,YAAM,MAAM;AAAA,IACd;AACA,QAAI,MAAM,OAAO,GAAG;AAAA,EACtB;AAEA,WAAS,UAAU;AACjB,QAAI,KAAK,UAAU,aAAa;AAC9B,WAAK,QAAQ,IAAI;AAAA,IACnB;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAEA,MAAM,gBAAgB,CAAC,YAAY;AAEnC,MAAM,WAAW,CAAC,QAAQ;AACxB,QAAM,OAAO,MAAM,KAAK,eAAe,IAAI;AAC3C,MAAI,KAAK,QAAQ,GAAG;AAClB,WAAO,KAAK,OAAO,YAAY;AAAA,EACjC;AACA,SAAO;AACT;AAEA,MAAM,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,MAAM;AACxC,SAAO,oCAAC,iBAAe,GAAG,SAAQ,KAAM;AAC1C;AAEO,MAAM,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,MAAM;AAC/C,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,CAAC,OAAO,IAAI,SAAS,MAAM,KAAK;AACtC,QAAM,QAAQ,QAAQ,MAAM;AAC1B,QAAI,YAAY,MAAM,OAAO;AAC3B,aAAO,SAAS,MAAM,KAAK;AAAA,IAC7B;AACA,WAAO,MAAM;AAAA,EACf,GAAG,CAAC,MAAM,OAAO,OAAO,CAAC;AAEzB,QAAM,OAAO,eAAe;AAC5B,QAAM,OAAO,QAAQ,MAAM,SAAS,SAAS,MAAM,YAAY,GAAG,IAAI;AAEtE,SACE,oCAAC,0BACC;AAAA,IAAC;AAAA;AAAA,MACC,OAAO,EAAE,gBAAgB;AAAA,MACzB,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,MACb,OAAO,KAAK;AAAA,MACZ,OAAO;AAAA,MACP,MAAM,GAAG,IAAI;AAAA,MACb,IAAI,GAAG,IAAI;AAAA,MACX,WAAU;AAAA,MACV,UAAU,MAAM;AAAA,MAChB,iBAAe,MAAM,eAAe;AAAA,MACpC,OAAO,CAAC,KAAK,MAAM,MAAM,QAAQ;AAAA;AAAA,EACnC,GACA;AAAA,IAAC;AAAA;AAAA,MACC,OAAO,EAAE,kBAAkB;AAAA,MAC3B,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,MACb,OAAO,KAAK;AAAA,MACZ,OAAO;AAAA,MACP,MAAM,GAAG,IAAI;AAAA,MACb,IAAI,GAAG,IAAI;AAAA,MACX,WAAU;AAAA,MACV,UAAU,MAAM;AAAA,MAChB,iBAAe,MAAM,eAAe;AAAA,MACpC,OAAO,CAAC,KAAK,QAAQ,MAAM,QAAQ;AAAA;AAAA,EACrC,GACA;AAAA,IAAC;AAAA;AAAA,MACC,OAAO,EAAE,iBAAiB;AAAA,MAC1B,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,MACb,OAAO,KAAK;AAAA,MACZ,OAAO;AAAA,MACP,MAAM,GAAG,IAAI;AAAA,MACb,IAAI,GAAG,IAAI;AAAA,MACX,WAAU;AAAA,MACV,UAAU,MAAM;AAAA,MAChB,iBAAe,MAAM,eAAe;AAAA,MACpC,OAAO,CAAC,KAAK,OAAO,MAAM,QAAQ;AAAA;AAAA,EACpC,CACF;AAEJ;AAEA,IAAO,oBAAQ;",
+  "sourcesContent": ["import React, { useMemo, useEffect } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport {\n  DateInputContainer,\n  DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    max?: string;\n    min?: string;\n  };\n}\n\nfunction useDate(name, value, form) {\n  const [year, month, day] = useMemo(() => {\n    if (!value || value.length === 0) {\n      return ['', '', ''];\n    }\n    const [day, month, year] = value.split('/');\n    return [year, month, day];\n  }, [value]);\n\n  function update(value) {\n    form.setValue(name, value, { shouldValidate: false });\n  }\n\n  function set(year, month, day) {\n    const value = `${day || ''}/${month || ''}/${year || ''}`;\n    if (!year && !month && !day) {\n      update('');\n    } else {\n      update(value);\n    }\n  }\n\n  function setYear(evt) {\n    const val = evt.target.value.trim();\n    set(val, month, day);\n  }\n\n  function setMonth(evt, cast) {\n    let val = evt.target.value.trim();\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, val, day);\n  }\n\n  function setDay(evt, cast) {\n    let val = evt.target.value.trim();\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, val);\n  }\n\n  function trigger() {\n    if (form.formState.isSubmitted) {\n      form.trigger(name);\n    }\n  }\n\n  return {\n    day,\n    month,\n    year,\n    setYear,\n    setMonth,\n    setDay,\n    trigger,\n  };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY'];\n\nconst makeDate = (val) => {\n  const date = dayjs(val, VALID_FORMATS, true);\n  if (date.isValid()) {\n    return date.format('DD/MM/YYYY');\n  }\n  return '';\n};\n\nconst DatePart = ({ label, ...props }) => {\n  return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateInput = ({ name, ...props }) => {\n  const { t } = useTranslation();\n  const form = useFormContext();\n\n  useEffect(() => {\n    const initialValue = form.getValues(name);\n    // checks if the initial value is undefined and if the default value is valid  date\n    if (initialValue === undefined && props.defaultValue) {\n      form.setValue(name, makeDate(props.defaultValue), {\n        shouldValidate: false,\n      });\n    } else {\n      // checks if the initial value is a valid date\n      form.setValue(name, makeDate(initialValue), {\n        shouldValidate: false,\n      });\n    }\n  }, []);\n\n  const value = form.getValues(name);\n  const date = useDate(name, value, form);\n\n  return (\n    <DateInputContainer>\n      <DatePart\n        label={t('form.label.day')}\n        onChange={date.setDay}\n        onBlur={(e) => {\n          if (date.day && date.day.length === 1) {\n            date.setDay(e, true);\n          }\n          date.trigger();\n        }}\n        value={date.day}\n        width={2}\n        name={`${name}-day`}\n        id={`${name}-day`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!date.day ? props.error : false}\n      />\n      <DatePart\n        label={t('form.label.month')}\n        onChange={date.setMonth}\n        onBlur={(e) => {\n          if (date.month && date.month.length === 1) {\n            date.setMonth(e, true);\n          }\n          date.trigger();\n        }}\n        value={date.month}\n        width={2}\n        name={`${name}-month`}\n        id={`${name}-month`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!date.month ? props.error : false}\n      />\n      <DatePart\n        label={t('form.label.year')}\n        onChange={date.setYear}\n        onBlur={date.trigger}\n        value={date.year}\n        width={4}\n        name={`${name}-year`}\n        id={`${name}-year`}\n        maxLength=\"4\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!date.year ? props.error : false}\n      />\n    </DateInputContainer>\n  );\n};\n\nexport default DateInput;\n"],
+  "mappings": "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",
   "names": ["day", "month", "year", "value"]
 }

package/inputs/DateTimeInput/DateTimeInput.stories.d.ts

@@ -1,9 +1,14 @@
 declare namespace _default {
     export let title: string;
-    export { Default as component };
+    export { DateTimeInput as component };
     export let tags: string[];
     export { doc as markdown };
+    export let displayName: string;
 }
 export default _default;
-export { Default };
-import { Default } from './__stories__/Default';
+export { Default } from "@digigov/form/inputs/DateTimeInput/__stories__/Default";
+export { WithDefaultValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithDefaultValue";
+export { WithWrongDefaultValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithWrongDefaultValue";
+export { WithInitialValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithInitialValue";
+export { WithWrongInitialValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithWrongInitialValue";
+import DateTimeInput from '@digigov/form/inputs/DateTimeInput';

package/inputs/DateTimeInput/__stories__/WithDefaultValue.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const WithDefaultValue: (_: any) => React.JSX.Element;
+export default WithDefaultValue;

package/inputs/DateTimeInput/__stories__/WithInitialValue.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const WithInitialValue: (_: any) => React.JSX.Element;
+export default WithInitialValue;

package/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const WithWrongDefaultValue: (_: any) => React.JSX.Element;
+export default WithWrongDefaultValue;

package/inputs/DateTimeInput/__stories__/WithWrongInitialValue.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const WithWrongInitialValue: (_: any) => React.JSX.Element;
+export default WithWrongInitialValue;

package/inputs/DateTimeInput/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from "react";
+import React, { useMemo, useEffect } from "react";
 import dayjs from "dayjs";
 import customParseFormat from "dayjs/plugin/customParseFormat";
 import { useFormContext } from "@digigov/form/FormContext";
@@ -11,7 +11,6 @@ dayjs.extend(customParseFormat);
 function useDateTime(name, value, form) {
   const [year, month, day, hours, minutes] = useMemo(() => {
     if (!value || value.length === 0) {
-      update("");
       return ["", "", "", "", ""];
     }
     const [datePart, timePart] = value.split(" ");
@@ -96,93 +95,115 @@ const DateTimePart = ({ label, ...props }) => {
 };
 const DateTimeInput = ({ name, ...props }) => {
   const { t } = useTranslation();
-  const [initial] = useState(props.value);
-  const value = useMemo(() => {
-    if (initial === props.value) {
-      return makeDateTime(props.value);
-    }
-    return props.value;
-  }, [props.value, initial]);
   const form = useFormContext();
-  const datetime = useDateTime(
-    name,
-    value || makeDateTime(props.defaultValue),
-    form
-  );
+  useEffect(() => {
+    const initialValue = form.getValues(name);
+    if (initialValue === void 0 && props.defaultValue) {
+      form.setValue(name, makeDateTime(props.defaultValue), {
+        shouldValidate: false
+      });
+    } else {
+      form.setValue(name, makeDateTime(initialValue), {
+        shouldValidate: false
+      });
+    }
+  }, []);
+  const value = form.getValues(name);
+  const dateTime = useDateTime(name, value, form);
   return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
     DateTimePart,
     {
       label: t("form.label.day"),
-      onChange: datetime.setDay,
-      onBlur: datetime.trigger,
-      value: datetime.day,
+      onChange: dateTime.setDay,
+      onBlur: (e) => {
+        if (dateTime.day && dateTime.day.length === 1) {
+          dateTime.setDay(e, true);
+        }
+        dateTime.trigger();
+      },
+      value: dateTime.day,
       width: 2,
       name: `${name}-day`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
-      error: !datetime.day ? props.error : false,
+      error: !dateTime.day ? props.error : false,
       id: `${name}-day`
     }
   ), /* @__PURE__ */ React.createElement(
     DateTimePart,
     {
       label: t("form.label.month"),
-      onChange: datetime.setMonth,
-      onBlur: datetime.trigger,
-      value: datetime.month,
+      onChange: dateTime.setMonth,
+      onBlur: (e) => {
+        if (dateTime.month && dateTime.month.length === 1) {
+          dateTime.setMonth(e, true);
+        }
+        dateTime.trigger();
+      },
+      value: dateTime.month,
       width: 2,
       name: `${name}-month`,
       id: `${name}-month`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
-      error: !datetime.month ? props.error : false
+      error: !dateTime.month ? props.error : false
     }
   ), /* @__PURE__ */ React.createElement(
     DateTimePart,
     {
       label: t("form.label.year"),
-      onChange: datetime.setYear,
-      onBlur: datetime.trigger,
-      value: datetime.year,
+      onChange: dateTime.setYear,
+      onBlur: dateTime.trigger,
+      value: dateTime.year,
       width: 4,
       name: `${name}-year`,
       id: `${name}-year`,
       maxLength: "4",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
-      error: !datetime.year ? props.error : false
+      error: !dateTime.year ? props.error : false
     }
   ), /* @__PURE__ */ React.createElement(
     DateTimePart,
     {
       label: t("form.label.hours"),
-      onChange: datetime.setHours,
-      onBlur: datetime.trigger,
-      value: datetime.hours,
+      onChange: dateTime.setHours,
+      onBlur: (e) => {
+        if (dateTime.hours && dateTime.hours.length === 1) {
+          dateTime.setHours(e, true);
+        }
+        dateTime.trigger();
+      },
+      value: dateTime.hours,
       width: 2,
       name: `${name}-hours`,
       id: `${name}-hours`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
-      error: !datetime.hours ? props.error : false
+      error: !dateTime.hours ? props.error : false
     }
   ), /* @__PURE__ */ React.createElement(
     DateTimePart,
     {
       label: t("form.label.minutes"),
-      onChange: datetime.setMinutes,
-      onBlur: datetime.trigger,
-      value: datetime.minutes,
+      onChange: dateTime.setMinutes,
+      onBlur: (e) => {
+        if (dateTime.minutes && dateTime.minutes.length === 1) {
+          dateTime.setMinutes(e, true);
+        }
+        dateTime.trigger();
+      },
+      value: dateTime.minutes,
       width: 2,
       name: `${name}-minutes`,
       id: `${name}-minutes`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
-      error: !datetime.minutes ? props.error : false
+      error: !dateTime.minutes ? props.error : false
     }
   ));
 };

package/inputs/DateTimeInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/DateTimeInput/index.tsx"],
-  "sourcesContent": ["import React, { useMemo, useState } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport {\n  DateInputContainer,\n  DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateTimeInputProps\n  extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    max?: string;\n    min?: string;\n  };\n}\n\nfunction useDateTime(name, value, form) {\n  const [year, month, day, hours, minutes] = useMemo(() => {\n    if (!value || value.length === 0) {\n      update('');\n      return ['', '', '', '', ''];\n    }\n    const [datePart, timePart] = value.split(' ');\n    const [day, month, year] = datePart.split('/');\n    const [hours, minutes] = timePart ? timePart.split(':') : ['', ''];\n    return [year, month, day, hours, minutes];\n  }, [value]);\n\n  function update(value) {\n    form.setValue(name, value, { shouldValidate: false });\n  }\n\n  function set(year, month, day, hours, minutes) {\n    const datePart = `${day || ''}/${month || ''}/${year || ''}`;\n    const timePart = hours || minutes ? `${hours || ''}:${minutes || ''}` : '';\n    const value = timePart ? `${datePart} ${timePart}` : datePart;\n\n    if (!year && !month && !day && !hours && !minutes) {\n      update('');\n    } else {\n      update(value);\n    }\n  }\n\n  function setYear(evt) {\n    const val = evt.target.value;\n    set(val, month, day, hours, minutes);\n  }\n\n  function setMonth(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, val, day, hours, minutes);\n  }\n\n  function setDay(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, val, hours, minutes);\n  }\n\n  function setHours(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, day, val, minutes);\n  }\n\n  function setMinutes(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, day, hours, val);\n  }\n\n  function trigger() {\n    if (form.formState.isSubmitted) {\n      form.trigger(name);\n    }\n  }\n\n  return {\n    day,\n    month,\n    year,\n    hours,\n    minutes,\n    setYear,\n    setMonth,\n    setDay,\n    setHours,\n    setMinutes,\n    trigger,\n  };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY HH:mm', 'DD/MM/YYYY'];\n\nconst makeDateTime = (val) => {\n  const date = dayjs(val, VALID_FORMATS, true);\n  if (date.isValid()) {\n    return date.format('DD/MM/YYYY HH:mm');\n  }\n  return '';\n};\n\nconst DateTimePart = ({ label, ...props }) => {\n  return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateTimeInput = ({ name, ...props }) => {\n  const { t } = useTranslation();\n  const [initial] = useState(props.value);\n  const value = useMemo(() => {\n    if (initial === props.value) {\n      return makeDateTime(props.value);\n    }\n    return props.value;\n  }, [props.value, initial]);\n\n  const form = useFormContext();\n  const datetime = useDateTime(\n    name,\n    value || makeDateTime(props.defaultValue),\n    form\n  );\n\n  return (\n    <DateInputContainer>\n      <DateTimePart\n        label={t('form.label.day')}\n        onChange={datetime.setDay}\n        onBlur={datetime.trigger}\n        value={datetime.day}\n        width={2}\n        name={`${name}-day`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!datetime.day ? props.error : false}\n        id={`${name}-day`}\n      />\n      <DateTimePart\n        label={t('form.label.month')}\n        onChange={datetime.setMonth}\n        onBlur={datetime.trigger}\n        value={datetime.month}\n        width={2}\n        name={`${name}-month`}\n        id={`${name}-month`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!datetime.month ? props.error : false}\n      />\n      <DateTimePart\n        label={t('form.label.year')}\n        onChange={datetime.setYear}\n        onBlur={datetime.trigger}\n        value={datetime.year}\n        width={4}\n        name={`${name}-year`}\n        id={`${name}-year`}\n        maxLength=\"4\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!datetime.year ? props.error : false}\n      />\n      <DateTimePart\n        label={t('form.label.hours')}\n        onChange={datetime.setHours}\n        onBlur={datetime.trigger}\n        value={datetime.hours}\n        width={2}\n        name={`${name}-hours`}\n        id={`${name}-hours`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!datetime.hours ? props.error : false}\n      />\n      <DateTimePart\n        label={t('form.label.minutes')}\n        onChange={datetime.setMinutes}\n        onBlur={datetime.trigger}\n        value={datetime.minutes}\n        width={2}\n        name={`${name}-minutes`}\n        id={`${name}-minutes`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!datetime.minutes ? props.error : false}\n      />\n    </DateInputContainer>\n  );\n};\n\nexport default DateTimeInput;\n"],
-  "mappings": "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",
+  "sourcesContent": ["import React, { useMemo, useEffect } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport {\n  DateInputContainer,\n  DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateTimeInputProps\n  extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    max?: string;\n    min?: string;\n  };\n}\n\nfunction useDateTime(name, value, form) {\n  const [year, month, day, hours, minutes] = useMemo(() => {\n    if (!value || value.length === 0) {\n      return ['', '', '', '', ''];\n    }\n    const [datePart, timePart] = value.split(' ');\n    const [day, month, year] = datePart.split('/');\n    const [hours, minutes] = timePart ? timePart.split(':') : ['', ''];\n    return [year, month, day, hours, minutes];\n  }, [value]);\n\n  function update(value) {\n    form.setValue(name, value, { shouldValidate: false });\n  }\n\n  function set(year, month, day, hours, minutes) {\n    const datePart = `${day || ''}/${month || ''}/${year || ''}`;\n    const timePart = hours || minutes ? `${hours || ''}:${minutes || ''}` : '';\n    const value = timePart ? `${datePart} ${timePart}` : datePart;\n\n    if (!year && !month && !day && !hours && !minutes) {\n      update('');\n    } else {\n      update(value);\n    }\n  }\n\n  function setYear(evt) {\n    const val = evt.target.value;\n    set(val, month, day, hours, minutes);\n  }\n\n  function setMonth(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, val, day, hours, minutes);\n  }\n\n  function setDay(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, val, hours, minutes);\n  }\n\n  function setHours(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, day, val, minutes);\n  }\n\n  function setMinutes(evt, cast) {\n    let val = evt.target.value;\n    if (cast && val && val.length === 1) {\n      val = '0' + val;\n    }\n    set(year, month, day, hours, val);\n  }\n\n  function trigger() {\n    if (form.formState.isSubmitted) {\n      form.trigger(name);\n    }\n  }\n\n  return {\n    day,\n    month,\n    year,\n    hours,\n    minutes,\n    setYear,\n    setMonth,\n    setDay,\n    setHours,\n    setMinutes,\n    trigger,\n  };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY HH:mm', 'DD/MM/YYYY'];\n\nconst makeDateTime = (val) => {\n  const date = dayjs(val, VALID_FORMATS, true);\n  if (date.isValid()) {\n    return date.format('DD/MM/YYYY HH:mm');\n  }\n  return '';\n};\n\nconst DateTimePart = ({ label, ...props }) => {\n  return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateTimeInput = ({ name, ...props }) => {\n  const { t } = useTranslation();\n  const form = useFormContext();\n\n  useEffect(() => {\n    const initialValue = form.getValues(name);\n    // checks if the initial value is undefined and if the default value is valid  date\n    if (initialValue === undefined && props.defaultValue) {\n      form.setValue(name, makeDateTime(props.defaultValue), {\n        shouldValidate: false,\n      });\n    } else {\n      // checks if the initial value is a valid date\n      form.setValue(name, makeDateTime(initialValue), {\n        shouldValidate: false,\n      });\n    }\n  }, []);\n\n  const value = form.getValues(name);\n  const dateTime = useDateTime(name, value, form);\n\n  return (\n    <DateInputContainer>\n      <DateTimePart\n        label={t('form.label.day')}\n        onChange={dateTime.setDay}\n        onBlur={(e) => {\n          if (dateTime.day && dateTime.day.length === 1) {\n            dateTime.setDay(e, true);\n          }\n          dateTime.trigger();\n        }}\n        value={dateTime.day}\n        width={2}\n        name={`${name}-day`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!dateTime.day ? props.error : false}\n        id={`${name}-day`}\n      />\n      <DateTimePart\n        label={t('form.label.month')}\n        onChange={dateTime.setMonth}\n        onBlur={(e) => {\n          if (dateTime.month && dateTime.month.length === 1) {\n            dateTime.setMonth(e, true);\n          }\n          dateTime.trigger();\n        }}\n        value={dateTime.month}\n        width={2}\n        name={`${name}-month`}\n        id={`${name}-month`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!dateTime.month ? props.error : false}\n      />\n      <DateTimePart\n        label={t('form.label.year')}\n        onChange={dateTime.setYear}\n        onBlur={dateTime.trigger}\n        value={dateTime.year}\n        width={4}\n        name={`${name}-year`}\n        id={`${name}-year`}\n        maxLength=\"4\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!dateTime.year ? props.error : false}\n      />\n      <DateTimePart\n        label={t('form.label.hours')}\n        onChange={dateTime.setHours}\n        onBlur={(e) => {\n          if (dateTime.hours && dateTime.hours.length === 1) {\n            dateTime.setHours(e, true);\n          }\n          dateTime.trigger();\n        }}\n        value={dateTime.hours}\n        width={2}\n        name={`${name}-hours`}\n        id={`${name}-hours`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!dateTime.hours ? props.error : false}\n      />\n      <DateTimePart\n        label={t('form.label.minutes')}\n        onChange={dateTime.setMinutes}\n        onBlur={(e) => {\n          if (dateTime.minutes && dateTime.minutes.length === 1) {\n            dateTime.setMinutes(e, true);\n          }\n          dateTime.trigger();\n        }}\n        value={dateTime.minutes}\n        width={2}\n        name={`${name}-minutes`}\n        id={`${name}-minutes`}\n        maxLength=\"2\"\n        disabled={props.disabled}\n        aria-required={props['aria-required']}\n        error={!dateTime.minutes ? props.error : false}\n      />\n    </DateInputContainer>\n  );\n};\n\nexport default DateTimeInput;\n"],
+  "mappings": "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",
   "names": ["day", "month", "year", "hours", "minutes", "value"]
 }

package/inputs/FileInput/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { UseFormReturn } from 'react-hook-form';
 import { UncontrolledFieldProps } from '@digigov/form/Field/types';
 import { ButtonProps } from '@digigov/ui/form/Button';
 import { FileUploadContainerProps, FileUploadProps } from '@digigov/ui/form/FileUpload';
@@ -21,6 +22,9 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
             resetFile?: string;
         };
     };
+    reset: (values?: FileList) => void;
+    resetField: UseFormReturn['resetField'];
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }
-export declare const FileInput: React.FC<any>;
+export declare const FileInput: React.ForwardRefExoticComponent<FileInputProps & React.RefAttributes<HTMLInputElement>>;
 export default FileInput;

package/inputs/FileInput/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useWatch } from "react-hook-form";
 import { Button } from "@digigov/ui/form/Button";
 import {
@@ -8,54 +8,72 @@ import {
 import { useTranslation } from "@digigov/ui/i18n";
 import { Hint } from "@digigov/ui/typography/Hint";
 import { Paragraph } from "@digigov/ui/typography/Paragraph";
-const FileInput = React.forwardRef(function FileInput2({ name, disabled, resetField, extra, control, onChange, ...props }, ref) {
-  delete props.Field;
-  delete props.reset;
+const FileInput = React.forwardRef(function FileInput2({
+  name,
+  disabled,
+  resetField,
+  extra,
+  control,
+  onChange,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  Field,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  reset,
+  ...props
+}, ref) {
   const { t } = useTranslation();
   const value = useWatch({ control, name });
-  const [files, setFiles] = useState(
-    Object.values(value || {})?.map?.(({ name: name2 }) => name2) || []
+  const [filenames, setFilenames] = useState(
+    Object.values(value || {}).map(({ name: name2 }) => name2) || []
   );
   useEffect(() => {
-    setFiles(Object.values(value || {})?.map?.(({ name: name2 }) => name2));
+    setFilenames(Object.values(value || {}).map(({ name: name2 }) => name2));
   }, [value]);
+  const handleChange = useCallback(
+    (event) => {
+      event.preventDefault();
+      const target = event.target;
+      if (target.files && target.files.length > 0) {
+        setFilenames(Object.values(target.files).map(({ name: name2 }) => name2));
+      }
+      onChange(event);
+    },
+    [onChange]
+  );
+  const handleReset = useCallback(
+    (event) => {
+      event.preventDefault();
+      resetField(name);
+      setFilenames(void 0);
+    },
+    [name, resetField]
+  );
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
     FileUploadContainer,
     {
       variant: extra?.containerProps?.variant || "default",
-      hasFiles: files && files.length > 0
+      hasFiles: filenames && filenames.length > 0
     },
-    files?.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Paragraph, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ":"), " ", `${files.join(", ")}`)) : /* @__PURE__ */ React.createElement(Hint, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ": "), t("upload.no_file")),
+    filenames?.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Paragraph, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ":"), " ", `${filenames.join(", ")}`)) : /* @__PURE__ */ React.createElement(Hint, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ": "), t("upload.no_file")),
     /* @__PURE__ */ React.createElement(
       FileUpload,
       {
         ref,
-        hasFiles: !!files?.length,
+        hasFiles: !!filenames?.length,
         name,
         variant: extra?.uploadButtonProps?.variant,
         disabled,
         id: name,
-        onChange: (event) => {
-          event.preventDefault();
-          const target = event?.target;
-          if (target?.files && target?.files.length > 0) {
-            setFiles(Object.values(target?.files)?.map?.(({ name: name2 }) => name2));
-          }
-          onChange(event);
-        },
+        onChange: handleChange,
         ...{ ...props, required: void 0 }
       },
-      files?.length ? t("upload.change_file") : t("upload.choose_file")
+      filenames?.length ? t("upload.change_file") : t("upload.choose_file")
     ),
-    files !== void 0 && files?.length > 0 && !extra?.noResetButton && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+    filenames !== void 0 && filenames?.length > 0 && !extra?.noResetButton && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       Button,
       {
         variant: extra?.resetButtonProps?.variant || "link",
-        onClick: (event) => {
-          event.preventDefault();
-          resetField(name);
-          setFiles(void 0);
-        },
+        onClick: handleReset,
         color: extra?.resetButtonProps?.color || "secondary"
       },
       t("upload.reset_file")

package/inputs/FileInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/FileInput/index.tsx"],
-  "sourcesContent": ["import React, { useEffect, useState } from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonProps } from '@digigov/ui/form/Button';\nimport {\n  FileUpload,\n  FileUploadContainer,\n  FileUploadContainerProps,\n  FileUploadProps,\n} from '@digigov/ui/form/FileUpload';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Paragraph } from '@digigov/ui/typography/Paragraph';\n\nexport interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    className?: string;\n    multiple?: boolean;\n    accept?: string;\n    limit: {\n      maxSize?: number;\n    };\n    containerProps?: FileUploadContainerProps;\n    uploadButtonProps?: FileUploadProps;\n    noResetButton?: boolean;\n    resetButtonProps?: ButtonProps;\n    locales?: {\n      file?: string;\n      chooseFile?: string;\n      changeFile?: string;\n      resetFile?: string;\n    };\n  };\n}\n\nexport const FileInput: React.FC<any> = React.forwardRef(function FileInput(\n  { name, disabled, resetField, extra, control, onChange, ...props },\n  ref: any\n) {\n  delete props.Field;\n  delete props.reset;\n  const { t } = useTranslation();\n  const value: any = useWatch({ control, name });\n\n  const [files, setFiles] = useState<string[] | undefined>(\n    Object.values(value || {})?.map?.(({ name }) => name) || []\n  );\n  useEffect(() => {\n    setFiles(Object.values(value || {})?.map?.(({ name }) => name));\n  }, [value]);\n\n  return (\n    <>\n      <FileUploadContainer\n        variant={extra?.containerProps?.variant || 'default'}\n        hasFiles={files && files.length > 0}\n      >\n        {files?.length ? (\n          <>\n            <Paragraph>\n              <b>{t('upload.file')}:</b> {`${files.join(', ')}`}\n            </Paragraph>\n          </>\n        ) : (\n          <Hint>\n            <b>\n              {t('upload.file')}\n              {': '}\n            </b>\n            {t('upload.no_file')}\n          </Hint>\n        )}\n        <FileUpload\n          ref={ref}\n          hasFiles={!!files?.length}\n          name={name}\n          variant={extra?.uploadButtonProps?.variant}\n          disabled={disabled}\n          id={name}\n          onChange={(event) => {\n            event.preventDefault();\n            const target = event?.target as HTMLInputElement;\n            if (target?.files && target?.files.length > 0) {\n              setFiles(Object.values(target?.files)?.map?.(({ name }) => name));\n            }\n            onChange(event);\n          }}\n          {...{ ...props, required: undefined }}\n        >\n          {files?.length ? t('upload.change_file') : t('upload.choose_file')}\n        </FileUpload>\n        {files !== undefined && files?.length > 0 && !extra?.noResetButton && (\n          <>\n            <Button\n              variant={extra?.resetButtonProps?.variant || 'link'}\n              onClick={(event) => {\n                event.preventDefault();\n                resetField(name);\n                setFiles(undefined);\n              }}\n              color={extra?.resetButtonProps?.color || 'secondary'}\n            >\n              {t('upload.reset_file')}\n            </Button>\n          </>\n        )}\n      </FileUploadContainer>\n    </>\n  );\n});\n\nexport default FileInput;\n"],
-  "mappings": "AAAA,OAAO,SAAS,WAAW,gBAAgB;AAC3C,SAAS,gBAAgB;AAEzB,SAAS,cAA2B;AACpC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAuBnB,MAAM,YAA2B,MAAM,WAAW,SAASA,WAChE,EAAE,MAAM,UAAU,YAAY,OAAO,SAAS,UAAU,GAAG,MAAM,GACjE,KACA;AACA,SAAO,MAAM;AACb,SAAO,MAAM;AACb,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,QAAa,SAAS,EAAE,SAAS,KAAK,CAAC;AAE7C,QAAM,CAAC,OAAO,QAAQ,IAAI;AAAA,IACxB,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,MAAAC,MAAK,MAAMA,KAAI,KAAK,CAAC;AAAA,EAC5D;AACA,YAAU,MAAM;AACd,aAAS,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,EAChE,GAAG,CAAC,KAAK,CAAC;AAEV,SACE,0DACE;AAAA,IAAC;AAAA;AAAA,MACC,SAAS,OAAO,gBAAgB,WAAW;AAAA,MAC3C,UAAU,SAAS,MAAM,SAAS;AAAA;AAAA,IAEjC,OAAO,SACN,0DACE,oCAAC,iBACC,oCAAC,WAAG,EAAE,aAAa,GAAE,GAAC,GAAI,KAAE,GAAG,MAAM,KAAK,IAAI,CAAC,EACjD,CACF,IAEA,oCAAC,YACC,oCAAC,WACE,EAAE,aAAa,GACf,IACH,GACC,EAAE,gBAAgB,CACrB;AAAA,IAEF;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,UAAU,CAAC,CAAC,OAAO;AAAA,QACnB;AAAA,QACA,SAAS,OAAO,mBAAmB;AAAA,QACnC;AAAA,QACA,IAAI;AAAA,QACJ,UAAU,CAAC,UAAU;AACnB,gBAAM,eAAe;AACrB,gBAAM,SAAS,OAAO;AACtB,cAAI,QAAQ,SAAS,QAAQ,MAAM,SAAS,GAAG;AAC7C,qBAAS,OAAO,OAAO,QAAQ,KAAK,GAAG,MAAM,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,UAClE;AACA,mBAAS,KAAK;AAAA,QAChB;AAAA,QACC,GAAG,EAAE,GAAG,OAAO,UAAU,OAAU;AAAA;AAAA,MAEnC,OAAO,SAAS,EAAE,oBAAoB,IAAI,EAAE,oBAAoB;AAAA,IACnE;AAAA,IACC,UAAU,UAAa,OAAO,SAAS,KAAK,CAAC,OAAO,iBACnD,0DACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,OAAO,kBAAkB,WAAW;AAAA,QAC7C,SAAS,CAAC,UAAU;AAClB,gBAAM,eAAe;AACrB,qBAAW,IAAI;AACf,mBAAS,MAAS;AAAA,QACpB;AAAA,QACA,OAAO,OAAO,kBAAkB,SAAS;AAAA;AAAA,MAExC,EAAE,mBAAmB;AAAA,IACxB,CACF;AAAA,EAEJ,CACF;AAEJ,CAAC;AAED,IAAO,oBAAQ;",
+  "sourcesContent": ["import React, { ComponentRef, useCallback, useEffect, useState } from 'react';\nimport { UseFormReturn, useWatch } from 'react-hook-form';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonProps } from '@digigov/ui/form/Button';\nimport {\n  FileUpload,\n  FileUploadContainer,\n  FileUploadContainerProps,\n  FileUploadProps,\n} from '@digigov/ui/form/FileUpload';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Paragraph } from '@digigov/ui/typography/Paragraph';\n\nexport interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    className?: string;\n    multiple?: boolean;\n    accept?: string;\n    limit: {\n      maxSize?: number;\n    };\n    containerProps?: FileUploadContainerProps;\n    uploadButtonProps?: FileUploadProps;\n    noResetButton?: boolean;\n    resetButtonProps?: ButtonProps;\n    locales?: {\n      file?: string;\n      chooseFile?: string;\n      changeFile?: string;\n      resetFile?: string;\n    };\n  };\n  reset: (values?: FileList) => void;\n  resetField: UseFormReturn['resetField'];\n  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;\n}\n\nexport const FileInput = React.forwardRef<\n  ComponentRef<typeof FileUpload>,\n  FileInputProps\n>(function FileInput(\n  {\n    name,\n    disabled,\n    resetField,\n    extra,\n    control,\n    onChange,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    Field,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    reset,\n    ...props\n  },\n  ref\n) {\n  const { t } = useTranslation();\n  const value: FileList = useWatch({ control, name });\n\n  const [filenames, setFilenames] = useState<string[] | undefined>(\n    Object.values(value || {}).map(({ name }) => name) || []\n  );\n\n  useEffect(() => {\n    setFilenames(Object.values(value || {}).map(({ name }) => name));\n  }, [value]);\n\n  const handleChange = useCallback(\n    (event: React.ChangeEvent<HTMLInputElement>) => {\n      event.preventDefault();\n      const target = event.target;\n      if (target.files && target.files.length > 0) {\n        setFilenames(Object.values(target.files).map(({ name }) => name));\n      }\n      onChange(event);\n    },\n    [onChange]\n  );\n\n  const handleReset = useCallback(\n    (event: React.MouseEvent<HTMLButtonElement>) => {\n      event.preventDefault();\n      resetField(name);\n      setFilenames(undefined);\n    },\n    [name, resetField]\n  );\n\n  return (\n    <>\n      <FileUploadContainer\n        variant={extra?.containerProps?.variant || 'default'}\n        hasFiles={filenames && filenames.length > 0}\n      >\n        {filenames?.length ? (\n          <>\n            <Paragraph>\n              <b>{t('upload.file')}:</b> {`${filenames.join(', ')}`}\n            </Paragraph>\n          </>\n        ) : (\n          <Hint>\n            <b>\n              {t('upload.file')}\n              {': '}\n            </b>\n            {t('upload.no_file')}\n          </Hint>\n        )}\n        <FileUpload\n          ref={ref}\n          hasFiles={!!filenames?.length}\n          name={name}\n          variant={extra?.uploadButtonProps?.variant}\n          disabled={disabled}\n          id={name}\n          onChange={handleChange}\n          {...{ ...props, required: undefined }}\n        >\n          {filenames?.length\n            ? t('upload.change_file')\n            : t('upload.choose_file')}\n        </FileUpload>\n        {filenames !== undefined &&\n          filenames?.length > 0 &&\n          !extra?.noResetButton && (\n            <>\n              <Button\n                variant={extra?.resetButtonProps?.variant || 'link'}\n                onClick={handleReset}\n                color={extra?.resetButtonProps?.color || 'secondary'}\n              >\n                {t('upload.reset_file')}\n              </Button>\n            </>\n          )}\n      </FileUploadContainer>\n    </>\n  );\n});\n\nexport default FileInput;\n"],
+  "mappings": "AAAA,OAAO,SAAuB,aAAa,WAAW,gBAAgB;AACtE,SAAwB,gBAAgB;AAExC,SAAS,cAA2B;AACpC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AA0BnB,MAAM,YAAY,MAAM,WAG7B,SAASA,WACT;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AAAA,EACA,GAAG;AACL,GACA,KACA;AACA,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,QAAkB,SAAS,EAAE,SAAS,KAAK,CAAC;AAElD,QAAM,CAAC,WAAW,YAAY,IAAI;AAAA,IAChC,OAAO,OAAO,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,MAAAC,MAAK,MAAMA,KAAI,KAAK,CAAC;AAAA,EACzD;AAEA,YAAU,MAAM;AACd,iBAAa,OAAO,OAAO,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,EACjE,GAAG,CAAC,KAAK,CAAC;AAEV,QAAM,eAAe;AAAA,IACnB,CAAC,UAA+C;AAC9C,YAAM,eAAe;AACrB,YAAM,SAAS,MAAM;AACrB,UAAI,OAAO,SAAS,OAAO,MAAM,SAAS,GAAG;AAC3C,qBAAa,OAAO,OAAO,OAAO,KAAK,EAAE,IAAI,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,MAClE;AACA,eAAS,KAAK;AAAA,IAChB;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AAEA,QAAM,cAAc;AAAA,IAClB,CAAC,UAA+C;AAC9C,YAAM,eAAe;AACrB,iBAAW,IAAI;AACf,mBAAa,MAAS;AAAA,IACxB;AAAA,IACA,CAAC,MAAM,UAAU;AAAA,EACnB;AAEA,SACE,0DACE;AAAA,IAAC;AAAA;AAAA,MACC,SAAS,OAAO,gBAAgB,WAAW;AAAA,MAC3C,UAAU,aAAa,UAAU,SAAS;AAAA;AAAA,IAEzC,WAAW,SACV,0DACE,oCAAC,iBACC,oCAAC,WAAG,EAAE,aAAa,GAAE,GAAC,GAAI,KAAE,GAAG,UAAU,KAAK,IAAI,CAAC,EACrD,CACF,IAEA,oCAAC,YACC,oCAAC,WACE,EAAE,aAAa,GACf,IACH,GACC,EAAE,gBAAgB,CACrB;AAAA,IAEF;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,UAAU,CAAC,CAAC,WAAW;AAAA,QACvB;AAAA,QACA,SAAS,OAAO,mBAAmB;AAAA,QACnC;AAAA,QACA,IAAI;AAAA,QACJ,UAAU;AAAA,QACT,GAAG,EAAE,GAAG,OAAO,UAAU,OAAU;AAAA;AAAA,MAEnC,WAAW,SACR,EAAE,oBAAoB,IACtB,EAAE,oBAAoB;AAAA,IAC5B;AAAA,IACC,cAAc,UACb,WAAW,SAAS,KACpB,CAAC,OAAO,iBACN,0DACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,OAAO,kBAAkB,WAAW;AAAA,QAC7C,SAAS;AAAA,QACT,OAAO,OAAO,kBAAkB,SAAS;AAAA;AAAA,MAExC,EAAE,mBAAmB;AAAA,IACxB,CACF;AAAA,EAEN,CACF;AAEJ,CAAC;AAED,IAAO,oBAAQ;",
   "names": ["FileInput", "name"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/form",
-  "version": "2.0.0-a402a664",
+  "version": "2.0.0-abd768eb",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -14,11 +14,11 @@
     "yup": "0.32.11",
     "dayjs": "1.10.4",
     "@hookform/resolvers": "5.0.1",
-    "@digigov/react-icons": "2.0.0-a402a664"
+    "@digigov/react-icons": "2.0.0-abd768eb"
   },
   "peerDependencies": {
-    "@digigov/ui": "2.0.0-a402a664",
-    "@digigov/react-core": "2.0.0-a402a664",
+    "@digigov/ui": "2.0.0-abd768eb",
+    "@digigov/react-core": "2.0.0-abd768eb",
     "clsx": "1.1.1",
     "react": "^18.3.0 || ^19.1.0",
     "react-dom": "^18.3.0 || ^19.1.0"

package/registry/index.js

@@ -45,11 +45,11 @@ import * as _digigov_form_Questions_Step_StepTitle from "@digigov/form/Questions
 import * as _digigov_form_Questions_Step_getAddMoreFields from "@digigov/form/Questions/Step/getAddMoreFields";
 import * as _digigov_form_Questions_Step from "@digigov/form/Questions/Step";
 import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Step/types";
-import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
 import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
+import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
 import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
-import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
 import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
+import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
 import * as _digigov_form_inputs_ImageInput from "@digigov/form/inputs/ImageInput";
 import * as _digigov_form_inputs_Input from "@digigov/form/inputs/Input";
 import * as _digigov_form_inputs_Label from "@digigov/form/inputs/Label";
@@ -136,11 +136,11 @@ export default {
   '@digigov/form/Questions/Step/getAddMoreFields': lazyImport(_digigov_form_Questions_Step_getAddMoreFields),
   '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
   '@digigov/form/Questions/Step/types': lazyImport(_digigov_form_Questions_Step_types),
-  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
   '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
+  '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
   '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
-  '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
   '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
+  '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
   '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
   '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
   '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),

package/src/Field/FieldBase.tsx

@@ -55,7 +55,7 @@ export const FieldBase: React.FC<FieldBaseProps> = ({
                 {...field}
                 control={control}
                 ref={undefined}
-                defaultValue={defaultValue}
+                defaultValue={defaultValue ?? field.value}
                 extra={extra}
                 error={!!error}
                 type={type}