Skip to content

Commit 9900591

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents aa43ad1 + bffe240 commit 9900591

File tree

7 files changed

+20
-8
lines changed

7 files changed

+20
-8
lines changed

.github/workflows/base.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: macos-latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Check broken links
2222
uses: JustinBeckwith/linkinator-action@v1
@@ -64,7 +64,7 @@ jobs:
6464
id-token: write
6565
runs-on: ubuntu-latest
6666
steps:
67-
- uses: actions/checkout@v3
67+
- uses: actions/checkout@v4
6868
- uses: dart-lang/setup-dart@v1
6969
- name: Flutter action
7070
uses: subosito/flutter-action@v2

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [9.1.1]
2+
3+
* `FormBuilderDateTimePicker` & `FormBuilderDateRangePicker`: Added optional parameter `mouseCursor`
4+
* Built with Flutter 3.13
5+
16
## [9.1.0]
27

38
### Features

example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ packages:
6060
path: ".."
6161
relative: true
6262
source: path
63-
version: "9.1.0"
63+
version: "9.1.1"
6464
flutter_lints:
6565
dependency: "direct dev"
6666
description:

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;

pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ packages:
5858
dependency: "direct dev"
5959
description:
6060
name: flutter_lints
61-
sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
61+
sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
6262
url: "https://pub.dev"
6363
source: hosted
64-
version: "2.0.2"
64+
version: "2.0.3"
6565
flutter_test:
6666
dependency: "direct dev"
6767
description: flutter

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_form_builder
22
description: This package helps in creation of forms in Flutter by removing the boilerplate code, reusing validation, react to changes, and collect final user input.
3-
version: 9.1.0
3+
version: 9.1.1
44
repository: https://github.com/flutter-form-builder-ecosystem/flutter_form_builder
55
issue_tracker: https://github.com/flutter-form-builder-ecosystem/flutter_form_builder/issues
66
homepage: https://github.com/flutter-form-builder-ecosystem

0 commit comments

Comments
 (0)