Started working on focusNodes and Tab support

danvick · danvick · commit 9dffa0bd630c · 2020-07-20T22:56:52.000+03:00
diff --git a/example/lib/sources/complete_form.dart b/example/lib/sources/complete_form.dart
@@ -233,6 +233,7 @@ class CompleteFormState extends State<CompleteForm> {
                       FormBuilderValidators.max(context, 70),
                     ]),
                     keyboardType: TextInputType.number,
+                    textInputAction: TextInputAction.next,
                   ),
                   FormBuilderDropdown(
                     attribute: 'gender',
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -17,14 +17,15 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
     @required String attribute,
     FormFieldValidator validator,
     bool initialValue,
-    bool readOnly,
-    InputDecoration decoration,
+    bool readOnly = false,
+    InputDecoration decoration = const InputDecoration(),
     ValueChanged onChanged,
     ValueTransformer valueTransformer,
     bool enabled = true,
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.title,
     this.activeColor,
     this.checkColor,
@@ -62,6 +63,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
                 onChanged: state.readOnly
                     ? null
                     : (val) {
+                  state.requestFocus();
                         state.didChange(val);
                       },
                 checkColor: checkColor,
diff --git a/lib/src/fields/form_builder_checkbox_list.dart b/lib/src/fields/form_builder_checkbox_list.dart
@@ -24,6 +24,7 @@ class FormBuilderCheckboxList<T> extends FormBuilderField<List<T>> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.options,
     this.controlAffinity = ListTileControlAffinity.leading,
     this.activeColor,
@@ -61,6 +62,7 @@ class FormBuilderCheckboxList<T> extends FormBuilderField<List<T>> {
                             } else {
                               currentValue.remove(options[i].value);
                             }
+                            state.requestFocus();
                             state.didChange(currentValue);
                           },
                     dense: true,
diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -17,7 +17,6 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
   final bool obscureText;
   final double suggestionsBoxMaxHeight;
   final TextCapitalization textCapitalization;
-  final FocusNode focusNode;
   final bool allowChipEditing;
   final bool autofocus;
   final TextOverflow textOverflow;
@@ -36,6 +35,7 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.chipBuilder,
     @required this.suggestionBuilder,
     @required this.findSuggestions,
@@ -49,7 +49,6 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
     this.keyboardAppearance = Brightness.light,
     this.obscureText = false,
     this.textCapitalization = TextCapitalization.none,
-    this.focusNode,
     this.allowChipEditing = false,
     this.autofocus = false,
     this.textOverflow,
diff --git a/lib/src/fields/form_builder_choice_chips.dart b/lib/src/fields/form_builder_choice_chips.dart
@@ -42,6 +42,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.options,
     this.selectedColor,
     this.disabledColor,
diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -27,6 +27,9 @@ extension on Color {
 enum ColorPickerType { ColorPicker, MaterialPicker, BlockPicker }
 
 class FormBuilderColorPickerField extends FormBuilderField<Color> {
+  final TextEditingController controller;
+  final ColorPickerType colorPickerType;
+
   FormBuilderColorPickerField({
     Key key,
     @required String attribute,
@@ -39,8 +42,8 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
     FormFieldSetter<Color> onSaved,
     VoidCallback onReset,
     this.controller,
-    this.focusNode,
-    this.readOnly = false,
+    FocusNode focusNode,
+    bool readOnly = false,
     this.colorPickerType = ColorPickerType.ColorPicker,
     InputDecoration decoration = const InputDecoration(),
     TextCapitalization textCapitalization = TextCapitalization.none,
@@ -141,12 +144,6 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
           },
         );
 
-  final TextEditingController controller;
-  final FocusNode focusNode;
-  @override
-  final bool readOnly;
-  final ColorPickerType colorPickerType;
-
   @override
   _FormBuilderColorPickerFieldState createState() =>
       _FormBuilderColorPickerFieldState();
diff --git a/lib/src/fields/form_builder_country_picker.dart b/lib/src/fields/form_builder_country_picker.dart
@@ -43,6 +43,7 @@ class FormBuilderCountryPicker extends FormBuilderField<String> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.favorite = const [],
     this.textStyle,
     this.padding = const EdgeInsets.all(0.0),
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -15,7 +15,6 @@ class FormBuilderDateRangePicker extends FormBuilderField {
   final bool obscureText;
   final TextStyle style;
   final TextEditingController controller;
-  final FocusNode focusNode;
   final TextCapitalization textCapitalization;
   final TextInputAction textInputAction;
   final StrutStyle strutStyle;
@@ -61,6 +60,7 @@ class FormBuilderDateRangePicker extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.firstDate,
     @required this.lastDate,
     this.format,
@@ -77,7 +77,6 @@ class FormBuilderDateRangePicker extends FormBuilderField {
     this.keyboardType,
     this.style,
     this.controller,
-    this.focusNode,
     this.textInputAction,
     this.strutStyle,
     this.textDirection,
@@ -203,21 +202,19 @@ class FormBuilderDateRangePickerState extends FormBuilderFieldState {
   @override
   void initState() {
     _effectiveFocusNode = widget.focusNode ?? FocusNode();
-    _effectiveController = widget.controller ??
-        TextEditingController(
-          text: _valueToText(),
-        );
+    _effectiveController =
+        widget.controller ?? TextEditingController(text: _valueToText());
     _effectiveFocusNode.addListener(_handleFocus);
     super.initState();
   }
 
   Future<void> _handleFocus() async {
     if (_effectiveFocusNode.hasFocus) {
       _hideKeyboard();
-      var initialFirstDate = value.isEmpty
+      var initialFirstDate = value?.isEmpty ?? true
           ? (widget.initialFirstDate ?? DateTime.now())
           : value[0];
-      var initialLastDate = value.isEmpty
+      var initialLastDate = value?.isEmpty ?? true
           ? (widget.initialLastDate ?? initialFirstDate)
           : (value.length < 2 ? initialFirstDate : value[1]);
       final picked = await date_range_picker.showDatePicker(
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -69,7 +69,6 @@ class FormBuilderDateTimePicker extends FormBuilderField {
   /// `null` if [format] fails to parse the text.
   final ValueChanged<DateTime> onFieldSubmitted;
   final TextEditingController controller;
-  final FocusNode focusNode;
   final TextInputType keyboardType;
   final TextStyle style;
   final TextAlign textAlign;
@@ -148,6 +147,7 @@ class FormBuilderDateTimePicker extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.inputType = InputType.both,
     this.scrollPadding = const EdgeInsets.all(20.0),
     this.cursorWidth = 2.0,
@@ -174,7 +174,6 @@ class FormBuilderDateTimePicker extends FormBuilderField {
     this.selectableDayPredicate,
     this.textDirection,
     this.controller,
-    this.focusNode,
     this.style,
     this.maxLength,
     this.inputFormatters,
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -18,7 +18,6 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
   final bool allowClear;
   final Widget clearIcon;
   final VoidCallback onTap;
-  final FocusNode focusNode;
   final bool autofocus;
   final Color dropdownColor;
   final Color focusColor;
@@ -39,6 +38,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.items,
     this.isExpanded = true,
     this.isDense = true,
@@ -54,7 +54,6 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
     this.allowClear = false,
     this.clearIcon = const Icon(Icons.close),
     this.onTap,
-    this.focusNode,
     this.autofocus = false,
     this.dropdownColor,
     this.focusColor,
diff --git a/lib/src/fields/form_builder_filter_chips.dart b/lib/src/fields/form_builder_filter_chips.dart
@@ -44,6 +44,7 @@ class FormBuilderFilterChip extends FormBuilderField<dynamic> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.options,
     this.selectedColor,
     this.disabledColor,
diff --git a/lib/src/fields/form_builder_image_picker.dart b/lib/src/fields/form_builder_image_picker.dart
@@ -44,6 +44,7 @@ class FormBuilderImagePicker extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.previewWidth = 130,
     this.previewHeight = 130,
     this.previewMargin,
diff --git a/lib/src/fields/form_builder_phone_field.dart b/lib/src/fields/form_builder_phone_field.dart
@@ -14,7 +14,6 @@ class FormBuilderPhoneField extends FormBuilderField {
   final bool obscureText;
   final TextStyle style;
   final TextEditingController controller;
-  final FocusNode focusNode;
   final TextCapitalization textCapitalization;
   final TextInputAction textInputAction;
   final StrutStyle strutStyle;
@@ -66,6 +65,7 @@ class FormBuilderPhoneField extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.maxLines,
     this.obscureText = false,
     this.textCapitalization = TextCapitalization.none,
@@ -79,7 +79,6 @@ class FormBuilderPhoneField extends FormBuilderField {
     this.keyboardType = TextInputType.phone,
     this.style,
     this.controller,
-    this.focusNode,
     this.textInputAction,
     this.strutStyle,
     this.textDirection,
diff --git a/lib/src/fields/form_builder_radio_group.dart b/lib/src/fields/form_builder_radio_group.dart
@@ -27,6 +27,7 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.options,
     this.leadingInput = false,
     this.materialTapTargetSize,
diff --git a/lib/src/fields/form_builder_radio_list.dart b/lib/src/fields/form_builder_radio_list.dart
@@ -21,6 +21,7 @@ class FormBuilderRadioList<T> extends FormBuilderField<T> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.activeColor,
     @required this.options,
     this.controlAffinity = ListTileControlAffinity.leading,
diff --git a/lib/src/fields/form_builder_range_slider.dart b/lib/src/fields/form_builder_range_slider.dart
@@ -33,6 +33,7 @@ class FormBuilderRangeSlider extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.min,
     @required this.max,
     this.divisions,
diff --git a/lib/src/fields/form_builder_rating.dart b/lib/src/fields/form_builder_rating.dart
@@ -29,6 +29,7 @@ class FormBuilderRating extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.max = 5.0,
     this.icon = Icons.star,
     this.iconSize = 24.0,
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -25,6 +25,7 @@ class FormBuilderSegmentedControl<T> extends FormBuilderField<T> {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.options,
     this.borderColor,
     this.selectedColor,
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -27,6 +27,7 @@ class FormBuilderSignaturePad extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.backgroundColor,
     this.clearButtonText,
     this.width,
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -35,6 +35,7 @@ class FormBuilderSlider extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.min,
     @required this.max,
     this.divisions,
diff --git a/lib/src/fields/form_builder_switch.dart b/lib/src/fields/form_builder_switch.dart
@@ -64,6 +64,7 @@ class FormBuilderSwitch extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.title,
     this.activeColor,
     this.activeTrackColor,
diff --git a/lib/src/fields/form_builder_text_field.dart b/lib/src/fields/form_builder_text_field.dart
@@ -13,7 +13,6 @@ class FormBuilderTextField extends FormBuilderField {
   final bool obscureText;
   final TextStyle style;
   final TextEditingController controller;
-  final FocusNode focusNode;
   final TextCapitalization textCapitalization;
   final TextInputAction textInputAction;
   final StrutStyle strutStyle;
@@ -62,6 +61,7 @@ class FormBuilderTextField extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.maxLines = 1,
     this.obscureText = false,
     this.textCapitalization = TextCapitalization.none,
@@ -75,7 +75,6 @@ class FormBuilderTextField extends FormBuilderField {
     this.keyboardType,
     this.style,
     this.controller,
-    this.focusNode,
     this.textInputAction,
     this.strutStyle,
     this.textDirection,
diff --git a/lib/src/fields/form_builder_touch_spin.dart b/lib/src/fields/form_builder_touch_spin.dart
@@ -36,6 +36,7 @@ class FormBuilderTouchSpin extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     this.step,
     this.min = 1,
     this.max = 9999,
@@ -78,7 +79,8 @@ class FormBuilderTouchSpin extends FormBuilderField {
                 onChanged: state.readOnly
                     ? null
                     : (value) {
-                        field.didChange(value);
+                        state.requestFocus();
+                        state.didChange(value);
                       },
                 displayFormat: displayFormat,
                 textStyle: textStyle,
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
@@ -49,6 +49,7 @@ class FormBuilderTypeAhead<T> extends FormBuilderField {
     FormFieldSetter onSaved,
     bool autovalidate = false,
     VoidCallback onReset,
+    FocusNode focusNode,
     @required this.itemBuilder,
     @required this.suggestionsCallback,
     this.getImmediateSuggestions = false,
diff --git a/lib/src/form_builder_field.dart b/lib/src/form_builder_field.dart
