Merge branch 'danvick:master' into master

Author: moazelsawaf

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # github: [danvick]
-custom: https://buymeacoff.ee/wb5M9y2Sz
+custom: https://www.buymeacoffee.com/danvick
 patreon: danvick

README.md

@@ -7,7 +7,7 @@
 [![OSS Lifecycle](https://img.shields.io/osslifecycle/danvick/flutter_form_builder?style=for-the-badge)](#support)
 <!-- [![Awesome Flutter](https://img.shields.io/badge/Awesome-Flutter-FC60A8?logo=awesome-lists&style=for-the-badge)](https://github.com/Solido/awesome-flutter#widgets) -->
 
-[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://buymeacoff.ee/wb5M9y2Sz)
+[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://www.buymeacoffee.com/danvick)
 
 ___
 
@@ -67,7 +67,7 @@ Also included is the `l10n` / `i18n` of error text messages into multiple langua
 If this set of packages was helpful to you in delivering your on project or you just wanna to support this
 repo, a cup of coffee would go a long way ;-)
 
-[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://buymeacoff.ee/wb5M9y2Sz)
+[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://www.buymeacoffee.com/danvick)
 
 
 ## Credits
@@ -85,15 +85,15 @@ Made with [contributors-img](https://contributors-img.firebaseapp.com).
 
 
 
-[core_code]: https://github.com/danvick/flutter_form_builder/tree/split_packages/packages/flutter_form_builder
+[core_code]: https://github.com/danvick/flutter_form_builder/tree/master/packages/flutter_form_builder
 
-[core_docs]: https://github.com/danvick/flutter_form_builder/blob/split_packages/packages/flutter_form_builder/README.md
+[core_docs]: https://github.com/danvick/flutter_form_builder/blob/master/packages/flutter_form_builder/README.md
 
-[extra_fields_code]: https://github.com/danvick/flutter_form_builder/tree/split_packages/packages/form_builder_extra_fields
+[extra_fields_code]: https://github.com/danvick/flutter_form_builder/tree/master/packages/form_builder_extra_fields
 
-[extra_fields_docs]: https://github.com/danvick/flutter_form_builder/blob/split_packages/packages/form_builder_extra_fields/README.md
+[extra_fields_docs]: https://github.com/danvick/flutter_form_builder/blob/master/packages/form_builder_extra_fields/README.md
 
-[validators_code]: https://github.com/danvick/flutter_form_builder/tree/split_packages/packages/form_builder_validators
+[validators_code]: https://github.com/danvick/flutter_form_builder/tree/master/packages/form_builder_validators
 
-[validators_docs]: https://github.com/danvick/flutter_form_builder/blob/split_packages/packages/form_builder_validators/README.md
+[validators_docs]: https://github.com/danvick/flutter_form_builder/blob/master/packages/form_builder_validators/README.md
 

packages/flutter_form_builder/README.md

@@ -13,7 +13,7 @@ ___
 [![GitHub](https://img.shields.io/github/license/danvick/flutter_form_builder?logo=open+source+initiative&style=for-the-badge)](https://github.com/danvick/flutter_form_builder/blob/master/LICENSE)
 [![OSS Lifecycle](https://img.shields.io/osslifecycle/danvick/flutter_form_builder?style=for-the-badge)](#support)
 
-[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://buymeacoff.ee/wb5M9y2Sz)
+[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://www.buymeacoffee.com/danvick)
 
 ___
 
@@ -414,4 +414,4 @@ Any kind of support in the form of reporting bugs, answering questions or PRs is
 If this package was helpful to you in delivering your project or you just wanna to support this
 package, a cup of coffee would be highly appreciated ;-)
 
-[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://buymeacoff.ee/wb5M9y2Sz)
+[![Buy me a coffee](https://www.buymeacoffee.com/assets/img/custom_images/purple_img.png)](https://www.buymeacoffee.com/danvick)

packages/flutter_form_builder/example/lib/sources/complete_form.dart

@@ -22,7 +22,7 @@ class CompleteFormState extends State<CompleteForm> {
 
   var genderOptions = ['Male', 'Female', 'Other'];
 
-  void _onChanged(dynamic val) => debugPrint(val);
+  void _onChanged(dynamic val) => debugPrint(val.toString());
 
   @override
   Widget build(BuildContext context) {

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 }
@@ -259,7 +260,8 @@ class _FormBuilderDateTimePickerState
     super.initState();
     _textFieldController = widget.controller ?? TextEditingController();
     _dateFormat = widget.format ?? _getDefaultDateTimeFormat();
-    final initVal = initialValue;
+    //setting this to value instead of initialValue here is OK since we handle initial value in the parent class
+    final initVal = value;
     _textFieldController.text =
         initVal == null ? '' : _dateFormat.format(initVal);
     effectiveFocusNode.addListener(_handleFocus);

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,