Fixed field registration on form

Author: danvick

README.md

@@ -494,30 +494,34 @@ RaisedButton(
 ### Conditional validation
 You can also validate a field based on the value of another field
 ```
-FormBuilderRadio(
+FormBuilderRadioGroup(
   decoration: InputDecoration(labelText: 'My best language'),
-  attribute: "best_language",
+  attribute: 'my_language',
   validator: FormBuilderValidators.required(context),
   options: [
-    "Dart",
-    "Kotlin",
-    "Java",
-    "Swift",
-    "Objective-C",
-    "Other"
+    'Dart',
+    'Kotlin',
+    'Java',
+    'Swift',
+    'Objective-C',
+    'Other'
   ]
-      .map((lang) => FormBuilderFieldOption(value: lang))
-      .toList(growable: false),
-),
-FormBuilderTextField(
-    attribute: "specify",
-    decoration: InputDecoration(labelText: "If Other, please specify"),
-    validator:
-      (val){
-          if(_fbKey.currentState.fields['best_language'].currentState.value == "Other" && (val == null || val.isEmpty))
-              return "Kindly specify your language";
-      },
-),
+    .map((lang) => FormBuilderFieldOption(value: lang))
+    .toList(growable: false),
+  ),
+  FormBuilderTextField(
+    attribute: 'specify',
+    decoration:
+        InputDecoration(labelText: 'If Other, please specify'),
+    validator: (val) {
+      if (_fbKey.currentState.fields['my_language']?.value ==
+              'Other' &&
+          (val == null || val.isEmpty)) {
+        return 'Kindly specify your language';
+      }
+      return null;
+    },
+  ),
 ```
 
 ## CREDITS

lib/src/fields/form_builder_date_time_picker.dart

@@ -224,7 +224,6 @@ class FormBuilderDateTimePicker extends FormBuilderField {
             final _FormBuilderDateTimePickerState state = field;
 
             return DateTimeField(
-              key: state.fieldKey,
               initialValue: state.initialValue,
               format: state.dateFormat,
               validator: validator,

lib/src/form_builder.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 typedef ValueTransformer<T> = dynamic Function(T value);
 
@@ -128,28 +129,28 @@ class FormBuilderState extends State<FormBuilder> {
   //TODO: Find way to assert no duplicates in field attributes
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
 
-  Map<String, GlobalKey<FormFieldState>> _fieldKeys;
+  Map<String, FormBuilderFieldState> _fields;
 
   Map<String, dynamic> _value;
 
   Map<String, dynamic> get value => {...widget.initialValue ?? {}, ..._value};
 
   Map<String, dynamic> get initialValue => widget.initialValue;
 
-  Map<String, GlobalKey<FormFieldState>> get fields => _fieldKeys;
+  Map<String, FormBuilderFieldState> get fields => _fields;
 
   bool get readOnly => widget.readOnly;
 
   @override
   void initState() {
     super.initState();
-    _fieldKeys = {};
+    _fields = {};
     _value = {};
   }
 
   @override
   void dispose() {
-    _fieldKeys = null;
+    _fields = null;
     super.dispose();
   }
 
@@ -159,13 +160,12 @@ class FormBuilderState extends State<FormBuilder> {
     });
   }
 
-  void registerFieldKey(String attribute, GlobalKey<FormFieldState> key) {
-    // assert(_fieldKeys.containsKey(attribute) == false, "Field with attribute '$attribute' already exists. Make sure that two or more fields don't have the same attribute name.");
-    _fieldKeys[attribute] = key;
+  void registerField(String attribute, FormBuilderFieldState field) {
+    _fields[attribute] = field;
   }
 
-  void unregisterFieldKey(String attribute) {
-    _fieldKeys.remove(attribute);
+  void unregisterField(String attribute) {
+    _fields.remove(attribute);
   }
 
   void save() {

lib/src/form_builder_field.dart

@@ -40,6 +40,8 @@ class FormBuilderField<T> extends FormField<T> {
   /// {@macro flutter.widgets.Focus.focusNode}
   final FocusNode focusNode;
 
+  //TODO: implement bool autofocus, ValueChanged<bool> onValidated
+
   FormBuilderField({
     Key key,
     //From Super
@@ -85,12 +87,8 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
   // Only autovalidate if dirty
   bool get autovalidate => dirty && widget.autovalidate;
 
-  GlobalKey<FormFieldState> get fieldKey => _fieldKey;
-
   T get initialValue => _initialValue;
 
-  final GlobalKey<FormFieldState> _fieldKey = GlobalKey<FormFieldState>();
-
   FormBuilderState _formBuilderState;
 
   bool _readOnly = false;
@@ -110,7 +108,7 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
     super.initState();
     _formBuilderState = FormBuilder.of(context);
     _readOnly = _formBuilderState?.readOnly == true || widget.readOnly;
-    _formBuilderState?.registerFieldKey(widget.attribute, _fieldKey);
+    _formBuilderState?.registerField(widget.attribute, this);
     _initialValue = widget.initialValue ??
         ((_formBuilderState?.initialValue?.containsKey(widget.attribute) ??
                 false)
@@ -127,11 +125,11 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
   }
 
   @override
-  void didChange(T value) {
+  void didChange(T val) {
     setState(() {
       _dirty = true;
     });
-    super.didChange(value);
+    super.didChange(val);
     widget.onChanged?.call(value);
   }
 
@@ -153,7 +151,7 @@ class FormBuilderFieldState<T> extends FormFieldState<T> {
 
   @override
   void dispose() {
-    _formBuilderState?.unregisterFieldKey(widget.attribute);
+    _formBuilderState?.unregisterField(widget.attribute);
     // The attachment will automatically be detached in dispose().
     _focusNode?.dispose();
     super.dispose();