@digigov/form 2.0.0-49de50c4 → 2.0.0-555d1027
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 +3 -4
- package/Field/FieldBase.js.map +2 -2
- package/Field/FieldBaseContainer/index.js +18 -2
- package/Field/FieldBaseContainer.js.map +2 -2
- package/Field/FieldConditional/index.js +1 -1
- package/Field/FieldConditional.js.map +1 -1
- package/Field/index.js +2 -1
- package/Field/index.js.map +2 -2
- package/Field/types.d.ts +2 -2
- package/Field/utils/index.js +4 -3
- package/Field/utils/index.js.map +2 -2
- package/FieldArray/FormDialog/index.js +5 -8
- package/FieldArray/FormDialog.d.ts +4 -4
- package/FieldArray/FormDialog.js.map +2 -2
- 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 -1
- package/FieldArray/index.js +75 -87
- package/FieldArray/index.js.map +3 -3
- 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 +3 -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 +1 -1
- package/MultiplicityField/add-objects.js.map +2 -2
- package/MultiplicityField/index.js +4 -2
- 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 +3 -4
- package/cjs/Field/FieldBase.js.map +2 -2
- package/cjs/Field/FieldBaseContainer/index.js +17 -1
- package/cjs/Field/FieldBaseContainer.js.map +3 -3
- package/cjs/Field/FieldConditional/index.js +1 -1
- package/cjs/Field/FieldConditional.js.map +1 -1
- package/cjs/Field/index.js +2 -1
- package/cjs/Field/index.js.map +2 -2
- package/cjs/Field/types.js.map +1 -1
- package/cjs/Field/utils/index.js +4 -3
- package/cjs/Field/utils/index.js.map +2 -2
- package/cjs/FieldArray/FormDialog/index.js +5 -8
- package/cjs/FieldArray/FormDialog.js.map +2 -2
- package/cjs/FieldArray/index.js +74 -83
- package/cjs/FieldArray/index.js.map +3 -3
- package/cjs/FormBuilder/index.js +3 -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 +1 -1
- package/cjs/MultiplicityField/add-objects.js.map +2 -2
- package/cjs/MultiplicityField/index.js +4 -2
- package/cjs/MultiplicityField/index.js.map +2 -2
- package/cjs/MultiplicityField/types.js.map +1 -1
- package/cjs/inputs/Checkboxes/index.js +2 -1
- package/cjs/inputs/Checkboxes/index.js.map +2 -2
- package/cjs/inputs/DateInput/index.js +27 -12
- package/cjs/inputs/DateInput/index.js.map +2 -2
- package/cjs/inputs/DateTimeInput/index.js +55 -34
- package/cjs/inputs/DateTimeInput/index.js.map +2 -2
- package/cjs/inputs/FileInput/index.js +45 -26
- 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 +1 -0
- package/cjs/inputs/Input/index.js.map +2 -2
- package/cjs/lazy/index.js +1 -1
- package/cjs/lazy.js.map +2 -2
- package/cjs/registry/index.js +4 -6
- package/cjs/registry.js.map +2 -2
- package/cjs/validators/index.js +8 -10
- package/cjs/validators/index.js.map +2 -2
- package/cjs/validators/utils/date/index.js +21 -3
- package/cjs/validators/utils/date.js.map +2 -2
- package/cjs/validators/utils/datetime/index.js +113 -24
- package/cjs/validators/utils/datetime.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 -1
- 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 +28 -13
- 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 +56 -35
- package/inputs/DateTimeInput/index.js.map +2 -2
- package/inputs/FileInput/FileInput.stories.d.ts +2 -0
- package/inputs/FileInput/__stories__/Default.d.ts +1 -1
- package/inputs/FileInput/index.d.ts +5 -1
- package/inputs/FileInput/index.js +46 -27
- 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/{Input/inputsInputScenarios → ImageInput/__stories__/logo.d}/package.json +1 -1
- 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 +3 -0
- package/inputs/Input/__stories__/AFM.d.ts +1 -1
- 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.js +1 -0
- 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/lazy/index.js +1 -1
- package/package.json +8 -8
- package/registry/index.js +4 -6
- package/src/Field/FieldBase.tsx +14 -18
- package/src/Field/FieldBaseContainer.tsx +13 -5
- package/src/Field/FieldConditional.tsx +1 -1
- package/src/Field/index.tsx +2 -1
- package/src/Field/types.tsx +2 -2
- package/src/Field/utils/index.ts +2 -1
- package/src/FieldArray/FormDialog.tsx +7 -13
- package/src/FieldArray/__stories__/Default.tsx +1 -1
- package/src/FieldArray/__stories__/WithExactLength.tsx +1 -1
- package/src/FieldArray/__stories__/WithModal.tsx +1 -1
- package/src/FieldArray/index.tsx +83 -102
- 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 +3 -7
- package/src/FormBuilder/scenarios.test.tsx +1 -1
- 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 +1 -1
- package/src/MultiplicityField/index.tsx +3 -1
- 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 +4 -5
- 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 +31 -13
- 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 +59 -35
- package/src/inputs/FileInput/FileInput.stories.js +3 -0
- package/src/inputs/FileInput/__stories__/Default.tsx +1 -1
- package/src/inputs/FileInput/index.tsx +72 -39
- 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 +4 -0
- package/src/inputs/ImageInput/index.tsx +100 -48
- package/src/inputs/Input/Input.stories.js +4 -0
- package/src/inputs/Input/__stories__/AFM.tsx +1 -1
- 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 +1 -0
- 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/lazy.js +1 -1
- package/src/registry.js +4 -6
- package/src/validators/index.ts +13 -13
- package/src/validators/utils/date.ts +23 -4
- package/src/validators/utils/datetime.ts +116 -29
- package/validators/index.js +8 -10
- package/validators/index.js.map +2 -2
- package/validators/utils/date/index.js +21 -3
- package/validators/utils/date.d.ts +1 -1
- package/validators/utils/date.js.map +2 -2
- package/validators/utils/datetime/index.js +113 -24
- package/validators/utils/datetime.d.ts +1 -1
- package/validators/utils/datetime.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,7 +1,7 @@
|
|
|
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/
|
|
4
|
+
import { useFormContext } from "@digigov/form/FormContext";
|
|
5
5
|
import {
|
|
6
6
|
DateInputContainer,
|
|
7
7
|
DateInputItem
|
|
@@ -11,7 +11,6 @@ dayjs.extend(customParseFormat);
|
|
|
11
11
|
function useDateTime(name, value, form) {
|
|
12
12
|
const [year, month, day, hours, minutes] = useMemo(() => {
|
|
13
13
|
if (!value || value.length === 0) {
|
|
14
|
-
update("");
|
|
15
14
|
return ["", "", "", "", ""];
|
|
16
15
|
}
|
|
17
16
|
const [datePart, timePart] = value.split(" ");
|
|
@@ -96,93 +95,115 @@ const DateTimePart = ({ label, ...props }) => {
|
|
|
96
95
|
};
|
|
97
96
|
const DateTimeInput = ({ name, ...props }) => {
|
|
98
97
|
const { t } = useTranslation();
|
|
99
|
-
const [initial] = useState(props.value);
|
|
100
|
-
const value = useMemo(() => {
|
|
101
|
-
if (initial === props.value) {
|
|
102
|
-
return makeDateTime(props.value);
|
|
103
|
-
}
|
|
104
|
-
return props.value;
|
|
105
|
-
}, [props.value, initial]);
|
|
106
98
|
const form = useFormContext();
|
|
107
|
-
|
|
108
|
-
name
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
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
|
+
});
|
|
109
|
+
}
|
|
110
|
+
}, []);
|
|
111
|
+
const value = form.getValues(name);
|
|
112
|
+
const dateTime = useDateTime(name, value, form);
|
|
112
113
|
return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
|
|
113
114
|
DateTimePart,
|
|
114
115
|
{
|
|
115
116
|
label: t("form.label.day"),
|
|
116
|
-
onChange:
|
|
117
|
-
onBlur:
|
|
118
|
-
|
|
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,
|
|
119
125
|
width: 2,
|
|
120
126
|
name: `${name}-day`,
|
|
121
127
|
maxLength: "2",
|
|
122
128
|
disabled: props.disabled,
|
|
123
129
|
"aria-required": props["aria-required"],
|
|
124
|
-
error: !
|
|
130
|
+
error: !dateTime.day ? props.error : false,
|
|
125
131
|
id: `${name}-day`
|
|
126
132
|
}
|
|
127
133
|
), /* @__PURE__ */ React.createElement(
|
|
128
134
|
DateTimePart,
|
|
129
135
|
{
|
|
130
136
|
label: t("form.label.month"),
|
|
131
|
-
onChange:
|
|
132
|
-
onBlur:
|
|
133
|
-
|
|
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,
|
|
134
145
|
width: 2,
|
|
135
146
|
name: `${name}-month`,
|
|
136
147
|
id: `${name}-month`,
|
|
137
148
|
maxLength: "2",
|
|
138
149
|
disabled: props.disabled,
|
|
139
150
|
"aria-required": props["aria-required"],
|
|
140
|
-
error: !
|
|
151
|
+
error: !dateTime.month ? props.error : false
|
|
141
152
|
}
|
|
142
153
|
), /* @__PURE__ */ React.createElement(
|
|
143
154
|
DateTimePart,
|
|
144
155
|
{
|
|
145
156
|
label: t("form.label.year"),
|
|
146
|
-
onChange:
|
|
147
|
-
onBlur:
|
|
148
|
-
value:
|
|
157
|
+
onChange: dateTime.setYear,
|
|
158
|
+
onBlur: dateTime.trigger,
|
|
159
|
+
value: dateTime.year,
|
|
149
160
|
width: 4,
|
|
150
161
|
name: `${name}-year`,
|
|
151
162
|
id: `${name}-year`,
|
|
152
163
|
maxLength: "4",
|
|
153
164
|
disabled: props.disabled,
|
|
154
165
|
"aria-required": props["aria-required"],
|
|
155
|
-
error: !
|
|
166
|
+
error: !dateTime.year ? props.error : false
|
|
156
167
|
}
|
|
157
168
|
), /* @__PURE__ */ React.createElement(
|
|
158
169
|
DateTimePart,
|
|
159
170
|
{
|
|
160
171
|
label: t("form.label.hours"),
|
|
161
|
-
onChange:
|
|
162
|
-
onBlur:
|
|
163
|
-
|
|
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,
|
|
164
180
|
width: 2,
|
|
165
181
|
name: `${name}-hours`,
|
|
166
182
|
id: `${name}-hours`,
|
|
167
183
|
maxLength: "2",
|
|
168
184
|
disabled: props.disabled,
|
|
169
185
|
"aria-required": props["aria-required"],
|
|
170
|
-
error: !
|
|
186
|
+
error: !dateTime.hours ? props.error : false
|
|
171
187
|
}
|
|
172
188
|
), /* @__PURE__ */ React.createElement(
|
|
173
189
|
DateTimePart,
|
|
174
190
|
{
|
|
175
191
|
label: t("form.label.minutes"),
|
|
176
|
-
onChange:
|
|
177
|
-
onBlur:
|
|
178
|
-
|
|
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,
|
|
179
200
|
width: 2,
|
|
180
201
|
name: `${name}-minutes`,
|
|
181
202
|
id: `${name}-minutes`,
|
|
182
203
|
maxLength: "2",
|
|
183
204
|
disabled: props.disabled,
|
|
184
205
|
"aria-required": props["aria-required"],
|
|
185
|
-
error: !
|
|
206
|
+
error: !dateTime.minutes ? props.error : false
|
|
186
207
|
}
|
|
187
208
|
));
|
|
188
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,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { UseFormReturn } from 'react-hook-form';
|
|
2
3
|
import { UncontrolledFieldProps } from '@digigov/form/Field/types';
|
|
3
4
|
import { ButtonProps } from '@digigov/ui/form/Button';
|
|
4
5
|
import { FileUploadContainerProps, FileUploadProps } from '@digigov/ui/form/FileUpload';
|
|
@@ -21,6 +22,9 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
|
21
22
|
resetFile?: string;
|
|
22
23
|
};
|
|
23
24
|
};
|
|
25
|
+
reset: (values?: FileList) => void;
|
|
26
|
+
resetField: UseFormReturn['resetField'];
|
|
27
|
+
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
|
|
24
28
|
}
|
|
25
|
-
export declare const FileInput: React.
|
|
29
|
+
export declare const FileInput: React.ForwardRefExoticComponent<FileInputProps & React.RefAttributes<HTMLInputElement>>;
|
|
26
30
|
export default FileInput;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import React, { useEffect, useState } from "react";
|
|
1
|
+
import React, { useCallback, useEffect, useState } from "react";
|
|
2
|
+
import { useWatch } from "react-hook-form";
|
|
2
3
|
import { Button } from "@digigov/ui/form/Button";
|
|
3
4
|
import {
|
|
4
5
|
FileUpload,
|
|
@@ -7,54 +8,72 @@ import {
|
|
|
7
8
|
import { useTranslation } from "@digigov/ui/i18n";
|
|
8
9
|
import { Hint } from "@digigov/ui/typography/Hint";
|
|
9
10
|
import { Paragraph } from "@digigov/ui/typography/Paragraph";
|
|
10
|
-
const FileInput = React.forwardRef(function FileInput2({
|
|
11
|
-
|
|
11
|
+
const FileInput = React.forwardRef(function FileInput2({
|
|
12
|
+
name,
|
|
13
|
+
disabled,
|
|
14
|
+
resetField,
|
|
15
|
+
extra,
|
|
16
|
+
control,
|
|
17
|
+
onChange,
|
|
18
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
19
|
+
Field,
|
|
20
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
21
|
+
reset,
|
|
22
|
+
...props
|
|
23
|
+
}, ref) {
|
|
12
24
|
const { t } = useTranslation();
|
|
13
|
-
const
|
|
14
|
-
|
|
25
|
+
const value = useWatch({ control, name });
|
|
26
|
+
const [filenames, setFilenames] = useState(
|
|
27
|
+
Object.values(value || {}).map(({ name: name2 }) => name2) || []
|
|
15
28
|
);
|
|
16
29
|
useEffect(() => {
|
|
17
|
-
|
|
30
|
+
setFilenames(Object.values(value || {}).map(({ name: name2 }) => name2));
|
|
18
31
|
}, [value]);
|
|
32
|
+
const handleChange = useCallback(
|
|
33
|
+
(event) => {
|
|
34
|
+
event.preventDefault();
|
|
35
|
+
const target = event.target;
|
|
36
|
+
if (target.files && target.files.length > 0) {
|
|
37
|
+
setFilenames(Object.values(target.files).map(({ name: name2 }) => name2));
|
|
38
|
+
}
|
|
39
|
+
onChange(event);
|
|
40
|
+
},
|
|
41
|
+
[onChange]
|
|
42
|
+
);
|
|
43
|
+
const handleReset = useCallback(
|
|
44
|
+
(event) => {
|
|
45
|
+
event.preventDefault();
|
|
46
|
+
resetField(name);
|
|
47
|
+
setFilenames(void 0);
|
|
48
|
+
},
|
|
49
|
+
[name, resetField]
|
|
50
|
+
);
|
|
19
51
|
return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
|
|
20
52
|
FileUploadContainer,
|
|
21
53
|
{
|
|
22
54
|
variant: extra?.containerProps?.variant || "default",
|
|
23
|
-
hasFiles:
|
|
55
|
+
hasFiles: filenames && filenames.length > 0
|
|
24
56
|
},
|
|
25
|
-
|
|
57
|
+
filenames?.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Paragraph, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ":"), " ", `${filenames.join(", ")}`)) : /* @__PURE__ */ React.createElement(Hint, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ": "), t("upload.no_file")),
|
|
26
58
|
/* @__PURE__ */ React.createElement(
|
|
27
59
|
FileUpload,
|
|
28
60
|
{
|
|
29
61
|
ref,
|
|
30
|
-
hasFiles: !!
|
|
62
|
+
hasFiles: !!filenames?.length,
|
|
31
63
|
name,
|
|
32
64
|
variant: extra?.uploadButtonProps?.variant,
|
|
33
65
|
disabled,
|
|
34
66
|
id: name,
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
if (event?.target?.files && event?.target?.files.length > 0) {
|
|
38
|
-
onChange(event.target.files);
|
|
39
|
-
}
|
|
40
|
-
},
|
|
41
|
-
...{
|
|
42
|
-
...props,
|
|
43
|
-
required: void 0,
|
|
44
|
-
error: void 0
|
|
45
|
-
}
|
|
67
|
+
onChange: handleChange,
|
|
68
|
+
...{ ...props, required: void 0 }
|
|
46
69
|
},
|
|
47
|
-
|
|
70
|
+
filenames?.length ? t("upload.change_file") : t("upload.choose_file")
|
|
48
71
|
),
|
|
49
|
-
|
|
72
|
+
filenames !== void 0 && filenames?.length > 0 && !extra?.noResetButton && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
|
|
50
73
|
Button,
|
|
51
74
|
{
|
|
52
75
|
variant: extra?.resetButtonProps?.variant || "link",
|
|
53
|
-
onClick:
|
|
54
|
-
event.preventDefault();
|
|
55
|
-
resetField(name);
|
|
56
|
-
setFiles(void 0);
|
|
57
|
-
},
|
|
76
|
+
onClick: handleReset,
|
|
58
77
|
color: extra?.resetButtonProps?.color || "secondary"
|
|
59
78
|
},
|
|
60
79
|
t("upload.reset_file")
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/inputs/FileInput/index.tsx"],
|
|
4
|
-
"sourcesContent": ["import React, { useEffect, useState } from 'react';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonProps } from '@digigov/ui/form/Button';\nimport {\n FileUpload,\n FileUploadContainer,\n FileUploadContainerProps,\n FileUploadProps,\n} from '@digigov/ui/form/FileUpload';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Paragraph } from '@digigov/ui/typography/Paragraph';\nexport interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n extra?: {\n className?: string;\n multiple?: boolean;\n accept?: string;\n limit: {\n maxSize?: number;\n };\n containerProps?: FileUploadContainerProps;\n uploadButtonProps?: FileUploadProps;\n noResetButton?: boolean;\n resetButtonProps?: ButtonProps;\n locales?: {\n file?: string;\n chooseFile?: string;\n changeFile?: string;\n resetFile?: string;\n };\n };\n}\n\nexport const FileInput
|
|
5
|
-
"mappings": "AAAA,OAAO,
|
|
4
|
+
"sourcesContent": ["import React, { ComponentRef, useCallback, useEffect, useState } from 'react';\nimport { UseFormReturn, useWatch } from 'react-hook-form';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonProps } from '@digigov/ui/form/Button';\nimport {\n FileUpload,\n FileUploadContainer,\n FileUploadContainerProps,\n FileUploadProps,\n} from '@digigov/ui/form/FileUpload';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Paragraph } from '@digigov/ui/typography/Paragraph';\n\nexport interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n extra?: {\n className?: string;\n multiple?: boolean;\n accept?: string;\n limit: {\n maxSize?: number;\n };\n containerProps?: FileUploadContainerProps;\n uploadButtonProps?: FileUploadProps;\n noResetButton?: boolean;\n resetButtonProps?: ButtonProps;\n locales?: {\n file?: string;\n chooseFile?: string;\n changeFile?: string;\n resetFile?: string;\n };\n };\n reset: (values?: FileList) => void;\n resetField: UseFormReturn['resetField'];\n onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;\n}\n\nexport const FileInput = React.forwardRef<\n ComponentRef<typeof FileUpload>,\n FileInputProps\n>(function FileInput(\n {\n name,\n disabled,\n resetField,\n extra,\n control,\n onChange,\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n Field,\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n reset,\n ...props\n },\n ref\n) {\n const { t } = useTranslation();\n const value: FileList = useWatch({ control, name });\n\n const [filenames, setFilenames] = useState<string[] | undefined>(\n Object.values(value || {}).map(({ name }) => name) || []\n );\n\n useEffect(() => {\n setFilenames(Object.values(value || {}).map(({ name }) => name));\n }, [value]);\n\n const handleChange = useCallback(\n (event: React.ChangeEvent<HTMLInputElement>) => {\n event.preventDefault();\n const target = event.target;\n if (target.files && target.files.length > 0) {\n setFilenames(Object.values(target.files).map(({ name }) => name));\n }\n onChange(event);\n },\n [onChange]\n );\n\n const handleReset = useCallback(\n (event: React.MouseEvent<HTMLButtonElement>) => {\n event.preventDefault();\n resetField(name);\n setFilenames(undefined);\n },\n [name, resetField]\n );\n\n return (\n <>\n <FileUploadContainer\n variant={extra?.containerProps?.variant || 'default'}\n hasFiles={filenames && filenames.length > 0}\n >\n {filenames?.length ? (\n <>\n <Paragraph>\n <b>{t('upload.file')}:</b> {`${filenames.join(', ')}`}\n </Paragraph>\n </>\n ) : (\n <Hint>\n <b>\n {t('upload.file')}\n {': '}\n </b>\n {t('upload.no_file')}\n </Hint>\n )}\n <FileUpload\n ref={ref}\n hasFiles={!!filenames?.length}\n name={name}\n variant={extra?.uploadButtonProps?.variant}\n disabled={disabled}\n id={name}\n onChange={handleChange}\n {...{ ...props, required: undefined }}\n >\n {filenames?.length\n ? t('upload.change_file')\n : t('upload.choose_file')}\n </FileUpload>\n {filenames !== undefined &&\n filenames?.length > 0 &&\n !extra?.noResetButton && (\n <>\n <Button\n variant={extra?.resetButtonProps?.variant || 'link'}\n onClick={handleReset}\n color={extra?.resetButtonProps?.color || 'secondary'}\n >\n {t('upload.reset_file')}\n </Button>\n </>\n )}\n </FileUploadContainer>\n </>\n );\n});\n\nexport default FileInput;\n"],
|
|
5
|
+
"mappings": "AAAA,OAAO,SAAuB,aAAa,WAAW,gBAAgB;AACtE,SAAwB,gBAAgB;AAExC,SAAS,cAA2B;AACpC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AA0BnB,MAAM,YAAY,MAAM,WAG7B,SAASA,WACT;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AAAA,EACA,GAAG;AACL,GACA,KACA;AACA,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,QAAM,QAAkB,SAAS,EAAE,SAAS,KAAK,CAAC;AAElD,QAAM,CAAC,WAAW,YAAY,IAAI;AAAA,IAChC,OAAO,OAAO,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,MAAAC,MAAK,MAAMA,KAAI,KAAK,CAAC;AAAA,EACzD;AAEA,YAAU,MAAM;AACd,iBAAa,OAAO,OAAO,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,EACjE,GAAG,CAAC,KAAK,CAAC;AAEV,QAAM,eAAe;AAAA,IACnB,CAAC,UAA+C;AAC9C,YAAM,eAAe;AACrB,YAAM,SAAS,MAAM;AACrB,UAAI,OAAO,SAAS,OAAO,MAAM,SAAS,GAAG;AAC3C,qBAAa,OAAO,OAAO,OAAO,KAAK,EAAE,IAAI,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,MAClE;AACA,eAAS,KAAK;AAAA,IAChB;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AAEA,QAAM,cAAc;AAAA,IAClB,CAAC,UAA+C;AAC9C,YAAM,eAAe;AACrB,iBAAW,IAAI;AACf,mBAAa,MAAS;AAAA,IACxB;AAAA,IACA,CAAC,MAAM,UAAU;AAAA,EACnB;AAEA,SACE,0DACE;AAAA,IAAC;AAAA;AAAA,MACC,SAAS,OAAO,gBAAgB,WAAW;AAAA,MAC3C,UAAU,aAAa,UAAU,SAAS;AAAA;AAAA,IAEzC,WAAW,SACV,0DACE,oCAAC,iBACC,oCAAC,WAAG,EAAE,aAAa,GAAE,GAAC,GAAI,KAAE,GAAG,UAAU,KAAK,IAAI,CAAC,EACrD,CACF,IAEA,oCAAC,YACC,oCAAC,WACE,EAAE,aAAa,GACf,IACH,GACC,EAAE,gBAAgB,CACrB;AAAA,IAEF;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,UAAU,CAAC,CAAC,WAAW;AAAA,QACvB;AAAA,QACA,SAAS,OAAO,mBAAmB;AAAA,QACnC;AAAA,QACA,IAAI;AAAA,QACJ,UAAU;AAAA,QACT,GAAG,EAAE,GAAG,OAAO,UAAU,OAAU;AAAA;AAAA,MAEnC,WAAW,SACR,EAAE,oBAAoB,IACtB,EAAE,oBAAoB;AAAA,IAC5B;AAAA,IACC,cAAc,UACb,WAAW,SAAS,KACpB,CAAC,OAAO,iBACN,0DACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,OAAO,kBAAkB,WAAW;AAAA,QAC7C,SAAS;AAAA,QACT,OAAO,OAAO,kBAAkB,SAAS;AAAA;AAAA,MAExC,EAAE,mBAAmB;AAAA,IACxB,CACF;AAAA,EAEN,CACF;AAEJ,CAAC;AAED,IAAO,oBAAQ;",
|
|
6
6
|
"names": ["FileInput", "name"]
|
|
7
7
|
}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
declare namespace _default {
|
|
2
2
|
export let title: string;
|
|
3
3
|
export { ImageInput 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/ImageInput/__stories__/Default";
|
|
8
|
-
export { WithInvalidImageDimension } from "@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension";
|
|
9
10
|
export { MaxSize } from "@digigov/form/inputs/ImageInput/__stories__/MaxSize";
|
|
11
|
+
export { WithInvalidImageDimension } from "@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension";
|
|
12
|
+
export { WithInitialValues } from "@digigov/form/inputs/ImageInput/__stories__/WithInitialValues";
|
|
10
13
|
import ImageInput from '@digigov/form/inputs/ImageInput';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=logo.d.js.map
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { UseFormReturn } from 'react-hook-form';
|
|
2
3
|
import { UncontrolledFieldProps } from '@digigov/form/Field/types';
|
|
3
4
|
export interface ImageProps {
|
|
4
|
-
src
|
|
5
|
+
src: string;
|
|
5
6
|
}
|
|
6
7
|
export interface Limit {
|
|
7
8
|
maxSize?: number;
|
|
@@ -11,6 +12,10 @@ export interface Limit {
|
|
|
11
12
|
minHeight?: number;
|
|
12
13
|
}
|
|
13
14
|
export declare const Image: React.FC<ImageProps>;
|
|
15
|
+
interface ImageInputDefaultValue {
|
|
16
|
+
filename: string;
|
|
17
|
+
src: string;
|
|
18
|
+
}
|
|
14
19
|
export interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
15
20
|
extra?: {
|
|
16
21
|
className?: string;
|
|
@@ -19,7 +24,10 @@ export interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
|
19
24
|
limit?: Limit;
|
|
20
25
|
};
|
|
21
26
|
reset: (values?: any) => void;
|
|
27
|
+
resetField: UseFormReturn['resetField'];
|
|
22
28
|
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
|
|
29
|
+
defaultValue?: ImageInputDefaultValue | null;
|
|
30
|
+
value: any;
|
|
23
31
|
}
|
|
24
32
|
export declare const ImageInput: React.FC<ImageInputProps>;
|
|
25
33
|
export default ImageInput;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState, useCallback } from "react";
|
|
1
|
+
import React, { useRef, useState, useEffect, useCallback } from "react";
|
|
2
2
|
import { Button, ButtonGroup } from "@digigov/ui/form/Button";
|
|
3
3
|
import { FileUpload, FileUploadContainer } from "@digigov/ui/form/FileUpload";
|
|
4
4
|
import { useTranslation } from "@digigov/ui/i18n";
|
|
@@ -8,11 +8,21 @@ import { Base } from "@digigov/ui/utils/Base";
|
|
|
8
8
|
const Image = React.memo(function Image2({ src }) {
|
|
9
9
|
return /* @__PURE__ */ React.createElement(Base, { as: "img", src, className: "ds-image--ratio" });
|
|
10
10
|
});
|
|
11
|
+
const blobToFileList = (blob, fileName) => {
|
|
12
|
+
const file = new File([blob], fileName, { type: "image/jpeg" });
|
|
13
|
+
const dataTransfer = new DataTransfer();
|
|
14
|
+
dataTransfer.items.add(file);
|
|
15
|
+
return dataTransfer.files;
|
|
16
|
+
};
|
|
11
17
|
const ImageInput = React.forwardRef(
|
|
12
|
-
function ImageInput2({ name, disabled, onChange,
|
|
18
|
+
function ImageInput2({ name, disabled, onChange, resetField, defaultValue, value, ...props }, ref) {
|
|
19
|
+
const imageRef = useRef(ref?.current);
|
|
13
20
|
const { t } = useTranslation();
|
|
14
|
-
const
|
|
15
|
-
const [
|
|
21
|
+
const currentValue = defaultValue || value || null;
|
|
22
|
+
const [selectedImage, setSelectedImage] = useState(currentValue);
|
|
23
|
+
const [imageUrl, setImageUrl] = useState(
|
|
24
|
+
currentValue?.src || null
|
|
25
|
+
);
|
|
16
26
|
const handleImageChange = useCallback(
|
|
17
27
|
(e) => {
|
|
18
28
|
e.preventDefault();
|
|
@@ -22,23 +32,36 @@ const ImageInput = React.forwardRef(
|
|
|
22
32
|
setSelectedImage(selectedFile);
|
|
23
33
|
setImageUrl(URL.createObjectURL(selectedFile));
|
|
24
34
|
}
|
|
25
|
-
onChange(
|
|
35
|
+
onChange(
|
|
36
|
+
target.files
|
|
37
|
+
);
|
|
26
38
|
},
|
|
27
39
|
[selectedImage]
|
|
28
40
|
);
|
|
29
41
|
const handleDeleteImage = useCallback(
|
|
30
42
|
(event) => {
|
|
31
43
|
event.preventDefault();
|
|
32
|
-
|
|
44
|
+
resetField(name);
|
|
33
45
|
setSelectedImage(null);
|
|
34
|
-
setImageUrl(
|
|
46
|
+
setImageUrl(null);
|
|
35
47
|
},
|
|
36
48
|
[selectedImage]
|
|
37
49
|
);
|
|
38
|
-
|
|
50
|
+
useEffect(() => {
|
|
51
|
+
if (defaultValue?.src && imageRef.current) {
|
|
52
|
+
fetch(defaultValue?.src).then((response) => response.blob()).then((blob) => {
|
|
53
|
+
const fileList = blobToFileList(blob, defaultValue.filename);
|
|
54
|
+
imageRef.current.files = fileList;
|
|
55
|
+
const fileChangeEvent = new Event("change", { bubbles: true });
|
|
56
|
+
imageRef.current.dispatchEvent(fileChangeEvent);
|
|
57
|
+
return;
|
|
58
|
+
}).catch((error) => console.error("Error fetching image:", error));
|
|
59
|
+
}
|
|
60
|
+
}, [defaultValue, imageRef]);
|
|
61
|
+
return /* @__PURE__ */ React.createElement(FileUploadContainer, null, selectedImage !== null ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Paragraph, null, /* @__PURE__ */ React.createElement(Base, { as: "b" }, t("upload.image"), ":"), " ", /* @__PURE__ */ React.createElement("em", null, `${selectedImage?.name || selectedImage?.filename}`))) : /* @__PURE__ */ React.createElement(Hint, { className: "ds-dashed--border" }, t("upload.no_image")), imageUrl !== null && selectedImage !== null && /* @__PURE__ */ React.createElement(Image, { src: imageUrl }), !disabled && /* @__PURE__ */ React.createElement(ButtonGroup, { marginTop: 2 }, /* @__PURE__ */ React.createElement(
|
|
39
62
|
FileUpload,
|
|
40
63
|
{
|
|
41
|
-
ref,
|
|
64
|
+
ref: imageRef,
|
|
42
65
|
hasFiles: selectedImage !== null,
|
|
43
66
|
name,
|
|
44
67
|
id: name,
|
|
@@ -52,8 +75,16 @@ const ImageInput = React.forwardRef(
|
|
|
52
75
|
type: "file"
|
|
53
76
|
}
|
|
54
77
|
},
|
|
55
|
-
t("upload.choose_image")
|
|
56
|
-
)
|
|
78
|
+
selectedImage ? t("upload.change_image") : t("upload.choose_image")
|
|
79
|
+
), selectedImage !== null && /* @__PURE__ */ React.createElement(
|
|
80
|
+
Button,
|
|
81
|
+
{
|
|
82
|
+
color: "warning",
|
|
83
|
+
variant: "link",
|
|
84
|
+
onClick: handleDeleteImage
|
|
85
|
+
},
|
|
86
|
+
t("upload.reset_file")
|
|
87
|
+
)));
|
|
57
88
|
}
|
|
58
89
|
);
|
|
59
90
|
var ImageInput_default = ImageInput;
|