wip

flutter · Sep 25, 2024 · e468640 · e468640
1 parent f678437
commit e468640
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/go_router/lib/src/configuration.dart b/packages/go_router/lib/src/configuration.dart
@@ -202,7 +202,7 @@ class RouteConfiguration {
         routingTable.routes, <GlobalKey<NavigatorState>>[navigatorKey]));
     assert(_debugCheckStatefulShellBranchDefaultLocations(routingTable.routes));
     _routesByName.clear();
-    _cacheRouteByName(routingTable.routes);
+    _cacheRoutesByName(routingTable.routes);
     log(debugKnownRoutes());
   }
 
@@ -619,7 +619,7 @@ class RouteConfiguration {
   }
 
   /// adds an entry in the _routesByName map for every route and their descendants.
-  void _cacheRouteByName(List<RouteBase> routes) {
+  void _cacheRoutesByName(List<RouteBase> routes) {
     for (final RouteBase route in routes) {
       if (route is GoRoute) {
         if (route.name != null) {
@@ -630,11 +630,11 @@ class RouteConfiguration {
         }
 
         if (route.routes.isNotEmpty) {
-          _cacheRouteByName(route.routes);
+          _cacheRoutesByName(route.routes);
         }
       } else if (route is ShellRouteBase) {
         if (route.routes.isNotEmpty) {
-          _cacheRouteByName(route.routes);
+          _cacheRoutesByName(route.routes);
         }
       }
     }

diff --git a/packages/go_router/lib/src/route.dart b/packages/go_router/lib/src/route.dart
@@ -261,7 +261,7 @@ class GoRoute extends RouteBase {
   /// - [path] and [name] cannot be empty strings.
   /// - One of either [builder] or [pageBuilder] must be provided.
   GoRoute({
-    required this.path,
+    required String path,
     this.name,
     this.builder,
     this.pageBuilder,
@@ -345,7 +345,7 @@ class GoRoute extends RouteBase {
   ///
   /// See [Query parameters and path parameters](https://github.com/flutter/packages/blob/main/packages/go_router/example/lib/path_and_query_parameters.dart)
   /// to learn more about parameters.
-  final String path;
+  String get path => pattern.toString();
 
   /// A page builder for this route.
   ///