@digigov/form 2.0.0-85c27c19 → 2.0.0-87b6232d

package/inputs/DateInput/index.js

@@ -1,52 +1,64 @@
 import React, { useMemo, useState } from "react";
 import dayjs from "dayjs";
 import customParseFormat from "dayjs/plugin/customParseFormat";
-import DateInputContainer from "@digigov/react-core/DateInputContainer";
-import CoreDateInputItem from "@digigov/react-core/DateInputItem";
+import { useFormContext } from "@digigov/form/FormBuilder";
+import {
+  DateInputContainer,
+  DateInputItem
+} from "@digigov/ui/form/DateInputContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 dayjs.extend(customParseFormat);
-function useDate(value, onChange) {
+function useDate(name, value, form) {
   const [year, month, day] = 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"];
@@ -58,9 +70,9 @@ const makeDate = (val) => {
   return "";
 };
 const DatePart = ({ label, ...props }) => {
-  return /* @__PURE__ */ React.createElement(CoreDateInputItem, { ...props }, label);
+  return /* @__PURE__ */ React.createElement(DateInputItem, { ...props }, label);
 };
-const DateInput = ({ name, type, ...props }) => {
+const DateInput = ({ name, ...props }) => {
   const { t } = useTranslation();
   const [initial] = useState(props.value);
   const value = useMemo(() => {
@@ -69,16 +81,18 @@ const DateInput = ({ name, type, ...props }) => {
     }
     return props.value;
   }, [props.value, initial]);
-  const date = useDate(value || makeDate(props.defaultValue), props.onChange);
+  const form = useFormContext();
+  const date = useDate(name, value || makeDate(props.defaultValue), form);
   return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.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"],
@@ -89,10 +103,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"],
@@ -103,9 +118,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"],

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 DateInputContainer from '@digigov/react-core/DateInputContainer';\nimport CoreDateInputItem from '@digigov/react-core/DateInputItem';\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(value, onChange) {\n  const [year, month, day] = useMemo(() => {\n    if (!value || value.length === 0) {\n      onChange('');\n      return ['', '', ''];\n    }\n    const [day, month, year] = value.split('/');\n    return [year, month, day];\n  }, [value]);\n\n  function set(year, month, day) {\n    const value = `${day || ''}/${month || ''}/${year || ''}`;\n    if (!year && !month && !day) {\n      onChange(null);\n    } else {\n      onChange(value);\n    }\n  }\n\n  function setYear(evt) {\n    const val = evt.target.value;\n    set(val, month, day);\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);\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);\n  }\n\n  return {\n    day,\n    month,\n    year,\n    setYear,\n    setMonth,\n    setDay,\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 <CoreDateInputItem {...props}>{label}</CoreDateInputItem>;\n};\n\nexport const DateInput = ({ name, type, ...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 date = useDate(value || makeDate(props.defaultValue), props.onChange);\n\n  return (\n    <DateInputContainer>\n      <DatePart\n        label={t('form.label.day')}\n        onChange={date.setDay}\n        onBlur={(e) => date.setDay(e, true)}\n        value={date.day}\n        width={2}\n        name={`${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) => date.setMonth(e, true)}\n        value={date.month}\n        width={2}\n        name={`${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        value={date.year}\n        width={4}\n        name={`${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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",
+  "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/FormBuilder';\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": "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",
   "names": ["day", "month", "year", "value"]
 }

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

@@ -0,0 +1,7 @@
+declare namespace _default {
+    export let title: string;
+    export { Default as component };
+}
+export default _default;
+export { Default };
+import { Default } from './__stories__/Default';

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

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

package/inputs/DateTimeInput/index.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+export interface DateTimeInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
+    extra?: {
+        max?: string;
+        min?: string;
+    };
+}
+export declare const DateTimeInput: ({ name, ...props }: {
+    [x: string]: any;
+    name: any;
+}) => React.JSX.Element;
+export default DateTimeInput;

package/inputs/DateTimeInput/index.js

@@ -0,0 +1,194 @@
+import React, { useMemo, useState } from "react";
+import dayjs from "dayjs";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+import { useFormContext } from "@digigov/form/FormBuilder";
+import {
+  DateInputContainer,
+  DateInputItem
+} from "@digigov/ui/form/DateInputContainer";
+import { useTranslation } from "@digigov/ui/i18n";
+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(" ");
+    const [day2, month2, year2] = datePart.split("/");
+    const [hours2, minutes2] = timePart ? timePart.split(":") : ["", ""];
+    return [year2, month2, day2, hours2, minutes2];
+  }, [value]);
+  function update(value2) {
+    form.setValue(name, value2, { shouldValidate: false });
+  }
+  function set(year2, month2, day2, hours2, minutes2) {
+    const datePart = `${day2 || ""}/${month2 || ""}/${year2 || ""}`;
+    const timePart = hours2 || minutes2 ? `${hours2 || ""}:${minutes2 || ""}` : "";
+    const value2 = timePart ? `${datePart} ${timePart}` : datePart;
+    if (!year2 && !month2 && !day2 && !hours2 && !minutes2) {
+      update("");
+    } else {
+      update(value2);
+    }
+  }
+  function setYear(evt) {
+    const val = evt.target.value;
+    set(val, month, day, hours, minutes);
+  }
+  function setMonth(evt, cast) {
+    let val = evt.target.value;
+    if (cast && val && val.length === 1) {
+      val = "0" + val;
+    }
+    set(year, val, day, hours, minutes);
+  }
+  function setDay(evt, cast) {
+    let val = evt.target.value;
+    if (cast && val && val.length === 1) {
+      val = "0" + val;
+    }
+    set(year, month, val, hours, minutes);
+  }
+  function setHours(evt, cast) {
+    let val = evt.target.value;
+    if (cast && val && val.length === 1) {
+      val = "0" + val;
+    }
+    set(year, month, day, val, minutes);
+  }
+  function setMinutes(evt, cast) {
+    let val = evt.target.value;
+    if (cast && val && val.length === 1) {
+      val = "0" + val;
+    }
+    set(year, month, day, hours, val);
+  }
+  function trigger() {
+    if (form.formState.isSubmitted) {
+      form.trigger(name);
+    }
+  }
+  return {
+    day,
+    month,
+    year,
+    hours,
+    minutes,
+    setYear,
+    setMonth,
+    setDay,
+    setHours,
+    setMinutes,
+    trigger
+  };
+}
+const VALID_FORMATS = ["DD/MM/YYYY HH:mm", "DD/MM/YYYY"];
+const makeDateTime = (val) => {
+  const date = dayjs(val, VALID_FORMATS, true);
+  if (date.isValid()) {
+    return date.format("DD/MM/YYYY HH:mm");
+  }
+  return "";
+};
+const DateTimePart = ({ label, ...props }) => {
+  return /* @__PURE__ */ React.createElement(DateInputItem, { ...props }, label);
+};
+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
+  );
+  return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
+    DateTimePart,
+    {
+      label: t("form.label.day"),
+      onChange: datetime.setDay,
+      onBlur: 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,
+      id: `${name}-day`
+    }
+  ), /* @__PURE__ */ React.createElement(
+    DateTimePart,
+    {
+      label: t("form.label.month"),
+      onChange: datetime.setMonth,
+      onBlur: 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
+    }
+  ), /* @__PURE__ */ React.createElement(
+    DateTimePart,
+    {
+      label: t("form.label.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
+    }
+  ), /* @__PURE__ */ React.createElement(
+    DateTimePart,
+    {
+      label: t("form.label.hours"),
+      onChange: datetime.setHours,
+      onBlur: 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
+    }
+  ), /* @__PURE__ */ React.createElement(
+    DateTimePart,
+    {
+      label: t("form.label.minutes"),
+      onChange: datetime.setMinutes,
+      onBlur: 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
+    }
+  ));
+};
+var DateTimeInput_default = DateTimeInput;
+export {
+  DateTimeInput,
+  DateTimeInput_default as default
+};
+//# sourceMappingURL=index.js.map

package/inputs/DateTimeInput/index.js.map

@@ -0,0 +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/FormBuilder';\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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",
+  "names": ["day", "month", "year", "hours", "minutes", "value"]
+}

package/inputs/DateTimeInput/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/inputs/{Input/Input.stories → DateTimeInput}/package.json

@@ -2,5 +2,5 @@
   "sideEffects": false,
   "module": "./index.js",
   "types": "./index.d.ts",
-  "main": "../../../cjs/inputs/Input/Input.stories/index.js"
+  "main": "../../cjs/inputs/DateTimeInput/index.js"
 }

package/inputs/FileInput/FileInput.stories.d.ts

@@ -5,4 +5,5 @@ declare namespace _default {
 }
 export default _default;
 export { Default } from "@digigov/form/inputs/FileInput/__stories__/Default";
+export { WithBorderAndLink } from "@digigov/form/inputs/FileInput/__stories__/WithBorderAndLink";
 import FileInput from '@digigov/form/inputs/FileInput';

package/inputs/FileInput/__stories__/WithBorderAndLink.d.ts

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

package/inputs/FileInput/index.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
 import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import { ButtonProps } from '@digigov/ui/form/Button';
+import { FileUploadContainerProps, FileUploadProps } from '@digigov/ui/form/FileUpload';
 export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
     extra?: {
         className?: string;
@@ -8,6 +10,16 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
         limit: {
             maxSize?: number;
         };
+        containerProps?: FileUploadContainerProps;
+        uploadButtonProps?: FileUploadProps;
+        noResetButton?: boolean;
+        resetButtonProps?: ButtonProps;
+        locales?: {
+            file?: string;
+            chooseFile?: string;
+            changeFile?: string;
+            resetFile?: string;
+        };
     };
 }
 export declare const FileInput: React.FC<any>;

package/inputs/FileInput/index.js

@@ -1,44 +1,65 @@
-import React, { useState } from "react";
-import FileUpload from "@digigov/react-core/FileUpload";
-import FileUploadContainer from "@digigov/react-core/FileUploadContainer";
-import CoreHint from "@digigov/react-core/Hint";
-import Button from "@digigov/ui/form/Button";
+import React, { useEffect, useState } from "react";
+import { Button } from "@digigov/ui/form/Button";
+import {
+  FileUpload,
+  FileUploadContainer
+} from "@digigov/ui/form/FileUpload";
 import { useTranslation } from "@digigov/ui/i18n";
-import Paragraph from "@digigov/ui/typography/Paragraph";
-const FileInput = React.forwardRef(function FileInput2({ name, extra = {}, disabled, reset, onChange, ...props }, ref) {
+import { Hint } from "@digigov/ui/typography/Hint";
+import { Paragraph } from "@digigov/ui/typography/Paragraph";
+const FileInput = React.forwardRef(function FileInput2({ name, disabled, resetField, extra, onChange, value, ...props }, ref) {
+  delete props.Field;
   const { t } = useTranslation();
-  const [files, setFiles] = useState([]);
-  const handleChange = (e) => {
-    const target = e.target;
-    const selectedFiles = Array.from(
-      target.files
-    ).map(({ name: name2 }) => name2);
-    setFiles(selectedFiles);
-    onChange(e);
-  };
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(FileUploadContainer, { hasFiles: files && files.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(CoreHint, null, t("upload.no_file")), /* @__PURE__ */ React.createElement(
-    FileUpload,
+  const [files, setFiles] = useState(
+    Object.values(value || {})?.map?.(({ name: name2 }) => name2) || []
+  );
+  useEffect(() => {
+    setFiles(Object.values(value || {})?.map?.(({ name: name2 }) => name2));
+  }, [value]);
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+    FileUploadContainer,
     {
-      ref,
-      hasFiles: !!files?.length,
-      name,
-      disabled,
-      onChange: handleChange,
-      ...{ ...props, required: void 0 }
+      variant: extra?.containerProps?.variant || "default",
+      hasFiles: files && files.length > 0
     },
-    files?.length ? t("upload.change_file") : t("upload.choose_file")
-  ), files !== void 0 && files.length > 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
-    Button,
-    {
-      variant: "link",
-      onClick: (event) => {
-        event.preventDefault();
-        reset({ [name]: "" });
-        setFiles(void 0);
-      }
-    },
-    t("upload.reset_file")
-  ))));
+    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")),
+    /* @__PURE__ */ React.createElement(
+      FileUpload,
+      {
+        ref,
+        hasFiles: !!files?.length,
+        name,
+        variant: extra?.uploadButtonProps?.variant,
+        disabled,
+        id: name,
+        value: value.filename,
+        onChange: (event) => {
+          if (event?.target?.files && event?.target?.files.length > 0) {
+            onChange(event.target.files);
+          }
+        },
+        ...{
+          ...props,
+          required: void 0,
+          error: void 0
+        }
+      },
+      files?.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(
+      Button,
+      {
+        variant: extra?.resetButtonProps?.variant || "link",
+        onClick: (event) => {
+          event.preventDefault();
+          resetField(name);
+          setFiles(void 0);
+        },
+        color: extra?.resetButtonProps?.color || "secondary"
+      },
+      t("upload.reset_file")
+    ))
+  ));
 });
 var FileInput_default = FileInput;
 export {

package/inputs/FileInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/FileInput/index.tsx"],
-  "sourcesContent": ["import React, { useState } from 'react';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport FileUpload from '@digigov/react-core/FileUpload';\nimport FileUploadContainer from '@digigov/react-core/FileUploadContainer';\nimport CoreHint from '@digigov/react-core/Hint';\nimport Button from '@digigov/ui/form/Button';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport Paragraph from '@digigov/ui/typography/Paragraph';\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  };\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport const FileInput: React.FC<any> = React.forwardRef(function FileInput(\n  { name, extra = {}, disabled, reset, onChange, ...props },\n  ref: any\n) {\n  const { t } = useTranslation();\n  const [files, setFiles] = useState<Array<string> | undefined>([]);\n  const handleChange = (e) => {\n    const target = e.target as HTMLInputElement;\n    const selectedFiles = Array.from(\n      target.files as ArrayLike<{ name: string }>\n    ).map(({ name }) => name);\n    setFiles(selectedFiles);\n    // proceed calling the onChange provided\n    // by react-hook-form\n    onChange(e);\n  };\n  return (\n    <>\n      <FileUploadContainer hasFiles={files && files.length > 0}>\n        {files?.length ? (\n          <>\n            <Paragraph>\n              <b>{t('upload.file')}:</b> {`${files.join(', ')}`}\n            </Paragraph>\n          </>\n        ) : (\n          <CoreHint>{t('upload.no_file')}</CoreHint>\n        )}\n        <FileUpload\n          ref={ref}\n          hasFiles={!!files?.length}\n          name={name}\n          disabled={disabled}\n          onChange={handleChange}\n          {...{ ...props, required: undefined }}\n        >\n          {files?.length ? t('upload.change_file') : t('upload.choose_file')}\n        </FileUpload>\n        {files !== undefined && files.length > 0 && (\n          <>\n            <Button\n              variant=\"link\"\n              onClick={(event) => {\n                event.preventDefault();\n                reset({ [name]: '' });\n                setFiles(undefined);\n              }}\n            >\n              {t('upload.reset_file')}\n            </Button>\n          </>\n        )}\n      </FileUploadContainer>\n    </>\n  );\n});\n\nexport default FileInput;\n"],
-  "mappings": "AAAA,OAAO,SAAS,gBAAgB;AAEhC,OAAO,gBAAgB;AACvB,OAAO,yBAAyB;AAChC,OAAO,cAAc;AACrB,OAAO,YAAY;AACnB,SAAS,sBAAsB;AAC/B,OAAO,eAAe;AAaf,MAAM,YAA2B,MAAM,WAAW,SAASA,WAChE,EAAE,MAAM,QAAQ,CAAC,GAAG,UAAU,OAAO,UAAU,GAAG,MAAM,GACxD,KACA;AACA,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAoC,CAAC,CAAC;AAChE,QAAM,eAAe,CAAC,MAAM;AAC1B,UAAM,SAAS,EAAE;AACjB,UAAM,gBAAgB,MAAM;AAAA,MAC1B,OAAO;AAAA,IACT,EAAE,IAAI,CAAC,EAAE,MAAAC,MAAK,MAAMA,KAAI;AACxB,aAAS,aAAa;AAGtB,aAAS,CAAC;AAAA,EACZ;AACA,SACE,0DACE,oCAAC,uBAAoB,UAAU,SAAS,MAAM,SAAS,KACpD,OAAO,SACN,0DACE,oCAAC,iBACC,oCAAC,WAAG,EAAE,aAAa,GAAE,GAAC,GAAI,KAAE,GAAG,MAAM,KAAK,IAAI,CAAC,EACjD,CACF,IAEA,oCAAC,gBAAU,EAAE,gBAAgB,CAAE,GAEjC;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA,UAAU,CAAC,CAAC,OAAO;AAAA,MACnB;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACT,GAAG,EAAE,GAAG,OAAO,UAAU,OAAU;AAAA;AAAA,IAEnC,OAAO,SAAS,EAAE,oBAAoB,IAAI,EAAE,oBAAoB;AAAA,EACnE,GACC,UAAU,UAAa,MAAM,SAAS,KACrC,0DACE;AAAA,IAAC;AAAA;AAAA,MACC,SAAQ;AAAA,MACR,SAAS,CAAC,UAAU;AAClB,cAAM,eAAe;AACrB,cAAM,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC;AACpB,iBAAS,MAAS;AAAA,MACpB;AAAA;AAAA,IAEC,EAAE,mBAAmB;AAAA,EACxB,CACF,CAEJ,CACF;AAEJ,CAAC;AAED,IAAO,oBAAQ;",
+  "sourcesContent": ["import React, { useEffect, useState } from 'react';\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';\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, onChange, value, ...props },\n  ref: any\n) {\n  delete props.Field;\n  const { t } = useTranslation();\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          value={value.filename}\n          onChange={(event) => {\n            if (event?.target?.files && event?.target?.files.length > 0) {\n              onChange(event.target.files);\n            }\n          }}\n          {...{\n            ...props,\n            required: undefined,\n            error: undefined,\n          }}\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;AAE3C,SAAS,cAA2B;AACpC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAsBnB,MAAM,YAA2B,MAAM,WAAW,SAASA,WAChE,EAAE,MAAM,UAAU,YAAY,OAAO,UAAU,OAAO,GAAG,MAAM,GAC/D,KACA;AACA,SAAO,MAAM;AACb,QAAM,EAAE,EAAE,IAAI,eAAe;AAE7B,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,OAAO,MAAM;AAAA,QACb,UAAU,CAAC,UAAU;AACnB,cAAI,OAAO,QAAQ,SAAS,OAAO,QAAQ,MAAM,SAAS,GAAG;AAC3D,qBAAS,MAAM,OAAO,KAAK;AAAA,UAC7B;AAAA,QACF;AAAA,QACC,GAAG;AAAA,UACF,GAAG;AAAA,UACH,UAAU;AAAA,UACV,OAAO;AAAA,QACT;AAAA;AAAA,MAEC,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;",
   "names": ["FileInput", "name"]
 }

package/inputs/ImageInput/ImageInput.stories.d.ts

@@ -5,6 +5,6 @@ declare namespace _default {
 }
 export default _default;
 export { Default } from "@digigov/form/inputs/ImageInput/__stories__/Default";
-export { WithInvalidImageSize } from "@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageSize";
 export { WithInvalidImageDimension } from "@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension";
+export { MaxSize } from "@digigov/form/inputs/ImageInput/__stories__/MaxSize";
 import ImageInput from '@digigov/form/inputs/ImageInput';

package/inputs/ImageInput/__stories__/MaxSize.d.ts

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