Removed an unnecessary null guard around decoration.

awhitford · awhitford · commit abc0eff20994 · 2020-11-20T11:21:19.000-08:00
diff --git a/lib/src/form_builder_field.dart b/lib/src/form_builder_field.dart
@@ -97,7 +97,7 @@ abstract class FormBuilderFieldState<F extends FormBuilderField<T>, T>
 
   bool _touched = false;
 
-  bool get enabled =>  _formBuilderState?.enabled == false ? false : widget.enabled;
+  bool get enabled => widget.enabled && (_formBuilderState?.enabled ?? true);
 
   FocusNode _focusNode;
 
@@ -173,6 +173,6 @@ abstract class FormBuilderFieldState<F extends FormBuilderField<T>, T>
   }
 
   InputDecoration decoration() => widget.decoration.copyWith(
-        errorText: widget.decoration?.errorText ?? errorText,
+        errorText: widget.decoration.errorText ?? errorText,
       );
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ abstract class FormBuilderFieldState<F extends FormBuilderField<T>, T>`
`97`	`97`
`98`	`98`	`bool _touched = false;`
`99`	`99`
`100`		`- bool get enabled => _formBuilderState?.enabled == false ? false : widget.enabled;`
	`100`	`+ bool get enabled => widget.enabled && (_formBuilderState?.enabled ?? true);`
`101`	`101`
`102`	`102`	`FocusNode _focusNode;`
`103`	`103`
`@@ -173,6 +173,6 @@ abstract class FormBuilderFieldState<F extends FormBuilderField<T>, T>`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`InputDecoration decoration() => widget.decoration.copyWith(`
`176`		`- errorText: widget.decoration?.errorText ?? errorText,`
	`176`	`+ errorText: widget.decoration.errorText ?? errorText,`
`177`	`177`	`);`
`178`	`178`	`}`