Merge pull request #21 from harkairt/fix/do-not-throw-without-name

fix: do not throw for ShellRoutes not having name
harkairt · Nov 20, 2024 · ab655d2 · ab655d2
2 parents bbc8eed + ebd09e8
commit ab655d2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/lib/src/guarded_go_router.dart b/lib/src/guarded_go_router.dart
@@ -403,7 +403,7 @@ class GuardedGoRouter {
           subordinateRoutes
               .map((e) {
                 if (e is! GoRoute) {
-                  throw "This should be a GoRoute";
+                  return null;
                 }
                 return e.name;
               })

diff --git a/test/guarded_go_router_test.dart b/test/guarded_go_router_test.dart
@@ -457,6 +457,32 @@ void main() {
         guard2 = Guard2();
       });
 
+      testWidgets("allow having a shell route as a direct child of it", (WidgetTester tester) async {
+        reset(guard1);
+        deactivateGuard(guard: guard1);
+
+        final router = await pumpRouter(
+          tester,
+          guards: [guard1],
+          routes: [
+            _goRoute("shield1", shieldOf: [Guard1]),
+            _discardShell<Guard1>([
+              ShellRoute(
+                routes: [
+                  _goRoute("3"),
+                ],
+              ),
+            ]),
+            _goRoute("followUp1", followUp: [Guard1]),
+          ],
+        );
+
+        router.goNamed("3");
+
+        await tester.pumpAndSettle();
+        expect(router.location.sanitized, "/followUp1");
+      });
+
       group('any() blocks', () {
         setUp(() {
           reset(guard1);