chore: change decoration() in FormBuilderField to getter

danvick · danvick · commit 19b82a0daa22 · 2021-09-01T14:15:53.000+03:00
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -113,13 +113,13 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
             final state = field as _FormBuilderCheckboxState;
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: CheckboxListTile(
                 dense: true,
                 isThreeLine: false,
                 title: title,
                 subtitle: subtitle,
-                value: state.value,
+                value: state.value ?? false,
                 onChanged: state.enabled
                     ? (val) {
                         state.requestFocus();
diff --git a/lib/src/fields/form_builder_checkbox_group.dart b/lib/src/fields/form_builder_checkbox_group.dart
@@ -76,7 +76,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
             final state = field as _FormBuilderCheckboxGroupState<T>;
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: GroupedCheckbox<T>(
                 orientation: orientation,
                 value: state.value,
diff --git a/lib/src/fields/form_builder_choice_chips.dart b/lib/src/fields/form_builder_choice_chips.dart
@@ -293,7 +293,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
               final state = field as _FormBuilderChoiceChipState<T>;
 
               return InputDecorator(
-                decoration: state.decoration(),
+                decoration: state.decoration,
                 child: Wrap(
                   direction: direction,
                   alignment: alignment,
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -143,7 +143,7 @@ class FormBuilderDateRangePicker extends FormBuilderField<DateTimeRange> {
               enabled: state.enabled,
               style: style,
               focusNode: state.effectiveFocusNode,
-              decoration: state.decoration(),
+              decoration: state.decoration,
               // initialValue: "${_initialValue ?? ''}",
               maxLines: maxLines,
               keyboardType: keyboardType,
diff --git a/lib/src/fields/form_builder_date_time_picker.dart b/lib/src/fields/form_builder_date_time_picker.dart
@@ -214,7 +214,7 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
               textAlign: textAlign,
               maxLength: maxLength,
               autofocus: autofocus,
-              decoration: state.decoration(),
+              decoration: state.decoration,
               readOnly: true,
               enabled: state.enabled,
               autocorrect: autocorrect,
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -239,7 +239,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
             }
 
             return InputDecorator(
-              decoration: state.decoration().copyWith(
+              decoration: state.decoration.copyWith(
                     floatingLabelBehavior: hint == null
                         ? decoration.floatingLabelBehavior
                         : FloatingLabelBehavior.always,
diff --git a/lib/src/fields/form_builder_filter_chips.dart b/lib/src/fields/form_builder_filter_chips.dart
@@ -97,7 +97,7 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
           builder: (FormFieldState<List<T>?> field) {
             final state = field as _FormBuilderFilterChipState<T>;
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: Wrap(
                 direction: direction,
                 alignment: alignment,
diff --git a/lib/src/fields/form_builder_radio_group.dart b/lib/src/fields/form_builder_radio_group.dart
@@ -72,7 +72,7 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
             final state = field as _FormBuilderRadioGroupState<T>;
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: GroupedRadio<T>(
                 orientation: orientation,
                 value: state.value,
diff --git a/lib/src/fields/form_builder_range_slider.dart b/lib/src/fields/form_builder_range_slider.dart
@@ -151,7 +151,7 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
               final _numberFormat = numberFormat ?? NumberFormat.compact();
 
               return InputDecorator(
-                decoration: state.decoration(),
+                decoration: state.decoration,
                 child: Container(
                   padding: const EdgeInsets.only(top: 10.0),
                   child: Column(
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -76,7 +76,7 @@ class FormBuilderSegmentedControl<T extends Object>
             final theme = Theme.of(state.context);
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: Padding(
                 padding: const EdgeInsets.only(top: 10.0),
                 child: CupertinoSegmentedControl<T>(
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -176,7 +176,7 @@ class FormBuilderSlider extends FormBuilderField<double> {
             final state = field as _FormBuilderSliderState;
             final _numberFormat = numberFormat ?? NumberFormat.compact();
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: Container(
                 padding: const EdgeInsets.only(top: 10.0),
                 child: Column(
diff --git a/lib/src/fields/form_builder_switch.dart b/lib/src/fields/form_builder_switch.dart
@@ -126,7 +126,7 @@ class FormBuilderSwitch extends FormBuilderField<bool> {
             final state = field as _FormBuilderSwitchState;
 
             return InputDecorator(
-              decoration: state.decoration(),
+              decoration: state.decoration,
               child: SwitchListTile(
                 dense: true,
                 isThreeLine: false,
diff --git a/lib/src/fields/form_builder_text_field.dart b/lib/src/fields/form_builder_text_field.dart
@@ -376,7 +376,7 @@ class FormBuilderTextField extends FormBuilderField<String> {
             return TextField(
               controller: state._effectiveController,
               focusNode: state.effectiveFocusNode,
-              decoration: state.decoration(),
+              decoration: state.decoration,
               keyboardType: keyboardType,
               textInputAction: textInputAction,
               style: style,
diff --git a/lib/src/form_builder_field.dart b/lib/src/form_builder_field.dart
@@ -190,8 +190,7 @@ class FormBuilderFieldState<F extends FormBuilderField<T?>, T>
     requestFocus();
   }
 
-  //  FIXME: This  could be a getter instead of a classic function
-  InputDecoration decoration() => widget.decoration.copyWith(
+  InputDecoration get decoration => widget.decoration.copyWith(
       errorText: widget.decoration.errorText ?? errorText ?? _customErrorText,
     );
 }

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`return InputDecorator(`
`242`		`- decoration: state.decoration().copyWith(`
	`242`	`+ decoration: state.decoration.copyWith(`
`243`	`243`	`floatingLabelBehavior: hint == null`
`244`	`244`	`? decoration.floatingLabelBehavior`
`245`	`245`	`: FloatingLabelBehavior.always,`