Fix for issue 1350 with some changes to tests. This fix makes it so t…

…hat valueTransformer can transform values to null.
flutter-form-builder-ecosystem · Aug 28, 2024 · eb5920f · eb5920f
1 parent 4d27723
commit eb5920f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/lib/src/form_builder.dart b/lib/src/form_builder.dart
@@ -170,14 +170,24 @@ class FormBuilderState extends State<FormBuilder> {
   /// Get all fields of form.
   FormBuilderFields get fields => _fields;
 
-  Map<String, dynamic> get instantValue =>
-      Map<String, dynamic>.unmodifiable(_instantValue.map((key, value) =>
-          MapEntry(key, _transformers[key]?.call(value) ?? value)));
+  Map<String, dynamic> get instantValue => Map<String, dynamic>.unmodifiable(
+        _instantValue.map(
+          (key, value) => MapEntry(
+            key,
+            _transformers[key] == null ? value : _transformers[key]!(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)));
+  Map<String, dynamic> get value => Map<String, dynamic>.unmodifiable(
+        _savedValue.map(
+          (key, value) => MapEntry(
+            key,
+            _transformers[key] == null ? value : _transformers[key]!(value),
+          ),
+        ),
+      );
 
   dynamic transformValue<T>(String name, T? v) {
     final t = _transformers[name];

diff --git a/lib/src/form_builder_field.dart b/lib/src/form_builder_field.dart
@@ -88,7 +88,7 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
       (_formBuilderState?.initialValue ??
           const <String, dynamic>{})[widget.name] as T?;
 
-  dynamic get transformedValue => widget.valueTransformer?.call(value) ?? value;
+  dynamic get transformedValue => widget.valueTransformer == null ? value : widget.valueTransformer!(value);
 
   @override
   String? get errorText => super.errorText ?? _customErrorText;

diff --git a/test/src/form_builder_test.dart b/test/src/form_builder_test.dart
@@ -39,10 +39,14 @@ void main() {
           ),
         );
 
+        // Write an input resulting in a null value after transformation
+        formFieldDidChange(testWidgetName, 'a');
+        expect(formInstantValue(testWidgetName), isNull);
+
         // Write an input and test the transformer
         formFieldDidChange(testWidgetName, '1');
-        expect(int, formInstantValue(testWidgetName).runtimeType);
-        expect(1, formInstantValue(testWidgetName));
+        expect(formInstantValue(testWidgetName).runtimeType, int);
+        expect(formInstantValue(testWidgetName), 1);
 
         // Remove the dynamic field from the widget tree
         final _DynamicFormFieldsState dynamicFieldState =
@@ -54,17 +58,17 @@ void main() {
 
         // With the field unregistered, the form does not have its transformer
         // but it still has its value, now recovered as type String
-        expect(String, formInstantValue(testWidgetName).runtimeType);
-        expect('1', formInstantValue(testWidgetName));
+        expect(formInstantValue(testWidgetName).runtimeType, String);
+        expect(formInstantValue(testWidgetName), '1');
 
         // Show and recreate the field's state
         dynamicFieldState.show = true;
         await tester.pump();
 
         // The transformer is registered again and with the internal value that
         // was kept, it's expected an int of value 1
-        expect(int, formInstantValue(testWidgetName).runtimeType);
-        expect(1, formInstantValue(testWidgetName));
+        expect(formInstantValue(testWidgetName).runtimeType, int);
+        expect(formInstantValue(testWidgetName), 1);
       },
     );
 
@@ -102,8 +106,8 @@ void main() {
 
         // With the field unregistered, the form does not have its transformer,
         // and since the value was cleared, neither its value
-        expect(Null, formInstantValue(testWidgetName).runtimeType);
-        expect(null, formInstantValue(testWidgetName));
+        expect(formInstantValue(testWidgetName).runtimeType, Null);
+        expect(formInstantValue(testWidgetName), isNull);
 
         // Show and recreate the field's state
         dynamicFieldState.show = true;
@@ -112,8 +116,8 @@ void main() {
         // A new input is needed to get another value
         formFieldDidChange(testWidgetName, '2');
         await tester.pump();
-        expect(int, formInstantValue(testWidgetName).runtimeType);
-        expect(2, formInstantValue(testWidgetName));
+        expect(formInstantValue(testWidgetName).runtimeType, int);
+        expect(formInstantValue(testWidgetName), 2);
       },
     );
   });