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

Author: danvick

packages/flutter_form_builder/lib/src/fields/form_builder_checkbox.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Single Checkbox field
@@ -42,6 +43,8 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
   /// {@macro flutter.widgets.Focus.autofocus}
   final bool autofocus;
 
+  final bool shouldRequestFocus;
+
   /// If true the checkbox's [value] can be true, false, or null.
   ///
   /// Checkbox displays a dash when its value is null.
@@ -86,14 +89,15 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
     FocusNode? focusNode,
     required this.title,
     this.activeColor,
+    this.autofocus = false,
     this.checkColor,
-    this.subtitle,
-    this.secondary,
-    this.controlAffinity = ListTileControlAffinity.leading,
     this.contentPadding = EdgeInsets.zero,
-    this.autofocus = false,
-    this.tristate = false,
+    this.controlAffinity = ListTileControlAffinity.leading,
+    this.secondary,
     this.selected = false,
+    this.shouldRequestFocus = false,
+    this.subtitle,
+    this.tristate = false,
   }) : super(
           key: key,
           initialValue: initialValue,
@@ -117,11 +121,13 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
                 isThreeLine: false,
                 title: title,
                 subtitle: subtitle,
-                value: tristate? state.value : (state.value ?? false),
+                value: tristate ? state.value : (state.value ?? false),
                 onChanged: state.enabled
-                    ? (val) {
-                        state.requestFocus();
-                        state.didChange(val);
+                    ? (value) {
+                        if (shouldRequestFocus) {
+                          state.requestFocus();
+                        }
+                        state.didChange(value);
                       }
                     : null,
                 checkColor: checkColor,

packages/flutter_form_builder/lib/src/fields/form_builder_checkbox_group.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// A list of Checkboxes for selecting multiple options

packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// A list of `Chip`s that acts like radio buttons
 class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
+  final bool shouldRequestFocus;
+
   /// The list of items the user can select.
   final List<FormBuilderFieldOption<T>> options;
 
@@ -240,41 +243,41 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
 
   /// Creates a list of `Chip`s that acts like radio buttons
   FormBuilderChoiceChip({
-    Key? key,
-    //From Super
-    required String name,
-    FormFieldValidator<T>? validator,
-    T? initialValue,
-    InputDecoration decoration = const InputDecoration(),
-    ValueChanged<T?>? onChanged,
-    ValueTransformer<T?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<T>? onSaved,
     AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
+    bool enabled = true,
     FocusNode? focusNode,
+    FormFieldSetter<T>? onSaved,
+    FormFieldValidator<T>? validator,
+    InputDecoration decoration = const InputDecoration(),
+    Key? key,
+    required String name, //From Super
     required this.options,
-    this.selectedColor,
-    this.disabledColor,
+    T? initialValue,
+    this.alignment = WrapAlignment.start,
     this.backgroundColor,
-    this.shadowColor,
-    this.selectedShadowColor,
-    this.shape,
+    this.crossAxisAlignment = WrapCrossAlignment.start,
+    this.direction = Axis.horizontal,
+    this.disabledColor,
     this.elevation,
-    this.pressElevation,
+    this.labelPadding,
+    this.labelStyle,
     this.materialTapTargetSize,
-    this.direction = Axis.horizontal,
-    this.alignment = WrapAlignment.start,
-    this.crossAxisAlignment = WrapCrossAlignment.start,
+    this.padding,
+    this.pressElevation,
     this.runAlignment = WrapAlignment.start,
     this.runSpacing = 0.0,
+    this.selectedColor,
+    this.selectedShadowColor,
+    this.shadowColor,
+    this.shape,
+    this.shouldRequestFocus = false,
     this.spacing = 0.0,
     this.textDirection,
     this.verticalDirection = VerticalDirection.down,
-    this.labelPadding,
-    this.labelStyle,
-    this.padding,
     this.visualDensity,
+    ValueChanged<T?>? onChanged,
+    ValueTransformer<T?>? valueTransformer,
+    VoidCallback? onReset,
   }) : super(
             key: key,
             initialValue: initialValue,
@@ -310,7 +313,9 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
                         onSelected: state.enabled
                             ? (selected) {
                                 final choice = selected ? option.value : null;
-                                state.requestFocus();
+                                if (shouldRequestFocus) {
+                                  state.requestFocus();
+                                }
                                 state.didChange(choice);
                               }
                             : null,
@@ -319,7 +324,6 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
                         backgroundColor: backgroundColor,
                         shadowColor: shadowColor,
                         selectedShadowColor: selectedShadowColor,
-                        // shape: shape,
                         elevation: elevation,
                         pressElevation: pressElevation,
                         materialTapTargetSize: materialTapTargetSize,

packages/flutter_form_builder/lib/src/fields/form_builder_date_range_picker.dart

@@ -2,9 +2,10 @@ import 'dart:core';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:intl/intl.dart' as intl;
 
+import 'package:flutter_form_builder/flutter_form_builder.dart';
+
 /// Field for selecting a range of dates
 class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
   //TODO: Add documentation

packages/flutter_form_builder/lib/src/fields/form_builder_date_time_picker.dart

@@ -1,11 +1,12 @@
-import 'dart:async';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_form_builder/flutter_form_builder.dart';
+
 import 'package:intl/intl.dart';
 
+import 'package:flutter_form_builder/flutter_form_builder.dart';
+
 enum InputType { date, time, both }
 
 // enum PickerType { material, cupertino }

packages/flutter_form_builder/lib/src/fields/form_builder_dropdown.dart

@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/material.dart';
+
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Field for Dropdown button
@@ -191,6 +192,8 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
   /// and bottom of the menu by at one menu item's height.
   final double? menuMaxHeight;
 
+  final bool shouldRequestFocus;
+
   /// Creates field for Dropdown button
   FormBuilderDropdown({
     Key? key,
@@ -221,6 +224,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
     this.clearIcon = const Icon(Icons.close),
     this.onTap,
     this.autofocus = false,
+    this.shouldRequestFocus = false,
     this.dropdownColor,
     this.focusColor,
     this.itemHeight = kMinInteractiveDimension,
@@ -245,7 +249,9 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
             // TextFormField
 
             void changeValue(T? value) {
-              state.requestFocus();
+              if (shouldRequestFocus) {
+                state.requestFocus();
+              }
               state.didChange(value);
             }
 
@@ -269,8 +275,8 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
                         isDense: isDense,
                         disabledHint: field.value != null
                             ? (items
-                                    .firstWhereOrNull(
-                                        (val) => val.value == field.value)
+                                    .firstWhereOrNull((dropDownItem) =>
+                                        dropDownItem.value == field.value)
                                     ?.child ??
                                 Text(field.value.toString()))
                             : disabledHint,