Skip to content

Commit 8224390

Browse files
committed
Fixed bug where locale, textDirection, useRootNavigator & builder not passed down to showDatePicker() and showTimePicker()
1 parent 8602975 commit 8224390

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ class FormBuilderDateTimePicker extends StatefulWidget {
7979
/// Corresponds to the [showDatePicker()] parameter.
8080
final ui.TextDirection textDirection;
8181

82+
/// Corresponds to the [showDatePicker()] parameter.
83+
final bool useRootNavigator;
84+
8285
/// Called when an enclosing form is submitted. The value passed will be
8386
/// `null` if [format] fails to parse the text.
8487
final ValueChanged<DateTime> onFieldSubmitted;
@@ -194,6 +197,7 @@ class FormBuilderDateTimePicker extends StatefulWidget {
194197
this.keyboardAppearance,
195198
this.textCapitalization = TextCapitalization.none,
196199
this.strutStyle,
200+
this.useRootNavigator = true,
197201
}) : super(key: key);
198202

199203
final StrutStyle strutStyle;
@@ -282,8 +286,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
282286
},
283287
onShowPicker: _onShowPicker,
284288
onChanged: (val) {
285-
if (widget.onChanged != null)
286-
widget.onChanged(val);
289+
if (widget.onChanged != null) widget.onChanged(val);
287290
},
288291
autovalidate: widget.autovalidate,
289292
resetIcon: widget.resetIcon,
@@ -364,6 +367,10 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
364367
initialDate: currentValue ?? widget.initialDate ?? DateTime.now(),
365368
firstDate: widget.firstDate ?? DateTime(1900),
366369
lastDate: widget.lastDate ?? DateTime(2100),
370+
locale: widget.locale,
371+
textDirection: widget.textDirection,
372+
useRootNavigator: widget.useRootNavigator,
373+
builder: widget.builder,
367374
);
368375
}
369376
}
@@ -380,6 +387,8 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
380387
? TimeOfDay.fromDateTime(currentValue)
381388
// ignore: deprecated_member_use_from_same_package
382389
: widget.initialTime ?? TimeOfDay.fromDateTime(DateTime.now()),
390+
builder: widget.builder,
391+
useRootNavigator: widget.useRootNavigator,
383392
).then(
384393
(result) {
385394
return result ??

0 commit comments

Comments
 (0)