@@ -76,15 +76,19 @@ class FormBuilderField<T> extends FormField<T> {
76
76
FormBuilderFieldState <T > createState () => FormBuilderFieldState ();
77
77
}
78
78
79
- class FormBuilderFieldState <T > extends FormFieldState <T > with AfterInitMixin {
79
+ class FormBuilderFieldState <T > extends FormFieldState <T > with AfterInitMixin {
80
80
@override
81
81
FormBuilderField <T > get widget => super .widget;
82
82
83
83
FormBuilderState get formState => _formBuilderState;
84
84
85
- bool get readOnly => _readOnly ;
85
+ bool get readOnly => _formBuilderState ? .readOnly == true || widget.readOnly ;
86
86
87
- T get initialValue => _initialValue;
87
+ T get initialValue =>
88
+ widget.initialValue ??
89
+ ((_formBuilderState? .initialValue? .containsKey (widget.name) ?? false )
90
+ ? _formBuilderState.initialValue[widget.name]
91
+ : null );
88
92
89
93
FormBuilderState _formBuilderState;
90
94
@@ -94,12 +98,8 @@ class FormBuilderFieldState<T> extends FormFieldState<T> with AfterInitMixin{
94
98
@override
95
99
bool get isValid => super .isValid && widget.decoration? .errorText == null ;
96
100
97
- bool _readOnly = false ;
98
-
99
101
bool _touched = false ;
100
102
101
- T _initialValue;
102
-
103
103
FocusNode _focusNode;
104
104
105
105
FocusNode get effectiveFocusNode =>
@@ -109,13 +109,8 @@ class FormBuilderFieldState<T> extends FormFieldState<T> with AfterInitMixin{
109
109
void didInitState () {
110
110
_formBuilderState = FormBuilder .of (context);
111
111
_formBuilderState? .registerField (widget.name, this );
112
- _readOnly = _formBuilderState? .readOnly == true || widget.readOnly;
113
- _initialValue = widget.initialValue ??
114
- ((_formBuilderState? .initialValue? .containsKey (widget.name) ?? false )
115
- ? _formBuilderState.initialValue[widget.name]
116
- : null );
117
112
effectiveFocusNode.addListener (setTouchedHandler);
118
- setValue (_initialValue );
113
+ setValue (initialValue );
119
114
}
120
115
121
116
@override
0 commit comments