Fix new route pop logic

chaldea-center · Aug 17, 2024 · 4d0d792 · 4d0d792
1 parent 5c3d218
commit 4d0d792
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/app/routes/delegate.dart b/lib/app/routes/delegate.dart
@@ -92,7 +92,6 @@ class AppRouterDelegate extends RouterDelegate<RouteConfiguration>
 
   // only called when [Page] found
   void onPopPage(Page page) {
-    assert(_history.contains(page));
     if (canPop()) {
       for (int index = _history.length - 1; index >= 0; index--) {
         if (_history[index] == page) {
@@ -216,11 +215,10 @@ class AppRouterDelegate extends RouterDelegate<RouteConfiguration>
   // use `SplitRoute.isMaster`
   void popDetails() {
     while (canPop()) {
-      final lastEntry = _history.last;
-      final page = lastEntry;
+      final page = _history.last;
       if (page.detail == true) {
-        _history.remove(lastEntry);
-        lastEntry.complete(null);
+        _history.remove(page);
+        page.complete(null);
       } else {
         return;
       }

diff --git a/lib/app/routes/routes.dart b/lib/app/routes/routes.dart
@@ -320,7 +320,7 @@ class RouteConfiguration {
 
   @override
   String toString() {
-    return 'RouteConfiguration(url=$url, detail=$detail)';
+    return 'RouteConfiguration(url=$url, detail=$detail, child=$child)';
   }
 
   RouteConfiguration copyWith({