Skip to content

Commit 7b5d33e

Browse files
authored
Merge pull request #331 from awhitford/null-safe
Tweaked code to leverage null-safe operator.
2 parents 99e1c1a + 7050d66 commit 7b5d33e

6 files changed

+8
-19
lines changed

lib/src/fields/form_builder_chips_choice.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,7 @@ class _FormBuilderChoiceChipState extends State<FormBuilderChoiceChip> {
148148
FocusScope.of(context).requestFocus(FocusNode());
149149
var choice = selected ? option.value : null;
150150
field.didChange(choice);
151-
if (widget.onChanged != null) {
152-
widget.onChanged(choice);
153-
}
151+
widget.onChanged?.call(choice);
154152
});
155153
},
156154
)

lib/src/fields/form_builder_chips_filter.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,7 @@ class _FormBuilderFilterChipState extends State<FormBuilderFilterChip> {
161161
}
162162

163163
field.didChange(currentValue);
164-
if (widget.onChanged != null) {
165-
widget.onChanged(currentValue);
166-
}
164+
widget.onChanged?.call(currentValue);
167165
},
168166
);
169167
},

lib/src/fields/form_builder_color_picker.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ class _FormBuilderColorPickerState extends State<FormBuilderColorPicker> {
130130
: null);
131131
_textEditingController =
132132
TextEditingController(text: HexColor(_initialValue)?.toHex());
133-
if (widget.focusNode != null) {
134-
widget.focusNode.addListener(_handleFocus);
135-
}
133+
widget.focusNode?.addListener(_handleFocus);
136134
_focusNode.addListener(_handleFocus);
137135
}
138136

lib/src/fields/form_builder_range_slider.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ class _FormBuilderRangeSliderState extends State<FormBuilderRangeSlider> {
118118
: (RangeValues values) {
119119
FocusScope.of(context).requestFocus(FocusNode());
120120
field.didChange(values);
121-
if (widget.onChanged != null) {
122-
widget.onChanged(values);
123-
}
121+
widget.onChanged?.call(values);
124122
},
125123
),
126124
Row(

lib/src/fields/form_builder_typeahead.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,9 @@ class _FormBuilderTypeAheadState<T> extends State<FormBuilderTypeAhead<T>> {
168168
_typeAheadController.text =
169169
widget.selectionToTextTransformer(suggestion);
170170
} else {
171-
_typeAheadController.text =
172-
suggestion != null ? suggestion.toString() : '';
173-
}
174-
if (widget.onSuggestionSelected != null) {
175-
widget.onSuggestionSelected(suggestion);
171+
_typeAheadController.text = suggestion?.toString() ?? '';
176172
}
173+
widget.onSuggestionSelected?.call(suggestion);
177174
widget.onChanged?.call(suggestion);
178175
},
179176
getImmediateSuggestions: widget.getImmediateSuggestions,

lib/src/form_builder_custom_field.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class FormBuilderCustomFieldState<T> extends State<FormBuilderCustomField<T>> {
6363
/*return widget.formField
6464
..onSaved = (T val) {
6565
_formState?.setValue(widget.attribute, val);
66-
if (widget.formField.onSaved != null) widget.formField.onSaved(val);
66+
widget.formField.onSaved?.call(val);
6767
}
6868
..validator = (val) {
6969
for (int i = 0; i < widget.validators.length; i++) {
@@ -78,7 +78,7 @@ class FormBuilderCustomFieldState<T> extends State<FormBuilderCustomField<T>> {
7878
child: FormField(
7979
key: _fieldKey,
8080
onSaved: (val) {
81-
if (widget.formField.onSaved != null) widget.formField.onSaved(val);
81+
widget.formField.onSaved?.call(val);
8282
if (widget.valueTransformer != null) {
8383
var transformed = widget.valueTransformer(val);
8484
FormBuilder.of(context)

0 commit comments

Comments
 (0)