@digigov/form 2.0.0-85c27c19 → 2.0.0-8e254888

package/index.js

@@ -1,160 +1,17 @@
-/** @license Digigov v2.0.0-85c27c19
+/** @license Digigov v2.0.0-8e254888
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React, { useCallback, useContext, useRef } from "react";
-import { useForm } from "react-hook-form";
-import Field from "@digigov/form/Field";
-import Fieldset from "@digigov/form/Fieldset";
-import { FormContext } from "@digigov/form/FormContext";
-import { yupResolver } from "@digigov/form/utils";
-import { useValidationSchema } from "@digigov/form/validators";
-import { Form } from "@digigov/react-core/Form";
-import { Button } from "@digigov/ui/form/Button";
-const FormBase = React.forwardRef(function FormBase2({
-  onSubmit,
-  children,
-  registerField,
-  fieldsMap,
-  fieldsetsMap,
-  resolver,
-  mode,
-  initial,
-  reValidateMode,
-  shouldFocusError,
-  criteriaMode,
-  componentRegistry,
-  grid,
-  ...props
-}, ref) {
-  const form = useForm({
-    resolver,
-    mode,
-    defaultValues: initial,
-    reValidateMode,
-    shouldFocusError,
-    criteriaMode
-  });
-  const handleSubmit = useCallback(
-    (data) => {
-      onSubmit && onSubmit(data);
-    },
-    [onSubmit]
-  );
-  const submit = form.handleSubmit(handleSubmit);
-  const ctx = {
-    fieldsMap,
-    fieldsetsMap,
-    control: form.control,
-    register: form.register,
-    watch: form.watch,
-    resetField: form.resetField,
-    registerField,
-    errors: form.formState.errors,
-    formState: form.formState,
-    reset: form.reset,
-    trigger: form.trigger,
-    getFieldState: form.getFieldState,
-    setValue: form.setValue,
-    clearErrors: form.clearErrors,
-    getValues: form.getValues,
-    unregister: form.unregister,
-    componentRegistry,
-    setError: form.setError,
-    formRef: ref,
-    submit
-  };
-  return /* @__PURE__ */ React.createElement(FormContext.Provider, { value: ctx }, /* @__PURE__ */ React.createElement(Form, { grid, onSubmit: submit, ref, ...props }, children));
-});
-const useFormContext = () => {
-  return useContext(FormContext);
-};
-const useFormValues = () => {
-  const ctx = useFormContext();
-  return ctx.getValues();
-};
-const FormBuilder = React.forwardRef(function FormBuilder2({
-  fields = [],
-  fieldsets,
-  initial = {},
-  onSubmit,
-  children,
-  reValidateMode = "onSubmit",
-  mode = "onSubmit",
-  shouldFocusError = true,
-  criteriaMode = "all",
-  auto = false,
-  validatorRegistry,
-  componentRegistry,
-  grid = false,
-  ...props
-}, ref) {
-  const fieldsState = useRef(fields);
-  const setFieldsState = useCallback((newFields) => {
-    fieldsState.current = newFields;
-  }, []);
-  const schema = useValidationSchema(fieldsState, validatorRegistry);
-  const registerField = useCallback((field) => {
-    const fieldIndex = fieldsState.current.findIndex(
-      (f) => f.key === field.key
-    );
-    if (fieldIndex > -1) {
-      fieldsState.current[fieldIndex] = field;
-    } else {
-      fieldsState.current.push(field);
-    }
-    setFieldsState(fieldsState.current);
-  }, []);
-  let resolver;
-  let fieldsMap;
-  let fieldsetsMap;
-  let fieldChildren;
-  if (schema) {
-    resolver = yupResolver(schema);
-    fieldsMap = fields ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {}) : {};
-    fieldsetsMap = fieldsets && fieldsets.reduce(
-      (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),
-      {}
-    );
-    if (auto) {
-      if (fieldsets) {
-        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ React.createElement(Fieldset, { key: fieldset.key }));
-      } else if (fields) {
-        fieldChildren = fields.map((field) => /* @__PURE__ */ React.createElement(Field, { key: field.key, name: field.key }));
-      }
-    }
-  }
-  return /* @__PURE__ */ React.createElement(
-    FormBase,
-    {
-      resolver,
-      fieldsetsMap,
-      fieldsMap,
-      registerField,
-      initial,
-      reValidateMode,
-      mode,
-      shouldFocusError,
-      criteriaMode,
-      onSubmit,
-      componentRegistry,
-      ref,
-      grid,
-      ...props
-    },
-    fieldChildren,
-    auto && /* @__PURE__ */ React.createElement(Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
-    children
-  );
-});
-export * from "@digigov/form/internal";
+import { default as default2 } from "@digigov/form/Field";
+import { default as default3 } from "@digigov/form/Fieldset";
+export * from "@digigov/form/inputs/Label";
+import FormBuilder from "@digigov/form/FormBuilder";
+export * from "@digigov/form/types";
 var src_default = FormBuilder;
 export {
-  FormBase,
-  FormBuilder,
-  src_default as default,
-  useFormContext,
-  useFormValues
+  default2 as Field,
+  default3 as Fieldset,
+  src_default as default
 };
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../src/index.tsx"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport React, { useCallback, useContext, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport Field from '@digigov/form/Field';\nimport Fieldset from '@digigov/form/Fieldset';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FormBaseProps, FormData, FormBuilderProps } from '@digigov/form/types';\nimport { yupResolver } from '@digigov/form/utils';\nimport { useValidationSchema } from '@digigov/form/validators';\nimport { Form } from '@digigov/react-core/Form';\nimport { Button } from '@digigov/ui/form/Button';\n\nconst FormBase = React.forwardRef(function FormBase(\n  {\n    onSubmit,\n    children,\n    registerField,\n    fieldsMap,\n    fieldsetsMap,\n    resolver,\n    mode,\n    initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n    componentRegistry,\n    grid,\n    ...props\n  }: FormBaseProps,\n  ref: React.Ref<HTMLFormElement>\n) {\n  const form = useForm({\n    resolver,\n    mode,\n    defaultValues: initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n  });\n\n  const handleSubmit = useCallback(\n    (data: FormData): void => {\n      onSubmit && onSubmit(data);\n    },\n    [onSubmit]\n  );\n  const submit = form.handleSubmit(handleSubmit);\n\n  const ctx = {\n    fieldsMap,\n    fieldsetsMap,\n    control: form.control,\n    register: form.register,\n    watch: form.watch,\n    resetField: form.resetField,\n    registerField: registerField,\n    errors: form.formState.errors,\n    formState: form.formState,\n    reset: form.reset,\n    trigger: form.trigger,\n    getFieldState: form.getFieldState,\n    setValue: form.setValue,\n    clearErrors: form.clearErrors,\n    getValues: form.getValues,\n    unregister: form.unregister,\n    componentRegistry,\n    setError: form.setError,\n    formRef: ref,\n    submit,\n  };\n  return (\n    <FormContext.Provider value={ctx}>\n      <Form grid={grid} onSubmit={submit} ref={ref} {...props}>\n        {children}\n      </Form>\n    </FormContext.Provider>\n  );\n});\n\nconst useFormContext = () => {\n  return useContext(FormContext);\n};\nconst useFormValues = () => {\n  const ctx = useFormContext();\n  return ctx.getValues();\n};\nconst FormBuilder = React.forwardRef(function FormBuilder(\n  {\n    fields = [],\n    fieldsets,\n    initial = {},\n    onSubmit,\n    children,\n    reValidateMode = 'onSubmit',\n    mode = 'onSubmit',\n    shouldFocusError = true,\n    criteriaMode = 'all',\n    auto = false,\n    validatorRegistry,\n    componentRegistry,\n    grid = false,\n    ...props\n  }: FormBuilderProps,\n  ref: React.Ref<HTMLFormElement>\n): React.ReactElement {\n  const fieldsState = useRef(fields);\n  const setFieldsState = useCallback((newFields) => {\n    fieldsState.current = newFields;\n  }, []);\n  const schema = useValidationSchema(fieldsState, validatorRegistry);\n  const registerField = useCallback((field) => {\n    const fieldIndex = fieldsState.current.findIndex(\n      (f) => f.key === field.key\n    );\n    if (fieldIndex > -1) {\n      fieldsState.current[fieldIndex] = field;\n    } else {\n      fieldsState.current.push(field);\n    }\n    setFieldsState(fieldsState.current);\n  }, []);\n  let resolver;\n  let fieldsMap;\n  let fieldsetsMap;\n  let fieldChildren;\n  if (schema) {\n    resolver = yupResolver(schema);\n    fieldsMap = fields\n      ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {})\n      : {};\n    fieldsetsMap =\n      fieldsets &&\n      fieldsets.reduce(\n        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),\n        {}\n      );\n\n    if (auto) {\n      if (fieldsets) {\n        fieldChildren = fieldsets.map((fieldset) => (\n          <Fieldset key={fieldset.key} />\n        ));\n      } else if (fields) {\n        fieldChildren = fields.map((field) => (\n          <Field key={field.key} name={field.key} />\n        ));\n      }\n    }\n  }\n  return (\n    <FormBase\n      resolver={resolver}\n      fieldsetsMap={fieldsetsMap}\n      fieldsMap={fieldsMap}\n      registerField={registerField}\n      initial={initial}\n      reValidateMode={reValidateMode}\n      mode={mode}\n      shouldFocusError={shouldFocusError}\n      criteriaMode={criteriaMode}\n      onSubmit={onSubmit}\n      componentRegistry={componentRegistry}\n      ref={ref}\n      grid={grid}\n      {...props}\n    >\n      {fieldChildren}\n      {auto && <Button type=\"submit\">\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1</Button>}\n      {children}\n    </FormBase>\n  );\n});\n\nexport { FormBase, useFormContext, useFormValues, FormBuilder };\n\nexport * from '@digigov/form/internal';\n\nexport default FormBuilder;\n"],
-  "mappings": "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",
-  "names": ["FormBase", "FormBuilder"]
+  "sources": ["../src/index.ts"],
+  "sourcesContent": ["export { default as Field } from '@digigov/form/Field';\nexport { default as Fieldset } from '@digigov/form/Fieldset';\nexport * from '@digigov/form/inputs/Label';\nimport FormBuilder from '@digigov/form/FormBuilder';\nexport * from '@digigov/form/types';\nexport default FormBuilder;\n"],
+  "mappings": "AAAA,SAAoB,WAAXA,gBAAwB;AACjC,SAAoB,WAAXA,gBAA2B;AACpC,cAAc;AACd,OAAO,iBAAiB;AACxB,cAAc;AACd,IAAO,cAAQ;",
+  "names": ["default"]
 }

package/inputs/AutoCompleteInput/index.d.ts

@@ -3,7 +3,7 @@ import { ControlledFieldProps } from '@digigov/form/Field/types';
 import { FieldOptionProps } from '@digigov/form/inputs/Label';
 import { AutoCompleteProps as UIAutoCompleteProps } from '@digigov/ui/form/AutoComplete';
 export interface AutoCompleteInputExtra extends Omit<UIAutoCompleteProps, 'source' | 'id' | 'templates' | 'defaultValue' | 'onConfirm' | 'dropdownArrow'> {
-    options: Array<FieldOptionProps>;
+    options: FieldOptionProps[];
 }
 export interface AutoCompleteInputProps extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'extra'> {
     extra: AutoCompleteInputExtra;

package/inputs/AutoCompleteInput/index.js

@@ -1,12 +1,15 @@
 import React, { useCallback } from "react";
-import { Hint } from "@digigov/react-core/Hint";
-import UIAutoComplete from "@digigov/ui/form/AutoComplete";
+import {
+  AutoComplete
+} from "@digigov/ui/form/AutoComplete";
+import { Hint } from "@digigov/ui/typography/Hint";
+import { Base } from "@digigov/ui/utils/Base";
 const AutoCompleteInput = ({
   name,
-  extra: { options, multiple },
+  type,
+  extra: { options },
   onChange,
   value,
-  error,
   ...props
 }) => {
   const suggest = useCallback(
@@ -20,21 +23,22 @@ const AutoCompleteInput = ({
     [options]
   );
   return /* @__PURE__ */ React.createElement(
-    UIAutoComplete,
+    AutoComplete,
     {
-      multiple,
+      multiple: type === "choice:multiple" ? true : false,
       source: suggest,
       onConfirm: (value2) => {
         if (Array.isArray(value2)) {
           const selectedValues = value2.map((item) => item.value);
-          selectedValues.length > 0 ? onChange(selectedValues) : onChange(void 0);
+          if (selectedValues.length > 0) onChange(selectedValues);
+          else onChange(void 0);
         } else {
           onChange(value2.value);
         }
       },
       templates: {
         suggestion({ label, value: value2 }) {
-          return /* @__PURE__ */ React.createElement("div", null, label && label.primary && label.primary || value2, label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, label.secondary));
+          return /* @__PURE__ */ React.createElement(Base, { as: "div" }, label && label.primary && label.primary || value2, label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, label.secondary));
         },
         inputValue: (option) => {
           if (!option) {
@@ -46,7 +50,8 @@ const AutoCompleteInput = ({
       ...{
         ...props,
         reset: void 0,
-        required: void 0
+        required: void 0,
+        Field: void 0
       },
       name,
       id: `${name}-id`,

package/inputs/AutoCompleteInput/index.js.map

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

package/inputs/Checkboxes/index.d.ts

@@ -5,7 +5,7 @@ export interface CheckboxesProps extends Omit<ControlledFieldProps, 'extra' | 'v
     value?: string[];
     extra: {
         className?: string;
-        options: Array<FieldOptionProps>;
+        options: FieldOptionProps[];
     };
     fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;
 }

package/inputs/Checkboxes/index.js

@@ -1,16 +1,18 @@
 import React, { useState } from "react";
-import CoreCheckboxes from "@digigov/react-core/Checkbox";
-import { CheckboxConditional } from "@digigov/react-core/CheckboxConditional";
-import CheckboxItem from "@digigov/react-core/CheckboxItem";
-import Hint from "@digigov/react-core/Hint";
+import {
+  Checkbox,
+  CheckboxItem,
+  CheckboxConditional
+} 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,
-  fieldComponent: Field,
+  Field,
   ...props
 }) => {
   if (!value) value = [];
@@ -33,7 +35,7 @@ const Checkboxes = ({
   const [checked, setChecked] = useState(
     Array(options.length).fill(false)
   );
-  return /* @__PURE__ */ React.createElement(CoreCheckboxes, { className }, options.map(
+  return /* @__PURE__ */ React.createElement(Checkbox, { className }, options.map(
     ({
       label,
       value: v,
@@ -46,6 +48,7 @@ const Checkboxes = ({
       {
         key: `${name}.${index}`,
         name: `${name}.${v}`,
+        id: `${name}.${v}`,
         value: v,
         disabled: disabled || optionDisabled,
         checked: value?.includes(v),
@@ -57,6 +60,7 @@ const Checkboxes = ({
           defaultValue: void 0,
           onBlur: void 0,
           required: void 0,
+          Field: void 0,
           "aria-describedby": void 0,
           type: "checkbox"
         }

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 CoreCheckboxes from '@digigov/react-core/Checkbox';\nimport { CheckboxConditional } from '@digigov/react-core/CheckboxConditional';\nimport CheckboxItem from '@digigov/react-core/CheckboxItem';\nimport Hint from '@digigov/react-core/Hint';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: Array<FieldOptionProps>;\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n}\n\nexport const Checkboxes: React.FC<CheckboxesProps> = ({\n  name,\n  onChange,\n  value,\n  extra: { options, className },\n  disabled,\n  fieldComponent: Field,\n  ...props\n}) => {\n  if (!value) value = [];\n  const handleChange =\n    (optionValue, idx, show) =>\n    (evt): void => {\n      let newValue;\n      if (evt.currentTarget.checked) {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.concat([optionValue]);\n      } else {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.filter((val) => val !== optionValue);\n      }\n      if (show && show.length > 0) {\n        setChecked((items) =>\n          items.map((item, index) => (index === idx ? !item : item))\n        );\n      }\n\n      // reset value to undefined instead of an empty array\n      // so the error state mechanism can throw validation errors\n      if (newValue.length === 0) newValue = undefined;\n      onChange(newValue);\n    };\n  const { t } = useTranslation();\n  const [checked, setChecked] = useState(\n    Array<boolean>(options.length).fill(false)\n  );\n  return (\n    <CoreCheckboxes className={className}>\n      {options.map(\n        (\n          {\n            label,\n            value: v,\n            show,\n            disabled: optionDisabled,\n            selected,\n            ...option\n          },\n          index\n        ) => (\n          <React.Fragment key={index}>\n            <CheckboxItem\n              key={`${name}.${index}`}\n              name={`${name}.${v}`}\n              value={v}\n              disabled={disabled || optionDisabled}\n              checked={value?.includes(v)}\n              onChange={handleChange(v, index, show)}\n              {...option}\n              {...{\n                ...props,\n                reset: undefined,\n                defaultValue: undefined,\n                onBlur: undefined,\n                required: undefined,\n                'aria-describedby': undefined,\n                type: 'checkbox',\n              }}\n            >\n              {(label && label.primary && t(label.primary)) || value}\n              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            </CheckboxItem>\n\n            {!!checked[index] && show && Field && (\n              <CheckboxConditional>\n                {show.map((fieldName) => (\n                  <Field name={fieldName} key={fieldName} />\n                ))}\n              </CheckboxConditional>\n            )}\n            {selected && selected()}\n          </React.Fragment>\n        )\n      )}\n    </CoreCheckboxes>\n  );\n};\n\nexport default Checkboxes;\n"],
-  "mappings": "AAAA,OAAO,SAAS,gBAAgB;AAGhC,OAAO,oBAAoB;AAC3B,SAAS,2BAA2B;AACpC,OAAO,kBAAkB;AACzB,OAAO,UAAU;AACjB,SAAS,sBAAsB;AAYxB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO,EAAE,SAAS,UAAU;AAAA,EAC5B;AAAA,EACA,gBAAgB;AAAA,EAChB,GAAG;AACL,MAAM;AACJ,MAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,QAAM,eACJ,CAAC,aAAa,KAAK,SACnB,CAAC,QAAc;AACb,QAAI;AACJ,QAAI,IAAI,cAAc,SAAS;AAG7B,iBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,IACvC,OAAO;AAGL,iBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,IACtD;AACA,QAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,QAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,MAC3D;AAAA,IACF;AAIA,QAAI,SAAS,WAAW,EAAG,YAAW;AACtC,aAAS,QAAQ;AAAA,EACnB;AACF,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,CAAC,SAAS,UAAU,IAAI;AAAA,IAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,EAC3C;AACA,SACE,oCAAC,kBAAe,aACb,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,OAAO;AAAA,QACP,UAAU,YAAY;AAAA,QACtB,SAAS,OAAO,SAAS,CAAC;AAAA,QAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,QACpC,GAAG;AAAA,QACH,GAAG;AAAA,UACF,GAAG;AAAA,UACH,OAAO;AAAA,UACP,cAAc;AAAA,UACd,QAAQ;AAAA,UACR,UAAU;AAAA,UACV,oBAAoB;AAAA,UACpB,MAAM;AAAA,QACR;AAAA;AAAA,MAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,MAChD,SAAS,MAAM,aAAa,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 { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport {\n  Checkbox,\n  CheckboxItem,\n  CheckboxConditional,\n} from '@digigov/ui/form/Checkbox';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: FieldOptionProps[];\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n}\n\nexport const Checkboxes: React.FC<CheckboxesProps> = ({\n  name,\n  onChange,\n  value,\n  extra: { options, className },\n  disabled,\n  Field,\n  ...props\n}) => {\n  if (!value) value = [];\n  const handleChange =\n    (optionValue, idx, show) =>\n    (evt): void => {\n      let newValue;\n      if (evt.currentTarget.checked) {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.concat([optionValue]);\n      } else {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.filter((val) => val !== optionValue);\n      }\n      if (show && show.length > 0) {\n        setChecked((items) =>\n          items.map((item, index) => (index === idx ? !item : item))\n        );\n      }\n\n      // reset value to undefined instead of an empty array\n      // so the error state mechanism can throw validation errors\n      if (newValue.length === 0) newValue = undefined;\n      onChange(newValue);\n    };\n  const { t } = useTranslation();\n  const [checked, setChecked] = useState(\n    Array<boolean>(options.length).fill(false)\n  );\n  return (\n    <Checkbox className={className}>\n      {options.map(\n        (\n          {\n            label,\n            value: v,\n            show,\n            disabled: optionDisabled,\n            selected,\n            ...option\n          },\n          index\n        ) => (\n          <React.Fragment key={index}>\n            <CheckboxItem\n              key={`${name}.${index}`}\n              name={`${name}.${v}`}\n              id={`${name}.${v}`}\n              value={v}\n              disabled={disabled || optionDisabled}\n              checked={value?.includes(v)}\n              onChange={handleChange(v, index, show)}\n              {...option}\n              {...{\n                ...props,\n                reset: undefined,\n                defaultValue: undefined,\n                onBlur: undefined,\n                required: undefined,\n                Field: 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;AAIA,QAAI,SAAS,WAAW,EAAG,YAAW;AACtC,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,QAAQ;AAAA,UACR,UAAU;AAAA,UACV,OAAO;AAAA,UACP,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;",
   "names": []
 }

package/inputs/DateInput/index.d.ts

@@ -6,9 +6,8 @@ export interface DateInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
         min?: string;
     };
 }
-export declare const DateInput: ({ name, type, ...props }: {
+export declare const DateInput: ({ name, ...props }: {
     [x: string]: any;
     name: any;
-    type: any;
 }) => React.JSX.Element;
 export default DateInput;

package/inputs/DateInput/index.js

@@ -1,8 +1,10 @@
 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 {
+  DateInputContainer,
+  DateInputItem
+} from "@digigov/ui/form/DateInputContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 dayjs.extend(customParseFormat);
 function useDate(value, onChange) {
@@ -23,18 +25,18 @@ function useDate(value, onChange) {
     }
   }
   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;
     }
@@ -58,9 +60,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(() => {
@@ -79,6 +81,7 @@ const DateInput = ({ name, type, ...props }) => {
       value: date.day,
       width: 2,
       name: `${name}-day`,
+      id: `${name}-day`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
@@ -93,6 +96,7 @@ const DateInput = ({ name, type, ...props }) => {
       value: date.month,
       width: 2,
       name: `${name}-month`,
+      id: `${name}-month`,
       maxLength: "2",
       disabled: props.disabled,
       "aria-required": props["aria-required"],
@@ -106,6 +110,7 @@ const DateInput = ({ name, type, ...props }) => {
       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 {\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(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.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  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 <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 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        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) => date.setMonth(e, true)}\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        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;