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
7bed5a28
Unverified
Commit
7bed5a28
authored
May 13, 2020
by
chunhtai
Committed by
GitHub
May 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix push replacement reports wrong previous route to navigator observer (#57036)
parent
3b31e89f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
76 additions
and
1 deletion
+76
-1
navigator.dart
packages/flutter/lib/src/widgets/navigator.dart
+1
-1
navigator_test.dart
packages/flutter/test/widgets/navigator_test.dart
+75
-0
No files found.
packages/flutter/lib/src/widgets/navigator.dart
View file @
7bed5a28
...
...
@@ -2368,7 +2368,7 @@ class _RouteEntry extends RouteTransitionRecord {
if
(
previousState
==
_RouteLifecycle
.
replace
||
previousState
==
_RouteLifecycle
.
pushReplace
)
{
for
(
final
NavigatorObserver
observer
in
navigator
.
widget
.
observers
)
observer
.
didReplace
(
newRoute:
route
,
oldRoute:
previous
);
observer
.
didReplace
(
newRoute:
route
,
oldRoute:
previous
Present
);
}
else
{
assert
(
previousState
==
_RouteLifecycle
.
push
);
for
(
final
NavigatorObserver
observer
in
navigator
.
widget
.
observers
)
...
...
packages/flutter/test/widgets/navigator_test.dart
View file @
7bed5a28
...
...
@@ -628,6 +628,74 @@ void main() {
expect
(
aOffset
.
dx
,
lessThan
(
aOffsetOriginal
.
dx
));
});
testWidgets
(
'pushReplacement correctly reports didReplace to the observer'
,
(
WidgetTester
tester
)
async
{
// Regression test for https://github.com/flutter/flutter/issues/56892.
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'/'
,
),
'/A'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'A'
,
),
'/A/B'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'B'
,
onTap:
(){
Navigator
.
of
(
context
).
popUntil
((
Route
<
dynamic
>
route
)
=>
route
.
isFirst
);
Navigator
.
of
(
context
).
pushReplacementNamed
(
'/C'
);
},
),
'/C'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'C'
,
),
};
final
List
<
NavigatorObservation
>
observations
=
<
NavigatorObservation
>[];
final
TestObserver
observer
=
TestObserver
()
..
onPopped
=
(
Route
<
dynamic
>
route
,
Route
<
dynamic
>
previousRoute
)
{
observations
.
add
(
NavigatorObservation
(
current:
route
.
settings
.
name
,
previous:
previousRoute
.
settings
.
name
,
operation:
'didPop'
)
);
}
..
onReplaced
=
(
Route
<
dynamic
>
route
,
Route
<
dynamic
>
previousRoute
)
{
observations
.
add
(
NavigatorObservation
(
current:
route
.
settings
.
name
,
previous:
previousRoute
.
settings
.
name
,
operation:
'didReplace'
)
);
};
await
tester
.
pumpWidget
(
MaterialApp
(
routes:
routes
,
navigatorObservers:
<
NavigatorObserver
>[
observer
],
initialRoute:
'/A/B'
,
)
);
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'B'
),
isOnstage
);
await
tester
.
tap
(
find
.
text
(
'B'
));
await
tester
.
pump
();
await
tester
.
pump
(
const
Duration
(
milliseconds:
16
));
expect
(
observations
.
length
,
3
);
expect
(
observations
[
0
].
current
,
'/A/B'
);
expect
(
observations
[
0
].
previous
,
'/A'
);
expect
(
observations
[
0
].
operation
,
'didPop'
);
expect
(
observations
[
1
].
current
,
'/A'
);
expect
(
observations
[
1
].
previous
,
'/'
);
expect
(
observations
[
1
].
operation
,
'didPop'
);
expect
(
observations
[
2
].
current
,
'/C'
);
expect
(
observations
[
2
].
previous
,
'/'
);
expect
(
observations
[
2
].
operation
,
'didReplace'
);
await
tester
.
pumpAndSettle
();
expect
(
find
.
text
(
'C'
),
isOnstage
);
});
testWidgets
(
'pushAndRemoveUntil triggers secondaryAnimation'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
...
...
@@ -2583,3 +2651,10 @@ class StatefulTestState extends State<StatefulTestWidget> {
return
Container
();
}
}
class
NavigatorObservation
{
const
NavigatorObservation
({
this
.
previous
,
this
.
current
,
this
.
operation
});
final
String
previous
;
final
String
current
;
final
String
operation
;
}
\ No newline at end of file
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