firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1490 from Hixie/navigator-ensure-pop

Browse Source 
Handle a route being dismissed before being popped
This commit is contained in:
Ian Hickson 2015-10-05 13:59:59 -07:00
commit 48142d6872
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/flutter/lib/src/widgets/navigator.dart
View File

@ -136,8 +136,13 @@ class NavigatorState extends State<Navigator> {
direction: (i <= _currentPosition) ? AnimationDirection.forward : AnimationDirection.reverse direction: (i <= _currentPosition) ? AnimationDirection.forward : AnimationDirection.reverse
); );
route._onDismissed = () { route._onDismissed = () {
setState(() {
assert(_history.contains(route)); assert(_history.contains(route));
if (_history.lastIndexOf(route) <= _currentPosition)
popRoute(route);
};
route._onRemoveRoute = () {
assert(_history.contains(route));
setState(() {
_history.remove(route); _history.remove(route);
}); });
}; };
@ -170,14 +175,19 @@ abstract class Route {
PerformanceView get performance => _performance?.view; PerformanceView get performance => _performance?.view;
Performance _performance; Performance _performance;
NotificationCallback _onDismissed; NotificationCallback _onDismissed;
NotificationCallback _onRemoveRoute;
Performance createPerformance() { Performance createPerformance() {
Duration duration = transitionDuration; Duration duration = transitionDuration;
if (duration > Duration.ZERO) { if (duration > Duration.ZERO) {
return new Performance(duration: duration) return new Performance(duration: duration)
..addStatusListener((PerformanceStatus status) { ..addStatusListener((PerformanceStatus status) {
if (status == PerformanceStatus.dismissed && _onDismissed != null) if (status == PerformanceStatus.dismissed) {
if (_onDismissed != null)
_onDismissed(); _onDismissed();
if (_onRemoveRoute != null)
_onRemoveRoute();
}
}); });
} }
return null; return null;
@ -253,8 +263,8 @@ abstract class Route {
Widget build(NavigatorState navigator, PerformanceView nextRoutePerformance); Widget build(NavigatorState navigator, PerformanceView nextRoutePerformance);
void didPop([dynamic result]) { void didPop([dynamic result]) {
if (performance == null && _onDismissed != null) if (performance == null && _onRemoveRoute != null)
_onDismissed(); _onRemoveRoute();
} }
String toString() => '$runtimeType()'; String toString() => '$runtimeType()';