@digigov/form 2.0.0-a32ad9b2 → 2.0.0-abd768eb
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Field/FieldBase/index.js +7 -2
- package/Field/FieldBase.js.map +2 -2
- package/Field/FieldBaseContainer/index.js +37 -18
- package/Field/FieldBaseContainer.d.ts +1 -1
- package/Field/FieldBaseContainer.js.map +2 -2
- package/Field/FieldConditional/index.js +4 -0
- package/Field/FieldConditional.js.map +2 -2
- package/Field/index.js +10 -4
- package/Field/index.js.map +2 -2
- package/Field/types.d.ts +10 -3
- package/Field/utils/index.js +3 -1
- package/Field/utils/index.js.map +2 -2
- package/Field/utils/useField/index.js +8 -1
- package/Field/utils/useField.js.map +2 -2
- package/FieldArray/FormDialog/index.js +314 -196
- package/FieldArray/FormDialog.d.ts +20 -7
- package/FieldArray/FormDialog.js.map +3 -3
- package/FieldArray/__stories__/Default.d.ts +1 -1
- package/FieldArray/__stories__/WithExactLength.d.ts +1 -1
- package/FieldArray/__stories__/WithModal.d.ts +1 -1
- package/FieldArray/index.d.ts +1 -0
- package/FieldArray/index.js +32 -8
- package/FieldArray/index.js.map +2 -2
- package/FieldObject/index.d.ts +3 -0
- package/FieldObject/index.js +26 -15
- package/FieldObject/index.js.map +2 -2
- package/FormBuilder/FormBuilder.stories.d.ts +2 -0
- package/FormBuilder/__stories__/AutoErrorGrouping.d.ts +1 -1
- package/FormBuilder/__stories__/Default.d.ts +1 -1
- package/FormBuilder/__stories__/ErrorGrouping.d.ts +1 -1
- package/FormBuilder/index.d.ts +1 -1
- package/FormBuilder/index.js +11 -7
- package/FormBuilder/index.js.map +2 -2
- package/FormContext/index.js +6 -2
- package/FormContext.d.ts +1 -0
- package/FormContext.js.map +2 -2
- package/MultiplicityField/MultiplicityField.stories.d.ts +2 -0
- package/MultiplicityField/__stories__/Default.d.ts +1 -1
- package/MultiplicityField/__stories__/PreviewDisplay.d.ts +1 -1
- package/MultiplicityField/__stories__/WithExactLength.d.ts +1 -1
- package/MultiplicityField/__stories__/WithMaxLength.d.ts +1 -1
- package/MultiplicityField/__stories__/WithMinAndMaxLength.d.ts +1 -1
- package/MultiplicityField/__stories__/WithMinLength.d.ts +1 -1
- package/MultiplicityField/add-objects/index.js +2 -0
- package/MultiplicityField/add-objects.js.map +2 -2
- package/MultiplicityField/index.js +4 -1
- package/MultiplicityField/index.js.map +2 -2
- package/MultiplicityField/types.d.ts +1 -0
- package/Questions/Questions.stories.d.ts +2 -0
- package/Questions/__stories__/Default.d.ts +1 -1
- package/cjs/Field/FieldBase/index.js +7 -2
- package/cjs/Field/FieldBase.js.map +2 -2
- package/cjs/Field/FieldBaseContainer/index.js +36 -17
- package/cjs/Field/FieldBaseContainer.js.map +3 -3
- package/cjs/Field/FieldConditional/index.js +4 -0
- package/cjs/Field/FieldConditional.js.map +2 -2
- package/cjs/Field/index.js +10 -4
- package/cjs/Field/index.js.map +2 -2
- package/cjs/Field/types.js.map +1 -1
- package/cjs/Field/utils/index.js +3 -1
- package/cjs/Field/utils/index.js.map +2 -2
- package/cjs/Field/utils/useField/index.js +8 -1
- package/cjs/Field/utils/useField.js.map +2 -2
- package/cjs/FieldArray/FormDialog/index.js +309 -194
- package/cjs/FieldArray/FormDialog.js.map +3 -3
- package/cjs/FieldArray/index.js +31 -7
- package/cjs/FieldArray/index.js.map +2 -2
- package/cjs/FieldObject/index.js +26 -15
- package/cjs/FieldObject/index.js.map +2 -2
- package/cjs/FormBuilder/index.js +11 -7
- package/cjs/FormBuilder/index.js.map +2 -2
- package/cjs/FormContext/index.js +7 -2
- package/cjs/FormContext.js.map +2 -2
- package/cjs/MultiplicityField/add-objects/index.js +2 -0
- package/cjs/MultiplicityField/add-objects.js.map +2 -2
- package/cjs/MultiplicityField/index.js +4 -1
- package/cjs/MultiplicityField/index.js.map +2 -2
- package/cjs/MultiplicityField/types.js.map +1 -1
- package/cjs/inputs/Checkboxes/index.js +2 -2
- package/cjs/inputs/Checkboxes/index.js.map +2 -2
- package/cjs/inputs/DateInput/index.js +41 -14
- package/cjs/inputs/DateInput/index.js.map +2 -2
- package/cjs/inputs/DateTimeInput/index.js +68 -34
- package/cjs/inputs/DateTimeInput/index.js.map +2 -2
- package/cjs/inputs/FileInput/index.js +52 -29
- package/cjs/inputs/FileInput/index.js.map +2 -2
- package/cjs/inputs/ImageInput/__stories__/logo.d/index.js +1 -0
- package/cjs/inputs/ImageInput/__stories__/logo.d.js.map +7 -0
- package/cjs/inputs/ImageInput/index.js +41 -10
- package/cjs/inputs/ImageInput/index.js.map +2 -2
- package/cjs/inputs/Input/index.js +4 -4
- package/cjs/inputs/Input/index.js.map +2 -2
- package/cjs/inputs/Select/index.js +4 -3
- package/cjs/inputs/Select/index.js.map +2 -2
- package/cjs/inputs/inputsScenarios/index.js +2 -2
- package/cjs/inputs/inputsScenarios.js.map +2 -2
- package/cjs/lazy/index.js +2 -1
- package/cjs/lazy.js.map +2 -2
- package/cjs/registry/index.js +6 -6
- package/cjs/registry.js.map +2 -2
- package/cjs/types.js.map +1 -1
- package/cjs/utils/index.js +20 -6
- package/cjs/utils.js.map +2 -2
- package/cjs/validators/index.js +11 -6
- package/cjs/validators/index.js.map +2 -2
- package/cjs/validators/utils/amka/index.js +60 -0
- package/cjs/validators/utils/amka.js.map +7 -0
- package/cjs/validators/utils/date/index.js +26 -3
- package/cjs/validators/utils/date.js.map +2 -2
- package/cjs/validators/utils/datetime/index.js +118 -24
- package/cjs/validators/utils/datetime.js.map +2 -2
- package/cjs/validators/utils/file/index.js +30 -17
- package/cjs/validators/utils/file.js.map +2 -2
- package/cjs/validators/utils/index.js +5 -1
- package/cjs/validators/utils/index.js.map +2 -2
- package/index.js +1 -1
- package/inputs/AutoCompleteInput/AutoComplete.stories.d.ts +2 -0
- package/inputs/AutoCompleteInput/__stories__/Default.d.ts +1 -1
- package/inputs/AutoCompleteInput/__stories__/Multiple.d.ts +1 -1
- package/inputs/Checkboxes/Checkboxes.stories.d.ts +2 -0
- package/inputs/Checkboxes/__stories__/Conditional.d.ts +1 -1
- package/inputs/Checkboxes/__stories__/Default.d.ts +1 -1
- package/inputs/Checkboxes/__stories__/WithDivider.d.ts +1 -1
- package/inputs/Checkboxes/index.js +2 -2
- package/inputs/Checkboxes/index.js.map +2 -2
- package/inputs/DateInput/DateInput.stories.d.ts +6 -0
- package/inputs/DateInput/__stories__/Default.d.ts +1 -1
- package/inputs/DateInput/__stories__/WithDefaultValue.d.ts +3 -0
- package/inputs/DateInput/__stories__/WithInitialValue.d.ts +3 -0
- package/inputs/DateInput/__stories__/WithWrongDefaultValue.d.ts +3 -0
- package/inputs/DateInput/__stories__/WithWrongInitialValue.d.ts +3 -0
- package/inputs/DateInput/index.js +42 -15
- package/inputs/DateInput/index.js.map +2 -2
- package/inputs/DateTimeInput/DateTimeInput.stories.d.ts +10 -3
- package/inputs/DateTimeInput/__stories__/Default.d.ts +1 -1
- package/inputs/DateTimeInput/__stories__/WithDefaultValue.d.ts +3 -0
- package/inputs/DateTimeInput/__stories__/WithInitialValue.d.ts +3 -0
- package/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.d.ts +3 -0
- package/inputs/DateTimeInput/__stories__/WithWrongInitialValue.d.ts +3 -0
- package/inputs/DateTimeInput/index.js +69 -35
- package/inputs/DateTimeInput/index.js.map +2 -2
- package/inputs/FileInput/FileInput.stories.d.ts +3 -0
- package/inputs/FileInput/__stories__/Default.d.ts +1 -1
- package/inputs/FileInput/__stories__/WithBorderAndLink.d.ts +3 -0
- package/inputs/FileInput/index.d.ts +11 -4
- package/inputs/FileInput/index.js +57 -31
- package/inputs/FileInput/index.js.map +2 -2
- package/inputs/ImageInput/ImageInput.stories.d.ts +4 -1
- package/inputs/ImageInput/__stories__/Default.d.ts +1 -1
- package/inputs/ImageInput/__stories__/MaxSize.d.ts +1 -1
- package/inputs/ImageInput/__stories__/WithInitialValues.d.ts +3 -0
- package/inputs/ImageInput/__stories__/WithInvalidImageDimension.d.ts +1 -1
- package/inputs/ImageInput/__stories__/logo.d/index.js +1 -0
- package/inputs/ImageInput/__stories__/logo.d/package.json +6 -0
- package/inputs/ImageInput/__stories__/logo.d.js.map +7 -0
- package/inputs/ImageInput/index.d.ts +9 -1
- package/inputs/ImageInput/index.js +42 -11
- package/inputs/ImageInput/index.js.map +2 -2
- package/inputs/Input/Input.stories.d.ts +4 -0
- package/inputs/Input/__stories__/AFM.d.ts +1 -1
- package/inputs/Input/__stories__/AMKA.d.ts +3 -0
- package/inputs/Input/__stories__/Boolean.d.ts +1 -1
- package/inputs/Input/__stories__/Email.d.ts +3 -0
- package/inputs/Input/__stories__/IBAN.d.ts +1 -1
- package/inputs/Input/__stories__/Integer.d.ts +1 -1
- package/inputs/Input/__stories__/LandlineNumber.d.ts +1 -1
- package/inputs/Input/__stories__/MobilePhone.d.ts +1 -1
- package/inputs/Input/__stories__/PhoneNumber.d.ts +1 -1
- package/inputs/Input/__stories__/PostalCode.d.ts +1 -1
- package/inputs/Input/__stories__/String.d.ts +1 -1
- package/inputs/Input/__stories__/StringWithTrimValidation.d.ts +1 -1
- package/inputs/Input/__stories__/TextWithLimit.d.ts +1 -1
- package/inputs/Input/index.d.ts +2 -1
- package/inputs/Input/index.js +4 -4
- package/inputs/Input/index.js.map +2 -2
- package/inputs/Label/Label.stories.d.ts +2 -0
- package/inputs/Label/__stories__/Default.d.ts +1 -1
- package/inputs/OtpInput/OtpInput.stories.d.ts +2 -0
- package/inputs/OtpInput/__stories__/Default.d.ts +1 -1
- package/inputs/Radio/Radio.stories.d.ts +2 -0
- package/inputs/Radio/__stories__/Conditional.d.ts +1 -1
- package/inputs/Radio/__stories__/Default.d.ts +1 -1
- package/inputs/Radio/__stories__/WithDivider.d.ts +1 -1
- package/inputs/Select/Select.stories.d.ts +2 -0
- package/inputs/Select/__stories__/Default.d.ts +1 -1
- package/inputs/Select/index.d.ts +2 -1
- package/inputs/Select/index.js +4 -3
- package/inputs/Select/index.js.map +2 -2
- package/inputs/inputsScenarios/index.js +2 -2
- package/inputs/inputsScenarios.d.ts +1 -1
- package/inputs/inputsScenarios.js.map +2 -2
- package/lazy/index.js +2 -1
- package/package.json +4 -4
- package/registry/index.js +6 -6
- package/src/Field/FieldBase.tsx +6 -1
- package/src/Field/FieldBaseContainer.tsx +68 -48
- package/src/Field/FieldConditional.tsx +4 -0
- package/src/Field/index.tsx +15 -5
- package/src/Field/types.tsx +11 -3
- package/src/Field/utils/index.ts +2 -0
- package/src/Field/utils/useField.ts +9 -1
- package/src/FieldArray/FormDialog.tsx +430 -243
- package/src/FieldArray/__stories__/Default.tsx +1 -1
- package/src/FieldArray/__stories__/WithExactLength.tsx +1 -1
- package/src/FieldArray/__stories__/WithModal.tsx +4 -3
- package/src/FieldArray/index.tsx +53 -30
- package/src/FieldObject/index.tsx +33 -18
- package/src/FormBuilder/FormBuilder.stories.js +3 -0
- package/src/FormBuilder/__stories__/AutoErrorGrouping.tsx +1 -1
- package/src/FormBuilder/__stories__/Default.tsx +1 -1
- package/src/FormBuilder/__stories__/ErrorGrouping.tsx +1 -1
- package/src/FormBuilder/index.tsx +12 -7
- package/src/FormBuilder/scenarios.test.tsx +763 -5
- package/src/FormContext.tsx +5 -1
- package/src/MultiplicityField/MultiplicityField.stories.js +3 -0
- package/src/MultiplicityField/__stories__/Default.tsx +1 -1
- package/src/MultiplicityField/__stories__/PreviewDisplay.tsx +1 -1
- package/src/MultiplicityField/__stories__/WithExactLength.tsx +1 -1
- package/src/MultiplicityField/__stories__/WithMaxLength.tsx +1 -1
- package/src/MultiplicityField/__stories__/WithMinAndMaxLength.tsx +1 -1
- package/src/MultiplicityField/__stories__/WithMinLength.tsx +1 -1
- package/src/MultiplicityField/add-objects.tsx +2 -0
- package/src/MultiplicityField/index.tsx +3 -0
- package/src/MultiplicityField/types.ts +1 -0
- package/src/Questions/Questions.stories.js +3 -0
- package/src/Questions/__stories__/Default.tsx +1 -1
- package/src/inputs/AutoCompleteInput/AutoComplete.stories.js +3 -0
- package/src/inputs/AutoCompleteInput/__stories__/Default.tsx +1 -1
- package/src/inputs/AutoCompleteInput/__stories__/Multiple.tsx +1 -1
- package/src/inputs/Checkboxes/Checkboxes.stories.js +3 -0
- package/src/inputs/Checkboxes/__stories__/Conditional.tsx +1 -1
- package/src/inputs/Checkboxes/__stories__/Default.tsx +1 -1
- package/src/inputs/Checkboxes/__stories__/WithDivider.tsx +1 -1
- package/src/inputs/Checkboxes/index.tsx +2 -6
- package/src/inputs/DateInput/DateInput.stories.js +7 -0
- package/src/inputs/DateInput/__stories__/Default.tsx +1 -1
- package/src/inputs/DateInput/__stories__/WithDefaultValue.tsx +26 -0
- package/src/inputs/DateInput/__stories__/WithInitialValue.tsx +28 -0
- package/src/inputs/DateInput/__stories__/WithWrongDefaultValue.tsx +26 -0
- package/src/inputs/DateInput/__stories__/WithWrongInitialValue.tsx +28 -0
- package/src/inputs/DateInput/index.test.tsx +16 -0
- package/src/inputs/DateInput/index.tsx +46 -14
- package/src/inputs/DateTimeInput/DateTimeInput.stories.js +12 -6
- package/src/inputs/DateTimeInput/__stories__/Default.tsx +1 -1
- package/src/inputs/DateTimeInput/__stories__/WithDefaultValue.tsx +26 -0
- package/src/inputs/DateTimeInput/__stories__/WithInitialValue.tsx +28 -0
- package/src/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.tsx +26 -0
- package/src/inputs/DateTimeInput/__stories__/WithWrongInitialValue.tsx +28 -0
- package/src/inputs/DateTimeInput/index.test.tsx +16 -0
- package/src/inputs/DateTimeInput/index.tsx +73 -34
- package/src/inputs/FileInput/FileInput.stories.js +4 -0
- package/src/inputs/FileInput/__stories__/Default.tsx +1 -1
- package/src/inputs/FileInput/__stories__/WithBorderAndLink.tsx +34 -0
- package/src/inputs/FileInput/index.test.tsx +4 -0
- package/src/inputs/FileInput/index.tsx +90 -48
- package/src/inputs/ImageInput/ImageInput.stories.js +5 -1
- package/src/inputs/ImageInput/__stories__/Default.tsx +1 -1
- package/src/inputs/ImageInput/__stories__/MaxSize.tsx +3 -2
- package/src/inputs/ImageInput/__stories__/WithInitialValues.tsx +45 -0
- package/src/inputs/ImageInput/__stories__/WithInvalidImageDimension.tsx +1 -1
- package/src/inputs/ImageInput/__stories__/logo.d.ts +4 -0
- package/src/inputs/ImageInput/__stories__/logo.png +0 -0
- package/src/inputs/ImageInput/index.test.tsx +21 -17
- package/src/inputs/ImageInput/index.tsx +100 -48
- package/src/inputs/Input/Input.stories.js +5 -0
- package/src/inputs/Input/__stories__/AFM.tsx +1 -1
- package/src/inputs/Input/__stories__/AMKA.tsx +23 -0
- package/src/inputs/Input/__stories__/Boolean.tsx +1 -1
- package/src/inputs/Input/__stories__/Email.tsx +23 -0
- package/src/inputs/Input/__stories__/IBAN.tsx +1 -1
- package/src/inputs/Input/__stories__/Integer.tsx +1 -1
- package/src/inputs/Input/__stories__/LandlineNumber.tsx +1 -1
- package/src/inputs/Input/__stories__/MobilePhone.tsx +1 -1
- package/src/inputs/Input/__stories__/PhoneNumber.tsx +1 -1
- package/src/inputs/Input/__stories__/PostalCode.tsx +1 -1
- package/src/inputs/Input/__stories__/String.tsx +1 -1
- package/src/inputs/Input/__stories__/StringWithTrimValidation.tsx +1 -1
- package/src/inputs/Input/__stories__/TextWithLimit.tsx +1 -1
- package/src/inputs/Input/index.test.tsx +8 -0
- package/src/inputs/Input/index.tsx +5 -3
- package/src/inputs/Label/Label.stories.js +3 -0
- package/src/inputs/Label/__stories__/Default.tsx +1 -1
- package/src/inputs/OtpInput/OtpInput.stories.js +3 -0
- package/src/inputs/OtpInput/__stories__/Default.tsx +1 -1
- package/src/inputs/Radio/Radio.stories.js +3 -0
- package/src/inputs/Radio/__stories__/Conditional.tsx +1 -1
- package/src/inputs/Radio/__stories__/Default.tsx +1 -1
- package/src/inputs/Radio/__stories__/WithDivider.tsx +1 -1
- package/src/inputs/Select/Select.stories.js +3 -0
- package/src/inputs/Select/__stories__/Default.tsx +1 -1
- package/src/inputs/Select/index.tsx +7 -4
- package/src/inputs/inputsScenarios.ts +2 -2
- package/src/lazy.js +2 -1
- package/src/registry.js +6 -6
- package/src/types.tsx +2 -1
- package/src/utils.ts +27 -6
- package/src/validators/index.ts +17 -6
- package/src/validators/utils/amka.ts +39 -0
- package/src/validators/utils/date.ts +28 -4
- package/src/validators/utils/datetime.ts +121 -29
- package/src/validators/utils/file.ts +33 -19
- package/src/validators/utils/index.ts +4 -1
- package/types.d.ts +2 -1
- package/types.js.map +1 -1
- package/utils/index.js +20 -6
- package/utils.d.ts +2 -0
- package/utils.js.map +2 -2
- package/validators/index.d.ts +1 -1
- package/validators/index.js +12 -6
- package/validators/index.js.map +2 -2
- package/validators/utils/amka/index.js +36 -0
- package/{inputs/Input/inputsInputScenarios → validators/utils/amka}/package.json +1 -1
- package/validators/utils/amka.d.ts +6 -0
- package/validators/utils/amka.js.map +7 -0
- package/validators/utils/date/index.js +26 -3
- package/validators/utils/date.d.ts +1 -1
- package/validators/utils/date.js.map +2 -2
- package/validators/utils/datetime/index.js +118 -24
- package/validators/utils/datetime.d.ts +1 -1
- package/validators/utils/datetime.js.map +2 -2
- package/validators/utils/file/index.js +30 -17
- package/validators/utils/file.js.map +2 -2
- package/validators/utils/index.d.ts +1 -0
- package/validators/utils/index.js +4 -1
- package/validators/utils/index.js.map +2 -2
- package/cjs/inputs/Input/inputsInputScenarios/index.js +0 -439
- package/cjs/inputs/Input/inputsInputScenarios.js.map +0 -7
- package/inputs/Input/inputsInputScenarios/index.js +0 -406
- package/inputs/Input/inputsInputScenarios.d.ts +0 -57
- package/inputs/Input/inputsInputScenarios.js.map +0 -7
- package/src/inputs/Input/inputsInputScenarios.ts +0 -404
|
@@ -1,27 +1,30 @@
|
|
|
1
|
-
import React, { useMemo,
|
|
1
|
+
import React, { useMemo, useEffect } from "react";
|
|
2
2
|
import dayjs from "dayjs";
|
|
3
3
|
import customParseFormat from "dayjs/plugin/customParseFormat";
|
|
4
|
+
import { useFormContext } from "@digigov/form/FormContext";
|
|
4
5
|
import {
|
|
5
6
|
DateInputContainer,
|
|
6
7
|
DateInputItem
|
|
7
8
|
} from "@digigov/ui/form/DateInputContainer";
|
|
8
9
|
import { useTranslation } from "@digigov/ui/i18n";
|
|
9
10
|
dayjs.extend(customParseFormat);
|
|
10
|
-
function useDate(value,
|
|
11
|
+
function useDate(name, value, form) {
|
|
11
12
|
const [year, month, day] = useMemo(() => {
|
|
12
13
|
if (!value || value.length === 0) {
|
|
13
|
-
onChange("");
|
|
14
14
|
return ["", "", ""];
|
|
15
15
|
}
|
|
16
16
|
const [day2, month2, year2] = value.split("/");
|
|
17
17
|
return [year2, month2, day2];
|
|
18
18
|
}, [value]);
|
|
19
|
+
function update(value2) {
|
|
20
|
+
form.setValue(name, value2, { shouldValidate: false });
|
|
21
|
+
}
|
|
19
22
|
function set(year2, month2, day2) {
|
|
20
23
|
const value2 = `${day2 || ""}/${month2 || ""}/${year2 || ""}`;
|
|
21
24
|
if (!year2 && !month2 && !day2) {
|
|
22
|
-
|
|
25
|
+
update("");
|
|
23
26
|
} else {
|
|
24
|
-
|
|
27
|
+
update(value2);
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
function setYear(evt) {
|
|
@@ -42,13 +45,19 @@ function useDate(value, onChange) {
|
|
|
42
45
|
}
|
|
43
46
|
set(year, month, val);
|
|
44
47
|
}
|
|
48
|
+
function trigger() {
|
|
49
|
+
if (form.formState.isSubmitted) {
|
|
50
|
+
form.trigger(name);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
45
53
|
return {
|
|
46
54
|
day,
|
|
47
55
|
month,
|
|
48
56
|
year,
|
|
49
57
|
setYear,
|
|
50
58
|
setMonth,
|
|
51
|
-
setDay
|
|
59
|
+
setDay,
|
|
60
|
+
trigger
|
|
52
61
|
};
|
|
53
62
|
}
|
|
54
63
|
const VALID_FORMATS = ["DD/MM/YYYY"];
|
|
@@ -64,20 +73,32 @@ const DatePart = ({ label, ...props }) => {
|
|
|
64
73
|
};
|
|
65
74
|
const DateInput = ({ name, ...props }) => {
|
|
66
75
|
const { t } = useTranslation();
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
76
|
+
const form = useFormContext();
|
|
77
|
+
useEffect(() => {
|
|
78
|
+
const initialValue = form.getValues(name);
|
|
79
|
+
if (initialValue === void 0 && props.defaultValue) {
|
|
80
|
+
form.setValue(name, makeDate(props.defaultValue), {
|
|
81
|
+
shouldValidate: false
|
|
82
|
+
});
|
|
83
|
+
} else {
|
|
84
|
+
form.setValue(name, makeDate(initialValue), {
|
|
85
|
+
shouldValidate: false
|
|
86
|
+
});
|
|
71
87
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const date = useDate(value
|
|
88
|
+
}, []);
|
|
89
|
+
const value = form.getValues(name);
|
|
90
|
+
const date = useDate(name, value, form);
|
|
75
91
|
return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
|
|
76
92
|
DatePart,
|
|
77
93
|
{
|
|
78
94
|
label: t("form.label.day"),
|
|
79
95
|
onChange: date.setDay,
|
|
80
|
-
onBlur: (e) =>
|
|
96
|
+
onBlur: (e) => {
|
|
97
|
+
if (date.day && date.day.length === 1) {
|
|
98
|
+
date.setDay(e, true);
|
|
99
|
+
}
|
|
100
|
+
date.trigger();
|
|
101
|
+
},
|
|
81
102
|
value: date.day,
|
|
82
103
|
width: 2,
|
|
83
104
|
name: `${name}-day`,
|
|
@@ -92,7 +113,12 @@ const DateInput = ({ name, ...props }) => {
|
|
|
92
113
|
{
|
|
93
114
|
label: t("form.label.month"),
|
|
94
115
|
onChange: date.setMonth,
|
|
95
|
-
onBlur: (e) =>
|
|
116
|
+
onBlur: (e) => {
|
|
117
|
+
if (date.month && date.month.length === 1) {
|
|
118
|
+
date.setMonth(e, true);
|
|
119
|
+
}
|
|
120
|
+
date.trigger();
|
|
121
|
+
},
|
|
96
122
|
value: date.month,
|
|
97
123
|
width: 2,
|
|
98
124
|
name: `${name}-month`,
|
|
@@ -107,6 +133,7 @@ const DateInput = ({ name, ...props }) => {
|
|
|
107
133
|
{
|
|
108
134
|
label: t("form.label.year"),
|
|
109
135
|
onChange: date.setYear,
|
|
136
|
+
onBlur: date.trigger,
|
|
110
137
|
value: date.year,
|
|
111
138
|
width: 4,
|
|
112
139
|
name: `${name}-year`,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/inputs/DateInput/index.tsx"],
|
|
4
|
-
"sourcesContent": ["import React, { useMemo,
|
|
5
|
-
"mappings": "AAAA,OAAO,SAAS,SAAS,
|
|
4
|
+
"sourcesContent": ["import React, { useMemo, useEffect } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport {\n DateInputContainer,\n DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n extra?: {\n max?: string;\n min?: string;\n };\n}\n\nfunction useDate(name, value, form) {\n const [year, month, day] = useMemo(() => {\n if (!value || value.length === 0) {\n return ['', '', ''];\n }\n const [day, month, year] = value.split('/');\n return [year, month, day];\n }, [value]);\n\n function update(value) {\n form.setValue(name, value, { shouldValidate: false });\n }\n\n function set(year, month, day) {\n const value = `${day || ''}/${month || ''}/${year || ''}`;\n if (!year && !month && !day) {\n update('');\n } else {\n update(value);\n }\n }\n\n function setYear(evt) {\n const val = evt.target.value.trim();\n set(val, month, day);\n }\n\n function setMonth(evt, cast) {\n let val = evt.target.value.trim();\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, val, day);\n }\n\n function setDay(evt, cast) {\n let val = evt.target.value.trim();\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, val);\n }\n\n function trigger() {\n if (form.formState.isSubmitted) {\n form.trigger(name);\n }\n }\n\n return {\n day,\n month,\n year,\n setYear,\n setMonth,\n setDay,\n trigger,\n };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY'];\n\nconst makeDate = (val) => {\n const date = dayjs(val, VALID_FORMATS, true);\n if (date.isValid()) {\n return date.format('DD/MM/YYYY');\n }\n return '';\n};\n\nconst DatePart = ({ label, ...props }) => {\n return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateInput = ({ name, ...props }) => {\n const { t } = useTranslation();\n const form = useFormContext();\n\n useEffect(() => {\n const initialValue = form.getValues(name);\n // checks if the initial value is undefined and if the default value is valid date\n if (initialValue === undefined && props.defaultValue) {\n form.setValue(name, makeDate(props.defaultValue), {\n shouldValidate: false,\n });\n } else {\n // checks if the initial value is a valid date\n form.setValue(name, makeDate(initialValue), {\n shouldValidate: false,\n });\n }\n }, []);\n\n const value = form.getValues(name);\n const date = useDate(name, value, form);\n\n return (\n <DateInputContainer>\n <DatePart\n label={t('form.label.day')}\n onChange={date.setDay}\n onBlur={(e) => {\n if (date.day && date.day.length === 1) {\n date.setDay(e, true);\n }\n date.trigger();\n }}\n value={date.day}\n width={2}\n name={`${name}-day`}\n id={`${name}-day`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!date.day ? props.error : false}\n />\n <DatePart\n label={t('form.label.month')}\n onChange={date.setMonth}\n onBlur={(e) => {\n if (date.month && date.month.length === 1) {\n date.setMonth(e, true);\n }\n date.trigger();\n }}\n value={date.month}\n width={2}\n name={`${name}-month`}\n id={`${name}-month`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!date.month ? props.error : false}\n />\n <DatePart\n label={t('form.label.year')}\n onChange={date.setYear}\n onBlur={date.trigger}\n value={date.year}\n width={4}\n name={`${name}-year`}\n id={`${name}-year`}\n maxLength=\"4\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!date.year ? props.error : false}\n />\n </DateInputContainer>\n );\n};\n\nexport default DateInput;\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["day", "month", "year", "value"]
|
|
7
7
|
}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
declare namespace _default {
|
|
2
2
|
export let title: string;
|
|
3
|
-
export {
|
|
3
|
+
export { DateTimeInput as component };
|
|
4
|
+
export let tags: string[];
|
|
5
|
+
export { doc as markdown };
|
|
6
|
+
export let displayName: string;
|
|
4
7
|
}
|
|
5
8
|
export default _default;
|
|
6
|
-
export { Default };
|
|
7
|
-
|
|
9
|
+
export { Default } from "@digigov/form/inputs/DateTimeInput/__stories__/Default";
|
|
10
|
+
export { WithDefaultValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithDefaultValue";
|
|
11
|
+
export { WithWrongDefaultValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithWrongDefaultValue";
|
|
12
|
+
export { WithInitialValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithInitialValue";
|
|
13
|
+
export { WithWrongInitialValue } from "@digigov/form/inputs/DateTimeInput/__stories__/WithWrongInitialValue";
|
|
14
|
+
import DateTimeInput from '@digigov/form/inputs/DateTimeInput';
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import React, { useMemo,
|
|
1
|
+
import React, { useMemo, useEffect } from "react";
|
|
2
2
|
import dayjs from "dayjs";
|
|
3
3
|
import customParseFormat from "dayjs/plugin/customParseFormat";
|
|
4
|
+
import { useFormContext } from "@digigov/form/FormContext";
|
|
4
5
|
import {
|
|
5
6
|
DateInputContainer,
|
|
6
7
|
DateInputItem
|
|
7
8
|
} from "@digigov/ui/form/DateInputContainer";
|
|
8
9
|
import { useTranslation } from "@digigov/ui/i18n";
|
|
9
10
|
dayjs.extend(customParseFormat);
|
|
10
|
-
function useDateTime(value,
|
|
11
|
+
function useDateTime(name, value, form) {
|
|
11
12
|
const [year, month, day, hours, minutes] = useMemo(() => {
|
|
12
13
|
if (!value || value.length === 0) {
|
|
13
|
-
onChange("");
|
|
14
14
|
return ["", "", "", "", ""];
|
|
15
15
|
}
|
|
16
16
|
const [datePart, timePart] = value.split(" ");
|
|
@@ -18,14 +18,17 @@ function useDateTime(value, onChange) {
|
|
|
18
18
|
const [hours2, minutes2] = timePart ? timePart.split(":") : ["", ""];
|
|
19
19
|
return [year2, month2, day2, hours2, minutes2];
|
|
20
20
|
}, [value]);
|
|
21
|
+
function update(value2) {
|
|
22
|
+
form.setValue(name, value2, { shouldValidate: false });
|
|
23
|
+
}
|
|
21
24
|
function set(year2, month2, day2, hours2, minutes2) {
|
|
22
25
|
const datePart = `${day2 || ""}/${month2 || ""}/${year2 || ""}`;
|
|
23
26
|
const timePart = hours2 || minutes2 ? `${hours2 || ""}:${minutes2 || ""}` : "";
|
|
24
27
|
const value2 = timePart ? `${datePart} ${timePart}` : datePart;
|
|
25
28
|
if (!year2 && !month2 && !day2 && !hours2 && !minutes2) {
|
|
26
|
-
|
|
29
|
+
update("");
|
|
27
30
|
} else {
|
|
28
|
-
|
|
31
|
+
update(value2);
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
34
|
function setYear(evt) {
|
|
@@ -60,6 +63,11 @@ function useDateTime(value, onChange) {
|
|
|
60
63
|
}
|
|
61
64
|
set(year, month, day, hours, val);
|
|
62
65
|
}
|
|
66
|
+
function trigger() {
|
|
67
|
+
if (form.formState.isSubmitted) {
|
|
68
|
+
form.trigger(name);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
63
71
|
return {
|
|
64
72
|
day,
|
|
65
73
|
month,
|
|
@@ -70,7 +78,8 @@ function useDateTime(value, onChange) {
|
|
|
70
78
|
setMonth,
|
|
71
79
|
setDay,
|
|
72
80
|
setHours,
|
|
73
|
-
setMinutes
|
|
81
|
+
setMinutes,
|
|
82
|
+
trigger
|
|
74
83
|
};
|
|
75
84
|
}
|
|
76
85
|
const VALID_FORMATS = ["DD/MM/YYYY HH:mm", "DD/MM/YYYY"];
|
|
@@ -86,90 +95,115 @@ const DateTimePart = ({ label, ...props }) => {
|
|
|
86
95
|
};
|
|
87
96
|
const DateTimeInput = ({ name, ...props }) => {
|
|
88
97
|
const { t } = useTranslation();
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
98
|
+
const form = useFormContext();
|
|
99
|
+
useEffect(() => {
|
|
100
|
+
const initialValue = form.getValues(name);
|
|
101
|
+
if (initialValue === void 0 && props.defaultValue) {
|
|
102
|
+
form.setValue(name, makeDateTime(props.defaultValue), {
|
|
103
|
+
shouldValidate: false
|
|
104
|
+
});
|
|
105
|
+
} else {
|
|
106
|
+
form.setValue(name, makeDateTime(initialValue), {
|
|
107
|
+
shouldValidate: false
|
|
108
|
+
});
|
|
93
109
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
const
|
|
97
|
-
value || makeDateTime(props.defaultValue),
|
|
98
|
-
props.onChange
|
|
99
|
-
);
|
|
110
|
+
}, []);
|
|
111
|
+
const value = form.getValues(name);
|
|
112
|
+
const dateTime = useDateTime(name, value, form);
|
|
100
113
|
return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
|
|
101
114
|
DateTimePart,
|
|
102
115
|
{
|
|
103
116
|
label: t("form.label.day"),
|
|
104
|
-
onChange:
|
|
105
|
-
onBlur: (e) =>
|
|
106
|
-
|
|
117
|
+
onChange: dateTime.setDay,
|
|
118
|
+
onBlur: (e) => {
|
|
119
|
+
if (dateTime.day && dateTime.day.length === 1) {
|
|
120
|
+
dateTime.setDay(e, true);
|
|
121
|
+
}
|
|
122
|
+
dateTime.trigger();
|
|
123
|
+
},
|
|
124
|
+
value: dateTime.day,
|
|
107
125
|
width: 2,
|
|
108
126
|
name: `${name}-day`,
|
|
109
127
|
maxLength: "2",
|
|
110
128
|
disabled: props.disabled,
|
|
111
129
|
"aria-required": props["aria-required"],
|
|
112
|
-
error: !
|
|
130
|
+
error: !dateTime.day ? props.error : false,
|
|
113
131
|
id: `${name}-day`
|
|
114
132
|
}
|
|
115
133
|
), /* @__PURE__ */ React.createElement(
|
|
116
134
|
DateTimePart,
|
|
117
135
|
{
|
|
118
136
|
label: t("form.label.month"),
|
|
119
|
-
onChange:
|
|
120
|
-
onBlur: (e) =>
|
|
121
|
-
|
|
137
|
+
onChange: dateTime.setMonth,
|
|
138
|
+
onBlur: (e) => {
|
|
139
|
+
if (dateTime.month && dateTime.month.length === 1) {
|
|
140
|
+
dateTime.setMonth(e, true);
|
|
141
|
+
}
|
|
142
|
+
dateTime.trigger();
|
|
143
|
+
},
|
|
144
|
+
value: dateTime.month,
|
|
122
145
|
width: 2,
|
|
123
146
|
name: `${name}-month`,
|
|
124
147
|
id: `${name}-month`,
|
|
125
148
|
maxLength: "2",
|
|
126
149
|
disabled: props.disabled,
|
|
127
150
|
"aria-required": props["aria-required"],
|
|
128
|
-
error: !
|
|
151
|
+
error: !dateTime.month ? props.error : false
|
|
129
152
|
}
|
|
130
153
|
), /* @__PURE__ */ React.createElement(
|
|
131
154
|
DateTimePart,
|
|
132
155
|
{
|
|
133
156
|
label: t("form.label.year"),
|
|
134
|
-
onChange:
|
|
135
|
-
|
|
157
|
+
onChange: dateTime.setYear,
|
|
158
|
+
onBlur: dateTime.trigger,
|
|
159
|
+
value: dateTime.year,
|
|
136
160
|
width: 4,
|
|
137
161
|
name: `${name}-year`,
|
|
138
162
|
id: `${name}-year`,
|
|
139
163
|
maxLength: "4",
|
|
140
164
|
disabled: props.disabled,
|
|
141
165
|
"aria-required": props["aria-required"],
|
|
142
|
-
error: !
|
|
166
|
+
error: !dateTime.year ? props.error : false
|
|
143
167
|
}
|
|
144
168
|
), /* @__PURE__ */ React.createElement(
|
|
145
169
|
DateTimePart,
|
|
146
170
|
{
|
|
147
171
|
label: t("form.label.hours"),
|
|
148
|
-
onChange:
|
|
149
|
-
onBlur: (e) =>
|
|
150
|
-
|
|
172
|
+
onChange: dateTime.setHours,
|
|
173
|
+
onBlur: (e) => {
|
|
174
|
+
if (dateTime.hours && dateTime.hours.length === 1) {
|
|
175
|
+
dateTime.setHours(e, true);
|
|
176
|
+
}
|
|
177
|
+
dateTime.trigger();
|
|
178
|
+
},
|
|
179
|
+
value: dateTime.hours,
|
|
151
180
|
width: 2,
|
|
152
181
|
name: `${name}-hours`,
|
|
153
182
|
id: `${name}-hours`,
|
|
154
183
|
maxLength: "2",
|
|
155
184
|
disabled: props.disabled,
|
|
156
185
|
"aria-required": props["aria-required"],
|
|
157
|
-
error: !
|
|
186
|
+
error: !dateTime.hours ? props.error : false
|
|
158
187
|
}
|
|
159
188
|
), /* @__PURE__ */ React.createElement(
|
|
160
189
|
DateTimePart,
|
|
161
190
|
{
|
|
162
191
|
label: t("form.label.minutes"),
|
|
163
|
-
onChange:
|
|
164
|
-
onBlur: (e) =>
|
|
165
|
-
|
|
192
|
+
onChange: dateTime.setMinutes,
|
|
193
|
+
onBlur: (e) => {
|
|
194
|
+
if (dateTime.minutes && dateTime.minutes.length === 1) {
|
|
195
|
+
dateTime.setMinutes(e, true);
|
|
196
|
+
}
|
|
197
|
+
dateTime.trigger();
|
|
198
|
+
},
|
|
199
|
+
value: dateTime.minutes,
|
|
166
200
|
width: 2,
|
|
167
201
|
name: `${name}-minutes`,
|
|
168
202
|
id: `${name}-minutes`,
|
|
169
203
|
maxLength: "2",
|
|
170
204
|
disabled: props.disabled,
|
|
171
205
|
"aria-required": props["aria-required"],
|
|
172
|
-
error: !
|
|
206
|
+
error: !dateTime.minutes ? props.error : false
|
|
173
207
|
}
|
|
174
208
|
));
|
|
175
209
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/inputs/DateTimeInput/index.tsx"],
|
|
4
|
-
"sourcesContent": ["import React, { useMemo,
|
|
5
|
-
"mappings": "AAAA,OAAO,SAAS,SAAS,
|
|
4
|
+
"sourcesContent": ["import React, { useMemo, useEffect } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormContext';\nimport {\n DateInputContainer,\n DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateTimeInputProps\n extends Omit<UncontrolledFieldProps, 'extra'> {\n extra?: {\n max?: string;\n min?: string;\n };\n}\n\nfunction useDateTime(name, value, form) {\n const [year, month, day, hours, minutes] = useMemo(() => {\n if (!value || value.length === 0) {\n return ['', '', '', '', ''];\n }\n const [datePart, timePart] = value.split(' ');\n const [day, month, year] = datePart.split('/');\n const [hours, minutes] = timePart ? timePart.split(':') : ['', ''];\n return [year, month, day, hours, minutes];\n }, [value]);\n\n function update(value) {\n form.setValue(name, value, { shouldValidate: false });\n }\n\n function set(year, month, day, hours, minutes) {\n const datePart = `${day || ''}/${month || ''}/${year || ''}`;\n const timePart = hours || minutes ? `${hours || ''}:${minutes || ''}` : '';\n const value = timePart ? `${datePart} ${timePart}` : datePart;\n\n if (!year && !month && !day && !hours && !minutes) {\n update('');\n } else {\n update(value);\n }\n }\n\n function setYear(evt) {\n const val = evt.target.value;\n set(val, month, day, hours, minutes);\n }\n\n function setMonth(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, val, day, hours, minutes);\n }\n\n function setDay(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, val, hours, minutes);\n }\n\n function setHours(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, day, val, minutes);\n }\n\n function setMinutes(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, day, hours, val);\n }\n\n function trigger() {\n if (form.formState.isSubmitted) {\n form.trigger(name);\n }\n }\n\n return {\n day,\n month,\n year,\n hours,\n minutes,\n setYear,\n setMonth,\n setDay,\n setHours,\n setMinutes,\n trigger,\n };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY HH:mm', 'DD/MM/YYYY'];\n\nconst makeDateTime = (val) => {\n const date = dayjs(val, VALID_FORMATS, true);\n if (date.isValid()) {\n return date.format('DD/MM/YYYY HH:mm');\n }\n return '';\n};\n\nconst DateTimePart = ({ label, ...props }) => {\n return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateTimeInput = ({ name, ...props }) => {\n const { t } = useTranslation();\n const form = useFormContext();\n\n useEffect(() => {\n const initialValue = form.getValues(name);\n // checks if the initial value is undefined and if the default value is valid date\n if (initialValue === undefined && props.defaultValue) {\n form.setValue(name, makeDateTime(props.defaultValue), {\n shouldValidate: false,\n });\n } else {\n // checks if the initial value is a valid date\n form.setValue(name, makeDateTime(initialValue), {\n shouldValidate: false,\n });\n }\n }, []);\n\n const value = form.getValues(name);\n const dateTime = useDateTime(name, value, form);\n\n return (\n <DateInputContainer>\n <DateTimePart\n label={t('form.label.day')}\n onChange={dateTime.setDay}\n onBlur={(e) => {\n if (dateTime.day && dateTime.day.length === 1) {\n dateTime.setDay(e, true);\n }\n dateTime.trigger();\n }}\n value={dateTime.day}\n width={2}\n name={`${name}-day`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!dateTime.day ? props.error : false}\n id={`${name}-day`}\n />\n <DateTimePart\n label={t('form.label.month')}\n onChange={dateTime.setMonth}\n onBlur={(e) => {\n if (dateTime.month && dateTime.month.length === 1) {\n dateTime.setMonth(e, true);\n }\n dateTime.trigger();\n }}\n value={dateTime.month}\n width={2}\n name={`${name}-month`}\n id={`${name}-month`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!dateTime.month ? props.error : false}\n />\n <DateTimePart\n label={t('form.label.year')}\n onChange={dateTime.setYear}\n onBlur={dateTime.trigger}\n value={dateTime.year}\n width={4}\n name={`${name}-year`}\n id={`${name}-year`}\n maxLength=\"4\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!dateTime.year ? props.error : false}\n />\n <DateTimePart\n label={t('form.label.hours')}\n onChange={dateTime.setHours}\n onBlur={(e) => {\n if (dateTime.hours && dateTime.hours.length === 1) {\n dateTime.setHours(e, true);\n }\n dateTime.trigger();\n }}\n value={dateTime.hours}\n width={2}\n name={`${name}-hours`}\n id={`${name}-hours`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!dateTime.hours ? props.error : false}\n />\n <DateTimePart\n label={t('form.label.minutes')}\n onChange={dateTime.setMinutes}\n onBlur={(e) => {\n if (dateTime.minutes && dateTime.minutes.length === 1) {\n dateTime.setMinutes(e, true);\n }\n dateTime.trigger();\n }}\n value={dateTime.minutes}\n width={2}\n name={`${name}-minutes`}\n id={`${name}-minutes`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!dateTime.minutes ? props.error : false}\n />\n </DateInputContainer>\n );\n};\n\nexport default DateTimeInput;\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["day", "month", "year", "hours", "minutes", "value"]
|
|
7
7
|
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
declare namespace _default {
|
|
2
2
|
export let title: string;
|
|
3
3
|
export { FileInput as component };
|
|
4
|
+
export let tags: string[];
|
|
5
|
+
export { doc as markdown };
|
|
4
6
|
export let displayName: string;
|
|
5
7
|
}
|
|
6
8
|
export default _default;
|
|
7
9
|
export { Default } from "@digigov/form/inputs/FileInput/__stories__/Default";
|
|
10
|
+
export { WithBorderAndLink } from "@digigov/form/inputs/FileInput/__stories__/WithBorderAndLink";
|
|
8
11
|
import FileInput from '@digigov/form/inputs/FileInput';
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { UseFormReturn } from 'react-hook-form';
|
|
2
3
|
import { UncontrolledFieldProps } from '@digigov/form/Field/types';
|
|
4
|
+
import { ButtonProps } from '@digigov/ui/form/Button';
|
|
5
|
+
import { FileUploadContainerProps, FileUploadProps } from '@digigov/ui/form/FileUpload';
|
|
3
6
|
export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
4
7
|
extra?: {
|
|
5
8
|
className?: string;
|
|
@@ -8,9 +11,10 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
|
8
11
|
limit: {
|
|
9
12
|
maxSize?: number;
|
|
10
13
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
+
containerProps?: FileUploadContainerProps;
|
|
15
|
+
uploadButtonProps?: FileUploadProps;
|
|
16
|
+
noResetButton?: boolean;
|
|
17
|
+
resetButtonProps?: ButtonProps;
|
|
14
18
|
locales?: {
|
|
15
19
|
file?: string;
|
|
16
20
|
chooseFile?: string;
|
|
@@ -18,6 +22,9 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
|
18
22
|
resetFile?: string;
|
|
19
23
|
};
|
|
20
24
|
};
|
|
25
|
+
reset: (values?: FileList) => void;
|
|
26
|
+
resetField: UseFormReturn['resetField'];
|
|
27
|
+
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
|
|
21
28
|
}
|
|
22
|
-
export declare const FileInput: React.
|
|
29
|
+
export declare const FileInput: React.ForwardRefExoticComponent<FileInputProps & React.RefAttributes<HTMLInputElement>>;
|
|
23
30
|
export default FileInput;
|