Enhanced FormBuilderFieldState so that subclasses do not need to override widget getter.

awhitford · awhitford · commit 1bbe5b7673fb · 2020-11-02T16:30:24.000-08:00
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -140,7 +140,5 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
   _FormBuilderCheckboxState createState() => _FormBuilderCheckboxState();
 }
 
-class _FormBuilderCheckboxState extends FormBuilderFieldState<bool> {
-  @override
-  FormBuilderCheckbox get widget => super.widget as FormBuilderCheckbox;
-}
+class _FormBuilderCheckboxState
+    extends FormBuilderFieldState<FormBuilderCheckbox, bool> {}
diff --git a/lib/src/fields/form_builder_checkbox_group.dart b/lib/src/fields/form_builder_checkbox_group.dart
@@ -114,11 +114,8 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
 
   @override
   _FormBuilderCheckboxGroupState<T> createState() =>
-      _FormBuilderCheckboxGroupState();
+      _FormBuilderCheckboxGroupState<T>();
 }
 
-class _FormBuilderCheckboxGroupState<T> extends FormBuilderFieldState<List<T>> {
-  @override
-  FormBuilderCheckboxGroup<T> get widget =>
-      super.widget as FormBuilderCheckboxGroup;
-}
+class _FormBuilderCheckboxGroupState<T>
+    extends FormBuilderFieldState<FormBuilderCheckboxGroup<T>, List<T>> {}
diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -68,8 +68,8 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
           onReset: onReset,
           decoration: decoration,
           focusNode: focusNode,
-          builder: (FormFieldState field) {
-            final _FormBuilderChipsInputState state = field;
+          builder: (FormFieldState<List<T>> field) {
+            final _FormBuilderChipsInputState<T> state = field;
 
             return ChipsInput(
               key: ObjectKey(state.value),
@@ -104,10 +104,9 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
         );
 
   @override
-  _FormBuilderChipsInputState<T> createState() => _FormBuilderChipsInputState();
+  _FormBuilderChipsInputState<T> createState() =>
+      _FormBuilderChipsInputState<T>();
 }
 
-class _FormBuilderChipsInputState<T> extends FormBuilderFieldState<List<T>> {
-  @override
-  FormBuilderChipsInput<T> get widget => super.widget as FormBuilderChipsInput;
-}
+class _FormBuilderChipsInputState<T>
+    extends FormBuilderFieldState<FormBuilderChipsInput<T>, List<T>> {}
diff --git a/lib/src/fields/form_builder_choice_chips.dart b/lib/src/fields/form_builder_choice_chips.dart
@@ -338,10 +338,9 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
             });
 
   @override
-  _FormBuilderChoiceChipState<T> createState() => _FormBuilderChoiceChipState();
+  _FormBuilderChoiceChipState<T> createState() =>
+      _FormBuilderChoiceChipState<T>();
 }
 
-class _FormBuilderChoiceChipState<T> extends FormBuilderFieldState<T> {
-  @override
-  FormBuilderChoiceChip<T> get widget => super.widget as FormBuilderChoiceChip;
-}
+class _FormBuilderChoiceChipState<T>
+    extends FormBuilderFieldState<FormBuilderChoiceChip<T>, T> {}
diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -118,7 +118,7 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
           enabled: enabled,
           onReset: onReset,
           decoration: decoration,
-          builder: (FormFieldState field) {
+          builder: (FormFieldState<Color> field) {
             final _FormBuilderColorPickerFieldState state = field;
             return TextField(
               style: style,
@@ -181,11 +181,8 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
       _FormBuilderColorPickerFieldState();
 }
 
-class _FormBuilderColorPickerFieldState extends FormBuilderFieldState<Color> {
-  @override
-  FormBuilderColorPickerField get widget =>
-      super.widget as FormBuilderColorPickerField;
-
+class _FormBuilderColorPickerFieldState
+    extends FormBuilderFieldState<FormBuilderColorPickerField, Color> {
   TextEditingController _effectiveController;
 
   TextEditingController get effectiveController => _effectiveController;
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -26,7 +26,7 @@ class FormBuilderDateRangePicker extends FormBuilderField<List<DateTime>> {
   final bool maxLengthEnforced;
   final int maxLength;
   final VoidCallback onEditingComplete;
-  final ValueChanged<String> onFieldSubmitted;
+  final ValueChanged<List<DateTime>> onFieldSubmitted;
   final List<TextInputFormatter> inputFormatters;
   final double cursorWidth;
   final Radius cursorRadius;
@@ -190,11 +190,7 @@ class FormBuilderDateRangePicker extends FormBuilderField<List<DateTime>> {
 }
 
 class FormBuilderDateRangePickerState
-    extends FormBuilderFieldState<List<DateTime>> {
-  @override
-  FormBuilderDateRangePicker get widget =>
-      super.widget as FormBuilderDateRangePicker;
-
+    extends FormBuilderFieldState<FormBuilderDateRangePicker, List<DateTime>> {
   TextEditingController _effectiveController;
 
   TextEditingController get effectiveController => _effectiveController;
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -289,11 +289,8 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
       _FormBuilderDateTimePickerState();
 }
 
-class _FormBuilderDateTimePickerState extends FormBuilderFieldState<DateTime> {
-  @override
-  FormBuilderDateTimePicker get widget =>
-      super.widget as FormBuilderDateTimePicker;
-
+class _FormBuilderDateTimePickerState
+    extends FormBuilderFieldState<FormBuilderDateTimePicker, DateTime> {
   TextEditingController get textFieldController => _textFieldController;
   TextEditingController _textFieldController;
 
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -300,10 +300,8 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
   }
 
   @override
-  _FormBuilderDropdownState<T> createState() => _FormBuilderDropdownState();
+  _FormBuilderDropdownState<T> createState() => _FormBuilderDropdownState<T>();
 }
 
-class _FormBuilderDropdownState<T> extends FormBuilderFieldState<T> {
-  @override
-  FormBuilderDropdown<T> get widget => super.widget as FormBuilderDropdown;
-}
+class _FormBuilderDropdownState<T>
+    extends FormBuilderFieldState<FormBuilderDropdown<T>, T> {}
diff --git a/lib/src/fields/form_builder_file_picker.dart b/lib/src/fields/form_builder_file_picker.dart
@@ -117,7 +117,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
 }
 
 class _FormBuilderFilePickerState
-    extends FormBuilderFieldState<List<PlatformFile>> {
+    extends FormBuilderFieldState<FormBuilderFilePicker, List<PlatformFile>> {
   List<PlatformFile> _files;
 
   int get _remainingItemCount =>
@@ -129,9 +129,6 @@ class _FormBuilderFilePickerState
     super.initState();
   }
 
-  @override
-  FormBuilderFilePicker get widget => super.widget as FormBuilderFilePicker;
-
   Future<void> pickFiles(FormFieldState field) async {
     FilePickerResult resultList;
 
diff --git a/lib/src/fields/form_builder_filter_chips.dart b/lib/src/fields/form_builder_filter_chips.dart
@@ -89,8 +89,8 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
           onReset: onReset,
           decoration: decoration,
           focusNode: focusNode,
-          builder: (FormFieldState field) {
-            final _FormBuilderFilterChipState state = field;
+          builder: (FormFieldState<List<T>> field) {
+            final _FormBuilderFilterChipState<T> state = field;
             return InputDecorator(
               decoration: decoration.copyWith(
                 errorText: decoration?.errorText ?? field.errorText,
@@ -105,7 +105,7 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
                 textDirection: textDirection,
                 verticalDirection: verticalDirection,
                 children: <Widget>[
-                  for (FormBuilderFieldOption option in options)
+                  for (FormBuilderFieldOption<T> option in options)
                     FilterChip(
                       label: option.child,
                       selected: field.value.contains(option.value),
@@ -114,7 +114,7 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
                                   (field.value.length >= maxChips &&
                                       !field.value.contains(option.value))))
                           ? null
-                          : (bool selected) {
+                          : (selected) {
                               var currentValue = [...field.value];
                               if (selected) {
                                 currentValue.add(option.value);
@@ -148,10 +148,9 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
         );
 
   @override
-  _FormBuilderFilterChipState<T> createState() => _FormBuilderFilterChipState();
+  _FormBuilderFilterChipState<T> createState() =>
+      _FormBuilderFilterChipState<T>();
 }
 
-class _FormBuilderFilterChipState<T> extends FormBuilderFieldState<List<T>> {
-  @override
-  FormBuilderFilterChip<T> get widget => super.widget as FormBuilderFilterChip;
-}
+class _FormBuilderFilterChipState<T>
+    extends FormBuilderFieldState<FormBuilderFilterChip<T>, List<T>> {}
diff --git a/lib/src/fields/form_builder_image_picker.dart b/lib/src/fields/form_builder_image_picker.dart
@@ -4,7 +4,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:flutter_form_builder/src/widgets/image_source_sheet.dart';
 import 'package:image_picker/image_picker.dart';
 
-class FormBuilderImagePicker extends FormBuilderField {
+class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
   //TODO: Add documentation
   final double previewWidth;
   final double previewHeight;
@@ -43,13 +43,13 @@ class FormBuilderImagePicker extends FormBuilderField {
     //From Super
     @required String name,
     FormFieldValidator validator,
-    List initialValue,
+    List<dynamic> initialValue,
     bool readOnly = false,
     InputDecoration decoration = const InputDecoration(),
-    ValueChanged onChanged,
-    ValueTransformer valueTransformer,
+    ValueChanged<List<dynamic>> onChanged,
+    ValueTransformer<List<dynamic>> valueTransformer,
     bool enabled = true,
-    FormFieldSetter onSaved,
+    FormFieldSetter<List<dynamic>> onSaved,
     AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback onReset,
     FocusNode focusNode,
@@ -84,7 +84,7 @@ class FormBuilderImagePicker extends FormBuilderField {
           onReset: onReset,
           decoration: decoration,
           focusNode: focusNode,
-          builder: (FormFieldState field) {
+          builder: (FormFieldState<List<dynamic>> field) {
             final _FormBuilderImagePickerState state = field;
             final theme = Theme.of(state.context);
             final disabledColor = theme.disabledColor;
@@ -203,10 +203,8 @@ class FormBuilderImagePicker extends FormBuilderField {
   _FormBuilderImagePickerState createState() => _FormBuilderImagePickerState();
 }
 
-class _FormBuilderImagePickerState extends FormBuilderFieldState {
-  @override
-  FormBuilderImagePicker get widget => super.widget as FormBuilderImagePicker;
-
+class _FormBuilderImagePickerState
+    extends FormBuilderFieldState<FormBuilderImagePicker, List<dynamic>> {
   bool get hasMaxImages {
     if (widget.maxImages == null || value == null) {
       return false;
diff --git a/lib/src/fields/form_builder_location_field.dart b/lib/src/fields/form_builder_location_field.dart
@@ -227,7 +227,7 @@ class FormBuilderLocationField extends FormBuilderField<CameraPosition> {
           enabled: enabled,
           onReset: onReset,
           decoration: decoration,
-          builder: (FormFieldState field) {
+          builder: (FormFieldState<CameraPosition> field) {
             final _FormBuilderLocationFieldState state = field;
 
             return Row(
@@ -266,10 +266,7 @@ class FormBuilderLocationField extends FormBuilderField<CameraPosition> {
 }
 
 class _FormBuilderLocationFieldState
-    extends FormBuilderFieldState<CameraPosition> {
-  @override
-  FormBuilderLocationField get widget =>
-      super.widget as FormBuilderLocationField;
+    extends FormBuilderFieldState<FormBuilderLocationField, CameraPosition> {
   TextEditingController _controller;
 
   TextEditingController get effectiveController =>
diff --git a/lib/src/fields/form_builder_phone_field.dart b/lib/src/fields/form_builder_phone_field.dart
@@ -216,10 +216,8 @@ class FormBuilderPhoneField extends FormBuilderField<String> {
   _FormBuilderPhoneFieldState createState() => _FormBuilderPhoneFieldState();
 }
 
-class _FormBuilderPhoneFieldState extends FormBuilderFieldState<String> {
-  @override
-  FormBuilderPhoneField get widget => super.widget as FormBuilderPhoneField;
-
+class _FormBuilderPhoneFieldState
+    extends FormBuilderFieldState<FormBuilderPhoneField, String> {
   TextEditingController _effectiveController = TextEditingController();
   Country _selectedDialogCountry;
 
diff --git a/lib/src/fields/form_builder_radio_group.dart b/lib/src/fields/form_builder_radio_group.dart
@@ -108,10 +108,9 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
         );
 
   @override
-  _FormBuilderRadioGroupState<T> createState() => _FormBuilderRadioGroupState();
+  _FormBuilderRadioGroupState<T> createState() =>
+      _FormBuilderRadioGroupState<T>();
 }
 
-class _FormBuilderRadioGroupState<T> extends FormBuilderFieldState<T> {
-  @override
-  FormBuilderRadioGroup<T> get widget => super.widget as FormBuilderRadioGroup;
-}
+class _FormBuilderRadioGroupState<T>
+    extends FormBuilderFieldState<FormBuilderRadioGroup<T>, T> {}
diff --git a/lib/src/fields/form_builder_range_slider.dart b/lib/src/fields/form_builder_range_slider.dart
@@ -211,7 +211,5 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
   _FormBuilderRangeSliderState createState() => _FormBuilderRangeSliderState();
 }
 
-class _FormBuilderRangeSliderState extends FormBuilderFieldState<RangeValues> {
-  @override
-  FormBuilderRangeSlider get widget => super.widget as FormBuilderRangeSlider;
-}
+class _FormBuilderRangeSliderState
+    extends FormBuilderFieldState<FormBuilderRangeSlider, RangeValues> {}
diff --git a/lib/src/fields/form_builder_rating.dart b/lib/src/fields/form_builder_rating.dart
@@ -121,7 +121,5 @@ class FormBuilderRating extends FormBuilderField<double> {
   _FormBuilderRateState createState() => _FormBuilderRateState();
 }
 
-class _FormBuilderRateState extends FormBuilderFieldState<double> {
-  @override
-  FormBuilderRating get widget => super.widget as FormBuilderRating;
-}
+class _FormBuilderRateState
+    extends FormBuilderFieldState<FormBuilderRating, double> {}
diff --git a/lib/src/fields/form_builder_searchable_dropdown.dart b/lib/src/fields/form_builder_searchable_dropdown.dart
@@ -158,8 +158,8 @@ class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
           enabled: enabled,
           onReset: onReset,
           decoration: decoration,
-          builder: (FormFieldState field) {
-            final _FormBuilderSearchableDropdownState state = field;
+          builder: (FormFieldState<T> field) {
+            final _FormBuilderSearchableDropdownState<T> state = field;
 
             return InputDecorator(
               decoration: decoration.copyWith(
@@ -211,11 +211,8 @@ class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
 
   @override
   _FormBuilderSearchableDropdownState<T> createState() =>
-      _FormBuilderSearchableDropdownState();
+      _FormBuilderSearchableDropdownState<T>();
 }
 
-class _FormBuilderSearchableDropdownState<T> extends FormBuilderFieldState<T> {
-  @override
-  FormBuilderSearchableDropdown<T> get widget =>
-      super.widget as FormBuilderSearchableDropdown<T>;
-}
+class _FormBuilderSearchableDropdownState<T>
+    extends FormBuilderFieldState<FormBuilderSearchableDropdown<T>, T> {}
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -119,8 +119,5 @@ class FormBuilderSegmentedControl<T> extends FormBuilderField<T> {
       _FormBuilderSegmentedControlState();
 }
 
-class _FormBuilderSegmentedControlState<T> extends FormBuilderFieldState<T> {
-  @override
-  FormBuilderSegmentedControl<T> get widget =>
-      super.widget as FormBuilderSegmentedControl;
-}
+class _FormBuilderSegmentedControlState<T>
+    extends FormBuilderFieldState<FormBuilderSegmentedControl<T>, T> {}
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -111,10 +111,8 @@ class FormBuilderSignaturePad extends FormBuilderField<Uint8List> {
       _FormBuilderSignaturePadState();
 }
 
-class _FormBuilderSignaturePadState extends FormBuilderFieldState<Uint8List> {
-  @override
-  FormBuilderSignaturePad get widget => super.widget as FormBuilderSignaturePad;
-
+class _FormBuilderSignaturePadState
+    extends FormBuilderFieldState<FormBuilderSignaturePad, Uint8List> {
   SignatureController get effectiveController =>
       widget.controller ?? _controller;
 
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
diff --git a/lib/src/fields/form_builder_switch.dart b/lib/src/fields/form_builder_switch.dart
diff --git a/lib/src/fields/form_builder_text_field.dart b/lib/src/fields/form_builder_text_field.dart
diff --git a/lib/src/fields/form_builder_touch_spin.dart b/lib/src/fields/form_builder_touch_spin.dart
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
diff --git a/lib/src/form_builder_field.dart b/lib/src/form_builder_field.dart

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,5 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {`
`140`	`140`	`_FormBuilderCheckboxState createState() => _FormBuilderCheckboxState();`
`141`	`141`	`}`
`142`	`142`
`143`		`-class _FormBuilderCheckboxState extends FormBuilderFieldState<bool> {`
`144`		`- @override`
`145`		`- FormBuilderCheckbox get widget => super.widget as FormBuilderCheckbox;`
`146`		`-}`
	`143`	`+class _FormBuilderCheckboxState`
	`144`	`+ extends FormBuilderFieldState<FormBuilderCheckbox, bool> {}`
Original file line number	Diff line number	Diff line change
`@@ -300,10 +300,8 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`@override`
`303`		`- _FormBuilderDropdownState<T> createState() => _FormBuilderDropdownState();`
	`303`	`+ _FormBuilderDropdownState<T> createState() => _FormBuilderDropdownState<T>();`
`304`	`304`	`}`
`305`	`305`
`306`		`-class _FormBuilderDropdownState<T> extends FormBuilderFieldState<T> {`
`307`		`- @override`
`308`		`- FormBuilderDropdown<T> get widget => super.widget as FormBuilderDropdown;`
`309`		`-}`
	`306`	`+class _FormBuilderDropdownState<T>`
	`307`	`+ extends FormBuilderFieldState<FormBuilderDropdown<T>, T> {}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`class _FormBuilderFilePickerState`
`120`		`- extends FormBuilderFieldState<List<PlatformFile>> {`
	`120`	`+ extends FormBuilderFieldState<FormBuilderFilePicker, List<PlatformFile>> {`
`121`	`121`	`List<PlatformFile> _files;`
`122`	`122`
`123`	`123`	`int get _remainingItemCount =>`
`@@ -129,9 +129,6 @@ class _FormBuilderFilePickerState`
`129`	`129`	`super.initState();`
`130`	`130`	`}`
`131`	`131`
`132`		`- @override`
`133`		`- FormBuilderFilePicker get widget => super.widget as FormBuilderFilePicker;`
`134`		`-`
`135`	`132`	`Future<void> pickFiles(FormFieldState field) async {`
`136`	`133`	`FilePickerResult resultList;`
`137`	`134`