@digigov/form 2.0.0-e7d30530 → 2.0.0-eaf330f5
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 +4 -3
- package/Field/FieldBase.js.map +2 -2
- package/Field/FieldBaseContainer/index.js +19 -37
- package/Field/FieldBaseContainer.d.ts +1 -1
- 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 +1 -2
- package/Field/index.js.map +2 -2
- package/Field/types.d.ts +2 -2
- package/Field/utils/index.js +3 -4
- package/Field/utils/index.js.map +2 -2
- package/FieldArray/FormDialog/index.js +7 -2
- package/FieldArray/FormDialog.d.ts +3 -2
- 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 +88 -95
- package/FieldArray/index.js.map +3 -3
- package/FormBuilder/FormBuilder.stories.d.ts +0 -2
- 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 +7 -3
- package/FormBuilder/index.js.map +2 -2
- package/FormContext/index.js +2 -6
- package/FormContext.d.ts +0 -1
- package/FormContext.js.map +2 -2
- package/MultiplicityField/MultiplicityField.stories.d.ts +0 -2
- 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 +2 -4
- package/MultiplicityField/index.js.map +2 -2
- package/MultiplicityField/types.d.ts +0 -1
- package/Questions/Questions.stories.d.ts +0 -2
- package/Questions/__stories__/Default.d.ts +1 -1
- package/cjs/Field/FieldBase/index.js +4 -3
- package/cjs/Field/FieldBase.js.map +2 -2
- package/cjs/Field/FieldBaseContainer/index.js +18 -36
- 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 +1 -2
- package/cjs/Field/index.js.map +2 -2
- package/cjs/Field/types.js.map +1 -1
- package/cjs/Field/utils/index.js +3 -4
- package/cjs/Field/utils/index.js.map +2 -2
- package/cjs/FieldArray/FormDialog/index.js +7 -2
- package/cjs/FieldArray/FormDialog.js.map +2 -2
- package/cjs/FieldArray/index.js +83 -93
- package/cjs/FieldArray/index.js.map +3 -3
- package/cjs/FormBuilder/index.js +7 -3
- package/cjs/FormBuilder/index.js.map +2 -2
- package/cjs/FormContext/index.js +2 -7
- 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 +2 -4
- package/cjs/MultiplicityField/index.js.map +2 -2
- package/cjs/MultiplicityField/types.js.map +1 -1
- package/cjs/inputs/Checkboxes/index.js +1 -2
- package/cjs/inputs/Checkboxes/index.js.map +2 -2
- package/cjs/inputs/DateInput/index.js +12 -27
- package/cjs/inputs/DateInput/index.js.map +2 -2
- package/cjs/inputs/DateTimeInput/index.js +34 -55
- package/cjs/inputs/DateTimeInput/index.js.map +2 -2
- package/cjs/inputs/FileInput/index.js +26 -45
- package/cjs/inputs/FileInput/index.js.map +2 -2
- package/cjs/inputs/ImageInput/index.js +10 -41
- package/cjs/inputs/ImageInput/index.js.map +2 -2
- package/cjs/inputs/Input/inputsInputScenarios/index.js +439 -0
- package/cjs/inputs/Input/inputsInputScenarios.js.map +7 -0
- package/cjs/lazy/index.js +6 -6
- package/cjs/lazy.js.map +2 -2
- package/cjs/registry/index.js +10 -8
- package/cjs/registry.js.map +2 -2
- package/cjs/validators/index.js +10 -8
- package/cjs/validators/index.js.map +2 -2
- package/cjs/validators/utils/date/index.js +3 -21
- package/cjs/validators/utils/date.js.map +2 -2
- package/cjs/validators/utils/datetime/index.js +24 -113
- package/cjs/validators/utils/datetime.js.map +2 -2
- package/index.js +1 -1
- package/inputs/AutoCompleteInput/AutoComplete.stories.d.ts +0 -2
- 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 +0 -2
- 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 +1 -2
- package/inputs/Checkboxes/index.js.map +2 -2
- package/inputs/DateInput/DateInput.stories.d.ts +0 -6
- package/inputs/DateInput/__stories__/Default.d.ts +1 -1
- package/inputs/DateInput/index.js +13 -28
- package/inputs/DateInput/index.js.map +2 -2
- package/inputs/DateTimeInput/DateTimeInput.stories.d.ts +3 -10
- package/inputs/DateTimeInput/__stories__/Default.d.ts +1 -1
- package/inputs/DateTimeInput/index.js +35 -56
- package/inputs/DateTimeInput/index.js.map +2 -2
- package/inputs/FileInput/FileInput.stories.d.ts +0 -2
- package/inputs/FileInput/__stories__/Default.d.ts +1 -1
- package/inputs/FileInput/index.d.ts +1 -5
- package/inputs/FileInput/index.js +27 -46
- package/inputs/FileInput/index.js.map +2 -2
- package/inputs/ImageInput/ImageInput.stories.d.ts +1 -4
- package/inputs/ImageInput/__stories__/Default.d.ts +1 -1
- package/inputs/ImageInput/__stories__/MaxSize.d.ts +1 -1
- package/inputs/ImageInput/__stories__/WithInvalidImageDimension.d.ts +1 -1
- package/inputs/ImageInput/index.d.ts +1 -9
- package/inputs/ImageInput/index.js +11 -42
- package/inputs/ImageInput/index.js.map +2 -2
- package/inputs/Input/Input.stories.d.ts +0 -3
- package/inputs/Input/__stories__/AFM.d.ts +1 -1
- package/inputs/Input/__stories__/Boolean.d.ts +1 -1
- 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/inputsInputScenarios/index.js +406 -0
- package/inputs/{ImageInput/__stories__/logo.d → Input/inputsInputScenarios}/package.json +1 -1
- package/inputs/Input/inputsInputScenarios.d.ts +57 -0
- package/inputs/Input/inputsInputScenarios.js.map +7 -0
- package/inputs/Label/Label.stories.d.ts +0 -2
- package/inputs/Label/__stories__/Default.d.ts +1 -1
- package/inputs/OtpInput/OtpInput.stories.d.ts +0 -2
- package/inputs/OtpInput/__stories__/Default.d.ts +1 -1
- package/inputs/Radio/Radio.stories.d.ts +0 -2
- 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 +0 -2
- package/inputs/Select/__stories__/Default.d.ts +1 -1
- package/lazy/index.js +6 -6
- package/package.json +8 -8
- package/registry/index.js +10 -8
- package/src/Field/FieldBase.tsx +18 -14
- package/src/Field/FieldBaseContainer.tsx +51 -68
- package/src/Field/FieldConditional.tsx +1 -1
- package/src/Field/index.tsx +1 -2
- package/src/Field/types.tsx +2 -2
- package/src/Field/utils/index.ts +1 -2
- package/src/FieldArray/FormDialog.tsx +12 -3
- 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 +103 -111
- package/src/FormBuilder/FormBuilder.stories.js +0 -3
- 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 +7 -3
- package/src/FormBuilder/scenarios.test.tsx +1 -1
- package/src/FormContext.tsx +1 -5
- package/src/MultiplicityField/MultiplicityField.stories.js +0 -3
- 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 +1 -3
- package/src/MultiplicityField/types.ts +0 -1
- package/src/Questions/Questions.stories.js +0 -3
- package/src/Questions/__stories__/Default.tsx +1 -1
- package/src/inputs/AutoCompleteInput/AutoComplete.stories.js +0 -3
- 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 +0 -3
- 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 +5 -4
- package/src/inputs/DateInput/DateInput.stories.js +0 -7
- package/src/inputs/DateInput/__stories__/Default.tsx +1 -1
- package/src/inputs/DateInput/index.test.tsx +0 -16
- package/src/inputs/DateInput/index.tsx +13 -31
- package/src/inputs/DateTimeInput/DateTimeInput.stories.js +6 -12
- package/src/inputs/DateTimeInput/__stories__/Default.tsx +1 -1
- package/src/inputs/DateTimeInput/index.test.tsx +0 -16
- package/src/inputs/DateTimeInput/index.tsx +35 -59
- package/src/inputs/FileInput/FileInput.stories.js +0 -3
- package/src/inputs/FileInput/__stories__/Default.tsx +1 -1
- package/src/inputs/FileInput/index.tsx +39 -72
- package/src/inputs/ImageInput/ImageInput.stories.js +1 -5
- package/src/inputs/ImageInput/__stories__/Default.tsx +1 -1
- package/src/inputs/ImageInput/__stories__/MaxSize.tsx +2 -3
- package/src/inputs/ImageInput/__stories__/WithInvalidImageDimension.tsx +1 -1
- package/src/inputs/ImageInput/index.test.tsx +0 -4
- package/src/inputs/ImageInput/index.tsx +48 -100
- package/src/inputs/Input/Input.stories.js +0 -4
- package/src/inputs/Input/__stories__/AFM.tsx +1 -1
- package/src/inputs/Input/__stories__/Boolean.tsx +1 -1
- 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 +0 -8
- package/src/inputs/Input/inputsInputScenarios.ts +404 -0
- package/src/inputs/Label/Label.stories.js +0 -3
- package/src/inputs/Label/__stories__/Default.tsx +1 -1
- package/src/inputs/OtpInput/OtpInput.stories.js +0 -3
- package/src/inputs/OtpInput/__stories__/Default.tsx +1 -1
- package/src/inputs/Radio/Radio.stories.js +0 -3
- 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 +0 -3
- package/src/inputs/Select/__stories__/Default.tsx +1 -1
- package/src/lazy.js +6 -6
- package/src/registry.js +10 -8
- package/src/validators/index.ts +13 -13
- package/src/validators/utils/date.ts +4 -23
- package/src/validators/utils/datetime.ts +29 -116
- package/validators/index.js +10 -8
- package/validators/index.js.map +2 -2
- package/validators/utils/date/index.js +3 -21
- package/validators/utils/date.d.ts +1 -1
- package/validators/utils/date.js.map +2 -2
- package/validators/utils/datetime/index.js +24 -113
- package/validators/utils/datetime.d.ts +1 -1
- package/validators/utils/datetime.js.map +2 -2
- package/cjs/inputs/ImageInput/__stories__/logo.d/index.js +0 -1
- package/cjs/inputs/ImageInput/__stories__/logo.d.js.map +0 -7
- package/inputs/DateInput/__stories__/WithDefaultValue.d.ts +0 -3
- package/inputs/DateInput/__stories__/WithInitialValue.d.ts +0 -3
- package/inputs/DateInput/__stories__/WithWrongDefaultValue.d.ts +0 -3
- package/inputs/DateInput/__stories__/WithWrongInitialValue.d.ts +0 -3
- package/inputs/DateTimeInput/__stories__/WithDefaultValue.d.ts +0 -3
- package/inputs/DateTimeInput/__stories__/WithInitialValue.d.ts +0 -3
- package/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.d.ts +0 -3
- package/inputs/DateTimeInput/__stories__/WithWrongInitialValue.d.ts +0 -3
- package/inputs/ImageInput/__stories__/WithInitialValues.d.ts +0 -3
- package/inputs/ImageInput/__stories__/logo.d/index.js +0 -1
- package/inputs/ImageInput/__stories__/logo.d.js.map +0 -7
- package/inputs/Input/__stories__/Email.d.ts +0 -3
- package/src/inputs/DateInput/__stories__/WithDefaultValue.tsx +0 -26
- package/src/inputs/DateInput/__stories__/WithInitialValue.tsx +0 -28
- package/src/inputs/DateInput/__stories__/WithWrongDefaultValue.tsx +0 -26
- package/src/inputs/DateInput/__stories__/WithWrongInitialValue.tsx +0 -28
- package/src/inputs/DateTimeInput/__stories__/WithDefaultValue.tsx +0 -26
- package/src/inputs/DateTimeInput/__stories__/WithInitialValue.tsx +0 -28
- package/src/inputs/DateTimeInput/__stories__/WithWrongDefaultValue.tsx +0 -26
- package/src/inputs/DateTimeInput/__stories__/WithWrongInitialValue.tsx +0 -28
- package/src/inputs/ImageInput/__stories__/WithInitialValues.tsx +0 -45
- package/src/inputs/ImageInput/__stories__/logo.d.ts +0 -4
- package/src/inputs/ImageInput/__stories__/logo.png +0 -0
- package/src/inputs/Input/__stories__/Email.tsx +0 -23
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import React, { useMemo,
|
|
1
|
+
import React, { useMemo, useState } 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/FormBuilder";
|
|
5
5
|
import {
|
|
6
6
|
DateInputContainer,
|
|
7
7
|
DateInputItem
|
|
@@ -11,6 +11,7 @@ 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("");
|
|
14
15
|
return ["", "", "", "", ""];
|
|
15
16
|
}
|
|
16
17
|
const [datePart, timePart] = value.split(" ");
|
|
@@ -95,115 +96,93 @@ const DateTimePart = ({ label, ...props }) => {
|
|
|
95
96
|
};
|
|
96
97
|
const DateTimeInput = ({ name, ...props }) => {
|
|
97
98
|
const { t } = useTranslation();
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
form.setValue(name, makeDateTime(props.defaultValue), {
|
|
103
|
-
shouldValidate: false
|
|
104
|
-
});
|
|
105
|
-
} else {
|
|
106
|
-
form.setValue(name, makeDateTime(initialValue), {
|
|
107
|
-
shouldValidate: false
|
|
108
|
-
});
|
|
99
|
+
const [initial] = useState(props.value);
|
|
100
|
+
const value = useMemo(() => {
|
|
101
|
+
if (initial === props.value) {
|
|
102
|
+
return makeDateTime(props.value);
|
|
109
103
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
const
|
|
104
|
+
return props.value;
|
|
105
|
+
}, [props.value, initial]);
|
|
106
|
+
const form = useFormContext();
|
|
107
|
+
const datetime = useDateTime(
|
|
108
|
+
name,
|
|
109
|
+
value || makeDateTime(props.defaultValue),
|
|
110
|
+
form
|
|
111
|
+
);
|
|
113
112
|
return /* @__PURE__ */ React.createElement(DateInputContainer, null, /* @__PURE__ */ React.createElement(
|
|
114
113
|
DateTimePart,
|
|
115
114
|
{
|
|
116
115
|
label: t("form.label.day"),
|
|
117
|
-
onChange:
|
|
118
|
-
onBlur:
|
|
119
|
-
|
|
120
|
-
dateTime.setDay(e, true);
|
|
121
|
-
}
|
|
122
|
-
dateTime.trigger();
|
|
123
|
-
},
|
|
124
|
-
value: dateTime.day,
|
|
116
|
+
onChange: datetime.setDay,
|
|
117
|
+
onBlur: datetime.trigger,
|
|
118
|
+
value: datetime.day,
|
|
125
119
|
width: 2,
|
|
126
120
|
name: `${name}-day`,
|
|
127
121
|
maxLength: "2",
|
|
128
122
|
disabled: props.disabled,
|
|
129
123
|
"aria-required": props["aria-required"],
|
|
130
|
-
error: !
|
|
124
|
+
error: !datetime.day ? props.error : false,
|
|
131
125
|
id: `${name}-day`
|
|
132
126
|
}
|
|
133
127
|
), /* @__PURE__ */ React.createElement(
|
|
134
128
|
DateTimePart,
|
|
135
129
|
{
|
|
136
130
|
label: t("form.label.month"),
|
|
137
|
-
onChange:
|
|
138
|
-
onBlur:
|
|
139
|
-
|
|
140
|
-
dateTime.setMonth(e, true);
|
|
141
|
-
}
|
|
142
|
-
dateTime.trigger();
|
|
143
|
-
},
|
|
144
|
-
value: dateTime.month,
|
|
131
|
+
onChange: datetime.setMonth,
|
|
132
|
+
onBlur: datetime.trigger,
|
|
133
|
+
value: datetime.month,
|
|
145
134
|
width: 2,
|
|
146
135
|
name: `${name}-month`,
|
|
147
136
|
id: `${name}-month`,
|
|
148
137
|
maxLength: "2",
|
|
149
138
|
disabled: props.disabled,
|
|
150
139
|
"aria-required": props["aria-required"],
|
|
151
|
-
error: !
|
|
140
|
+
error: !datetime.month ? props.error : false
|
|
152
141
|
}
|
|
153
142
|
), /* @__PURE__ */ React.createElement(
|
|
154
143
|
DateTimePart,
|
|
155
144
|
{
|
|
156
145
|
label: t("form.label.year"),
|
|
157
|
-
onChange:
|
|
158
|
-
onBlur:
|
|
159
|
-
value:
|
|
146
|
+
onChange: datetime.setYear,
|
|
147
|
+
onBlur: datetime.trigger,
|
|
148
|
+
value: datetime.year,
|
|
160
149
|
width: 4,
|
|
161
150
|
name: `${name}-year`,
|
|
162
151
|
id: `${name}-year`,
|
|
163
152
|
maxLength: "4",
|
|
164
153
|
disabled: props.disabled,
|
|
165
154
|
"aria-required": props["aria-required"],
|
|
166
|
-
error: !
|
|
155
|
+
error: !datetime.year ? props.error : false
|
|
167
156
|
}
|
|
168
157
|
), /* @__PURE__ */ React.createElement(
|
|
169
158
|
DateTimePart,
|
|
170
159
|
{
|
|
171
160
|
label: t("form.label.hours"),
|
|
172
|
-
onChange:
|
|
173
|
-
onBlur:
|
|
174
|
-
|
|
175
|
-
dateTime.setHours(e, true);
|
|
176
|
-
}
|
|
177
|
-
dateTime.trigger();
|
|
178
|
-
},
|
|
179
|
-
value: dateTime.hours,
|
|
161
|
+
onChange: datetime.setHours,
|
|
162
|
+
onBlur: datetime.trigger,
|
|
163
|
+
value: datetime.hours,
|
|
180
164
|
width: 2,
|
|
181
165
|
name: `${name}-hours`,
|
|
182
166
|
id: `${name}-hours`,
|
|
183
167
|
maxLength: "2",
|
|
184
168
|
disabled: props.disabled,
|
|
185
169
|
"aria-required": props["aria-required"],
|
|
186
|
-
error: !
|
|
170
|
+
error: !datetime.hours ? props.error : false
|
|
187
171
|
}
|
|
188
172
|
), /* @__PURE__ */ React.createElement(
|
|
189
173
|
DateTimePart,
|
|
190
174
|
{
|
|
191
175
|
label: t("form.label.minutes"),
|
|
192
|
-
onChange:
|
|
193
|
-
onBlur:
|
|
194
|
-
|
|
195
|
-
dateTime.setMinutes(e, true);
|
|
196
|
-
}
|
|
197
|
-
dateTime.trigger();
|
|
198
|
-
},
|
|
199
|
-
value: dateTime.minutes,
|
|
176
|
+
onChange: datetime.setMinutes,
|
|
177
|
+
onBlur: datetime.trigger,
|
|
178
|
+
value: datetime.minutes,
|
|
200
179
|
width: 2,
|
|
201
180
|
name: `${name}-minutes`,
|
|
202
181
|
id: `${name}-minutes`,
|
|
203
182
|
maxLength: "2",
|
|
204
183
|
disabled: props.disabled,
|
|
205
184
|
"aria-required": props["aria-required"],
|
|
206
|
-
error: !
|
|
185
|
+
error: !datetime.minutes ? props.error : false
|
|
207
186
|
}
|
|
208
187
|
));
|
|
209
188
|
};
|
|
@@ -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, useState } from 'react';\nimport dayjs from 'dayjs';\nimport customParseFormat from 'dayjs/plugin/customParseFormat';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { useFormContext } from '@digigov/form/FormBuilder';\nimport {\n DateInputContainer,\n DateInputItem,\n} from '@digigov/ui/form/DateInputContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\ndayjs.extend(customParseFormat);\n\nexport interface DateTimeInputProps\n extends Omit<UncontrolledFieldProps, 'extra'> {\n extra?: {\n max?: string;\n min?: string;\n };\n}\n\nfunction useDateTime(name, value, form) {\n const [year, month, day, hours, minutes] = useMemo(() => {\n if (!value || value.length === 0) {\n update('');\n return ['', '', '', '', ''];\n }\n const [datePart, timePart] = value.split(' ');\n const [day, month, year] = datePart.split('/');\n const [hours, minutes] = timePart ? timePart.split(':') : ['', ''];\n return [year, month, day, hours, minutes];\n }, [value]);\n\n function update(value) {\n form.setValue(name, value, { shouldValidate: false });\n }\n\n function set(year, month, day, hours, minutes) {\n const datePart = `${day || ''}/${month || ''}/${year || ''}`;\n const timePart = hours || minutes ? `${hours || ''}:${minutes || ''}` : '';\n const value = timePart ? `${datePart} ${timePart}` : datePart;\n\n if (!year && !month && !day && !hours && !minutes) {\n update('');\n } else {\n update(value);\n }\n }\n\n function setYear(evt) {\n const val = evt.target.value;\n set(val, month, day, hours, minutes);\n }\n\n function setMonth(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, val, day, hours, minutes);\n }\n\n function setDay(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, val, hours, minutes);\n }\n\n function setHours(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, day, val, minutes);\n }\n\n function setMinutes(evt, cast) {\n let val = evt.target.value;\n if (cast && val && val.length === 1) {\n val = '0' + val;\n }\n set(year, month, day, hours, val);\n }\n\n function trigger() {\n if (form.formState.isSubmitted) {\n form.trigger(name);\n }\n }\n\n return {\n day,\n month,\n year,\n hours,\n minutes,\n setYear,\n setMonth,\n setDay,\n setHours,\n setMinutes,\n trigger,\n };\n}\n\nconst VALID_FORMATS = ['DD/MM/YYYY HH:mm', 'DD/MM/YYYY'];\n\nconst makeDateTime = (val) => {\n const date = dayjs(val, VALID_FORMATS, true);\n if (date.isValid()) {\n return date.format('DD/MM/YYYY HH:mm');\n }\n return '';\n};\n\nconst DateTimePart = ({ label, ...props }) => {\n return <DateInputItem {...props}>{label}</DateInputItem>;\n};\n\nexport const DateTimeInput = ({ name, ...props }) => {\n const { t } = useTranslation();\n const [initial] = useState(props.value);\n const value = useMemo(() => {\n if (initial === props.value) {\n return makeDateTime(props.value);\n }\n return props.value;\n }, [props.value, initial]);\n\n const form = useFormContext();\n const datetime = useDateTime(\n name,\n value || makeDateTime(props.defaultValue),\n form\n );\n\n return (\n <DateInputContainer>\n <DateTimePart\n label={t('form.label.day')}\n onChange={datetime.setDay}\n onBlur={datetime.trigger}\n value={datetime.day}\n width={2}\n name={`${name}-day`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!datetime.day ? props.error : false}\n id={`${name}-day`}\n />\n <DateTimePart\n label={t('form.label.month')}\n onChange={datetime.setMonth}\n onBlur={datetime.trigger}\n value={datetime.month}\n width={2}\n name={`${name}-month`}\n id={`${name}-month`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!datetime.month ? props.error : false}\n />\n <DateTimePart\n label={t('form.label.year')}\n onChange={datetime.setYear}\n onBlur={datetime.trigger}\n value={datetime.year}\n width={4}\n name={`${name}-year`}\n id={`${name}-year`}\n maxLength=\"4\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!datetime.year ? props.error : false}\n />\n <DateTimePart\n label={t('form.label.hours')}\n onChange={datetime.setHours}\n onBlur={datetime.trigger}\n value={datetime.hours}\n width={2}\n name={`${name}-hours`}\n id={`${name}-hours`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!datetime.hours ? props.error : false}\n />\n <DateTimePart\n label={t('form.label.minutes')}\n onChange={datetime.setMinutes}\n onBlur={datetime.trigger}\n value={datetime.minutes}\n width={2}\n name={`${name}-minutes`}\n id={`${name}-minutes`}\n maxLength=\"2\"\n disabled={props.disabled}\n aria-required={props['aria-required']}\n error={!datetime.minutes ? props.error : false}\n />\n </DateInputContainer>\n );\n};\n\nexport default DateTimeInput;\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["day", "month", "year", "hours", "minutes", "value"]
|
|
7
7
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { UseFormReturn } from 'react-hook-form';
|
|
3
2
|
import { UncontrolledFieldProps } from '@digigov/form/Field/types';
|
|
4
3
|
import { ButtonProps } from '@digigov/ui/form/Button';
|
|
5
4
|
import { FileUploadContainerProps, FileUploadProps } from '@digigov/ui/form/FileUpload';
|
|
@@ -22,9 +21,6 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
|
22
21
|
resetFile?: string;
|
|
23
22
|
};
|
|
24
23
|
};
|
|
25
|
-
reset: (values?: FileList) => void;
|
|
26
|
-
resetField: UseFormReturn['resetField'];
|
|
27
|
-
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
|
|
28
24
|
}
|
|
29
|
-
export declare const FileInput: React.
|
|
25
|
+
export declare const FileInput: React.FC<any>;
|
|
30
26
|
export default FileInput;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
2
|
-
import { useWatch } from "react-hook-form";
|
|
1
|
+
import React, { useEffect, useState } from "react";
|
|
3
2
|
import { Button } from "@digigov/ui/form/Button";
|
|
4
3
|
import {
|
|
5
4
|
FileUpload,
|
|
@@ -8,72 +7,54 @@ import {
|
|
|
8
7
|
import { useTranslation } from "@digigov/ui/i18n";
|
|
9
8
|
import { Hint } from "@digigov/ui/typography/Hint";
|
|
10
9
|
import { Paragraph } from "@digigov/ui/typography/Paragraph";
|
|
11
|
-
const FileInput = React.forwardRef(function FileInput2({
|
|
12
|
-
|
|
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) {
|
|
10
|
+
const FileInput = React.forwardRef(function FileInput2({ name, disabled, resetField, extra, onChange, value, ...props }, ref) {
|
|
11
|
+
delete props.Field;
|
|
24
12
|
const { t } = useTranslation();
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
Object.values(value || {}).map(({ name: name2 }) => name2) || []
|
|
13
|
+
const [files, setFiles] = useState(
|
|
14
|
+
Object.values(value || {})?.map?.(({ name: name2 }) => name2) || []
|
|
28
15
|
);
|
|
29
16
|
useEffect(() => {
|
|
30
|
-
|
|
17
|
+
setFiles(Object.values(value || {})?.map?.(({ name: name2 }) => name2));
|
|
31
18
|
}, [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
|
-
);
|
|
51
19
|
return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
|
|
52
20
|
FileUploadContainer,
|
|
53
21
|
{
|
|
54
22
|
variant: extra?.containerProps?.variant || "default",
|
|
55
|
-
hasFiles:
|
|
23
|
+
hasFiles: files && files.length > 0
|
|
56
24
|
},
|
|
57
|
-
|
|
25
|
+
files?.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Paragraph, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ":"), " ", `${files.join(", ")}`)) : /* @__PURE__ */ React.createElement(Hint, null, /* @__PURE__ */ React.createElement("b", null, t("upload.file"), ": "), t("upload.no_file")),
|
|
58
26
|
/* @__PURE__ */ React.createElement(
|
|
59
27
|
FileUpload,
|
|
60
28
|
{
|
|
61
29
|
ref,
|
|
62
|
-
hasFiles: !!
|
|
30
|
+
hasFiles: !!files?.length,
|
|
63
31
|
name,
|
|
64
32
|
variant: extra?.uploadButtonProps?.variant,
|
|
65
33
|
disabled,
|
|
66
34
|
id: name,
|
|
67
|
-
|
|
68
|
-
|
|
35
|
+
value: value?.filename,
|
|
36
|
+
onChange: (event) => {
|
|
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
|
+
}
|
|
69
46
|
},
|
|
70
|
-
|
|
47
|
+
files?.length ? t("upload.change_file") : t("upload.choose_file")
|
|
71
48
|
),
|
|
72
|
-
|
|
49
|
+
files !== void 0 && files?.length > 0 && !extra?.noResetButton && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
|
|
73
50
|
Button,
|
|
74
51
|
{
|
|
75
52
|
variant: extra?.resetButtonProps?.variant || "link",
|
|
76
|
-
onClick:
|
|
53
|
+
onClick: (event) => {
|
|
54
|
+
event.preventDefault();
|
|
55
|
+
resetField(name);
|
|
56
|
+
setFiles(void 0);
|
|
57
|
+
},
|
|
77
58
|
color: extra?.resetButtonProps?.color || "secondary"
|
|
78
59
|
},
|
|
79
60
|
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, {
|
|
5
|
-
"mappings": "AAAA,OAAO,
|
|
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: React.FC<any> = React.forwardRef(function FileInput(\n { name, disabled, resetField, extra, onChange, value, ...props },\n ref: any\n) {\n delete props.Field;\n const { t } = useTranslation();\n\n const [files, setFiles] = useState<string[] | undefined>(\n Object.values(value || {})?.map?.(({ name }) => name) || []\n );\n useEffect(() => {\n setFiles(Object.values(value || {})?.map?.(({ name }) => name));\n }, [value]);\n\n return (\n <>\n <FileUploadContainer\n variant={extra?.containerProps?.variant || 'default'}\n hasFiles={files && files.length > 0}\n >\n {files?.length ? (\n <>\n <Paragraph>\n <b>{t('upload.file')}:</b> {`${files.join(', ')}`}\n </Paragraph>\n </>\n ) : (\n <Hint>\n <b>\n {t('upload.file')}\n {': '}\n </b>\n {t('upload.no_file')}\n </Hint>\n )}\n <FileUpload\n ref={ref}\n hasFiles={!!files?.length}\n name={name}\n variant={extra?.uploadButtonProps?.variant}\n disabled={disabled}\n id={name}\n value={value?.filename}\n onChange={(event) => {\n if (event?.target?.files && event?.target?.files.length > 0) {\n onChange(event.target.files);\n }\n }}\n {...{\n ...props,\n required: undefined,\n error: undefined,\n }}\n >\n {files?.length ? t('upload.change_file') : t('upload.choose_file')}\n </FileUpload>\n {files !== undefined && files?.length > 0 && !extra?.noResetButton && (\n <>\n <Button\n variant={extra?.resetButtonProps?.variant || 'link'}\n onClick={(event) => {\n event.preventDefault();\n resetField(name);\n setFiles(undefined);\n }}\n color={extra?.resetButtonProps?.color || 'secondary'}\n >\n {t('upload.reset_file')}\n </Button>\n </>\n )}\n </FileUploadContainer>\n </>\n );\n});\n\nexport default FileInput;\n"],
|
|
5
|
+
"mappings": "AAAA,OAAO,SAAS,WAAW,gBAAgB;AAE3C,SAAS,cAA2B;AACpC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAsBnB,MAAM,YAA2B,MAAM,WAAW,SAASA,WAChE,EAAE,MAAM,UAAU,YAAY,OAAO,UAAU,OAAO,GAAG,MAAM,GAC/D,KACA;AACA,SAAO,MAAM;AACb,QAAM,EAAE,EAAE,IAAI,eAAe;AAE7B,QAAM,CAAC,OAAO,QAAQ,IAAI;AAAA,IACxB,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,MAAAC,MAAK,MAAMA,KAAI,KAAK,CAAC;AAAA,EAC5D;AACA,YAAU,MAAM;AACd,aAAS,OAAO,OAAO,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,MAAAA,MAAK,MAAMA,KAAI,CAAC;AAAA,EAChE,GAAG,CAAC,KAAK,CAAC;AAEV,SACE,0DACE;AAAA,IAAC;AAAA;AAAA,MACC,SAAS,OAAO,gBAAgB,WAAW;AAAA,MAC3C,UAAU,SAAS,MAAM,SAAS;AAAA;AAAA,IAEjC,OAAO,SACN,0DACE,oCAAC,iBACC,oCAAC,WAAG,EAAE,aAAa,GAAE,GAAC,GAAI,KAAE,GAAG,MAAM,KAAK,IAAI,CAAC,EACjD,CACF,IAEA,oCAAC,YACC,oCAAC,WACE,EAAE,aAAa,GACf,IACH,GACC,EAAE,gBAAgB,CACrB;AAAA,IAEF;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,UAAU,CAAC,CAAC,OAAO;AAAA,QACnB;AAAA,QACA,SAAS,OAAO,mBAAmB;AAAA,QACnC;AAAA,QACA,IAAI;AAAA,QACJ,OAAO,OAAO;AAAA,QACd,UAAU,CAAC,UAAU;AACnB,cAAI,OAAO,QAAQ,SAAS,OAAO,QAAQ,MAAM,SAAS,GAAG;AAC3D,qBAAS,MAAM,OAAO,KAAK;AAAA,UAC7B;AAAA,QACF;AAAA,QACC,GAAG;AAAA,UACF,GAAG;AAAA,UACH,UAAU;AAAA,UACV,OAAO;AAAA,QACT;AAAA;AAAA,MAEC,OAAO,SAAS,EAAE,oBAAoB,IAAI,EAAE,oBAAoB;AAAA,IACnE;AAAA,IACC,UAAU,UAAa,OAAO,SAAS,KAAK,CAAC,OAAO,iBACnD,0DACE;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,OAAO,kBAAkB,WAAW;AAAA,QAC7C,SAAS,CAAC,UAAU;AAClB,gBAAM,eAAe;AACrB,qBAAW,IAAI;AACf,mBAAS,MAAS;AAAA,QACpB;AAAA,QACA,OAAO,OAAO,kBAAkB,SAAS;AAAA;AAAA,MAExC,EAAE,mBAAmB;AAAA,IACxB,CACF;AAAA,EAEJ,CACF;AAEJ,CAAC;AAED,IAAO,oBAAQ;",
|
|
6
6
|
"names": ["FileInput", "name"]
|
|
7
7
|
}
|
|
@@ -1,13 +1,10 @@
|
|
|
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 };
|
|
6
4
|
export let displayName: string;
|
|
7
5
|
}
|
|
8
6
|
export default _default;
|
|
9
7
|
export { Default } from "@digigov/form/inputs/ImageInput/__stories__/Default";
|
|
10
|
-
export { MaxSize } from "@digigov/form/inputs/ImageInput/__stories__/MaxSize";
|
|
11
8
|
export { WithInvalidImageDimension } from "@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension";
|
|
12
|
-
export {
|
|
9
|
+
export { MaxSize } from "@digigov/form/inputs/ImageInput/__stories__/MaxSize";
|
|
13
10
|
import ImageInput from '@digigov/form/inputs/ImageInput';
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { UseFormReturn } from 'react-hook-form';
|
|
3
2
|
import { UncontrolledFieldProps } from '@digigov/form/Field/types';
|
|
4
3
|
export interface ImageProps {
|
|
5
|
-
src
|
|
4
|
+
src?: any;
|
|
6
5
|
}
|
|
7
6
|
export interface Limit {
|
|
8
7
|
maxSize?: number;
|
|
@@ -12,10 +11,6 @@ export interface Limit {
|
|
|
12
11
|
minHeight?: number;
|
|
13
12
|
}
|
|
14
13
|
export declare const Image: React.FC<ImageProps>;
|
|
15
|
-
interface ImageInputDefaultValue {
|
|
16
|
-
filename: string;
|
|
17
|
-
src: string;
|
|
18
|
-
}
|
|
19
14
|
export interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
20
15
|
extra?: {
|
|
21
16
|
className?: string;
|
|
@@ -24,10 +19,7 @@ export interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
|
|
|
24
19
|
limit?: Limit;
|
|
25
20
|
};
|
|
26
21
|
reset: (values?: any) => void;
|
|
27
|
-
resetField: UseFormReturn['resetField'];
|
|
28
22
|
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
|
|
29
|
-
defaultValue?: ImageInputDefaultValue | null;
|
|
30
|
-
value: any;
|
|
31
23
|
}
|
|
32
24
|
export declare const ImageInput: React.FC<ImageInputProps>;
|
|
33
25
|
export default ImageInput;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useState, 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,21 +8,11 @@ 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
|
-
};
|
|
17
11
|
const ImageInput = React.forwardRef(
|
|
18
|
-
function ImageInput2({ name, disabled, onChange,
|
|
19
|
-
const imageRef = useRef(ref?.current);
|
|
12
|
+
function ImageInput2({ name, disabled, onChange, reset, ...props }, ref) {
|
|
20
13
|
const { t } = useTranslation();
|
|
21
|
-
const
|
|
22
|
-
const [
|
|
23
|
-
const [imageUrl, setImageUrl] = useState(
|
|
24
|
-
currentValue?.src || null
|
|
25
|
-
);
|
|
14
|
+
const [selectedImage, setSelectedImage] = useState(null);
|
|
15
|
+
const [imageUrl, setImageUrl] = useState(null);
|
|
26
16
|
const handleImageChange = useCallback(
|
|
27
17
|
(e) => {
|
|
28
18
|
e.preventDefault();
|
|
@@ -32,36 +22,23 @@ const ImageInput = React.forwardRef(
|
|
|
32
22
|
setSelectedImage(selectedFile);
|
|
33
23
|
setImageUrl(URL.createObjectURL(selectedFile));
|
|
34
24
|
}
|
|
35
|
-
onChange(
|
|
36
|
-
target.files
|
|
37
|
-
);
|
|
25
|
+
onChange(e);
|
|
38
26
|
},
|
|
39
27
|
[selectedImage]
|
|
40
28
|
);
|
|
41
29
|
const handleDeleteImage = useCallback(
|
|
42
30
|
(event) => {
|
|
43
31
|
event.preventDefault();
|
|
44
|
-
|
|
32
|
+
reset({ [name]: "" });
|
|
45
33
|
setSelectedImage(null);
|
|
46
|
-
setImageUrl(
|
|
34
|
+
setImageUrl("");
|
|
47
35
|
},
|
|
48
36
|
[selectedImage]
|
|
49
37
|
);
|
|
50
|
-
|
|
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(
|
|
38
|
+
return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__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"), ":"), " ", `${selectedImage?.name}`)) : /* @__PURE__ */ React.createElement(Hint, { className: "ds-dashed--border" }, t("upload.no_image")), /* @__PURE__ */ React.createElement(React.Fragment, null, selectedImage !== null && /* @__PURE__ */ React.createElement(Image, { src: imageUrl }), /* @__PURE__ */ React.createElement(ButtonGroup, { marginTop: 2 }, selectedImage !== null && /* @__PURE__ */ React.createElement(Button, { variant: "link", onClick: handleDeleteImage }, t("upload.reset_file")), /* @__PURE__ */ React.createElement(
|
|
62
39
|
FileUpload,
|
|
63
40
|
{
|
|
64
|
-
ref
|
|
41
|
+
ref,
|
|
65
42
|
hasFiles: selectedImage !== null,
|
|
66
43
|
name,
|
|
67
44
|
id: name,
|
|
@@ -75,16 +52,8 @@ const ImageInput = React.forwardRef(
|
|
|
75
52
|
type: "file"
|
|
76
53
|
}
|
|
77
54
|
},
|
|
78
|
-
|
|
79
|
-
)
|
|
80
|
-
Button,
|
|
81
|
-
{
|
|
82
|
-
color: "warning",
|
|
83
|
-
variant: "link",
|
|
84
|
-
onClick: handleDeleteImage
|
|
85
|
-
},
|
|
86
|
-
t("upload.reset_file")
|
|
87
|
-
)));
|
|
55
|
+
t("upload.choose_image")
|
|
56
|
+
)))));
|
|
88
57
|
}
|
|
89
58
|
);
|
|
90
59
|
var ImageInput_default = ImageInput;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/inputs/ImageInput/index.tsx"],
|
|
4
|
-
"sourcesContent": ["import React, {
|
|
5
|
-
"mappings": "AAAA,OAAO,SAAS,
|
|
4
|
+
"sourcesContent": ["import React, { useState, useCallback } from 'react';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonGroup } from '@digigov/ui/form/Button';\nimport { FileUpload, FileUploadContainer } 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';\nimport { Base } from '@digigov/ui/utils/Base';\nexport interface ImageProps {\n src?: any;\n}\n\nexport interface Limit {\n maxSize?: number;\n maxWidth?: number;\n maxHeight?: number;\n minWidth?: number;\n minHeight?: number;\n}\n\nexport const Image: React.FC<ImageProps> = React.memo(function Image({ src }) {\n return <Base as=\"img\" src={src} className=\"ds-image--ratio\" />;\n});\nexport interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n extra?: {\n className?: string;\n multiple?: boolean;\n accept?: string;\n limit?: Limit;\n };\n reset: (values?: any) => void;\n onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;\n}\n\nexport const ImageInput: React.FC<ImageInputProps> = React.forwardRef(\n function ImageInput({ name, disabled, onChange, reset, ...props }, ref: any) {\n const { t } = useTranslation();\n const [selectedImage, setSelectedImage] = useState<File | null>(null);\n const [imageUrl, setImageUrl] = useState<string | null>(null);\n const handleImageChange = useCallback(\n (e: React.ChangeEvent<HTMLInputElement>) => {\n e.preventDefault();\n const target = e.target as HTMLInputElement;\n const selectedFile = target.files?.[0];\n\n if (selectedFile) {\n setSelectedImage(selectedFile);\n setImageUrl(URL.createObjectURL(selectedFile));\n }\n onChange(e);\n },\n [selectedImage]\n );\n\n const handleDeleteImage = useCallback(\n (event) => {\n event.preventDefault();\n reset({ [name]: '' });\n setSelectedImage(null);\n setImageUrl('');\n },\n [selectedImage]\n );\n\n return (\n <>\n <FileUploadContainer>\n {selectedImage !== null ? (\n <>\n <Paragraph>\n <Base as=\"b\">{t('upload.image')}:</Base>{' '}\n {`${selectedImage?.name}`}\n </Paragraph>\n </>\n ) : (\n <Hint className=\"ds-dashed--border\">{t('upload.no_image')}</Hint>\n )}\n <>\n {selectedImage !== null && <Image src={imageUrl} />}\n <ButtonGroup marginTop={2}>\n {selectedImage !== null && (\n <Button variant=\"link\" onClick={handleDeleteImage}>\n {t('upload.reset_file')}\n </Button>\n )}\n <FileUpload\n ref={ref}\n hasFiles={selectedImage !== null}\n name={name}\n id={name}\n disabled={disabled}\n accept=\"image/*\"\n onChange={handleImageChange}\n {...{\n ...props,\n required: undefined,\n Field: undefined,\n type: 'file',\n }}\n >\n {t('upload.choose_image')}\n </FileUpload>\n </ButtonGroup>\n </>\n </FileUploadContainer>\n </>\n );\n }\n);\n\nexport default ImageInput;\n"],
|
|
5
|
+
"mappings": "AAAA,OAAO,SAAS,UAAU,mBAAmB;AAE7C,SAAS,QAAQ,mBAAmB;AACpC,SAAS,YAAY,2BAA2B;AAChD,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAC1B,SAAS,YAAY;AAad,MAAM,QAA8B,MAAM,KAAK,SAASA,OAAM,EAAE,IAAI,GAAG;AAC5E,SAAO,oCAAC,QAAK,IAAG,OAAM,KAAU,WAAU,mBAAkB;AAC9D,CAAC;AAYM,MAAM,aAAwC,MAAM;AAAA,EACzD,SAASC,YAAW,EAAE,MAAM,UAAU,UAAU,OAAO,GAAG,MAAM,GAAG,KAAU;AAC3E,UAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAsB,IAAI;AACpE,UAAM,CAAC,UAAU,WAAW,IAAI,SAAwB,IAAI;AAC5D,UAAM,oBAAoB;AAAA,MACxB,CAAC,MAA2C;AAC1C,UAAE,eAAe;AACjB,cAAM,SAAS,EAAE;AACjB,cAAM,eAAe,OAAO,QAAQ,CAAC;AAErC,YAAI,cAAc;AAChB,2BAAiB,YAAY;AAC7B,sBAAY,IAAI,gBAAgB,YAAY,CAAC;AAAA,QAC/C;AACA,iBAAS,CAAC;AAAA,MACZ;AAAA,MACA,CAAC,aAAa;AAAA,IAChB;AAEA,UAAM,oBAAoB;AAAA,MACxB,CAAC,UAAU;AACT,cAAM,eAAe;AACrB,cAAM,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC;AACpB,yBAAiB,IAAI;AACrB,oBAAY,EAAE;AAAA,MAChB;AAAA,MACA,CAAC,aAAa;AAAA,IAChB;AAEA,WACE,0DACE,oCAAC,2BACE,kBAAkB,OACjB,0DACE,oCAAC,iBACC,oCAAC,QAAK,IAAG,OAAK,EAAE,cAAc,GAAE,GAAC,GAAQ,KACxC,GAAG,eAAe,IAAI,EACzB,CACF,IAEA,oCAAC,QAAK,WAAU,uBAAqB,EAAE,iBAAiB,CAAE,GAE5D,0DACG,kBAAkB,QAAQ,oCAAC,SAAM,KAAK,UAAU,GACjD,oCAAC,eAAY,WAAW,KACrB,kBAAkB,QACjB,oCAAC,UAAO,SAAQ,QAAO,SAAS,qBAC7B,EAAE,mBAAmB,CACxB,GAEF;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,UAAU,kBAAkB;AAAA,QAC5B;AAAA,QACA,IAAI;AAAA,QACJ;AAAA,QACA,QAAO;AAAA,QACP,UAAU;AAAA,QACT,GAAG;AAAA,UACF,GAAG;AAAA,UACH,UAAU;AAAA,UACV,OAAO;AAAA,UACP,MAAM;AAAA,QACR;AAAA;AAAA,MAEC,EAAE,qBAAqB;AAAA,IAC1B,CACF,CACF,CACF,CACF;AAAA,EAEJ;AACF;AAEA,IAAO,qBAAQ;",
|
|
6
6
|
"names": ["Image", "ImageInput"]
|
|
7
7
|
}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
declare namespace _default {
|
|
2
2
|
export let title: string;
|
|
3
3
|
export { Input as component };
|
|
4
|
-
export let tags: string[];
|
|
5
|
-
export { doc as markdown };
|
|
6
4
|
export let displayName: string;
|
|
7
5
|
}
|
|
8
6
|
export default _default;
|
|
@@ -16,7 +14,6 @@ export { MobilePhone } from "@digigov/form/inputs/Input/__stories__/MobilePhone"
|
|
|
16
14
|
export { AFM } from "@digigov/form/inputs/Input/__stories__/AFM";
|
|
17
15
|
export { AMKA } from "@digigov/form/inputs/Input/__stories__/AMKA";
|
|
18
16
|
export { IBAN } from "@digigov/form/inputs/Input/__stories__/IBAN";
|
|
19
|
-
export { Email } from "@digigov/form/inputs/Input/__stories__/Email";
|
|
20
17
|
export { PostalCode } from "@digigov/form/inputs/Input/__stories__/PostalCode";
|
|
21
18
|
export { TextWithLimit } from "@digigov/form/inputs/Input/__stories__/TextWithLimit";
|
|
22
19
|
import Input from '@digigov/form/inputs/Input';
|