DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from collinjackson/fix_history

Browse Source 
Fix history collisions

R=abarth
This commit is contained in:
Collin Jackson 2015-07-17 09:10:23 -07:00
commit a19fdb4a98
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sky/sdk/lib/widgets/navigator.dart
View File

@ -130,8 +130,9 @@ class Transition extends AnimatedComponent {
}
class HistoryEntry {
HistoryEntry(this.route);
HistoryEntry({ this.route, this.key });
final RouteBase route;
final int key;
// TODO(jackson): Keep track of the requested transition
}
@ -142,11 +143,12 @@ class NavigationState {
if (route.name != null)
namedRoutes[route.name] = route;
}
history.add(new HistoryEntry(routes[0]));
history.add(new HistoryEntry(route: routes[0], key: _lastKey++));
}
List<HistoryEntry> history = new List<HistoryEntry>();
int historyIndex = 0;
int _lastKey = 0;
Map<String, RouteBase> namedRoutes = new Map<String, RouteBase>();
RouteBase get currentRoute => history[historyIndex].route;
@ -159,7 +161,7 @@ class NavigationState {
}
void push(RouteBase route) {
HistoryEntry historyEntry = new HistoryEntry(route);
HistoryEntry historyEntry = new HistoryEntry(route: route, key: _lastKey++);
history.insert(historyIndex + 1, historyEntry);
historyIndex++;
}
@ -224,9 +226,8 @@ class Navigator extends StatefulComponent {
}
if (content == null)
continue;
String key = historyEntry.route.key;
Transition transition = new Transition(
key: key,
key: historyEntry.key.toString(),
content: content,
direction: (i <= state.historyIndex) ? TransitionDirection.forward : TransitionDirection.reverse,
interactive: (i == state.historyIndex),