Skip to content

Commit c55499e

Browse files
Merge pull request #1282 from RyanCarrier/mouseCursor
feat: add mouseCursor option to range and time picker to match other …
2 parents a125af5 + babacea commit c55499e

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/src/fields/form_builder_date_range_picker.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class FormBuilderDateRangePicker
3535
final EdgeInsets scrollPadding;
3636
final bool enableInteractiveSelection;
3737
final InputCounterWidgetBuilder? buildCounter;
38+
final MouseCursor? mouseCursor;
3839
final bool expands;
3940
final int? minLines;
4041
final bool showCursor;
@@ -106,6 +107,7 @@ class FormBuilderDateRangePicker
106107
this.cursorColor,
107108
this.keyboardAppearance,
108109
this.buildCounter,
110+
this.mouseCursor,
109111
this.expands = false,
110112
this.minLines,
111113
this.showCursor = false,
@@ -146,6 +148,7 @@ class FormBuilderDateRangePicker
146148
autocorrect: autocorrect,
147149
autofocus: autofocus,
148150
buildCounter: buildCounter,
151+
mouseCursor: mouseCursor,
149152
cursorColor: cursorColor,
150153
cursorRadius: cursorRadius,
151154
cursorWidth: cursorWidth,

lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
9999
final VoidCallback? onEditingComplete;
100100

101101
final InputCounterWidgetBuilder? buildCounter;
102+
final MouseCursor? mouseCursor;
102103

103104
final Radius? cursorRadius;
104105
final Color? cursorColor;
@@ -178,6 +179,7 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
178179
this.textInputAction,
179180
this.onEditingComplete,
180181
this.buildCounter,
182+
this.mouseCursor,
181183
this.cursorRadius,
182184
this.cursorColor,
183185
this.keyboardAppearance,
@@ -219,6 +221,7 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
219221
style: style,
220222
onEditingComplete: onEditingComplete,
221223
buildCounter: buildCounter,
224+
mouseCursor: mouseCursor,
222225
cursorColor: cursorColor,
223226
cursorRadius: cursorRadius,
224227
cursorWidth: cursorWidth,
@@ -295,10 +298,11 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldDecorationState<
295298
newValue = await _showDatePicker(context, currentValue);
296299
break;
297300
case InputType.time:
298-
final newTime = await _showTimePicker(context, currentValue);
299-
newValue = null != newTime ? convert(newTime) : null;
301+
if (!context.mounted) return null;
302+
newValue = convert(await _showTimePicker(context, currentValue));
300303
break;
301304
case InputType.both:
305+
if (!context.mounted) return null;
302306
final date = await _showDatePicker(context, currentValue);
303307
if (date != null) {
304308
if (!mounted) break;

0 commit comments

Comments
 (0)