Merge pull request #1 from flutter-form-builder-ecosystem/main

Project update
flutter-form-builder-ecosystem · Sep 21, 2023 · bffe240 · bffe240
2 parents ccd00f3 + 4e16275
commit bffe240
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [9.1.1]
+
+* `FormBuilderDateTimePicker` & `FormBuilderDateRangePicker`: Added optional parameter `mouseCursor`
+* Built with Flutter 3.13
+
 ## [9.1.0]
 
 ### Features

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -60,7 +60,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "9.1.0"
+    version: "9.1.1"
   flutter_lints:
     dependency: "direct dev"
     description:

diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -35,6 +35,7 @@ class FormBuilderDateRangePicker
   final EdgeInsets scrollPadding;
   final bool enableInteractiveSelection;
   final InputCounterWidgetBuilder? buildCounter;
+  final MouseCursor? mouseCursor;
   final bool expands;
   final int? minLines;
   final bool showCursor;
@@ -106,6 +107,7 @@ class FormBuilderDateRangePicker
     this.cursorColor,
     this.keyboardAppearance,
     this.buildCounter,
+    this.mouseCursor,
     this.expands = false,
     this.minLines,
     this.showCursor = false,
@@ -146,6 +148,7 @@ class FormBuilderDateRangePicker
               autocorrect: autocorrect,
               autofocus: autofocus,
               buildCounter: buildCounter,
+              mouseCursor: mouseCursor,
               cursorColor: cursorColor,
               cursorRadius: cursorRadius,
               cursorWidth: cursorWidth,

diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -99,6 +99,7 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
   final VoidCallback? onEditingComplete;
 
   final InputCounterWidgetBuilder? buildCounter;
+  final MouseCursor? mouseCursor;
 
   final Radius? cursorRadius;
   final Color? cursorColor;
@@ -178,6 +179,7 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
     this.textInputAction,
     this.onEditingComplete,
     this.buildCounter,
+    this.mouseCursor,
     this.cursorRadius,
     this.cursorColor,
     this.keyboardAppearance,
@@ -219,6 +221,7 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
               style: style,
               onEditingComplete: onEditingComplete,
               buildCounter: buildCounter,
+              mouseCursor: mouseCursor,
               cursorColor: cursorColor,
               cursorRadius: cursorRadius,
               cursorWidth: cursorWidth,
@@ -295,10 +298,11 @@ class _FormBuilderDateTimePickerState extends FormBuilderFieldDecorationState<
         newValue = await _showDatePicker(context, currentValue);
         break;
       case InputType.time:
-        final newTime = await _showTimePicker(context, currentValue);
-        newValue = null != newTime ? convert(newTime) : null;
+        if (!context.mounted) return null;
+        newValue = convert(await _showTimePicker(context, currentValue));
         break;
       case InputType.both:
+        if (!context.mounted) return null;
         final date = await _showDatePicker(context, currentValue);
         if (date != null) {
           if (!mounted) break;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_form_builder
 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.
-version: 9.1.0
+version: 9.1.1
 repository: https://github.com/flutter-form-builder-ecosystem/flutter_form_builder
 issue_tracker: https://github.com/flutter-form-builder-ecosystem/flutter_form_builder/issues
 homepage: https://github.com/flutter-form-builder-ecosystem