From ccd285c9debc47740b0ecb416c0b96d0a498eefd Mon Sep 17 00:00:00 2001
From: Chun-Heng Tai <chtai@google.com>
Date: Thu, 8 Aug 2024 14:02:11 -0700
Subject: [PATCH] update

---
 packages/go_router/lib/src/delegate.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/go_router/lib/src/delegate.dart b/packages/go_router/lib/src/delegate.dart
index 15652aec597e..06e4f08184f4 100644
--- a/packages/go_router/lib/src/delegate.dart
+++ b/packages/go_router/lib/src/delegate.dart
@@ -99,8 +99,9 @@ class GoRouterDelegate extends RouterDelegate<RouteMatchList>
     }
     RouteMatchBase walker = currentConfiguration.matches.last;
     while (walker is ShellRouteMatch) {
-      final NavigatorState potentialCandidate = walker.navigatorKey.currentState!;
-      if (!ModalRoute.isCurrentOf(potentialCandidate.context)!) {
+      final NavigatorState potentialCandidate =
+          walker.navigatorKey.currentState!;
+      if (!ModalRoute.of(potentialCandidate.context)!.isCurrent) {
         // There is a pageless route on top of the shell route. it needs to be
         // popped first.
         break;