Rename updateFormAttributeValue to setInternalAttributeValue to avoid confusion

Author: danvick

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [4.0.0-alpha.6] - 20-Jul-2020
+* Added focusNode to all fields. 
+* Attempted tab/next support - work in progress
+* Request Focus to Field when change is attempted.
+* Include guide to programmatically inducing errors to README. Closes #123
+* Fixed bug in Localization where `Locale.countrycCode` is `null`. Closes #369
+* Added more options to DatePicker for showDatePicker() Flutter function
+* Rename `updateFormAttributeValue` to `setInternalAttributeValue` to avoid confusion
+
 ## [4.0.0-alpha.5] - 08-Jul-2020
 * Improvements to dirty check for FormBuilderField - fixes autovalidate only when dirty
 

lib/src/fields/form_builder_date_time_picker.dart

@@ -169,7 +169,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
     this.initialDate,
     // this.onSaved,
     this.onFieldSubmitted,
-    this.initialDatePickerMode,
+    this.initialDatePickerMode = DatePickerMode.day,
     this.locale,
     this.selectableDayPredicate,
     this.textDirection,
@@ -199,7 +199,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
     this.fieldHintText,
     this.fieldLabelText,
     this.helpText,
-    this.initialEntryMode,
+    this.initialEntryMode = DatePickerEntryMode.calendar,
     this.routeSettings,
   }) : super(
           key: key,

lib/src/fields/form_builder_dropdown.dart

@@ -11,7 +11,6 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
   final int elevation;
   final Widget disabledHint;
   final double iconSize;
-  final Widget underline;
   final Widget icon;
   final Color iconDisabledColor;
   final Color iconEnabledColor;
@@ -47,7 +46,6 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
     this.hint,
     this.style,
     this.disabledHint,
-    this.underline,
     this.icon,
     this.iconDisabledColor,
     this.iconEnabledColor,
@@ -79,11 +77,14 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
                 decoration: decoration.copyWith(
                   enabled: !state.readOnly,
                   errorText: field.errorText,
+                  floatingLabelBehavior: hint == null
+                      ? decoration.floatingLabelBehavior
+                      : FloatingLabelBehavior.always,
                 ),
-                child: DropdownButtonHideUnderline(
-                  child: Row(
-                    children: <Widget>[
-                      Expanded(
+                child: Row(
+                  children: <Widget>[
+                    Expanded(
+                      child: DropdownButtonHideUnderline(
                         child: DropdownButton(
                           isExpanded: isExpanded,
                           hint: hint,
@@ -104,7 +105,6 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
                           icon: icon,
                           iconDisabledColor: iconDisabledColor,
                           iconEnabledColor: iconEnabledColor,
-                          underline: underline,
                           onChanged: state.readOnly
                               ? null
                               : (value) {
@@ -119,17 +119,17 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
                           selectedItemBuilder: selectedItemBuilder,
                         ),
                       ),
-                      if (allowClear && !readOnly && field.value != null) ...[
-                        VerticalDivider(),
-                        InkWell(
-                          child: clearIcon,
-                          onTap: () {
-                            _changeValue(state, null);
-                          },
-                        ),
-                      ]
-                    ],
-                  ),
+                    ),
+                    if (allowClear && !readOnly && field.value != null) ...[
+                      VerticalDivider(),
+                      InkWell(
+                        child: clearIcon,
+                        onTap: () {
+                          _changeValue(state, null);
+                        },
+                      ),
+                    ]
+                  ],
                 ),
               );
             });

lib/src/form_builder.dart

@@ -120,7 +120,7 @@ class FormBuilderState extends State<FormBuilder> {
     super.dispose();
   }
 
-  void updateFormAttributeValue(String attribute, dynamic value) {
+  void setInternalAttributeValue(String attribute, dynamic value) {
     setState(() {
       _value = {..._value, attribute: value};
     });

lib/src/form_builder_field.dart

@@ -73,8 +73,6 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
 
   FocusNode _node;
 
-  FocusAttachment _nodeAttachment;
-
   bool _focused = false;
 
   @override
@@ -90,7 +88,7 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
             : null);
     _node = widget.focusNode ?? FocusNode(debugLabel: '${widget.attribute}');
     _node.addListener(_handleFocusChange);
-    _nodeAttachment = _node.attach(context, onKey: _handleKeyPress);
+    _node.attach(context, onKey: _handleKeyPress);
     setValue(_initialValue);
   }
 
@@ -113,16 +111,10 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
     return false;
   }
 
-  @override
-  void dispose() {
-    _formBuilderState?.unregisterFieldKey(widget.attribute);
-    super.dispose();
-  }
-
   @override
   void save() {
     super.save();
-    _formBuilderState?.updateFormAttributeValue(
+    _formBuilderState?.setInternalAttributeValue(
         widget.attribute, widget.valueTransformer?.call(value) ?? value);
   }
 
@@ -150,4 +142,13 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
   void requestFocus() {
     FocusScope.of(context).requestFocus(_node);
   }
+
+  @override
+  void dispose() {
+    _formBuilderState?.unregisterFieldKey(widget.attribute);
+    _node.removeListener(_handleFocusChange);
+    // The attachment will automatically be detached in dispose().
+    _node.dispose();
+    super.dispose();
+  }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_form_builder
 description: Package to build Material Form with fields like TextField, DropDown, Switches etc. with ability to create custom FormFields and composability and reuse validation functions.
-version: 4.0.0-alpha.5
+version: 4.0.0-alpha.6
 homepage: https://github.com/danvick/flutter_form_builder
 
 environment: