Fix rebuilding without query parameters

tomgilder · Jul 11, 2021 · 037d25b · 037d25b
1 parent f6db883
commit 037d25b
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.9.5
+
+* Fixed: an issue where pages would not receive query parameters
+
 # 0.9.4
 
 * Fixed: an issue where pages were incorrectly rebuilding, causing state such as the active tab to reset

diff --git a/lib/routemaster.dart b/lib/routemaster.dart
@@ -598,21 +598,23 @@ class RoutemasterDelegate extends RouterDelegate<RouteData>
       );
 
       // Get a page wrapper object for the current route
-      final page = routerData.builder(routeData);
-      _assertIsPage(page, routeData.fullPath);
-
-      final current = isLastRoute
-          ? _createPageWrapper(
-              routeRequest: request,
-              page: page as Page,
-              routeData: routeData,
-            )
-          : _getOrCreatePageWrapper(
-              routeRequest: request,
-              routeData: routeData,
-              currentRoutes: currentRoutes,
-              routerResult: routerData,
-            );
+      late final _PageResult current;
+      if (isLastRoute) {
+        final page = routerData.builder(routeData);
+        _assertIsPage(page, routeData.fullPath);
+        current = _createPageWrapper(
+          routeRequest: request,
+          page: page as Page,
+          routeData: routeData,
+        );
+      } else {
+        current = _getOrCreatePageWrapper(
+          routeRequest: request,
+          routeData: routeData,
+          currentRoutes: currentRoutes,
+          routerResult: routerData,
+        );
+      }
 
       if (current is _PageWrapperResult) {
         final page = current.pageWrapper;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: routemaster
 description: Easy-to-use Navigator 2.0 router for web, mobile and desktop. URL-based routing, simple navigation of tabs and nested routes.
-version: 0.9.4
+version: 0.9.5
 homepage: https://github.com/tomgilder/routemaster
 
 environment:

diff --git a/test/router_test.dart b/test/router_test.dart
@@ -501,6 +501,38 @@ void main() {
     expect(find.byType(DefaultNotFoundPage), findsOneWidget);
   });
 
+  testWidgets(
+      "Doesn't rebuild page hierarchy when nested page route pushed on top",
+      (tester) async {
+    final queryParamBuilds = <String?>[];
+
+    final delegate = RoutemasterDelegate(
+      routesBuilder: (BuildContext context) => RouteMap(
+        routes: {
+          '/': (routeData) => const Redirect(
+                '/one',
+                queryParameters: {'query1': 'val1'},
+              ),
+          '/one': (routeData) {
+            queryParamBuilds.add(routeData.queryParameters['query1']);
+            return const MaterialPageOne();
+          },
+          '/one/two': (_) => const MaterialPageTwo(),
+        },
+      ),
+    );
+
+    await tester.pumpWidget(MaterialApp.router(
+      routeInformationParser: const RoutemasterParser(),
+      routerDelegate: delegate,
+    ));
+
+    delegate.push('/one/two');
+    await tester.pump();
+
+    expect(queryParamBuilds, ['val1']);
+  });
+
   testWidgets('Unknown startup URL redirects to another page', (tester) async {
     await tester.pumpWidget(
       MaterialApp.router(