@@ -125,9 +125,6 @@ class FormBuilderPhoneField extends StatefulWidget {
125
125
class FormBuilderPhoneFieldState extends State <FormBuilderPhoneField > {
126
126
bool _readOnly = false ;
127
127
TextEditingController _effectiveController = TextEditingController ();
128
- FocusNode _focusNode;
129
- FocusNode get _effectiveFocusNode =>
130
- widget.focusNode ?? (_focusNode ?? FocusNode ());
131
128
FormBuilderState _formState;
132
129
final GlobalKey <FormFieldState > _fieldKey = GlobalKey <FormFieldState >();
133
130
String _initialValue;
@@ -210,8 +207,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
210
207
return TextField (
211
208
enabled: ! _readOnly,
212
209
style: widget.style,
213
- focusNode:
214
- _readOnly ? AlwaysDisabledFocusNode () : _effectiveFocusNode,
210
+ focusNode: _readOnly ? AlwaysDisabledFocusNode () : widget.focusNode,
215
211
decoration: widget.decoration.copyWith (
216
212
enabled: ! _readOnly,
217
213
errorText: field.errorText,
@@ -255,7 +251,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
255
251
Widget _textFieldPrefix (field) {
256
252
return GestureDetector (
257
253
onTap: () {
258
- _effectiveFocusNode ? . requestFocus ();
254
+ FocusScope . of (context). requestFocus (FocusNode () );
259
255
if (widget.isCupertinoPicker) {
260
256
_openCupertinoCountryPicker (field);
261
257
} else {
@@ -333,7 +329,7 @@ class FormBuilderPhoneFieldState extends State<FormBuilderPhoneField> {
333
329
onValuePicked: (Country country) {
334
330
setState (() => _selectedDialogCountry = country);
335
331
_invokeChange (field);
336
- _effectiveFocusNode ? .requestFocus ();
332
+ widget.focusNode ? .requestFocus ();
337
333
},
338
334
itemFilter: widget.countryFilterByIsoCode != null
339
335
? (c) => widget.countryFilterByIsoCode.contains (c.isoCode)
0 commit comments