Skip to content

Commit 501c8fc

Browse files
danvickdanvick
committed
Fixed exception if valueTransformer converts expected FormField type
1 parent 5d19077 commit 501c8fc

17 files changed

+95
-77
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
## [3.0.0-beta.6] - 07-April-2019
1+
## [3.0.0-beta.8] - 10-April-2019
2+
* Fixed unhandled exception when `valueTransformer` tries to convert value from predefined `FormField` type
3+
4+
## [3.0.0-beta.7] - 09-April-2019
25
* Check if value candidate is of type String, Iterable or Map before checking length to determine empty in `FormValidators.required`
36

47
## [3.0.0-beta.6] - 09-April-2019

‎lib/src/fields/form_builder_checkbox.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ class _FormBuilderCheckboxState extends State<FormBuilderCheckbox> {
5151
}
5252
},
5353
onSaved: (val) {
54-
var transformed = val;
55-
if (widget.valueTransformer != null)
56-
transformed = widget.valueTransformer(val);
57-
FormBuilder.of(context)
58-
?.setAttributeValue(widget.attribute, transformed);
54+
if (widget.valueTransformer != null) {
55+
var transformed = widget.valueTransformer(val);
56+
FormBuilder.of(context)
57+
?.setAttributeValue(widget.attribute, transformed);
58+
} else
59+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
5960
},
6061
builder: (FormFieldState<dynamic> field) {
6162
return InputDecorator(

‎lib/src/fields/form_builder_checkbox_list.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ class _FormBuilderCheckboxListState extends State<FormBuilderCheckboxList> {
5252
}
5353
},
5454
onSaved: (val) {
55-
var transformed = val;
56-
if (widget.valueTransformer != null)
57-
transformed = widget.valueTransformer(val);
58-
FormBuilder.of(context)
59-
?.setAttributeValue(widget.attribute, transformed);
55+
if (widget.valueTransformer != null) {
56+
var transformed = widget.valueTransformer(val);
57+
FormBuilder.of(context)
58+
?.setAttributeValue(widget.attribute, transformed);
59+
} else
60+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
6061
},
6162
builder: (FormFieldState<dynamic> field) {
6263
List<Widget> checkboxList = [];

‎lib/src/fields/form_builder_chips_input.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ class _FormBuilderChipsInputState extends State<FormBuilderChipsInput> {
6363
}
6464
},
6565
onSaved: (val) {
66-
var transformed = val;
67-
if (widget.valueTransformer != null)
68-
transformed = widget.valueTransformer(val);
69-
FormBuilder.of(context)
70-
?.setAttributeValue(widget.attribute, transformed);
66+
if (widget.valueTransformer != null) {
67+
var transformed = widget.valueTransformer(val);
68+
FormBuilder.of(context)
69+
?.setAttributeValue(widget.attribute, transformed);
70+
} else
71+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
7172
},
7273
builder: (FormFieldState<dynamic> field) {
7374
return ChipsInput(

‎lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@ class _FormBuilderDateTimePickerState extends State<FormBuilderDateTimePicker> {
169169
enabled: !_readonly,
170170
),
171171
onSaved: (val) {
172-
var transformed = val;
173-
if (widget.valueTransformer != null)
174-
transformed = widget.valueTransformer(val);
175-
FormBuilder.of(context)
176-
?.setAttributeValue(widget.attribute, transformed);
172+
if (widget.valueTransformer != null) {
173+
var transformed = widget.valueTransformer(val);
174+
FormBuilder.of(context)
175+
?.setAttributeValue(widget.attribute, transformed);
176+
} else
177+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
177178
},
178179
validator: (val) {
179180
for (int i = 0; i < widget.validators.length; i++) {

‎lib/src/fields/form_builder_dropdown.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@ class _FormBuilderDropdownState extends State<FormBuilderDropdown> {
6464
}
6565
},
6666
onSaved: (val) {
67-
var transformed = val;
68-
if (widget.valueTransformer != null)
69-
transformed = widget.valueTransformer(val);
70-
FormBuilder.of(context)
71-
?.setAttributeValue(widget.attribute, transformed);
67+
if (widget.valueTransformer != null) {
68+
var transformed = widget.valueTransformer(val);
69+
FormBuilder.of(context)
70+
?.setAttributeValue(widget.attribute, transformed);
71+
} else
72+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
7273
},
7374
builder: (FormFieldState<dynamic> field) {
7475
return InputDecorator(

‎lib/src/fields/form_builder_radio.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ class _FormBuilderRadioState extends State<FormBuilderRadio> {
5151
}
5252
},
5353
onSaved: (val) {
54-
var transformed = val;
55-
if (widget.valueTransformer != null)
56-
transformed = widget.valueTransformer(val);
57-
FormBuilder.of(context)
58-
?.setAttributeValue(widget.attribute, transformed);
54+
if (widget.valueTransformer != null) {
55+
var transformed = widget.valueTransformer(val);
56+
FormBuilder.of(context)
57+
?.setAttributeValue(widget.attribute, transformed);
58+
} else
59+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
5960
},
6061
builder: (FormFieldState<dynamic> field) {
6162
List<Widget> radioList = [];

‎lib/src/fields/form_builder_rate.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,12 @@ class _FormBuilderRateState extends State<FormBuilderRate> {
5656
}
5757
},
5858
onSaved: (val) {
59-
var transformed = val;
60-
if (widget.valueTransformer != null)
61-
transformed = widget.valueTransformer(val);
62-
FormBuilder.of(context)
63-
?.setAttributeValue(widget.attribute, transformed);
59+
if (widget.valueTransformer != null) {
60+
var transformed = widget.valueTransformer(val);
61+
FormBuilder.of(context)
62+
?.setAttributeValue(widget.attribute, transformed);
63+
} else
64+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
6465
},
6566
builder: (FormFieldState<dynamic> field) {
6667
return InputDecorator(

‎lib/src/fields/form_builder_segmented_control.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@ class _FormBuilderSegmentedControlState
5454
}
5555
},
5656
onSaved: (val) {
57-
var transformed = val;
58-
if (widget.valueTransformer != null)
59-
transformed = widget.valueTransformer(val);
60-
FormBuilder.of(context)
61-
?.setAttributeValue(widget.attribute, transformed);
57+
if (widget.valueTransformer != null) {
58+
var transformed = widget.valueTransformer(val);
59+
FormBuilder.of(context)
60+
?.setAttributeValue(widget.attribute, transformed);
61+
} else
62+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
6263
},
6364
builder: (FormFieldState<dynamic> field) {
6465
return InputDecorator(

‎lib/src/fields/form_builder_signature_pad.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ class _FormBuilderSignaturePadState extends State<FormBuilderSignaturePad> {
7272
}
7373
},
7474
onSaved: (val) {
75-
var transformed = val;
76-
if (widget.valueTransformer != null)
77-
transformed = widget.valueTransformer(val);
78-
FormBuilder.of(context)
79-
?.setAttributeValue(widget.attribute, transformed);
75+
if (widget.valueTransformer != null) {
76+
var transformed = widget.valueTransformer(val);
77+
FormBuilder.of(context)
78+
?.setAttributeValue(widget.attribute, transformed);
79+
} else
80+
FormBuilder.of(context)?.setAttributeValue(widget.attribute, val);
8081
},
8182
builder: (FormFieldState<dynamic> field) {
8283
return InputDecorator(

0 commit comments

Comments
 (0)