Merge branch 'master' of https://github.com/danvick/flutter_form_builder

Author: danvick

lib/src/fields/form_builder_color_picker.dart

@@ -134,6 +134,12 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
     _focusNode.addListener(_handleFocus);
   }
 
+  @override
+  void dispose() {
+    _textEditingController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     _readOnly = _formState?.readOnly == true || widget.readOnly;

lib/src/fields/form_builder_date_range_picker.dart

@@ -292,7 +292,7 @@ class FormBuilderDateRangePickerState
   @override
   void dispose() {
     _formState?.unregisterFieldKey(widget.attribute);
-    _effectiveController.dispose();
+    _controller.dispose();
     super.dispose();
   }
 }

lib/src/fields/form_builder_date_time_picker.dart

@@ -273,8 +273,11 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
 
   @override
   void dispose() {
-    super.dispose();
     _formState?.unregisterFieldKey(widget.attribute);
+    if (widget.controller == null) {
+      _textFieldController.dispose();
+    }
+    super.dispose();
   }
 
   @override

lib/src/fields/form_builder_phone_field.dart

@@ -124,7 +124,7 @@ class FormBuilderPhoneField extends StatefulWidget {
 
 class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
   bool _readOnly = false;
-  TextEditingController _effectiveController = TextEditingController();
+  TextEditingController _effectiveController;
   FormBuilderState _formState;
   final GlobalKey<FormFieldState> _fieldKey = GlobalKey<FormFieldState>();
   String _initialValue;
@@ -147,9 +147,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
         ((_formState?.initialValue?.containsKey(widget.attribute) ?? false)
             ? _formState.initialValue[widget.attribute]
             : null);
-    if (widget.controller != null) {
-      _effectiveController = widget.controller;
-    }
+    _effectiveController = widget.controller ?? TextEditingController();
     _selectedDialogCountry = CountryPickerUtils.getCountryByIsoCode(
         widget.defaultSelectedCountryIsoCode);
     _parsePhone();

lib/src/fields/form_builder_text_field.dart

@@ -112,7 +112,7 @@ class FormBuilderTextField extends StatefulWidget {
 
 class FormBuilderTextFieldState extends State<FormBuilderTextField> {
   bool _readOnly = false;
-  TextEditingController _effectiveController = TextEditingController();
+  TextEditingController _effectiveController;
   FormBuilderState _formState;
   final GlobalKey<FormFieldState> _fieldKey = GlobalKey<FormFieldState>();
   String _initialValue;
@@ -128,7 +128,7 @@ class FormBuilderTextFieldState extends State<FormBuilderTextField> {
     if (widget.controller != null) {
       _effectiveController = widget.controller;
     } else {
-      _effectiveController.text = _initialValue ?? '';
+      _effectiveController = TextEditingController(text: _initialValue ?? '');
     }
     super.initState();
   }

lib/src/fields/form_builder_typeahead.dart

@@ -197,6 +197,9 @@ class _FormBuilderTypeAheadState<T> extends State<FormBuilderTypeAhead<T>> {
   @override
   void dispose() {
     _formState?.unregisterFieldKey(widget.attribute);
+    if (widget.controller == null) {
+      _typeAheadController.dispose();
+    }
     super.dispose();
   }
 }