[go_router] Fix pop() restoring stale configuration when route has onExit

packages/go_router/lib/src/router.dart

@@ -583,8 +583,13 @@ class GoRouter implements RouterConfig<RouteMatchList> {
       log('popping ${routerDelegate.currentConfiguration.uri}');
       return true;
     }());
+    final RouteMatchList configBeforePop = routerDelegate.currentConfiguration;
     routerDelegate.pop<T>(result);
-    restore(routerDelegate.currentConfiguration);
+    // Only restore when the pop completed synchronously (no onExit).
+    // If deferred, currentConfiguration is still the same instance.
+    if (!identical(routerDelegate.currentConfiguration, configBeforePop)) {
+      restore(routerDelegate.currentConfiguration);
+    }
   }
 
   /// Refresh the route.

packages/go_router/pending_changelogs/11241_fix_pop_restore.yaml

@@ -0,0 +1,3 @@
+changelog: |
+  - Fixes `pop()` restoring stale configuration when route has `onExit`, which could cause the popped route to reappear with async redirects.
+version: patch

packages/go_router/test/on_exit_test.dart

@@ -493,4 +493,89 @@ void main() {
       expect(onExitState2.fullPath, '/route-2/:id2');
     },
   );
+
+  // Regression test: pop() with onExit + async redirect must not restore
+  // stale configuration.
+  testWidgets(
+    'pop does not call restore with stale config when route has onExit',
+    (WidgetTester tester) async {
+      final homeKey = UniqueKey();
+      final detailKey = UniqueKey();
+
+      final GoRouter router = await createRouter(
+        <RouteBase>[
+          GoRoute(
+            path: '/',
+            builder: (_, __) => DummyScreen(key: homeKey),
+            routes: <RouteBase>[
+              GoRoute(
+                path: 'detail',
+                onExit: (_, __) => true,
+                builder: (_, __) => DummyScreen(key: detailKey),
+              ),
+            ],
+          ),
+        ],
+        tester,
+        initialLocation: '/detail',
+        redirect: (_, GoRouterState state) async {
+          // Async redirect — completes in a later microtask.
+          await Future<void>.delayed(Duration.zero);
+          return null;
+        },
+      );
+
+      await tester.pumpAndSettle();
+      expect(find.byKey(detailKey), findsOneWidget);
+
+      router.pop();
+      await tester.pumpAndSettle();
+
+      // The detail route should be gone after pop.
+      expect(
+        find.byKey(detailKey),
+        findsNothing,
+        reason:
+            'Route with onExit should be properly popped '
+            'even when async redirect is present',
+      );
+      expect(find.byKey(homeKey), findsOneWidget);
+    },
+  );
+
+  // Verify that pop is correctly cancelled when onExit returns false.
+  testWidgets('pop is cancelled when onExit returns false', (
+    WidgetTester tester,
+  ) async {
+    final homeKey = UniqueKey();
+    final detailKey = UniqueKey();
+
+    final GoRouter router = await createRouter(
+      <RouteBase>[
+        GoRoute(
+          path: '/',
+          builder: (_, __) => DummyScreen(key: homeKey),
+          routes: <RouteBase>[
+            GoRoute(
+              path: 'detail',
+              onExit: (_, __) => false, // Always prevent leaving.
+              builder: (_, __) => DummyScreen(key: detailKey),
+            ),
+          ],
+        ),
+      ],
+      tester,
+      initialLocation: '/detail',
+    );
+
+    await tester.pumpAndSettle();
+    expect(find.byKey(detailKey), findsOneWidget);
+
+    router.pop();
+    await tester.pumpAndSettle();
+
+    // Should still be on the detail page.
+    expect(find.byKey(detailKey), findsOneWidget);
+    expect(find.byKey(homeKey), findsNothing);
+  });
 }