Skip to content

Commit 2cf87cc

Browse files
committed
chore(core): release flutter_form_builder v7.2.0
1 parent c5addf0 commit 2cf87cc

17 files changed

+70
-62
lines changed

packages/flutter_form_builder/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [7.2.0] - 19-May-2022
2+
* Added new dropdown attributes: borderRadius, enableFeedback, alignment. Fixes #1011
3+
* Added more date picker and time picker options
4+
* Made itemHeight attribute of FormBuilderDropdown nullable. Fixes #1015
5+
* Resolved 'Null check operator used on a null value' bug in RangeSlider. Fixes #990
6+
17
## [7.1.1] - 17-Feb-2022
28
* More improvements to focus handling
39
* Other minor fixes

packages/flutter_form_builder/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
sdk: flutter
1919

2020
dev_dependencies:
21-
flutter_lints: ^1.0.4
21+
flutter_lints: ^2.0.1
2222
flutter_test:
2323
sdk: flutter
2424

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
112112
decoration: decoration,
113113
focusNode: focusNode,
114114
builder: (FormFieldState<bool?> field) {
115-
final state = field as _FormBuilderCheckboxState;
115+
final state = field as FormBuilderCheckboxState;
116116

117117
return InputDecorator(
118118
decoration: state.decoration,
@@ -144,8 +144,8 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
144144
);
145145

146146
@override
147-
_FormBuilderCheckboxState createState() => _FormBuilderCheckboxState();
147+
FormBuilderCheckboxState createState() => FormBuilderCheckboxState();
148148
}
149149

150-
class _FormBuilderCheckboxState
150+
class FormBuilderCheckboxState
151151
extends FormBuilderFieldState<FormBuilderCheckbox, bool> {}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
7474
decoration: decoration,
7575
focusNode: focusNode,
7676
builder: (FormFieldState<List<T>?> field) {
77-
final state = field as _FormBuilderCheckboxGroupState<T>;
77+
final state = field as FormBuilderCheckboxGroupState<T>;
7878

7979
return InputDecorator(
8080
decoration: state.decoration,
@@ -113,9 +113,9 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
113113
);
114114

115115
@override
116-
_FormBuilderCheckboxGroupState<T> createState() =>
117-
_FormBuilderCheckboxGroupState<T>();
116+
FormBuilderCheckboxGroupState<T> createState() =>
117+
FormBuilderCheckboxGroupState<T>();
118118
}
119119

120-
class _FormBuilderCheckboxGroupState<T>
120+
class FormBuilderCheckboxGroupState<T>
121121
extends FormBuilderFieldState<FormBuilderCheckboxGroup<T>, List<T>> {}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
292292
decoration: decoration,
293293
focusNode: focusNode,
294294
builder: (FormFieldState<T?> field) {
295-
final state = field as _FormBuilderChoiceChipState<T>;
295+
final state = field as FormBuilderChoiceChipState<T>;
296296

297297
return InputDecorator(
298298
decoration: state.decoration,
@@ -338,9 +338,9 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
338338
});
339339

340340
@override
341-
_FormBuilderChoiceChipState<T> createState() =>
342-
_FormBuilderChoiceChipState<T>();
341+
FormBuilderChoiceChipState<T> createState() =>
342+
FormBuilderChoiceChipState<T>();
343343
}
344344

345-
class _FormBuilderChoiceChipState<T>
345+
class FormBuilderChoiceChipState<T>
346346
extends FormBuilderFieldState<FormBuilderChoiceChip<T>, T> {}

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

+8-7
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
211211
decoration: decoration,
212212
focusNode: focusNode,
213213
builder: (FormFieldState<DateTime?> field) {
214-
final state = field as _FormBuilderDateTimePickerState;
214+
final state = field as FormBuilderDateTimePickerState;
215215

216216
return TextField(
217217
textDirection: textDirection,
@@ -249,11 +249,11 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
249249
);
250250

251251
@override
252-
_FormBuilderDateTimePickerState createState() =>
253-
_FormBuilderDateTimePickerState();
252+
FormBuilderDateTimePickerState createState() =>
253+
FormBuilderDateTimePickerState();
254254
}
255255

256-
class _FormBuilderDateTimePickerState
256+
class FormBuilderDateTimePickerState
257257
extends FormBuilderFieldState<FormBuilderDateTimePicker, DateTime> {
258258
late TextEditingController _textFieldController;
259259

@@ -316,6 +316,7 @@ class _FormBuilderDateTimePickerState
316316
case InputType.both:
317317
final date = await _showDatePicker(context, currentValue);
318318
if (date != null) {
319+
if(!mounted) break;
319320
final time = await _showTimePicker(context, currentValue);
320321
newValue = combine(date, time);
321322
}
@@ -385,8 +386,8 @@ class _FormBuilderDateTimePickerState
385386
time == null ? null : DateTime(1, 1, 1, time.hour, time.minute);
386387

387388
@override
388-
void didChange(DateTime? val) {
389-
super.didChange(val);
390-
_textFieldController.text = (val == null) ? '' : _dateFormat.format(val);
389+
void didChange(DateTime? value) {
390+
super.didChange(value);
391+
_textFieldController.text = (value == null) ? '' : _dateFormat.format(value);
391392
}
392393
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
278278
decoration: decoration,
279279
focusNode: focusNode,
280280
builder: (FormFieldState<T?> field) {
281-
final state = field as _FormBuilderDropdownState<T>;
281+
final state = field as FormBuilderDropdownState<T>;
282282
// DropdownButtonFormField
283283
// TextFormField
284284

@@ -350,8 +350,8 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
350350
);
351351

352352
@override
353-
_FormBuilderDropdownState<T> createState() => _FormBuilderDropdownState<T>();
353+
FormBuilderDropdownState<T> createState() => FormBuilderDropdownState<T>();
354354
}
355355

356-
class _FormBuilderDropdownState<T>
356+
class FormBuilderDropdownState<T>
357357
extends FormBuilderFieldState<FormBuilderDropdown<T>, T> {}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
8888
validator: validator,
8989
valueTransformer: valueTransformer,
9090
builder: (FormFieldState<List<T>?> field) {
91-
final state = field as _FormBuilderFilterChipState<T>;
91+
final state = field as FormBuilderFilterChipState<T>;
9292

9393
return InputDecorator(
9494
decoration: state.decoration,
@@ -145,9 +145,9 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
145145
);
146146

147147
@override
148-
_FormBuilderFilterChipState<T> createState() =>
149-
_FormBuilderFilterChipState<T>();
148+
FormBuilderFilterChipState<T> createState() =>
149+
FormBuilderFilterChipState<T>();
150150
}
151151

152-
class _FormBuilderFilterChipState<T>
152+
class FormBuilderFilterChipState<T>
153153
extends FormBuilderFieldState<FormBuilderFilterChip<T>, List<T>> {}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
6969
focusNode: focusNode,
7070
decoration: decoration,
7171
builder: (FormFieldState<T?> field) {
72-
final state = field as _FormBuilderRadioGroupState<T>;
72+
final state = field as FormBuilderRadioGroupState<T>;
7373

7474
return InputDecorator(
7575
decoration: state.decoration,
@@ -106,9 +106,9 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
106106
);
107107

108108
@override
109-
_FormBuilderRadioGroupState<T> createState() =>
110-
_FormBuilderRadioGroupState<T>();
109+
FormBuilderRadioGroupState<T> createState() =>
110+
FormBuilderRadioGroupState<T>();
111111
}
112112

113-
class _FormBuilderRadioGroupState<T>
113+
class FormBuilderRadioGroupState<T>
114114
extends FormBuilderFieldState<FormBuilderRadioGroup<T>, T> {}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
148148
decoration: decoration,
149149
focusNode: focusNode,
150150
builder: (FormFieldState<RangeValues?> field) {
151-
final state = field as _FormBuilderRangeSliderState;
152-
final _numberFormat = numberFormat ?? NumberFormat.compact();
151+
final state = field as FormBuilderRangeSliderState;
152+
final effectiveNumberFormat = numberFormat ?? NumberFormat.compact();
153153

154154
return InputDecorator(
155155
decoration: state.decoration,
@@ -183,21 +183,21 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
183183
if (displayValues != DisplayValues.none &&
184184
displayValues != DisplayValues.current)
185185
Text(
186-
_numberFormat.format(min),
186+
effectiveNumberFormat.format(min),
187187
style: minTextStyle ?? textStyle,
188188
),
189189
const Spacer(),
190190
if (displayValues != DisplayValues.none &&
191191
displayValues != DisplayValues.minMax)
192192
Text(
193-
'${_numberFormat.format(field.value!.start)} - ${_numberFormat.format(field.value!.end)}',
193+
'${effectiveNumberFormat.format(field.value!.start)} - ${effectiveNumberFormat.format(field.value!.end)}',
194194
style: textStyle,
195195
),
196196
const Spacer(),
197197
if (displayValues != DisplayValues.none &&
198198
displayValues != DisplayValues.current)
199199
Text(
200-
_numberFormat.format(max),
200+
effectiveNumberFormat.format(max),
201201
style: maxTextStyle ?? textStyle,
202202
),
203203
],
@@ -209,8 +209,8 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
209209
});
210210

211211
@override
212-
_FormBuilderRangeSliderState createState() => _FormBuilderRangeSliderState();
212+
FormBuilderRangeSliderState createState() => FormBuilderRangeSliderState();
213213
}
214214

215-
class _FormBuilderRangeSliderState
215+
class FormBuilderRangeSliderState
216216
extends FormBuilderFieldState<FormBuilderRangeSlider, RangeValues> {}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class FormBuilderSegmentedControl<T extends Object>
7575
decoration: decoration,
7676
focusNode: focusNode,
7777
builder: (FormFieldState<T?> field) {
78-
final state = field as _FormBuilderSegmentedControlState<T>;
78+
final state = field as FormBuilderSegmentedControlState<T>;
7979
final theme = Theme.of(state.context);
8080

8181
return InputDecorator(
@@ -119,9 +119,9 @@ class FormBuilderSegmentedControl<T extends Object>
119119
);
120120

121121
@override
122-
_FormBuilderSegmentedControlState<T> createState() =>
123-
_FormBuilderSegmentedControlState();
122+
FormBuilderSegmentedControlState<T> createState() =>
123+
FormBuilderSegmentedControlState();
124124
}
125125

126-
class _FormBuilderSegmentedControlState<T extends Object>
126+
class FormBuilderSegmentedControlState<T extends Object>
127127
extends FormBuilderFieldState<FormBuilderSegmentedControl<T>, T> {}

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

+8-7
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ class FormBuilderSlider extends FormBuilderField<double> {
175175
decoration: decoration,
176176
focusNode: focusNode,
177177
builder: (FormFieldState<double?> field) {
178-
final state = field as _FormBuilderSliderState;
179-
final _numberFormat = numberFormat ?? NumberFormat.compact();
178+
final state = field as FormBuilderSliderState;
179+
final effectiveNumberFormat = numberFormat ?? NumberFormat.compact();
180+
180181
return InputDecorator(
181182
decoration: state.decoration,
182183
child: Container(
@@ -212,21 +213,21 @@ class FormBuilderSlider extends FormBuilderField<double> {
212213
if (displayValues != DisplayValues.none &&
213214
displayValues != DisplayValues.current)
214215
Text(
215-
_numberFormat.format(min),
216+
effectiveNumberFormat.format(min),
216217
style: minTextStyle ?? textStyle,
217218
),
218219
const Spacer(),
219220
if (displayValues != DisplayValues.none &&
220221
displayValues != DisplayValues.minMax)
221222
Text(
222-
_numberFormat.format(field.value),
223+
effectiveNumberFormat.format(field.value),
223224
style: textStyle,
224225
),
225226
const Spacer(),
226227
if (displayValues != DisplayValues.none &&
227228
displayValues != DisplayValues.current)
228229
Text(
229-
_numberFormat.format(max),
230+
effectiveNumberFormat.format(max),
230231
style: maxTextStyle ?? textStyle,
231232
),
232233
],
@@ -239,8 +240,8 @@ class FormBuilderSlider extends FormBuilderField<double> {
239240
);
240241

241242
@override
242-
_FormBuilderSliderState createState() => _FormBuilderSliderState();
243+
FormBuilderSliderState createState() => FormBuilderSliderState();
243244
}
244245

245-
class _FormBuilderSliderState
246+
class FormBuilderSliderState
246247
extends FormBuilderFieldState<FormBuilderSlider, double> {}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class FormBuilderSwitch extends FormBuilderField<bool> {
124124
decoration: decoration,
125125
focusNode: focusNode,
126126
builder: (FormFieldState<bool?> field) {
127-
final state = field as _FormBuilderSwitchState;
127+
final state = field as FormBuilderSwitchState;
128128

129129
return InputDecorator(
130130
decoration: state.decoration,
@@ -159,8 +159,8 @@ class FormBuilderSwitch extends FormBuilderField<bool> {
159159
);
160160

161161
@override
162-
_FormBuilderSwitchState createState() => _FormBuilderSwitchState();
162+
FormBuilderSwitchState createState() => FormBuilderSwitchState();
163163
}
164164

165-
class _FormBuilderSwitchState
165+
class FormBuilderSwitchState
166166
extends FormBuilderFieldState<FormBuilderSwitch, bool> {}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ class FormBuilderTextField extends FormBuilderField<String> {
367367
decoration: decoration,
368368
focusNode: focusNode,
369369
builder: (FormFieldState<String?> field) {
370-
final state = field as _FormBuilderTextFieldState;
370+
final state = field as FormBuilderTextFieldState;
371371
/*final effectiveDecoration = (decoration ?? const InputDecoration())
372372
.applyDefaults(Theme.of(field.context).inputDecorationTheme);*/
373373

@@ -422,10 +422,10 @@ class FormBuilderTextField extends FormBuilderField<String> {
422422
);
423423

424424
@override
425-
_FormBuilderTextFieldState createState() => _FormBuilderTextFieldState();
425+
FormBuilderTextFieldState createState() => FormBuilderTextFieldState();
426426
}
427427

428-
class _FormBuilderTextFieldState
428+
class FormBuilderTextFieldState
429429
extends FormBuilderFieldState<FormBuilderTextField, String> {
430430
TextEditingController? get _effectiveController =>
431431
widget.controller ?? _controller;

packages/flutter_form_builder/lib/src/form_builder_field.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ class FormBuilderFieldState<F extends FormBuilderField<T>, T>
101101

102102
dynamic get transformedValue => widget.valueTransformer?.call(value) ?? value;
103103

104-
void registerTransformer(Map<String, Function> _map) {
105-
final _fun = widget.valueTransformer;
106-
if (_fun != null) {
107-
_map[widget.name] = _fun;
104+
void registerTransformer(Map<String, Function> map) {
105+
final fun = widget.valueTransformer;
106+
if (fun != null) {
107+
map[widget.name] = fun;
108108
}
109109
}
110110

packages/flutter_form_builder/lib/src/widgets/grouped_radio.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ class GroupedRadio<T> extends StatefulWidget {
196196
}) : super(key: key);
197197

198198
@override
199-
_GroupedRadioState<T> createState() => _GroupedRadioState<T>();
199+
GroupedRadioState<T> createState() => GroupedRadioState<T>();
200200
}
201201

202-
class _GroupedRadioState<T> extends State<GroupedRadio<T?>> {
202+
class GroupedRadioState<T> extends State<GroupedRadio<T?>> {
203203
@override
204204
Widget build(BuildContext context) {
205205
final widgetList = <Widget>[];

packages/flutter_form_builder/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_form_builder
22
description: This package helps in creation of forms in Flutter by removing the boilerplate code, reusing validation, react to changes, and collect final user input.
3-
version: 7.1.1
3+
version: 7.2.0
44
homepage: https://github.com/danvick/flutter_form_builder
55

66
environment:
@@ -13,6 +13,6 @@ dependencies:
1313
collection: ^1.15.0
1414

1515
dev_dependencies:
16-
flutter_lints: ^1.0.4
16+
flutter_lints: ^2.0.1
1717
flutter_test:
1818
sdk: flutter

0 commit comments

Comments
 (0)