Skip to content

[go_router] Fix: guard empty matches in _findCurrentNavigators and popRoute #11911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhaysaqi wants to merge 5 commits into
base: main
Choose a base branch
from
+31 −4
Open

[go_router] Fix: guard empty matches in _findCurrentNavigators and popRoute #11911

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7aaae97
Fix: guard empty matches in _findCurrentNavigators and popRoute
abhaysaqi Jun 16, 2026
6530be3
Fix: use currentConfiguration.isEmpty instead of currentConfiguration…
abhaysaqi Jun 16, 2026
bd1dca7
Update packages/go_router/lib/src/delegate.dart
abhaysaqi Jun 16, 2026
d5b6e12
[go_router] Update version to 17.3.1 and add CHANGELOG entry
abhaysaqi Jun 18, 2026
5170dc2
Merge branch 'fix-go-router-pop-route-empty-matches' of https://githu…
abhaysaqi Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/go_router/lib/src/delegate.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList> with ChangeNotifie
return true; // Return true if maybePop handled the pop
}
}

if (currentConfiguration.isEmpty) {
return false;
}
// Fallback to onExit if maybePop did not handle the pop
final GoRoute lastRoute = currentConfiguration.last.route;
if (lastRoute.onExit != null && navigatorKey.currentContext != null) {
Expand All @@ -79,7 +81,7 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList> with ChangeNotifie
if (navigatorKey.currentState?.canPop() ?? false) {
return true;
}
if (currentConfiguration.matches.isEmpty) {
if (currentConfiguration.isEmpty) {
return false;
}
RouteMatchBase walker = currentConfiguration.matches.last;
Expand Down Expand Up @@ -115,7 +117,9 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList> with ChangeNotifie
// Set state directly without canPop check
states.add(navigatorKey.currentState!);
}

if (currentConfiguration.matches.isEmpty) {
return states.reversed;
}
Comment thread
abhaysaqi marked this conversation as resolved.
Outdated
Comment thread
abhaysaqi marked this conversation as resolved.
Outdated
RouteMatchBase walker = currentConfiguration.matches.last;
while (walker is ShellRouteMatch) {
final NavigatorState potentialCandidate = walker.navigatorKey.currentState!;
Expand Down
17 changes: 17 additions & 0 deletions packages/go_router/test/delegate_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,23 @@ void main() {
});
});

testWidgets('popRoute does not throw Bad state when currentConfiguration is empty', (
WidgetTester tester,
) async {
final GoRouter goRouter = GoRouter(
initialLocation: '/',
routes: <GoRoute>[GoRoute(path: '/', builder: (_, _) => const DummyStatefulWidget())],
);
addTearDown(goRouter.dispose);
await tester.pumpWidget(MaterialApp.router(routerConfig: goRouter));

// Simulate empty configuration (e.g. startup window before first route resolves)
goRouter.routerDelegate.currentConfiguration = RouteMatchList.empty;

// Should return false without throwing "Bad state: No element"
expect(await goRouter.routerDelegate.popRoute(), isFalse);
});

group('push', () {
testWidgets('It should return different pageKey when push is called', (
WidgetTester tester,
Expand Down