@digigov/form 2.0.0-87b6232d → 2.0.0-8bbad051

package/inputs/Checkboxes/index.js

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { omit } from "@digigov/form/utils";
 import {
   Checkbox,
   CheckboxItem,
@@ -6,69 +7,74 @@ import {
 } from "@digigov/ui/form/Checkbox";
 import { useTranslation } from "@digigov/ui/i18n";
 import { Hint } from "@digigov/ui/typography/Hint";
-const Checkboxes = ({
-  name,
-  onChange,
-  value,
-  extra: { options, className },
-  disabled,
-  Field,
-  ...props
-}) => {
-  if (!value) value = [];
-  const handleChange = (optionValue, idx, show) => (evt) => {
-    let newValue;
-    if (evt.currentTarget.checked) {
-      newValue = value.concat([optionValue]);
-    } else {
-      newValue = value.filter((val) => val !== optionValue);
-    }
-    if (show && show.length > 0) {
-      setChecked(
-        (items) => items.map((item, index) => index === idx ? !item : item)
-      );
-    }
-    onChange(newValue);
-  };
-  const { t } = useTranslation();
-  const [checked, setChecked] = useState(
-    Array(options.length).fill(false)
-  );
-  return /* @__PURE__ */ React.createElement(Checkbox, { className }, options.map(
-    ({
-      label,
-      value: v,
-      show,
-      disabled: optionDisabled,
-      selected,
-      ...option
-    }, index) => /* @__PURE__ */ React.createElement(React.Fragment, { key: index }, /* @__PURE__ */ React.createElement(
-      CheckboxItem,
-      {
-        key: `${name}.${index}`,
-        name: `${name}.${v}`,
-        id: `${name}.${v}`,
+const Checkboxes = React.forwardRef(
+  ({
+    name,
+    onChange,
+    value,
+    extra: { options, className },
+    disabled,
+    Field,
+    ...props
+  }, ref) => {
+    if (!value) value = [];
+    const handleChange = (optionValue, idx, show) => (evt) => {
+      let newValue = [];
+      if (evt.currentTarget.checked) {
+        newValue = value.concat([optionValue]);
+      } else {
+        newValue = value.filter((val) => val !== optionValue);
+      }
+      if (show && show.length > 0) {
+        setChecked(
+          (items) => items.map((item, index) => index === idx ? !item : item)
+        );
+      }
+      if (newValue.length === 0) newValue = void 0;
+      onChange(newValue);
+    };
+    const { t } = useTranslation();
+    const [checked, setChecked] = useState(
+      Array(options.length).fill(false)
+    );
+    return /* @__PURE__ */ React.createElement(Checkbox, { className }, options.map(
+      ({
+        label,
         value: v,
-        disabled: disabled || optionDisabled,
-        checked: value?.includes(v),
-        onChange: handleChange(v, index, show),
-        ...option,
-        ...{
-          ...props,
-          reset: void 0,
-          defaultValue: void 0,
-          error: void 0,
-          onBlur: void 0,
-          required: void 0,
-          "aria-describedby": void 0,
-          type: "checkbox"
-        }
-      },
-      label && label.primary && t(label.primary) || value,
-      label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, t(label.secondary))
-    ), !!checked[index] && show && Field && /* @__PURE__ */ React.createElement(CheckboxConditional, null, show.map((fieldName) => /* @__PURE__ */ React.createElement(Field, { name: fieldName, key: fieldName }))), selected && selected())
-  ));
-};
+        show,
+        disabled: optionDisabled,
+        selected,
+        ...option
+      }, index) => /* @__PURE__ */ React.createElement(React.Fragment, { key: index }, /* @__PURE__ */ React.createElement(
+        CheckboxItem,
+        {
+          ref: index === 0 ? ref : void 0,
+          key: `${name}.${index}`,
+          name: `${name}.${v}`,
+          id: `${name}.${v}`,
+          value: v,
+          disabled: disabled || optionDisabled,
+          checked: value?.includes(v),
+          onChange: handleChange(v, index, show),
+          ...option,
+          ...{
+            ...omit(props, ["resetField"]),
+            reset: void 0,
+            defaultValue: void 0,
+            error: void 0,
+            onBlur: void 0,
+            required: void 0,
+            "aria-describedby": void 0,
+            type: "checkbox"
+          }
+        },
+        label && label.primary && t(label.primary) || value,
+        label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, t(label.secondary))
+      ), !!checked[index] && show && Field && /* @__PURE__ */ React.createElement(CheckboxConditional, null, show.map((fieldName) => /* @__PURE__ */ React.createElement(Field, { name: fieldName, key: fieldName }))), selected && selected())
+    ));
+  }
+);
+Checkboxes.displayName = "Checkboxes";
 var Checkboxes_default = Checkboxes;
 export {
   Checkboxes,

package/inputs/Checkboxes/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/Checkboxes/index.tsx"],
-  "sourcesContent": ["import React, { useState } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport {\n  Checkbox,\n  CheckboxItem,\n  CheckboxConditional,\n} from '@digigov/ui/form/Checkbox';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: FieldOptionProps[];\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n}\n\nexport const Checkboxes: React.FC<CheckboxesProps> = ({\n  name,\n  onChange,\n  value,\n  extra: { options, className },\n  disabled,\n  Field,\n  ...props\n}) => {\n  if (!value) value = [];\n  const handleChange =\n    (optionValue, idx, show) =>\n    (evt): void => {\n      let newValue;\n      if (evt.currentTarget.checked) {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.concat([optionValue]);\n      } else {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.filter((val) => val !== optionValue);\n      }\n      if (show && show.length > 0) {\n        setChecked((items) =>\n          items.map((item, index) => (index === idx ? !item : item))\n        );\n      }\n\n      onChange(newValue);\n    };\n  const { t } = useTranslation();\n  const [checked, setChecked] = useState(\n    Array<boolean>(options.length).fill(false)\n  );\n  return (\n    <Checkbox className={className}>\n      {options.map(\n        (\n          {\n            label,\n            value: v,\n            show,\n            disabled: optionDisabled,\n            selected,\n            ...option\n          },\n          index\n        ) => (\n          <React.Fragment key={index}>\n            <CheckboxItem\n              key={`${name}.${index}`}\n              name={`${name}.${v}`}\n              id={`${name}.${v}`}\n              value={v}\n              disabled={disabled || optionDisabled}\n              checked={value?.includes(v)}\n              onChange={handleChange(v, index, show)}\n              {...option}\n              {...{\n                ...props,\n                reset: undefined,\n                defaultValue: undefined,\n                error: undefined,\n                onBlur: undefined,\n                required: undefined,\n                'aria-describedby': undefined,\n                type: 'checkbox',\n              }}\n            >\n              {(label && label.primary && t(label.primary)) || value}\n              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            </CheckboxItem>\n\n            {!!checked[index] && show && Field && (\n              <CheckboxConditional>\n                {show.map((fieldName) => (\n                  <Field name={fieldName} key={fieldName} />\n                ))}\n              </CheckboxConditional>\n            )}\n            {selected && selected()}\n          </React.Fragment>\n        )\n      )}\n    </Checkbox>\n  );\n};\n\nexport default Checkboxes;\n"],
-  "mappings": "AAAA,OAAO,SAAS,gBAAgB;AAGhC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAYd,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO,EAAE,SAAS,UAAU;AAAA,EAC5B;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,QAAM,eACJ,CAAC,aAAa,KAAK,SACnB,CAAC,QAAc;AACb,QAAI;AACJ,QAAI,IAAI,cAAc,SAAS;AAG7B,iBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,IACvC,OAAO;AAGL,iBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,IACtD;AACA,QAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,QAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,MAC3D;AAAA,IACF;AAEA,aAAS,QAAQ;AAAA,EACnB;AACF,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,CAAC,SAAS,UAAU,IAAI;AAAA,IAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,EAC3C;AACA,SACE,oCAAC,YAAS,aACP,QAAQ;AAAA,IACP,CACE;AAAA,MACE;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA,GAAG;AAAA,IACL,GACA,UAEA,oCAAC,MAAM,UAAN,EAAe,KAAK,SACnB;AAAA,MAAC;AAAA;AAAA,QACC,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,QACrB,MAAM,GAAG,IAAI,IAAI,CAAC;AAAA,QAClB,IAAI,GAAG,IAAI,IAAI,CAAC;AAAA,QAChB,OAAO;AAAA,QACP,UAAU,YAAY;AAAA,QACtB,SAAS,OAAO,SAAS,CAAC;AAAA,QAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,QACpC,GAAG;AAAA,QACH,GAAG;AAAA,UACF,GAAG;AAAA,UACH,OAAO;AAAA,UACP,cAAc;AAAA,UACd,OAAO;AAAA,UACP,QAAQ;AAAA,UACR,UAAU;AAAA,UACV,oBAAoB;AAAA,UACpB,MAAM;AAAA,QACR;AAAA;AAAA,MAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,MAChD,SAAS,MAAM,aAAa,oCAAC,YAAM,EAAE,MAAM,SAAS,CAAE;AAAA,IACzD,GAEC,CAAC,CAAC,QAAQ,KAAK,KAAK,QAAQ,SAC3B,oCAAC,2BACE,KAAK,IAAI,CAAC,cACT,oCAAC,SAAM,MAAM,WAAW,KAAK,WAAW,CACzC,CACH,GAED,YAAY,SAAS,CACxB;AAAA,EAEJ,CACF;AAEJ;AAEA,IAAO,qBAAQ;",
+  "sourcesContent": ["import React, { useState } from 'react';\nimport type { UseFormReturn } from 'react-hook-form';\nimport type { ControlledFieldProps } from '@digigov/form/Field/types';\nimport type { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport { omit } from '@digigov/form/utils';\nimport {\n  Checkbox,\n  CheckboxItem,\n  CheckboxConditional,\n} from '@digigov/ui/form/Checkbox';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: FieldOptionProps[];\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n  resetField: UseFormReturn['resetField'];\n}\n\nexport const Checkboxes = React.forwardRef<HTMLInputElement, CheckboxesProps>(\n  (\n    {\n      name,\n      onChange,\n      value,\n      extra: { options, className },\n      disabled,\n      Field,\n      ...props\n    },\n    ref\n  ) => {\n    if (!value) value = [];\n    const handleChange =\n      (optionValue, idx, show) =>\n      (evt): void => {\n        let newValue: any = [];\n        if (evt.currentTarget.checked) {\n          newValue = value.concat([optionValue]);\n        } else {\n          newValue = value.filter((val) => val !== optionValue);\n        }\n        if (show && show.length > 0) {\n          setChecked((items) =>\n            items.map((item, index) => (index === idx ? !item : item))\n          );\n        }\n\n        // reset value to undefined instead of an empty array\n        // so the error state mechanism can throw validation errors\n        if (newValue.length === 0) newValue = undefined;\n        onChange(newValue);\n      };\n    const { t } = useTranslation();\n    const [checked, setChecked] = useState(\n      Array<boolean>(options.length).fill(false)\n    );\n    return (\n      <Checkbox className={className}>\n        {options.map(\n          (\n            {\n              label,\n              value: v,\n              show,\n              disabled: optionDisabled,\n              selected,\n              ...option\n            },\n            index\n          ) => (\n            <React.Fragment key={index}>\n              <CheckboxItem\n                ref={index === 0 ? ref : undefined}\n                key={`${name}.${index}`}\n                name={`${name}.${v}`}\n                id={`${name}.${v}`}\n                value={v}\n                disabled={disabled || optionDisabled}\n                checked={value?.includes(v)}\n                onChange={handleChange(v, index, show)}\n                {...option}\n                {...{\n                  ...omit(props, ['resetField']),\n                  reset: undefined,\n                  defaultValue: undefined,\n                  error: undefined,\n                  onBlur: undefined,\n                  required: undefined,\n                  'aria-describedby': undefined,\n                  type: 'checkbox',\n                }}\n              >\n                {(label && label.primary && t(label.primary)) || value}\n                {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n              </CheckboxItem>\n\n              {!!checked[index] && show && Field && (\n                <CheckboxConditional>\n                  {show.map((fieldName) => (\n                    <Field name={fieldName} key={fieldName} />\n                  ))}\n                </CheckboxConditional>\n              )}\n              {selected && selected()}\n            </React.Fragment>\n          )\n        )}\n      </Checkbox>\n    );\n  }\n);\n\nCheckboxes.displayName = 'Checkboxes';\n\nexport default Checkboxes;\n"],
+  "mappings": "AAAA,OAAO,SAAS,gBAAgB;AAIhC,SAAS,YAAY;AACrB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAad,MAAM,aAAa,MAAM;AAAA,EAC9B,CACE;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,EAAE,SAAS,UAAU;AAAA,IAC5B;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,GACA,QACG;AACH,QAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,UAAM,eACJ,CAAC,aAAa,KAAK,SACnB,CAAC,QAAc;AACb,UAAI,WAAgB,CAAC;AACrB,UAAI,IAAI,cAAc,SAAS;AAC7B,mBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,MACvC,OAAO;AACL,mBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,MACtD;AACA,UAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,UAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,QAC3D;AAAA,MACF;AAIA,UAAI,SAAS,WAAW,EAAG,YAAW;AACtC,eAAS,QAAQ;AAAA,IACnB;AACF,UAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,UAAM,CAAC,SAAS,UAAU,IAAI;AAAA,MAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,IAC3C;AACA,WACE,oCAAC,YAAS,aACP,QAAQ;AAAA,MACP,CACE;AAAA,QACE;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA,UAAU;AAAA,QACV;AAAA,QACA,GAAG;AAAA,MACL,GACA,UAEA,oCAAC,MAAM,UAAN,EAAe,KAAK,SACnB;AAAA,QAAC;AAAA;AAAA,UACC,KAAK,UAAU,IAAI,MAAM;AAAA,UACzB,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,UACrB,MAAM,GAAG,IAAI,IAAI,CAAC;AAAA,UAClB,IAAI,GAAG,IAAI,IAAI,CAAC;AAAA,UAChB,OAAO;AAAA,UACP,UAAU,YAAY;AAAA,UACtB,SAAS,OAAO,SAAS,CAAC;AAAA,UAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,UACpC,GAAG;AAAA,UACH,GAAG;AAAA,YACF,GAAG,KAAK,OAAO,CAAC,YAAY,CAAC;AAAA,YAC7B,OAAO;AAAA,YACP,cAAc;AAAA,YACd,OAAO;AAAA,YACP,QAAQ;AAAA,YACR,UAAU;AAAA,YACV,oBAAoB;AAAA,YACpB,MAAM;AAAA,UACR;AAAA;AAAA,QAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,QAChD,SAAS,MAAM,aAAa,oCAAC,YAAM,EAAE,MAAM,SAAS,CAAE;AAAA,MACzD,GAEC,CAAC,CAAC,QAAQ,KAAK,KAAK,QAAQ,SAC3B,oCAAC,2BACE,KAAK,IAAI,CAAC,cACT,oCAAC,SAAM,MAAM,WAAW,KAAK,WAAW,CACzC,CACH,GAED,YAAY,SAAS,CACxB;AAAA,IAEJ,CACF;AAAA,EAEJ;AACF;AAEA,WAAW,cAAc;AAEzB,IAAO,qBAAQ;",
   "names": []
 }

package/inputs/DateInput/DateInput.stories.d.ts

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

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

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

package/inputs/DateInput/__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/DateInput/__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/DateInput/__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/DateInput/__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/DateInput/index.d.ts

@@ -1,13 +1,10 @@
 import React from 'react';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
 export interface DateInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
     extra?: {
         max?: string;
         min?: string;
     };
 }
-export declare const DateInput: ({ name, ...props }: {
-    [x: string]: any;
-    name: any;
-}) => React.JSX.Element;
+export declare const DateInput: React.ForwardRefExoticComponent<Omit<Record<string, any>, "ref"> & React.RefAttributes<HTMLInputElement>>;
 export default DateInput;

package/inputs/DateInput/index.js

@@ -1,7 +1,7 @@
-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/FormBuilder";
+import { useFormContext } from "@digigov/form/FormContext";
 import {
   DateInputContainer,
   DateInputItem
@@ -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("/");
@@ -69,26 +68,41 @@ const makeDate = (val) => {
   }
   return "";
 };
-const DatePart = ({ label, ...props }) => {
-  return /* @__PURE__ */ React.createElement(DateInputItem, { ...props }, label);
-};
-const DateInput = ({ name, ...props }) => {
+const DatePart = React.forwardRef(
+  ({ label, ...props }, ref) => {
+    return /* @__PURE__ */ React.createElement(DateInputItem, { ...props, ref }, label);
+  }
+);
+DatePart.displayName = "DatePart";
+const DateInput = React.forwardRef(({ name, ...props }, ref) => {
   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,
     {
+      ref,
       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 +117,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`,
@@ -129,7 +148,8 @@ const DateInput = ({ name, ...props }) => {
       error: !date.year ? props.error : false
     }
   ));
-};
+});
+DateInput.displayName = "DateInput";
 var DateInput_default = DateInput;
 export {
   DateInput,

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/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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",
+  "sourcesContent": ["import React, { useMemo, useEffect } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport type { 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 = React.forwardRef<HTMLInputElement, Record<string, any>>(\n  ({ label, ...props }, ref) => {\n    return (\n      <DateInputItem {...props} ref={ref}>\n        {label}\n      </DateInputItem>\n    );\n  }\n);\nDatePart.displayName = 'DatePart';\n\nexport const DateInput = React.forwardRef<\n  HTMLInputElement,\n  Record<string, any>\n>(({ name, ...props }, ref) => {\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        ref={ref}\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\nDateInput.displayName = 'DateInput';\n\nexport default DateInput;\n"],
+  "mappings": "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",
   "names": ["day", "month", "year", "value"]
 }

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

@@ -1,7 +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__/Default.d.ts

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

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.d.ts

@@ -1,13 +1,10 @@
 import React from 'react';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { 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 declare const DateTimeInput: React.ForwardRefExoticComponent<Omit<Record<string, any>, "ref"> & React.RefAttributes<HTMLInputElement>>;
 export default DateTimeInput;

package/inputs/DateTimeInput/index.js

@@ -1,7 +1,7 @@
-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/FormBuilder";
+import { useFormContext } from "@digigov/form/FormContext";
 import {
   DateInputContainer,
   DateInputItem
@@ -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(" ");
@@ -91,101 +90,128 @@ const makeDateTime = (val) => {
   }
   return "";
 };
-const DateTimePart = ({ label, ...props }) => {
-  return /* @__PURE__ */ React.createElement(DateInputItem, { ...props }, label);
-};
-const DateTimeInput = ({ name, ...props }) => {
+const DateTimePart = React.forwardRef(
+  ({ label, ...props }, ref) => {
+    return /* @__PURE__ */ React.createElement(DateInputItem, { ...props, ref }, label);
+  }
+);
+DateTimePart.displayName = "DateTimePart";
+const DateTimeInput = React.forwardRef(({ name, ...props }, ref) => {
   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,
     {
+      ref,
       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
     }
   ));
-};
+});
+DateTimeInput.displayName = "DateTimeInput";
 var DateTimeInput_default = DateTimeInput;
 export {
   DateTimeInput,