Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
9cda3092
Unverified
Commit
9cda3092
authored
Aug 02, 2023
by
Justin McCandless
Committed by
GitHub
Aug 02, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace TextField.canRequestFocus with TextField.focusNode.canRequestFocus (#130164)
Simplifying the TextField API.
parent
47b188ec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
11 deletions
+44
-11
dropdown_menu.dart
packages/flutter/lib/src/material/dropdown_menu.dart
+21
-2
text_field.dart
packages/flutter/lib/src/material/text_field.dart
+16
-4
dropdown_menu_test.dart
packages/flutter/test/material/dropdown_menu_test.dart
+3
-4
text_field_test.dart
packages/flutter/test/material/text_field_test.dart
+4
-1
No files found.
packages/flutter/lib/src/material/dropdown_menu.dart
View file @
9cda3092
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
import
'dart:math'
as
math
;
import
'dart:math'
as
math
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/rendering.dart'
;
import
'package:flutter/rendering.dart'
;
import
'package:flutter/services.dart'
;
import
'package:flutter/services.dart'
;
import
'package:flutter/widgets.dart'
;
import
'package:flutter/widgets.dart'
;
...
@@ -309,6 +310,7 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
...
@@ -309,6 +310,7 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
int
?
currentHighlight
;
int
?
currentHighlight
;
double
?
leadingPadding
;
double
?
leadingPadding
;
bool
_menuHasEnabledItem
=
false
;
bool
_menuHasEnabledItem
=
false
;
late
final
FocusNode
_focusNode
;
@override
@override
void
initState
()
{
void
initState
()
{
...
@@ -326,6 +328,18 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
...
@@ -326,6 +328,18 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
TextSelection
.
collapsed
(
offset:
_textEditingController
.
text
.
length
);
TextSelection
.
collapsed
(
offset:
_textEditingController
.
text
.
length
);
}
}
refreshLeadingPadding
();
refreshLeadingPadding
();
_focusNode
=
FocusNode
(
canRequestFocus:
canRequestFocus
(),
);
}
@override
void
didChangeDependencies
()
{
super
.
didChangeDependencies
();
final
bool
widgetCanRequestFocus
=
canRequestFocus
();
if
(
widgetCanRequestFocus
!=
_focusNode
.
canRequestFocus
)
{
_focusNode
.
canRequestFocus
=
widgetCanRequestFocus
;
}
}
}
@override
@override
...
@@ -353,6 +367,10 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
...
@@ -353,6 +367,10 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
TextSelection
.
collapsed
(
offset:
_textEditingController
.
text
.
length
);
TextSelection
.
collapsed
(
offset:
_textEditingController
.
text
.
length
);
}
}
}
}
final
bool
widgetCanRequestFocus
=
canRequestFocus
();
if
(
widgetCanRequestFocus
!=
_focusNode
.
canRequestFocus
)
{
_focusNode
.
canRequestFocus
=
widgetCanRequestFocus
;
}
}
}
bool
canRequestFocus
()
{
bool
canRequestFocus
()
{
...
@@ -360,7 +378,7 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
...
@@ -360,7 +378,7 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
return
widget
.
requestFocusOnTap
!;
return
widget
.
requestFocusOnTap
!;
}
}
switch
(
Theme
.
of
(
context
).
p
latform
)
{
switch
(
defaultTargetP
latform
)
{
case
TargetPlatform
.
iOS
:
case
TargetPlatform
.
iOS
:
case
TargetPlatform
.
android
:
case
TargetPlatform
.
android
:
case
TargetPlatform
.
fuchsia
:
case
TargetPlatform
.
fuchsia
:
...
@@ -592,7 +610,8 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
...
@@ -592,7 +610,8 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
final
Widget
textField
=
TextField
(
final
Widget
textField
=
TextField
(
key:
_anchorKey
,
key:
_anchorKey
,
mouseCursor:
effectiveMouseCursor
,
mouseCursor:
effectiveMouseCursor
,
canRequestFocus:
canRequestFocus
(),
focusNode:
_focusNode
,
readOnly:
!
canRequestFocus
(),
enableInteractiveSelection:
canRequestFocus
(),
enableInteractiveSelection:
canRequestFocus
(),
textAlignVertical:
TextAlignVertical
.
center
,
textAlignVertical:
TextAlignVertical
.
center
,
style:
effectiveTextStyle
,
style:
effectiveTextStyle
,
...
...
packages/flutter/lib/src/material/text_field.dart
View file @
9cda3092
...
@@ -314,6 +314,10 @@ class TextField extends StatefulWidget {
...
@@ -314,6 +314,10 @@ class TextField extends StatefulWidget {
this
.
scribbleEnabled
=
true
,
this
.
scribbleEnabled
=
true
,
this
.
enableIMEPersonalizedLearning
=
true
,
this
.
enableIMEPersonalizedLearning
=
true
,
this
.
contextMenuBuilder
=
_defaultContextMenuBuilder
,
this
.
contextMenuBuilder
=
_defaultContextMenuBuilder
,
@Deprecated
(
'Use `focusNode` instead. '
'This feature was deprecated after v3.12.0-14.0.pre.'
,
)
this
.
canRequestFocus
=
true
,
this
.
canRequestFocus
=
true
,
this
.
spellCheckConfiguration
,
this
.
spellCheckConfiguration
,
this
.
magnifierConfiguration
,
this
.
magnifierConfiguration
,
...
@@ -776,6 +780,10 @@ class TextField extends StatefulWidget {
...
@@ -776,6 +780,10 @@ class TextField extends StatefulWidget {
/// Defaults to true. If false, the text field will not request focus
/// Defaults to true. If false, the text field will not request focus
/// when tapped, or when its context menu is displayed. If false it will not
/// when tapped, or when its context menu is displayed. If false it will not
/// be possible to move the focus to the text field with tab key.
/// be possible to move the focus to the text field with tab key.
@Deprecated
(
'Use `focusNode` instead. '
'This feature was deprecated after v3.12.0-14.0.pre.'
,
)
final
bool
canRequestFocus
;
final
bool
canRequestFocus
;
/// {@macro flutter.widgets.undoHistory.controller}
/// {@macro flutter.widgets.undoHistory.controller}
...
@@ -1026,7 +1034,9 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
...
@@ -1026,7 +1034,9 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
if
(
widget
.
controller
==
null
)
{
if
(
widget
.
controller
==
null
)
{
_createLocalController
();
_createLocalController
();
}
}
_effectiveFocusNode
.
canRequestFocus
=
widget
.
canRequestFocus
&&
_isEnabled
;
_effectiveFocusNode
.
canRequestFocus
=
widget
.
focusNode
==
null
?
widget
.
canRequestFocus
&&
_isEnabled
:
widget
.
focusNode
!.
canRequestFocus
&&
_isEnabled
;
_effectiveFocusNode
.
addListener
(
_handleFocusChanged
);
_effectiveFocusNode
.
addListener
(
_handleFocusChanged
);
}
}
...
@@ -1034,7 +1044,9 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
...
@@ -1034,7 +1044,9 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
final
NavigationMode
mode
=
MediaQuery
.
maybeNavigationModeOf
(
context
)
??
NavigationMode
.
traditional
;
final
NavigationMode
mode
=
MediaQuery
.
maybeNavigationModeOf
(
context
)
??
NavigationMode
.
traditional
;
switch
(
mode
)
{
switch
(
mode
)
{
case
NavigationMode
.
traditional
:
case
NavigationMode
.
traditional
:
return
widget
.
canRequestFocus
&&
_isEnabled
;
return
widget
.
focusNode
==
null
?
widget
.
canRequestFocus
&&
_isEnabled
:
widget
.
focusNode
!.
canRequestFocus
&&
_isEnabled
;
case
NavigationMode
.
directional
:
case
NavigationMode
.
directional
:
return
true
;
return
true
;
}
}
...
@@ -1086,8 +1098,8 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
...
@@ -1086,8 +1098,8 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
void
_createLocalController
([
TextEditingValue
?
value
])
{
void
_createLocalController
([
TextEditingValue
?
value
])
{
assert
(
_controller
==
null
);
assert
(
_controller
==
null
);
_controller
=
value
==
null
_controller
=
value
==
null
?
RestorableTextEditingController
()
?
RestorableTextEditingController
()
:
RestorableTextEditingController
.
fromValue
(
value
);
:
RestorableTextEditingController
.
fromValue
(
value
);
if
(!
restorePending
)
{
if
(!
restorePending
)
{
_registerController
();
_registerController
();
}
}
...
...
packages/flutter/test/material/dropdown_menu_test.dart
View file @
9cda3092
...
@@ -1232,7 +1232,7 @@ void main() {
...
@@ -1232,7 +1232,7 @@ void main() {
final
Finder
textFieldFinder
=
find
.
byType
(
TextField
);
final
Finder
textFieldFinder
=
find
.
byType
(
TextField
);
final
TextField
result
=
tester
.
widget
<
TextField
>(
textFieldFinder
);
final
TextField
result
=
tester
.
widget
<
TextField
>(
textFieldFinder
);
expect
(
result
.
canRequestFocus
,
false
);
expect
(
result
.
focusNode
!.
canRequestFocus
,
false
);
},
variant:
TargetPlatformVariant
.
mobile
());
},
variant:
TargetPlatformVariant
.
mobile
());
testWidgets
(
'The text input field should be focused on desktop platforms '
testWidgets
(
'The text input field should be focused on desktop platforms '
...
@@ -1300,7 +1300,7 @@ void main() {
...
@@ -1300,7 +1300,7 @@ void main() {
final
Finder
textFieldFinder1
=
find
.
byType
(
TextField
);
final
Finder
textFieldFinder1
=
find
.
byType
(
TextField
);
final
TextField
textField1
=
tester
.
widget
<
TextField
>(
textFieldFinder1
);
final
TextField
textField1
=
tester
.
widget
<
TextField
>(
textFieldFinder1
);
expect
(
textField1
.
canRequestFocus
,
false
);
expect
(
textField1
.
focusNode
!.
canRequestFocus
,
false
);
// Open the dropdown menu.
// Open the dropdown menu.
await
tester
.
tap
(
textFieldFinder1
);
await
tester
.
tap
(
textFieldFinder1
);
await
tester
.
pump
();
await
tester
.
pump
();
...
@@ -1329,7 +1329,7 @@ void main() {
...
@@ -1329,7 +1329,7 @@ void main() {
final
Finder
textFieldFinder
=
find
.
byType
(
TextField
);
final
Finder
textFieldFinder
=
find
.
byType
(
TextField
);
final
TextField
textField
=
tester
.
widget
<
TextField
>(
textFieldFinder
);
final
TextField
textField
=
tester
.
widget
<
TextField
>(
textFieldFinder
);
expect
(
textField
.
canRequestFocus
,
false
);
expect
(
textField
.
focusNode
!.
canRequestFocus
,
false
);
final
TestGesture
gesture
=
await
tester
.
createGesture
(
kind:
PointerDeviceKind
.
mouse
,
pointer:
1
);
final
TestGesture
gesture
=
await
tester
.
createGesture
(
kind:
PointerDeviceKind
.
mouse
,
pointer:
1
);
await
gesture
.
moveTo
(
tester
.
getCenter
(
textFieldFinder
));
await
gesture
.
moveTo
(
tester
.
getCenter
(
textFieldFinder
));
...
@@ -1526,7 +1526,6 @@ void main() {
...
@@ -1526,7 +1526,6 @@ void main() {
// Item 5 should show up.
// Item 5 should show up.
expect
(
find
.
text
(
'Item 5'
).
hitTestable
(),
findsOneWidget
);
expect
(
find
.
text
(
'Item 5'
).
hitTestable
(),
findsOneWidget
);
});
});
}
}
enum
TestMenu
{
enum
TestMenu
{
...
...
packages/flutter/test/material/text_field_test.dart
View file @
9cda3092
...
@@ -15568,6 +15568,7 @@ void main() {
...
@@ -15568,6 +15568,7 @@ void main() {
expect
(
focusNode
.
hasFocus
,
isTrue
);
expect
(
focusNode
.
hasFocus
,
isTrue
);
// Set canRequestFocus to false: the text field cannot be focused when it is tapped/long pressed.
// Set canRequestFocus to false: the text field cannot be focused when it is tapped/long pressed.
focusNode
.
canRequestFocus
=
false
;
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
boilerplate
(
boilerplate
(
child:
TextField
(
child:
TextField
(
...
@@ -15749,7 +15750,9 @@ void main() {
...
@@ -15749,7 +15750,9 @@ void main() {
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
testWidgets
(
'Right clicking cannot request focus if canRequestFocus is false'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Right clicking cannot request focus if canRequestFocus is false'
,
(
WidgetTester
tester
)
async
{
final
FocusNode
focusNode
=
FocusNode
();
final
FocusNode
focusNode
=
FocusNode
(
canRequestFocus:
false
,
);
final
UniqueKey
key
=
UniqueKey
();
final
UniqueKey
key
=
UniqueKey
();
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
MaterialApp
(
MaterialApp
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment