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
08e61631
Unverified
Commit
08e61631
authored
Sep 12, 2022
by
Greg Spencer
Committed by
GitHub
Sep 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow Navigator to inherit traversal policy from parent. (#110818)
parent
8f9a5195
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
106 additions
and
63 deletions
+106
-63
navigator.dart
packages/flutter/lib/src/widgets/navigator.dart
+1
-0
navigator_test.dart
packages/flutter/test/widgets/navigator_test.dart
+105
-63
No files found.
packages/flutter/lib/src/widgets/navigator.dart
View file @
08e61631
...
...
@@ -5235,6 +5235,7 @@ class NavigatorState extends State<Navigator> with TickerProviderStateMixin, Res
child:
AbsorbPointer
(
absorbing:
false
,
// it's mutated directly by _cancelActivePointers above
child:
FocusTraversalGroup
(
policy:
FocusTraversalGroup
.
maybeOf
(
context
),
child:
Focus
(
focusNode:
focusNode
,
autofocus:
true
,
...
...
packages/flutter/test/widgets/navigator_test.dart
View file @
08e61631
...
...
@@ -3775,72 +3775,71 @@ void main() {
expect
(
focusNode
.
hasFocus
,
true
);
});
testWidgets
(
'Navigator does not request focus if requestFocus is false'
,
(
WidgetTester
tester
)
async
{
final
GlobalKey
navigatorKey
=
GlobalKey
();
final
GlobalKey
innerKey
=
GlobalKey
();
final
Map
<
String
,
Widget
>
routes
=
<
String
,
Widget
>{
'/'
:
const
Text
(
'A'
),
'/second'
:
Text
(
'B'
,
key:
innerKey
),
};
late
final
NavigatorState
navigator
=
navigatorKey
.
currentState
!
as
NavigatorState
;
final
FocusScopeNode
focusNode
=
FocusScopeNode
();
testWidgets
(
'Navigator does not request focus if requestFocus is false'
,
(
WidgetTester
tester
)
async
{
final
GlobalKey
navigatorKey
=
GlobalKey
();
final
GlobalKey
innerKey
=
GlobalKey
();
final
Map
<
String
,
Widget
>
routes
=
<
String
,
Widget
>{
'/'
:
const
Text
(
'A'
),
'/second'
:
Text
(
'B'
,
key:
innerKey
),
};
late
final
NavigatorState
navigator
=
navigatorKey
.
currentState
!
as
NavigatorState
;
final
FocusScopeNode
focusNode
=
FocusScopeNode
();
await
tester
.
pumpWidget
(
Column
(
children:
<
Widget
>[
FocusScope
(
node:
focusNode
,
child:
Container
()),
Expanded
(
child:
MaterialApp
(
home:
Navigator
(
key:
navigatorKey
,
onGenerateRoute:
(
RouteSettings
settings
)
{
return
PageRouteBuilder
<
void
>(
settings:
settings
,
pageBuilder:
(
BuildContext
_
,
Animation
<
double
>
__
,
Animation
<
double
>
___
)
{
return
routes
[
settings
.
name
!]!;
},
);
await
tester
.
pumpWidget
(
Column
(
children:
<
Widget
>[
FocusScope
(
node:
focusNode
,
child:
Container
()),
Expanded
(
child:
MaterialApp
(
home:
Navigator
(
key:
navigatorKey
,
onGenerateRoute:
(
RouteSettings
settings
)
{
return
PageRouteBuilder
<
void
>(
settings:
settings
,
pageBuilder:
(
BuildContext
_
,
Animation
<
double
>
__
,
Animation
<
double
>
___
)
{
return
routes
[
settings
.
name
!]!;
},
requestFocus:
false
,
)
,
)
,
);
}
,
requestFocus:
false
,
),
],
));
expect
(
find
.
text
(
'A'
),
findsOneWidget
);
expect
(
find
.
text
(
'B'
,
skipOffstage:
false
),
findsNothing
);
expect
(
focusNode
.
hasFocus
,
false
);
focusNode
.
requestFocus
();
await
tester
.
pumpAndSettle
();
expect
(
focusNode
.
hasFocus
,
true
);
navigator
.
pushNamed
(
'/second'
);
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'A'
,
skipOffstage:
false
),
findsOneWidget
);
expect
(
find
.
text
(
'B'
),
findsOneWidget
);
expect
(
focusNode
.
hasFocus
,
true
);
navigator
.
pop
();
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'A'
),
findsOneWidget
);
expect
(
find
.
text
(
'B'
,
skipOffstage:
false
),
findsNothing
);
expect
(
focusNode
.
hasFocus
,
true
);
navigator
.
pushReplacementNamed
(
'/second'
);
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'A'
,
skipOffstage:
false
),
findsNothing
);
expect
(
find
.
text
(
'B'
),
findsOneWidget
);
expect
(
focusNode
.
hasFocus
,
true
);
ModalRoute
.
of
(
innerKey
.
currentContext
!)!.
addLocalHistoryEntry
(
LocalHistoryEntry
(),
);
await
tester
.
pumpAndSettle
();
expect
(
focusNode
.
hasFocus
,
true
);
});
),
),
],
));
expect
(
find
.
text
(
'A'
),
findsOneWidget
);
expect
(
find
.
text
(
'B'
,
skipOffstage:
false
),
findsNothing
);
expect
(
focusNode
.
hasFocus
,
false
);
focusNode
.
requestFocus
();
await
tester
.
pumpAndSettle
();
expect
(
focusNode
.
hasFocus
,
true
);
navigator
.
pushNamed
(
'/second'
);
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'A'
,
skipOffstage:
false
),
findsOneWidget
);
expect
(
find
.
text
(
'B'
),
findsOneWidget
);
expect
(
focusNode
.
hasFocus
,
true
);
navigator
.
pop
();
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'A'
),
findsOneWidget
);
expect
(
find
.
text
(
'B'
,
skipOffstage:
false
),
findsNothing
);
expect
(
focusNode
.
hasFocus
,
true
);
navigator
.
pushReplacementNamed
(
'/second'
);
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'A'
,
skipOffstage:
false
),
findsNothing
);
expect
(
find
.
text
(
'B'
),
findsOneWidget
);
expect
(
focusNode
.
hasFocus
,
true
);
ModalRoute
.
of
(
innerKey
.
currentContext
!)!.
addLocalHistoryEntry
(
LocalHistoryEntry
(),
);
await
tester
.
pumpAndSettle
();
expect
(
focusNode
.
hasFocus
,
true
);
});
testWidgets
(
'class implementing NavigatorObserver can be used without problems'
,
(
WidgetTester
tester
)
async
{
final
_MockNavigatorObserver
observer
=
_MockNavigatorObserver
();
...
...
@@ -3873,6 +3872,49 @@ void main() {
await
tester
.
pumpWidget
(
Container
(
child:
build
(
key
)));
observer
.
_checkInvocations
(<
Symbol
>[
#navigator
,
#navigator
]);
});
testWidgets
(
"Navigator doesn't override FocusTraversalPolicy of ancestors"
,
(
WidgetTester
tester
)
async
{
FocusTraversalPolicy
?
policy
;
await
tester
.
pumpWidget
(
TestDependencies
(
child:
FocusTraversalGroup
(
policy:
WidgetOrderTraversalPolicy
(),
child:
Navigator
(
onGenerateRoute:
(
RouteSettings
settings
)
{
return
PageRouteBuilder
<
void
>(
settings:
settings
,
pageBuilder:
(
BuildContext
context
,
Animation
<
double
>
__
,
Animation
<
double
>
___
)
{
policy
=
FocusTraversalGroup
.
of
(
context
);
return
const
SizedBox
();
},
);
},
),
),
),
);
expect
(
policy
,
isA
<
WidgetOrderTraversalPolicy
>());
});
testWidgets
(
'Navigator inserts ReadingOrderTraversalPolicy if no ancestor has a policy'
,
(
WidgetTester
tester
)
async
{
FocusTraversalPolicy
?
policy
;
await
tester
.
pumpWidget
(
TestDependencies
(
child:
Navigator
(
onGenerateRoute:
(
RouteSettings
settings
)
{
return
PageRouteBuilder
<
void
>(
settings:
settings
,
pageBuilder:
(
BuildContext
context
,
Animation
<
double
>
__
,
Animation
<
double
>
___
)
{
policy
=
FocusTraversalGroup
.
of
(
context
);
return
const
SizedBox
();
},
);
},
),
),
);
expect
(
policy
,
isA
<
ReadingOrderTraversalPolicy
>());
});
}
typedef
AnnouncementCallBack
=
void
Function
(
Route
<
dynamic
>?);
...
...
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