@@ -281,7 +281,10 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
281
281
return null ;
282
282
},
283
283
onShowPicker: _onShowPicker,
284
- // onChanged: widget.onChanged,
284
+ onChanged: (val) {
285
+ if (widget.onChanged != null )
286
+ widget.onChanged (val);
287
+ },
285
288
autovalidate: widget.autovalidate,
286
289
resetIcon: widget.resetIcon,
287
290
textDirection: widget.textDirection,
@@ -344,8 +347,6 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
344
347
}
345
348
newValue = newValue ?? currentValue;
346
349
_fieldKey.currentState.didChange (newValue);
347
- if (widget.onChanged != null )
348
- widget.onChanged (_fieldKey.currentState.value);
349
350
return newValue;
350
351
}
351
352
@@ -355,14 +356,15 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
355
356
return widget.datePicker (context);
356
357
} else {
357
358
return showDatePicker (
358
- context: context,
359
- selectableDayPredicate: widget.selectableDayPredicate,
360
- initialDatePickerMode:
361
- widget.initialDatePickerMode ?? DatePickerMode .day,
362
- // ignore: deprecated_member_use_from_same_package
363
- initialDate: currentValue ?? widget.initialDate ?? DateTime .now (),
364
- firstDate: widget.firstDate ?? DateTime (1900 ),
365
- lastDate: widget.lastDate ?? DateTime (2100 ));
359
+ context: context,
360
+ selectableDayPredicate: widget.selectableDayPredicate,
361
+ initialDatePickerMode:
362
+ widget.initialDatePickerMode ?? DatePickerMode .day,
363
+ // ignore: deprecated_member_use_from_same_package
364
+ initialDate: currentValue ?? widget.initialDate ?? DateTime .now (),
365
+ firstDate: widget.firstDate ?? DateTime (1900 ),
366
+ lastDate: widget.lastDate ?? DateTime (2100 ),
367
+ );
366
368
}
367
369
}
368
370
@@ -378,12 +380,14 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
378
380
? TimeOfDay .fromDateTime (currentValue)
379
381
// ignore: deprecated_member_use_from_same_package
380
382
: widget.initialTime ?? TimeOfDay .fromDateTime (DateTime .now ()),
381
- ).then ((result) {
382
- return result ??
383
- (currentValue != null
384
- ? TimeOfDay .fromDateTime (currentValue)
385
- : null );
386
- });
383
+ ).then (
384
+ (result) {
385
+ return result ??
386
+ (currentValue != null
387
+ ? TimeOfDay .fromDateTime (currentValue)
388
+ : null );
389
+ },
390
+ );
387
391
}
388
392
}
389
393
}
0 commit comments