@@ -127,8 +127,7 @@ class FormBuilderTextField extends FormBuilderField {
127
127
assert (enableInteractiveSelection != null ),
128
128
super (
129
129
key: key,
130
- initialValue:
131
- controller != null ? controller.text : (initialValue ?? '' ),
130
+ initialValue: controller != null ? controller.text : initialValue,
132
131
attribute: attribute,
133
132
validator: validator,
134
133
valueTransformer: valueTransformer,
@@ -165,7 +164,6 @@ class FormBuilderTextField extends FormBuilderField {
165
164
textDirection: textDirection,
166
165
textCapitalization: textCapitalization,
167
166
autofocus: autofocus,
168
- // toolbarOptions: toolbarOptions,
169
167
readOnly: readOnly,
170
168
showCursor: showCursor,
171
169
obscureText: obscureText,
@@ -207,7 +205,7 @@ class FormBuilderTextField extends FormBuilderField {
207
205
208
206
class _FormBuilderTextFieldState extends FormBuilderFieldState {
209
207
@override
210
- FormBuilderTextField get widget => super .widget;
208
+ FormBuilderTextField get widget => super .widget as FormBuilderTextField ;
211
209
212
210
TextEditingController get _effectiveController =>
213
211
widget.controller ?? _controller;
@@ -218,7 +216,7 @@ class _FormBuilderTextFieldState extends FormBuilderFieldState {
218
216
void initState () {
219
217
super .initState ();
220
218
if (widget.controller == null ) {
221
- _controller = TextEditingController (text: widget. initialValue);
219
+ _controller = TextEditingController (text: initialValue);
222
220
} else {
223
221
widget.controller.addListener (_handleControllerChanged);
224
222
}
@@ -245,14 +243,15 @@ class _FormBuilderTextFieldState extends FormBuilderFieldState {
245
243
@override
246
244
void dispose () {
247
245
widget.controller? .removeListener (_handleControllerChanged);
246
+ _controller? .dispose ();
248
247
super .dispose ();
249
248
}
250
249
251
250
@override
252
251
void reset () {
253
252
super .reset ();
254
253
setState (() {
255
- _effectiveController.text = widget. initialValue ?? '' ;
254
+ _effectiveController.text = initialValue ?? '' ;
256
255
});
257
256
}
258
257
0 commit comments