Skip to content

Commit 9d0b0bc

Browse files
Merge pull request #1361 from Chia-Network/fix-date-picker
fix: address breaking changes in flowbite datepicker
2 parents 4da3425 + 5e52e89 commit 9d0b0bc

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/renderer/components/form/Field.tsx

+9-7
Original file line numberDiff line numberDiff line change
@@ -139,31 +139,33 @@ const Field: React.FC<FieldProps> = ({
139139
options={options}
140140
/>
141141
);
142-
case 'date':
143-
// eslint-disable-next-line
142+
case 'date': {
144143
const props: any = {
145144
showTodayButton: true,
146145
showClearButton: false,
147-
onSelectedDateChanged: (date) => {
146+
onChange: (date) => {
148147
const dateValue = date ? date.toISOString() : undefined;
148+
console.log(`setting ${name} to ${dateValue}`);
149149
setFieldValue(name, dateValue);
150150
},
151151
placeholder: 'Select date',
152152
};
153153

154-
if (initialValue) {
155-
props.defaultDate = new Date(initialValue);
156-
}
154+
const formValue = get(values, name);
155+
const formValueIsDate = !isNaN(Date.parse(formValue));
157156

158-
if (!initialValue && !get(values, name)) {
157+
if (!initialValue && !formValue) {
159158
props.value = undefined;
159+
} else if (formValue && formValueIsDate) {
160+
props.value = new Date(formValue);
160161
}
161162

162163
return (
163164
<div key={initialValue}>
164165
<Datepicker {...props} />
165166
</div>
166167
);
168+
}
167169
case 'checkbox':
168170
return <Checkbox id={name} name={name} onChange={(e) => setFieldValue(name, e.target.checked)} />;
169171
// Add cases for other field types as needed

0 commit comments

Comments
 (0)