Merge pull request #538 from awhitford/decoration

awhitford · web-flow · commit c8cf6eb9a9f0 · 2020-11-05T03:43:37.000-08:00
Refactored the decoration logic.
diff --git a/lib/src/fields/form_builder_checkbox.dart b/lib/src/fields/form_builder_checkbox.dart
@@ -107,10 +107,7 @@ class FormBuilderCheckbox extends FormBuilderField<bool> {
             final _FormBuilderCheckboxState state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: CheckboxListTile(
                 dense: true,
                 isThreeLine: false,
diff --git a/lib/src/fields/form_builder_checkbox_group.dart b/lib/src/fields/form_builder_checkbox_group.dart
@@ -76,10 +76,7 @@ class FormBuilderCheckboxGroup<T> extends FormBuilderField<List<T>> {
             final _FormBuilderCheckboxGroupState<T> state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? state.errorText,
-              ),
+              decoration: state.decoration(),
               child: GroupedCheckbox<T>(
                 orientation: orientation,
                 value: state.value,
diff --git a/lib/src/fields/form_builder_chips_input.dart b/lib/src/fields/form_builder_chips_input.dart
@@ -74,11 +74,8 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
             return ChipsInput<T>(
               key: ObjectKey(state.value),
               initialValue: field.value,
-              enabled: !state.readOnly,
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              enabled: enabled,
+              decoration: state.decoration(),
               findSuggestions: findSuggestions,
               onChanged: (data) {
                 field.didChange(data);
diff --git a/lib/src/fields/form_builder_choice_chips.dart b/lib/src/fields/form_builder_choice_chips.dart
@@ -293,10 +293,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
               final _FormBuilderChoiceChipState<T> state = field;
 
               return InputDecorator(
-                decoration: decoration.copyWith(
-                  enabled: !state.readOnly,
-                  errorText: decoration?.errorText ?? field.errorText,
-                ),
+                decoration: state.decoration(),
                 child: Wrap(
                   direction: direction,
                   alignment: alignment,
diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -127,28 +127,26 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
             final _FormBuilderColorPickerFieldState state = field;
             return TextField(
               style: style,
-              decoration: decoration.copyWith(
-                errorText: decoration?.errorText ?? field.errorText,
-                enabled: !state.readOnly,
-                suffixIcon: LayoutBuilder(
-                  key: ObjectKey(state.value),
-                  builder: (context, constraints) {
-                    return Container(
+              decoration: state.decoration().copyWith(
+                    suffixIcon: LayoutBuilder(
                       key: ObjectKey(state.value),
-                      height: constraints.minHeight,
-                      width: constraints.minHeight,
-                      decoration: BoxDecoration(
-                        color: state.value,
-                        shape: BoxShape.circle,
-                        border: Border.all(
-                          color: Colors.black,
-                        ),
-                      ),
-                    );
-                  },
-                ),
-              ),
-              enabled: !state.readOnly,
+                      builder: (context, constraints) {
+                        return Container(
+                          key: ObjectKey(state.value),
+                          height: constraints.minHeight,
+                          width: constraints.minHeight,
+                          decoration: BoxDecoration(
+                            color: state.value,
+                            shape: BoxShape.circle,
+                            border: Border.all(
+                              color: Colors.black,
+                            ),
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+              enabled: enabled,
               readOnly: state.readOnly,
               controller: state._effectiveController,
               focusNode: state.effectiveFocusNode,
diff --git a/lib/src/fields/form_builder_date_range_picker.dart b/lib/src/fields/form_builder_date_range_picker.dart
@@ -138,10 +138,7 @@ class FormBuilderDateRangePicker extends FormBuilderField<List<DateTime>> {
               focusNode: state.readOnly
                   ? AlwaysDisabledFocusNode()
                   : state.effectiveFocusNode,
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              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
@@ -248,10 +248,7 @@ class FormBuilderDateTimePicker extends FormBuilderField<DateTime> {
               textAlign: textAlign,
               maxLength: maxLength,
               autofocus: autofocus,
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               readOnly: true,
               enabled: state.readOnly ? false : enabled,
               autocorrect: autocorrect,
diff --git a/lib/src/fields/form_builder_dropdown.dart b/lib/src/fields/form_builder_dropdown.dart
@@ -232,13 +232,11 @@ class FormBuilderDropdown<T> extends FormBuilderField<T> {
             // TextFormField
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-                floatingLabelBehavior: hint == null
-                    ? decoration.floatingLabelBehavior
-                    : FloatingLabelBehavior.always,
-              ),
+              decoration: state.decoration().copyWith(
+                    floatingLabelBehavior: hint == null
+                        ? decoration.floatingLabelBehavior
+                        : FloatingLabelBehavior.always,
+                  ),
               isEmpty: state.value == null,
               child: Row(
                 children: <Widget>[
diff --git a/lib/src/fields/form_builder_file_picker.dart b/lib/src/fields/form_builder_file_picker.dart
@@ -83,10 +83,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
             final _FormBuilderFilePickerState state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: Column(
                 children: <Widget>[
                   Row(
diff --git a/lib/src/fields/form_builder_filter_chips.dart b/lib/src/fields/form_builder_filter_chips.dart
@@ -92,9 +92,7 @@ class FormBuilderFilterChip<T> extends FormBuilderField<List<T>> {
           builder: (FormFieldState<List<T>> field) {
             final _FormBuilderFilterChipState<T> state = field;
             return InputDecorator(
-              decoration: decoration.copyWith(
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: Wrap(
                 direction: direction,
                 alignment: alignment,
diff --git a/lib/src/fields/form_builder_image_picker.dart b/lib/src/fields/form_builder_image_picker.dart
@@ -91,10 +91,7 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
             final primaryColor = theme.primaryColor;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: Container(
                 height: previewHeight,
                 child: ListView(
diff --git a/lib/src/fields/form_builder_location_field.dart b/lib/src/fields/form_builder_location_field.dart
@@ -235,11 +235,9 @@ class FormBuilderLocationField extends FormBuilderField<CameraPosition> {
               children: [
                 Expanded(
                   child: TextField(
-                    decoration: decoration.copyWith(
-                      errorText: decoration?.errorText ?? field.errorText,
-                      enabled: !state.readOnly,
-                    ),
-                    enabled: !state.readOnly,
+                    decoration: state.decoration(),
+                    enabled: enabled,
+                    // Setting readOnly to be true hides the keyboard
                     readOnly: true,
                     controller: state.effectiveController,
                     focusNode: state.effectiveFocusNode,
diff --git a/lib/src/fields/form_builder_phone_field.dart b/lib/src/fields/form_builder_phone_field.dart
@@ -126,10 +126,7 @@ class FormBuilderPhoneField extends FormBuilderField<String> {
             final _FormBuilderPhoneFieldState state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: Row(
                 children: <Widget>[
                   GestureDetector(
diff --git a/lib/src/fields/form_builder_radio_group.dart b/lib/src/fields/form_builder_radio_group.dart
@@ -73,10 +73,7 @@ class FormBuilderRadioGroup<T> extends FormBuilderField<T> {
             final _FormBuilderRadioGroupState<T> state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? state.errorText,
-              ),
+              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
@@ -150,10 +150,7 @@ class FormBuilderRangeSlider extends FormBuilderField<RangeValues> {
               final _numberFormat = numberFormat ?? NumberFormat.compact();
 
               return InputDecorator(
-                decoration: decoration.copyWith(
-                  enabled: !state.readOnly,
-                  errorText: decoration?.errorText ?? field.errorText,
-                ),
+                decoration: state.decoration(),
                 child: Container(
                   padding: const EdgeInsets.only(top: 10.0),
                   child: Column(
diff --git a/lib/src/fields/form_builder_rating.dart b/lib/src/fields/form_builder_rating.dart
@@ -73,10 +73,7 @@ class FormBuilderRating extends FormBuilderField<double> {
             final _FormBuilderRateState state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: _buildRatingBar(state),
             );
           },
diff --git a/lib/src/fields/form_builder_searchable_dropdown.dart b/lib/src/fields/form_builder_searchable_dropdown.dart
@@ -162,9 +162,7 @@ class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
             final _FormBuilderSearchableDropdownState<T> state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: dropdown_search.DropdownSearch<T>(
                 items: items,
                 maxHeight: 300,
diff --git a/lib/src/fields/form_builder_segmented_control.dart b/lib/src/fields/form_builder_segmented_control.dart
@@ -74,10 +74,7 @@ class FormBuilderSegmentedControl<T> extends FormBuilderField<T> {
             final theme = Theme.of(state.context);
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: Padding(
                 padding: const EdgeInsets.only(top: 10.0),
                 child: CupertinoSegmentedControl<T>(
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -66,10 +66,7 @@ class FormBuilderSignaturePad extends FormBuilderField<Uint8List> {
             final localizations = MaterialLocalizations.of(state.context);
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: Column(
                 children: <Widget>[
                   Container(
diff --git a/lib/src/fields/form_builder_slider.dart b/lib/src/fields/form_builder_slider.dart
@@ -175,10 +175,7 @@ class FormBuilderSlider extends FormBuilderField<double> {
             final _FormBuilderSliderState state = field;
             final _numberFormat = numberFormat ?? NumberFormat.compact();
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              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
@@ -125,9 +125,7 @@ class FormBuilderSwitch extends FormBuilderField<bool> {
             final _FormBuilderSwitchState state = field;
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              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
@@ -398,9 +398,7 @@ class FormBuilderTextField extends FormBuilderField<String> {
             return TextField(
               controller: state._effectiveController,
               focusNode: state.effectiveFocusNode,
-              decoration: decoration.copyWith(
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               keyboardType: keyboardType,
               textInputAction: textInputAction,
               style: style,
diff --git a/lib/src/fields/form_builder_touch_spin.dart b/lib/src/fields/form_builder_touch_spin.dart
@@ -87,10 +87,7 @@ class FormBuilderTouchSpin extends FormBuilderField<double> {
             final theme = Theme.of(state.context);
 
             return InputDecorator(
-              decoration: decoration.copyWith(
-                enabled: !state.readOnly,
-                errorText: decoration?.errorText ?? field.errorText,
-              ),
+              decoration: state.decoration(),
               child: TouchSpin(
                 key: ObjectKey(state.value),
                 min: min,
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
@@ -324,10 +324,7 @@ class FormBuilderTypeAhead<T> extends FormBuilderField<T> {
                       )
                     : textFieldConfiguration.style,
                 focusNode: state.effectiveFocusNode,
-                decoration: decoration.copyWith(
-                  enabled: !state.readOnly,
-                  errorText: decoration?.errorText ?? field.errorText,
-                ),
+                decoration: state.decoration(),
               ),
               suggestionsCallback: suggestionsCallback,
               itemBuilder: itemBuilder,
diff --git a/lib/src/form_builder_field.dart b/lib/src/form_builder_field.dart
@@ -177,4 +177,8 @@ abstract class FormBuilderFieldState<F extends FormBuilderField<T>, T>
   void patchValue(T value) {
     didChange(value);
   }
+
+  InputDecoration decoration() => widget.decoration.copyWith(
+        errorText: widget.decoration?.errorText ?? errorText,
+      );
 }
