Fix bug "NoSuchMethodError: invalid member on null: 'initialValue'" when fields not wrapped in ForrmBuilder

danvick · danvick · commit 1b1f832b3c2c · 2020-07-25T23:10:26.000+03:00
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -44,6 +44,7 @@ class MyHomePageState extends State<MyHomePage> {
 
   final ValueChanged _onChanged = (val) => print(val);
   var genderOptions = ['Male', 'Female', 'Other'];
+  final _ageController = TextEditingController(text: '45');
 
   @override
   Widget build(BuildContext context) {
@@ -261,6 +262,7 @@ class MyHomePageState extends State<MyHomePage> {
                   ),
                   FormBuilderTextField(
                     attribute: 'age',
+                    controller: _ageController,
                     decoration: const InputDecoration(
                       labelText:
                           'This value is passed along to the [Text.maxLines] attribute of the [Text] widget used to display the hint text.',
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -55,7 +55,7 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -112,9 +112,7 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+          widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_checkbox_group.dart b/lib/src/fields/form_builder_checkbox_group.dart
@@ -93,7 +93,7 @@ class _FormBuilderCheckboxGroupState<T>
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
diff --git a/lib/src/fields/form_builder_checkbox_list.dart b/lib/src/fields/form_builder_checkbox_list.dart
@@ -55,7 +55,7 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -118,9 +118,7 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         final checkboxList = <Widget>[];
diff --git a/lib/src/fields/form_builder_chips_choice.dart b/lib/src/fields/form_builder_chips_choice.dart
@@ -82,7 +82,7 @@ class _FormBuilderChoiceChipState extends State<FormBuilderChoiceChip> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -112,9 +112,7 @@ class _FormBuilderChoiceChipState extends State<FormBuilderChoiceChip> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_chips_filter.dart b/lib/src/fields/form_builder_chips_filter.dart
@@ -92,7 +92,7 @@ class _FormBuilderFilterChipState extends State<FormBuilderFilterChip> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -122,9 +122,7 @@ class _FormBuilderFilterChipState extends State<FormBuilderFilterChip> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -75,7 +75,7 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -105,9 +105,7 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return ChipsInput(
diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -125,7 +125,7 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     _textEditingController =
@@ -152,9 +152,7 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       autovalidate: widget.autovalidate ?? false,
       builder: (FormFieldState<Color> field) {
diff --git a/lib/src/fields/form_builder_country_picker.dart b/lib/src/fields/form_builder_country_picker.dart
@@ -96,9 +96,7 @@ class _FormBuilderCountryPickerState extends State<FormBuilderCountryPicker> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val.name);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val.name);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<Country> field) {
         return GestureDetector(
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -163,7 +163,7 @@ class FormBuilderDateRangePickerState
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = _currentValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : []);
     _controller = TextEditingController(
@@ -196,9 +196,7 @@ class FormBuilderDateRangePickerState
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       autovalidate: widget.autovalidate ?? false,
       builder: (FormFieldState<List<DateTime>> field) {
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -245,7 +245,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     stateCurrentValue = _initialValue;
@@ -294,9 +294,7 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
           } else {
             _formState?.setAttributeValue(widget.attribute, value);
           }
-          if (widget.onSaved != null) {
-            widget.onSaved(transformed ?? value);
-          }
+          widget.onSaved?.call(transformed ?? val);
         },
         validator: (val) =>
             FormBuilderValidators.validateValidators(val, widget.validators),
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -113,9 +113,7 @@ class _FormBuilderDropdownState<T> extends State<FormBuilderDropdown<T>> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<T> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_image_picker.dart b/lib/src/fields/form_builder_image_picker.dart
@@ -98,7 +98,7 @@ class _FormBuilderImagePickerState extends State<FormBuilderImagePicker> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = List.of(widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : []));
     super.initState();
@@ -128,9 +128,7 @@ class _FormBuilderImagePickerState extends State<FormBuilderImagePicker> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (field) {
         var theme = Theme.of(context);
diff --git a/lib/src/fields/form_builder_phone_field.dart b/lib/src/fields/form_builder_phone_field.dart
@@ -144,7 +144,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     if (widget.controller != null) {
@@ -199,9 +199,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState field) {
         return TextField(
diff --git a/lib/src/fields/form_builder_radio.dart b/lib/src/fields/form_builder_radio.dart
@@ -50,7 +50,7 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -104,9 +104,7 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         final radioList = <Widget>[];
diff --git a/lib/src/fields/form_builder_radio_group.dart b/lib/src/fields/form_builder_radio_group.dart
@@ -81,7 +81,7 @@ class _FormBuilderRadioGroupState extends State<FormBuilderRadioGroup> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
diff --git a/lib/src/fields/form_builder_range_slider.dart b/lib/src/fields/form_builder_range_slider.dart
@@ -59,7 +59,7 @@ class _FormBuilderRangeSliderState extends State<FormBuilderRangeSlider> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -89,9 +89,7 @@ class _FormBuilderRangeSliderState extends State<FormBuilderRangeSlider> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<RangeValues> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_rate.dart b/lib/src/fields/form_builder_rate.dart
@@ -59,7 +59,7 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -89,9 +89,7 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -62,7 +62,7 @@ class _FormBuilderSegmentedControlState
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -92,9 +92,7 @@ class _FormBuilderSegmentedControlState
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -121,9 +121,7 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
         setState(() {
           _savedValue = transformed ?? val;
         });
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -73,7 +73,7 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     _numberFormat = widget.numberFormat ?? NumberFormat('##0.0');
@@ -104,9 +104,7 @@ class _FormBuilderSliderState extends State<FormBuilderSlider> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
diff --git a/lib/src/fields/form_builder_stepper.dart b/lib/src/fields/form_builder_stepper.dart
@@ -74,7 +74,7 @@ class _FormBuilderStepperState extends State<FormBuilderStepper> {
     _formState = FormBuilder.of(context);
     _formState?.registerFieldKey(widget.attribute, _fieldKey);
     _initialValue = widget.initialValue ??
-        (_formState.initialValue.containsKey(widget.attribute)
+        ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
     super.initState();
@@ -104,9 +104,7 @@ class _FormBuilderStepperState extends State<FormBuilderStepper> {
         } else {
           _formState?.setAttributeValue(widget.attribute, val);
         }
-        if (widget.onSaved != null) {
-          widget.onSaved(transformed ?? val);
-        }
+        widget.onSaved?.call(transformed ?? val);
       },
       builder: (FormFieldState<dynamic> field) {
         return InputDecorator(
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_custom_field.dart b/lib/src/form_builder_custom_field.dart
