Merge branch 'duplicate_field_handling'

# Conflicts:
#	packages/flutter_form_builder/lib/src/form_builder.dart
#	packages/flutter_form_builder/lib/src/form_builder_field.dart

Author: danvick

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

@@ -260,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_text_field.dart

@@ -435,8 +435,8 @@ class _FormBuilderTextFieldState
   @override
   void initState() {
     super.initState();
-    _controller =
-        widget.controller ?? TextEditingController(text: initialValue);
+    //setting this to value instead of initialValue here is OK since we handle initial value in the parent class
+    _controller = widget.controller ?? TextEditingController(text: value);
     _controller!.addListener(_handleControllerChanged);
   }
 

packages/flutter_form_builder/lib/src/form_builder.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 
 import 'package:flutter_form_builder/flutter_form_builder.dart';
@@ -91,23 +93,60 @@ class FormBuilderState extends State<FormBuilder> {
 
   final _fields = <String, FormBuilderFieldState>{};
 
-  final _value = <String, dynamic>{};
+  //because dart type system will not accept ValueTransformer<dynamic>
+  final _transformers = <String, Function>{};
+  final _instantValue = <String, dynamic>{};
+  final _savedValue = <String, dynamic>{};
+
+  Map<String, dynamic> get instantValue =>
+      Map<String, dynamic>.unmodifiable(_instantValue.map((key, value) =>
+          MapEntry(key, _transformers[key]?.call(value) ?? value)));
 
-  Map<String, dynamic> get value => Map<String, dynamic>.unmodifiable(_value);
+  /// Returns the saved value only
+  Map<String, dynamic> get value =>
+      Map<String, dynamic>.unmodifiable(_savedValue.map((key, value) =>
+          MapEntry(key, _transformers[key]?.call(value) ?? value)));
 
+  /// Returns values after saving
   Map<String, dynamic> get initialValue => widget.initialValue;
 
   Map<String, FormBuilderFieldState> get fields => _fields;
 
-  bool get isValid =>
-      fields.values.where((element) => !element.isValid).isEmpty;
+  dynamic transformValue<T>(String name, T? v) {
+    final t = _transformers[name];
+    return t != null ? t.call(v) : v;
+  }
+
+  dynamic getTransformedValue<T>(String name, {bool fromSaved = false}) {
+    return transformValue<T>(name, getRawValue(name));
+  }
+
+  T? getRawValue<T>(String name, {bool fromSaved = false}) {
+    return (fromSaved ? _savedValue[name] : _instantValue[name]) ??
+        initialValue[name];
+  }
 
-  void setInternalFieldValue(String name, dynamic value) {
-    setState(() => _value[name] = value);
+  void setInternalFieldValue<T>(
+    String name,
+    T? value, {
+    required bool isSetState,
+  }) {
+    _instantValue[name] = value;
+    if (isSetState) {
+      setState(() {});
+    }
   }
+  bool get isValid =>
+      fields.values.where((element) => !element.isValid).isEmpty;
 
-  void removeInternalFieldValue(String name) {
-    setState(() => _value.remove(name));
+  void removeInternalFieldValue(
+    String name, {
+    required bool isSetState,
+  }) {
+    _instantValue.remove(name);
+    if (isSetState) {
+      setState(() {});
+    }
   }
 
   void registerField(String name, FormBuilderFieldState field) {
@@ -117,14 +156,30 @@ class FormBuilderState extends State<FormBuilder> {
     // field is being replaced, the new instance is registered before the old
     // one is unregistered.  To accommodate that use case, but also provide
     // assistance to accidental duplicate names, we check and emit a warning.
+    final oldField = _fields[name];
     assert(() {
-      if (_fields.containsKey(name)) {
+      if (oldField != null) {
         debugPrint('Warning! Replacing duplicate Field for $name'
             ' -- this is OK to ignore as long as the field was intentionally replaced');
       }
       return true;
     }());
+
     _fields[name] = field;
+    field.registerTransformer(_transformers);
+    if (oldField != null) {
+      // ignore: invalid_use_of_protected_member
+      field.setValue(
+        oldField.value,
+        populateForm: false,
+      );
+    } else {
+      // ignore: invalid_use_of_protected_member
+      field.setValue(
+        _instantValue[name] ??= field.initialValue,
+        populateForm: false,
+      );
+    }
   }
 
   void unregisterField(String name, FormBuilderFieldState field) {
@@ -135,6 +190,7 @@ class FormBuilderState extends State<FormBuilder> {
     // since it may be intentional.
     if (field == _fields[name]) {
       _fields.remove(name);
+      _transformers.remove(name);
     } else {
       assert(() {
         // This is OK to ignore when you are intentionally replacing a field
@@ -145,11 +201,14 @@ class FormBuilderState extends State<FormBuilder> {
       }());
     }
     // Removes internal field value
-    _value.remove(name);
+    // _savedValue.remove(name);
   }
 
   void save() {
     _formKey.currentState!.save();
+    //copy values from instant to saved
+    _savedValue.clear();
+    _savedValue.addAll(_instantValue);
   }
 
   void invalidateField({required String name, String? errorText}) =>
@@ -174,7 +233,21 @@ class FormBuilderState extends State<FormBuilder> {
   }
 
   void reset() {
+    log('reset called');
     _formKey.currentState!.reset();
+    for (var item in _fields.entries) {
+      try {
+        item.value.didChange(getRawValue(item.key));
+      } catch (e, st) {
+        log(
+          'Error when resetting field: ${item.key}',
+          error: e,
+          stackTrace: st,
+          level: 2000,
+        );
+      }
+    }
+    // _formKey.currentState!.setState(() {});
   }
 
   void patchValue(Map<String, dynamic> val) {

packages/flutter_form_builder/lib/src/form_builder_field.dart

@@ -74,8 +74,6 @@ class FormBuilderField<T> extends FormField<T> {
           validator: validator,
         );
 
-  /*@override
-  FormBuilderFieldState<T> createState();*/
   @override
   FormBuilderFieldState<FormBuilderField<T>, T> createState() =>
       FormBuilderFieldState<FormBuilderField<T>, T>();
@@ -100,6 +98,15 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
 
   FormBuilderState? _formBuilderState;
 
+  dynamic get transformedValue => widget.valueTransformer?.call(value) ?? value;
+
+  void registerTransformer(Map<String, Function> _map) {
+    final _fun = widget.valueTransformer;
+    if (_fun != null) {
+      _map[widget.name] = _fun;
+    }
+  }
+
   @override
   String? get errorText => super.errorText ?? _customErrorText;
 
@@ -115,20 +122,29 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
 
   bool get enabled => widget.enabled && (_formBuilderState?.enabled ?? true);
 
-  FocusNode? _focusNode;
-  FocusNode get effectiveFocusNode =>
-      widget.focusNode ?? (_focusNode ??= FocusNode());
+  late FocusNode effectiveFocusNode;
 
   @override
   void initState() {
     super.initState();
     // Register this field when there is a parent FormBuilder
     _formBuilderState = FormBuilder.of(context);
+    // Set the initial value
     _formBuilderState?.registerField(widget.name, this);
+
+    effectiveFocusNode = widget.focusNode ?? FocusNode(debugLabel: widget.name);
     // Register a touch handler
     effectiveFocusNode.addListener(_touchedHandler);
-    // Set the initial value
-    setValue(initialValue);
+  }
+
+  @override
+  void didUpdateWidget(covariant FormBuilderField<T> oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.focusNode != oldWidget.focusNode) {
+      effectiveFocusNode.removeListener(_touchedHandler);
+      effectiveFocusNode = widget.focusNode ?? FocusNode();
+      effectiveFocusNode.addListener(_touchedHandler);
+    }
   }
 
   @override
@@ -142,17 +158,29 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
     super.dispose();
   }
 
-  @override
-  void save() {
-    super.save();
+  // @override
+  // void save() {
+  //   _informFormForFieldChange(
+  //     isSetState: true,
+  //   );
+  //   super.save();
+  // }
+
+  void _informFormForFieldChange({
+    required bool isSetState,
+  }) {
     if (_formBuilderState != null) {
       if (enabled || !_formBuilderState!.widget.skipDisabled) {
-        _formBuilderState!.setInternalFieldValue(
+        _formBuilderState!.setInternalFieldValue<T>(
           widget.name,
-          widget.valueTransformer?.call(value) ?? value,
+          value,
+          isSetState: isSetState,
         );
       } else {
-        _formBuilderState!.removeInternalFieldValue(widget.name);
+        _formBuilderState!.removeInternalFieldValue(
+          widget.name,
+          isSetState: isSetState,
+        );
       }
     }
   }
@@ -163,9 +191,22 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
     }
   }
 
+  @override
+  void setValue(T? value, {bool populateForm = true}) {
+    super.setValue(value);
+    if (populateForm) {
+      _informFormForFieldChange(
+        isSetState: false,
+      );
+    }
+  }
+
   @override
   void didChange(T? value) {
     super.didChange(value);
+    _informFormForFieldChange(
+      isSetState: false,
+    );
     widget.onChanged?.call(value);
   }
 

packages/form_builder_extra_fields/example/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

packages/form_builder_extra_fields/example/lib/home_page.dart

@@ -28,12 +28,31 @@ class _MyHomePageState extends State<MyHomePage> {
             autovalidateMode: AutovalidateMode.onUserInteraction,
             child: Column(
               children: [
-                FormBuilderSearchableDropdown(
-                  name: 'searchable_dropdown',
+                FormBuilderSearchableDropdown<String>(
+                  name: 'searchable_dropdown_online',
+                  // items: allCountries,
+                  onChanged: _onChanged,
+                  showSearchBox: true,
+                  isFilteredOnline: true,
+                  compareFn: (item, selectedItem) =>
+                      item.toLowerCase() == selectedItem.toLowerCase(),
+                  onFind: (text) async {
+                    await Future.delayed(const Duration(seconds: 1));
+                    return allCountries
+                        .where((element) =>
+                            element.toLowerCase().contains(text.toLowerCase()))
+                        .toList();
+                  },
+                  decoration: const InputDecoration(
+                      labelText: 'Searchable Dropdown Online'),
+                ),
+                FormBuilderSearchableDropdown<String>(
+                  name: 'searchable_dropdown_offline',
                   items: allCountries,
                   onChanged: _onChanged,
-                  decoration:
-                      const InputDecoration(labelText: 'Searchable Dropdown'),
+                  showSearchBox: true,
+                  decoration: const InputDecoration(
+                      labelText: 'Searchable Dropdown Offline'),
                 ),
                 const SizedBox(height: 15),
                 FormBuilderColorPickerField(