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

Author: ahmednfwela

.github/workflows/form_builder_core.yaml

@@ -6,13 +6,13 @@ name: Form Builder Core
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [split_packages]
+    branches: [master]
     paths:
       - "packages/flutter_form_builder/**"
       - ".github/workflows/form_builder_core.yaml"
 
   pull_request:
-    branches: [split_packages]
+    branches: [master]
     paths:
       - "packages/flutter_form_builder/**"
       - ".github/workflows/form_builder_core.yaml"

.github/workflows/form_builder_extra_fields.yaml

@@ -6,13 +6,13 @@ name: Form Builder Extra Fields
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [split_packages]
+    branches: [master]
     paths:
       - "packages/form_builder_extra_fields/**"
       - ".github/workflows/form_builder_extra_fields.yaml"
 
   pull_request:
-    branches: [split_packages]
+    branches: [master]
     paths:
       - "packages/form_builder_extra_fields/**"
       - ".github/workflows/form_builder_extra_fields.yaml"

.github/workflows/form_builder_validators.yaml

@@ -6,13 +6,13 @@ name: Form Builder Validators
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [split_packages]
+    branches: [master]
     paths:
       - "packages/form_builder_validators/**"
       - ".github/workflows/form_builder_validators.yaml"
 
   pull_request:
-    branches: [split_packages]
+    branches: [master]
     paths:
       - "packages/form_builder_validators/**"
       - ".github/workflows/form_builder_validators.yaml"

.github/workflows/main.yml

@@ -1,3 +1,7 @@
+## [7.0.0] - 27-Oct-2021
+**BREAKING CHANGE**:
+* For ease of maintainability, validation functionality has been broken up into a separate package: [form_builder_validators](https://pub.dev/packages/form_builder_validators)
+
 ## [7.0.0-beta.0] - 02-Sep-2021
 * Merged back `form_builder_fields` into `flutter_form_builder`
 
@@ -15,6 +19,16 @@
 ## [7.0.0-alpha.0] - 16-May-2021
 * Split up packages - removed fields and validation from core
 
+## [6.2.1] - 27-Oct-2021
+* Fixed bug where `didChange` and `reset` on FormBuilderCheckboxGroup has no visible effect
+
+## [6.2.0] - 21-Oct-2021
+* Fixed `didChange` unable to handle null value in  `FormBuilderTextField`
+
+**BREAKING CHANGE**
+* Added new attribute - `autoFocusOnValidationFailure` (default: `false`) - to FormBuilder to set whether should scroll to first error if validation fails
+
+
 ## [6.1.0] - 01-Sep-2021
 * When form validation fails, automatically scroll to first error
 * New way to programmatically induce custom errors by calling `GlobalKey<FormBuilderState>.invalidateField()` or `GlobalKey<FormBuilderFieldState>.invalidate()`

analysis_options.yaml

@@ -7,12 +7,12 @@ import 'code_page.dart';
 import 'sources/complete_form.dart';
 
 class HomePage extends StatelessWidget {
+  const HomePage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Flutter Form Builder')
-      ),
+      appBar: AppBar(title: const Text('Flutter Form Builder')),
       body: ListView(
         children: <Widget>[
           ListTile(
@@ -22,7 +22,7 @@ class HomePage extends StatelessWidget {
               Navigator.of(context).push(
                 MaterialPageRoute(
                   builder: (context) {
-                    return CodePage(
+                    return const CodePage(
                       title: 'Complete Form',
                       sourceFilePath: 'lib/sources/complete_form.dart',
                       child: CompleteForm(),
@@ -40,7 +40,7 @@ class HomePage extends StatelessWidget {
               Navigator.of(context).push(
                 MaterialPageRoute(
                   builder: (context) {
-                    return CodePage(
+                    return const CodePage(
                       title: 'Custom Fields',
                       sourceFilePath: 'lib/sources/custom_fields.dart',
                       child: CustomFields(),
@@ -58,7 +58,7 @@ class HomePage extends StatelessWidget {
               Navigator.of(context).push(
                 MaterialPageRoute(
                   builder: (context) {
-                    return CodePage(
+                    return const CodePage(
                       title: 'Signup Form',
                       sourceFilePath: 'lib/sources/signup_form.dart',
                       child: SignupForm(),

packages/flutter_form_builder/CHANGELOG.md

@@ -5,25 +5,27 @@ import 'package:form_builder_validators/form_builder_validators.dart';
 
 import 'home_page.dart';
 
-void main() => runApp(MyApp());
+void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
+  const MyApp({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Flutter FormBuilder Demo',
       theme: ThemeData(
         primarySwatch: Colors.blue,
-        inputDecorationTheme: InputDecorationTheme(
+        inputDecorationTheme: const InputDecorationTheme(
           labelStyle: TextStyle(color: Colors.blueAccent),
         ),
       ),
-      localizationsDelegates: [
+      localizationsDelegates: const [
         FormBuilderLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,
         GlobalWidgetsLocalizations.delegate,
       ],
-      supportedLocales: [
+      supportedLocales: const [
         Locale('en', ''),
         Locale('es', ''),
         Locale('fa', ''),
@@ -33,7 +35,7 @@ class MyApp extends StatelessWidget {
         Locale('sk', ''),
         Locale('pl', ''),
       ],
-      home: HomePage(),
+      home: const HomePage(),
     );
   }
 }

packages/flutter_form_builder/example/lib/home_page.dart

@@ -5,6 +5,8 @@ import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:intl/intl.dart';
 
 class CompleteForm extends StatefulWidget {
+  const CompleteForm({Key? key}) : super(key: key);
+
   @override
   CompleteFormState createState() {
     return CompleteFormState();
@@ -19,9 +21,10 @@ class CompleteFormState extends State<CompleteForm> {
   bool _ageHasError = false;
   bool _genderHasError = false;
 
-  final ValueChanged _onChanged = (dynamic val) => print(val);
   var genderOptions = ['Male', 'Female', 'Other'];
 
+  void _onChanged(dynamic val) => debugPrint(val);
+
   @override
   Widget build(BuildContext context) {
     return Padding(
@@ -50,14 +53,14 @@ class CompleteFormState extends State<CompleteForm> {
                     decoration: InputDecoration(
                       labelText: 'Appointment Time',
                       suffixIcon: IconButton(
-                          icon: Icon(Icons.close),
+                          icon: const Icon(Icons.close),
                           onPressed: () {
                             _formKey.currentState!.fields['date']
                                 ?.didChange(null);
                           }),
                     ),
-                    initialTime: TimeOfDay(hour: 8, minute: 0),
-                    locale: Locale.fromSubtags(languageCode: 'fr'),
+                    initialTime: const TimeOfDay(hour: 8, minute: 0),
+                    locale: const Locale.fromSubtags(languageCode: 'fr'),
                   ),
                   FormBuilderDateRangePicker(
                     name: 'date_range',
@@ -70,7 +73,7 @@ class CompleteFormState extends State<CompleteForm> {
                       helperText: 'Helper text',
                       hintText: 'Hint text',
                       suffixIcon: IconButton(
-                          icon: Icon(Icons.close),
+                          icon: const Icon(Icons.close),
                           onPressed: () {
                             _formKey.currentState!.fields['date_range']
                                 ?.didChange(null);
@@ -99,7 +102,7 @@ class CompleteFormState extends State<CompleteForm> {
                     onChanged: _onChanged,
                     min: 0.0,
                     max: 100.0,
-                    initialValue: RangeValues(4, 7),
+                    initialValue: const RangeValues(4, 7),
                     divisions: 20,
                     activeColor: Colors.red,
                     inactiveColor: Colors.pink[100],
@@ -110,7 +113,7 @@ class CompleteFormState extends State<CompleteForm> {
                     initialValue: false,
                     onChanged: _onChanged,
                     title: RichText(
-                      text: TextSpan(
+                      text: const TextSpan(
                         children: [
                           TextSpan(
                             text: 'I have read and agree to the ',
@@ -175,7 +178,7 @@ class CompleteFormState extends State<CompleteForm> {
                     ),
                     // initialValue: 'Male',
                     allowClear: true,
-                    hint: Text('Select Gender'),
+                    hint: const Text('Select Gender'),
                     validator: FormBuilderValidators.compose(
                         [FormBuilderValidators.required(context)]),
                     items: genderOptions
@@ -270,10 +273,10 @@ class CompleteFormState extends State<CompleteForm> {
                     color: Theme.of(context).colorScheme.secondary,
                     onPressed: () {
                       if (_formKey.currentState?.saveAndValidate() ?? false) {
-                        print(_formKey.currentState?.value);
+                        debugPrint(_formKey.currentState?.value.toString());
                       } else {
-                        print(_formKey.currentState?.value);
-                        print('validation failed');
+                        debugPrint(_formKey.currentState?.value.toString());
+                        debugPrint('validation failed');
                       }
                     },
                     child: const Text(

packages/flutter_form_builder/example/lib/main.dart

@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 class CustomFields extends StatefulWidget {
+  const CustomFields({Key? key}) : super(key: key);
+
   @override
   _CustomFieldsState createState() => _CustomFieldsState();
 }
@@ -21,15 +23,12 @@ class _CustomFieldsState extends State<CustomFields> {
           children: <Widget>[
             FormBuilderField<String?>(
               name: 'name',
-              onChanged: (val) => print(val),
+              onChanged: (val) => debugPrint(val.toString()),
               builder: (FormFieldState field) {
                 return Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    Expanded(
-                      child: Text('Name'),
-                      flex: 1,
-                    ),
+                    const Expanded(child: Text('Name'), flex: 1),
                     Expanded(
                       flex: 2,
                       child: InputDecorator(
@@ -71,11 +70,12 @@ class _CustomFieldsState extends State<CustomFields> {
                 return InputDecorator(
                   decoration: InputDecoration(
                     labelText: "Select option",
-                    contentPadding: EdgeInsets.only(top: 10.0, bottom: 0.0),
+                    contentPadding:
+                        const EdgeInsets.only(top: 10.0, bottom: 0.0),
                     border: InputBorder.none,
                     errorText: field.errorText,
                   ),
-                  child: Container(
+                  child: SizedBox(
                     height: 200,
                     child: CupertinoPicker(
                       itemExtent: 30,
@@ -93,25 +93,25 @@ class _CustomFieldsState extends State<CustomFields> {
                 Expanded(
                   child: MaterialButton(
                     color: Theme.of(context).colorScheme.secondary,
-                    child: Text(
+                    child: const Text(
                       "Submit",
                       style: TextStyle(color: Colors.white),
                     ),
                     onPressed: () {
                       _formKey.currentState!.save();
                       if (_formKey.currentState!.validate()) {
-                        print(_formKey.currentState!.value);
+                        debugPrint(_formKey.currentState!.value.toString());
                       } else {
-                        print("validation failed");
+                        debugPrint("validation failed");
                       }
                     },
                   ),
                 ),
-                SizedBox(width: 20),
+                const SizedBox(width: 20),
                 Expanded(
                   child: MaterialButton(
                     color: Theme.of(context).colorScheme.secondary,
-                    child: Text(
+                    child: const Text(
                       "Reset",
                       style: TextStyle(color: Colors.white),
                     ),