Skip to content

Commit 881d1d7

Browse files
feat: remove deprecated code
1 parent 3c663fd commit 881d1d7

8 files changed

+28
-46
lines changed

example/lib/minimal_code_example.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class _ExamplePageState extends State<_ExamplePage> {
4444
key: _formKey,
4545
child: Column(
4646
children: [
47-
FormBuilderFilterChip<String>(
47+
FormBuilderFilterChips<String>(
4848
decoration: const InputDecoration(
4949
labelText: 'The language of my people',
5050
enabled: false,

example/lib/sources/complete_form.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class _CompleteFormState extends State<CompleteForm> {
252252
FormBuilderValidators.maxLength(3),
253253
]),
254254
),
255-
FormBuilderFilterChip<String>(
255+
FormBuilderFilterChips<String>(
256256
autovalidateMode: AutovalidateMode.onUserInteraction,
257257
decoration: const InputDecoration(
258258
labelText: 'The language of my people'),
@@ -286,7 +286,7 @@ class _CompleteFormState extends State<CompleteForm> {
286286
FormBuilderValidators.maxLength(3),
287287
]),
288288
),
289-
FormBuilderChoiceChip<String>(
289+
FormBuilderChoiceChips<String>(
290290
autovalidateMode: AutovalidateMode.onUserInteraction,
291291
decoration: const InputDecoration(
292292
labelText:

lib/src/fields/form_builder_choice_chips.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_form_builder/flutter_form_builder.dart';
33

44
/// A list of `Chip`s that acts like radio buttons
5-
class FormBuilderChoiceChip<T> extends FormBuilderFieldDecoration<T> {
5+
class FormBuilderChoiceChips<T> extends FormBuilderFieldDecoration<T> {
66
/// The list of items the user can select.
77
final List<FormBuilderChipOption<T>> options;
88

@@ -344,7 +344,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderFieldDecoration<T> {
344344
final String? tooltip;
345345

346346
/// Creates a list of `Chip`s that acts like radio buttons
347-
FormBuilderChoiceChip({
347+
FormBuilderChoiceChips({
348348
super.autovalidateMode = AutovalidateMode.disabled,
349349
super.enabled,
350350
super.focusNode,
@@ -457,12 +457,12 @@ class FormBuilderChoiceChip<T> extends FormBuilderFieldDecoration<T> {
457457
});
458458

459459
@override
460-
FormBuilderFieldDecorationState<FormBuilderChoiceChip<T>, T> createState() =>
460+
FormBuilderFieldDecorationState<FormBuilderChoiceChips<T>, T> createState() =>
461461
_FormBuilderChoiceChipState<T>();
462462
}
463463

464464
class _FormBuilderChoiceChipState<T>
465-
extends FormBuilderFieldDecorationState<FormBuilderChoiceChip<T>, T> {
465+
extends FormBuilderFieldDecorationState<FormBuilderChoiceChips<T>, T> {
466466
void handleFocusChange() {
467467
setState(() {});
468468
}

lib/src/fields/form_builder_date_time_picker.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
4040
/// to noon. Explicitly set this to `null` to use the current time.
4141
final TimeOfDay initialTime;
4242

43-
@Deprecated(
44-
'This property is no used anymore. Please use decoration.suffixIcon to set your desired icon')
45-
final Widget? resetIcon;
46-
4743
/// Called when an enclosing form is saved. The value passed will be `null`
4844
/// if [format] fails to parse the text.
4945
// final FormFieldSetter<DateTime> onSaved;
@@ -146,7 +142,6 @@ class FormBuilderDateTimePicker extends FormBuilderFieldDecoration<DateTime> {
146142
this.scrollPadding = const EdgeInsets.all(20.0),
147143
this.cursorWidth = 2.0,
148144
this.enableInteractiveSelection = true,
149-
this.resetIcon = const Icon(Icons.close),
150145
this.initialTime = const TimeOfDay(hour: 12, minute: 0),
151146
this.keyboardType,
152147
this.textAlign = TextAlign.start,

lib/src/fields/form_builder_filter_chips.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
33
import 'package:flutter_form_builder/flutter_form_builder.dart';
44

55
/// Field with chips that acts like a list checkboxes.
6-
class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
6+
class FormBuilderFilterChips<T> extends FormBuilderFieldDecoration<List<T>> {
77
//TODO: Add documentation
88
final Color? backgroundColor;
99
final Color? disabledColor;
@@ -35,7 +35,7 @@ class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
3535
final ShapeBorder avatarBorder;
3636

3737
/// Creates field with chips that acts like a list checkboxes.
38-
FormBuilderFilterChip({
38+
FormBuilderFilterChips({
3939
super.autovalidateMode = AutovalidateMode.disabled,
4040
super.enabled,
4141
super.focusNode,
@@ -59,7 +59,7 @@ class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
5959
this.labelPadding,
6060
this.labelStyle,
6161
this.materialTapTargetSize,
62-
this.maxChips,
62+
@Deprecated('Useless property. Please remove it.') this.maxChips,
6363
this.padding,
6464
this.pressElevation,
6565
this.runAlignment = WrapAlignment.start,
@@ -143,9 +143,9 @@ class FormBuilderFilterChip<T> extends FormBuilderFieldDecoration<List<T>> {
143143
);
144144

145145
@override
146-
FormBuilderFieldDecorationState<FormBuilderFilterChip<T>, List<T>>
146+
FormBuilderFieldDecorationState<FormBuilderFilterChips<T>, List<T>>
147147
createState() => _FormBuilderFilterChipState<T>();
148148
}
149149

150150
class _FormBuilderFilterChipState<T> extends FormBuilderFieldDecorationState<
151-
FormBuilderFilterChip<T>, List<T>> {}
151+
FormBuilderFilterChips<T>, List<T>> {}

lib/src/form_builder.dart

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ class FormBuilder extends StatefulWidget {
1010
/// will rebuild.
1111
final VoidCallback? onChanged;
1212

13-
/// DEPRECATED: Use [onPopInvokedWithResult] instead.
14-
final void Function(bool)? onPopInvoked;
15-
1613
/// {@macro flutter.widgets.navigator.onPopInvokedWithResult}
1714
///
1815
/// {@tool dartpad}
@@ -105,11 +102,6 @@ class FormBuilder extends StatefulWidget {
105102
required this.child,
106103
this.onChanged,
107104
this.autovalidateMode,
108-
@Deprecated(
109-
'Use onPopInvokedWithResult instead. '
110-
'This feature was deprecated after v3.22.0-12.0.pre.',
111-
)
112-
this.onPopInvoked,
113105
this.onPopInvokedWithResult,
114106
this.initialValue = const <String, dynamic>{},
115107
this.skipDisabled = false,
@@ -143,6 +135,7 @@ class FormBuilderState extends State<FormBuilder> {
143135
/// Only used to internal logic
144136
bool get focusOnInvalid => _focusOnInvalid;
145137

138+
/// Get if form is enabled
146139
bool get enabled => widget.enabled;
147140

148141
/// Verify if all fields on form are valid.
@@ -171,6 +164,7 @@ class FormBuilderState extends State<FormBuilder> {
171164
/// Get all fields of form.
172165
FormBuilderFields get fields => _fields;
173166

167+
/// Get all fields values of form.
174168
Map<String, dynamic> get instantValue => Map<String, dynamic>.unmodifiable(
175169
_instantValue.map(
176170
(key, value) => MapEntry(
@@ -204,15 +198,18 @@ class FormBuilderState extends State<FormBuilder> {
204198
initialValue[name];
205199
}
206200

201+
/// Get a field value by name
207202
void setInternalFieldValue<T>(String name, T? value) {
208203
_instantValue[name] = value;
209204
widget.onChanged?.call();
210205
}
211206

207+
/// Remove a field value by name
212208
void removeInternalFieldValue(String name) {
213209
_instantValue.remove(name);
214210
}
215211

212+
/// Register a field on form
216213
void registerField(String name, FormBuilderFieldState field) {
217214
// Each field must have a unique name. Ideally we could simply:
218215
// assert(!_fields.containsKey(name));
@@ -242,6 +239,7 @@ class FormBuilderState extends State<FormBuilder> {
242239
);
243240
}
244241

242+
/// Unregister a field on form
245243
void unregisterField(String name, FormBuilderFieldState field) {
246244
assert(
247245
_fields.containsKey(name),
@@ -270,23 +268,14 @@ class FormBuilderState extends State<FormBuilder> {
270268
}
271269
}
272270

271+
/// Save form values
273272
void save() {
274273
_formKey.currentState!.save();
275274
// Copy values from instant to saved
276275
_savedValue.clear();
277276
_savedValue.addAll(_instantValue);
278277
}
279278

280-
@Deprecated(
281-
'Will be remove to avoid redundancy. Use fields[name]?.invalidate(errorText) instead')
282-
void invalidateField({required String name, String? errorText}) =>
283-
fields[name]?.invalidate(errorText ?? '');
284-
285-
@Deprecated(
286-
'Will be remove to avoid redundancy. Use fields.first.invalidate(errorText) instead')
287-
void invalidateFirstField({required String errorText}) =>
288-
fields.values.first.invalidate(errorText);
289-
290279
/// Validate all fields of form
291280
///
292281
/// Focus to first invalid field when has field invalid, if [focusOnInvalid] is `true`.
@@ -343,7 +332,7 @@ class FormBuilderState extends State<FormBuilder> {
343332
);
344333
}
345334

346-
/// Reset form to `initialValue`
335+
/// Reset form to `initialValue` set on FormBuilder or on each field.
347336
void reset() {
348337
_formKey.currentState?.reset();
349338
}
@@ -376,8 +365,6 @@ class FormBuilderState extends State<FormBuilder> {
376365
key: _formKey,
377366
autovalidateMode: widget.autovalidateMode,
378367
onPopInvokedWithResult: widget.onPopInvokedWithResult,
379-
// ignore: deprecated_member_use
380-
onPopInvoked: widget.onPopInvoked,
381368
canPop: widget.canPop,
382369
// `onChanged` is called during setInternalFieldValue else will be called early
383370
child: _FormBuilderScope(

test/src/fields/form_builder_choice_chips_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void main() {
1111
testWidgets('basic', (WidgetTester tester) async {
1212
const widgetName = 'cc1';
1313

14-
final testWidget = FormBuilderChoiceChip<int>(
14+
final testWidget = FormBuilderChoiceChips<int>(
1515
name: widgetName,
1616
options: const [
1717
FormBuilderChipOption(key: ValueKey('1'), value: 1),
@@ -37,7 +37,7 @@ void main() {
3737
testWidgets('to FormBuilder', (WidgetTester tester) async {
3838
const widgetName = 'cc2';
3939

40-
final testWidget = FormBuilderChoiceChip<int>(
40+
final testWidget = FormBuilderChoiceChips<int>(
4141
name: widgetName,
4242
options: const [
4343
FormBuilderChipOption(key: ValueKey('1'), value: 1),
@@ -62,7 +62,7 @@ void main() {
6262
testWidgets('to Widget', (WidgetTester tester) async {
6363
const widgetName = 'cc3';
6464

65-
final testWidget = FormBuilderChoiceChip<int>(
65+
final testWidget = FormBuilderChoiceChips<int>(
6666
name: widgetName,
6767
initialValue: 1,
6868
options: const [
@@ -87,7 +87,7 @@ void main() {
8787
testWidgets('When press tab, field will be focused',
8888
(WidgetTester tester) async {
8989
const widgetName = 'cb1';
90-
final testWidget = FormBuilderChoiceChip<int>(
90+
final testWidget = FormBuilderChoiceChips<int>(
9191
name: widgetName,
9292
options: const [
9393
FormBuilderChipOption(key: ValueKey('1'), value: 1),

test/src/fields/form_builder_filter_chips_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void main() {
1010
testWidgets('basic', (WidgetTester tester) async {
1111
const widgetName = 'formBuilderFilterChip';
1212

13-
final testWidget = FormBuilderFilterChip<int>(
13+
final testWidget = FormBuilderFilterChips<int>(
1414
name: widgetName,
1515
options: const [
1616
FormBuilderChipOption(key: ValueKey('1'), value: 1),
@@ -35,7 +35,7 @@ void main() {
3535
testWidgets('to FormBuilder', (WidgetTester tester) async {
3636
const widgetName = 'fc2';
3737

38-
final testWidget = FormBuilderFilterChip<int>(
38+
final testWidget = FormBuilderFilterChips<int>(
3939
name: widgetName,
4040
options: const [
4141
FormBuilderChipOption(key: ValueKey('1'), value: 1),
@@ -66,7 +66,7 @@ void main() {
6666
testWidgets('to Widget', (WidgetTester tester) async {
6767
const widgetName = 'fc3';
6868

69-
final testWidget = FormBuilderFilterChip<int>(
69+
final testWidget = FormBuilderFilterChips<int>(
7070
name: widgetName,
7171
initialValue: const [1],
7272
options: const [
@@ -95,7 +95,7 @@ void main() {
9595
testWidgets('When press tab, field will be focused',
9696
(WidgetTester tester) async {
9797
const widgetName = 'key';
98-
final testWidget = FormBuilderFilterChip<int>(
98+
final testWidget = FormBuilderFilterChips<int>(
9999
name: widgetName,
100100
options: const [
101101
FormBuilderChipOption(key: ValueKey('1'), value: 1),

0 commit comments

Comments
 (0)