Fix blank screen when middleware is working and no page in the stack

SchabanBo · Dec 22, 2021 · 1c5ba12 · 1c5ba12
1 parent 403188a
commit 1c5ba12
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 433 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,6 @@
 *.iws
 .idea/
 
-.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -44,4 +43,5 @@ app.*.map.json
 example/android/app/debug
 example/android/app/profile
 example/android/app/release
-pubspec.lock
+*.lock
+.vscode
diff --git a/.pubignore b/.pubignore
@@ -0,0 +1,4 @@
+example/
+Check.ps1
+build/
+qlevar_router.iml
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## [1.5.9] 21.12.2021
+
+- Fix blank screen when middleware is working and no page in the stack
+
 ## [1.5.8] 30.11.2021
 
 - Add `QR.IsSamePath`, `QR.isSameName`

diff --git a/example/pubspec.lock b/example/pubspec.lock
diff --git a/lib/src/controllers/pages_controller.dart b/lib/src/controllers/pages_controller.dart
@@ -6,21 +6,23 @@ import 'middleware_controller.dart';
 
 class PagesController {
   final routes = <QRouteInternal>[];
-  final pages = <QPageInternal>[
-    QMaterialPageInternal(
-        child: QR.settings.iniPage, matchKey: QKey('Init Page'))
-  ];
+  late final pages = <QPageInternal>[_initPage];
 
   bool exist(QRouteInternal route) =>
       routes.any((element) => element.key.isSame(route.key));
 
+  static const String _initPageKey = 'Init Page';
+
+  QMaterialPageInternal get _initPage => QMaterialPageInternal(
+      child: QR.settings.iniPage, matchKey: QKey(_initPageKey));
+
   Future<void> add(QRouteInternal route) async {
     routes.add(route);
     await MiddlewareController(route).runOnEnter();
     await _notifyObserverOnNavigation(route);
     pages.add(PageCreator(route).create());
-    if (pages.any((element) => element.matchKey.hasName('Init Page'))) {
-      pages.removeWhere((element) => element.matchKey.hasName('Init Page'));
+    if (pages.any((element) => element.matchKey.hasName(_initPageKey))) {
+      pages.removeWhere((element) => element.matchKey.hasName(_initPageKey));
     }
   }
 
@@ -49,6 +51,7 @@ class PagesController {
     await _notifyObserverOnPop(route);
     routes.removeLast(); // remove from the routes
     pages.removeLast(); // reomve from the pages
+    _checkEmptyStack();
     return PopResult.Poped;
   }
 
@@ -64,13 +67,16 @@ class PagesController {
     await _notifyObserverOnPop(route);
     routes.removeAt(index); // remove from the routes
     pages.removeAt(index); // reomve from the pages
+    _checkEmptyStack();
     return true;
   }
 
   Future<PopResult> removeAll() async {
-    for (var i = 0; i < pages.length; i++) {
+    for (var i = 0; i < routes.length; i++) {
       final result = await removeLast(allowEmptyPages: true);
-      if (result != PopResult.Poped) return result;
+      if (result != PopResult.Poped) {
+        return result;
+      }
       i--;
     }
     return PopResult.Poped;
@@ -87,4 +93,12 @@ class PagesController {
       await onPop(route.activePath!, route.route);
     }
   }
+
+  /// show init page when a middleware has something to do,
+  /// so no red screen will be showen
+  void _checkEmptyStack() {
+    if (pages.isEmpty) {
+      pages.add(_initPage);
+    }
+  }
 }