fixes issue 343 (#344)

jamesblasco · Jun 18, 2023 · 3917484 · 3917484
1 parent 62c5428
commit 3917484
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 2 deletions.
diff --git a/sheet/lib/src/route/base_route_extended.dart b/sheet/lib/src/route/base_route_extended.dart
@@ -73,7 +73,7 @@ class _PageBasedMaterialPageRoute<T> extends MaterialExtendedPageRoute<T> {
 
   @override
   Widget buildContent(BuildContext context) {
-    return builder(context);
+    return _page.child;
   }
 
   @override
@@ -150,7 +150,7 @@ class _PageBasedCupertinoPageRoute<T> extends CupertinoExtendedPageRoute<T> {
 
   @override
   Widget buildContent(BuildContext context) {
-    return builder(context);
+    return _page.child;
   }
 
   @override

diff --git a/sheet/test/src/route/base_route_extended_test.dart b/sheet/test/src/route/base_route_extended_test.dart
@@ -55,6 +55,36 @@ void main() {
       expect(find.text('child'), findsOneWidget);
     });
 
+    testWidgets('navigating to different routes keeping the same page',
+        (WidgetTester tester) async {
+      await tester.pumpWidget(MaterialApp(
+        builder: (context, child) {
+          return Navigator(
+            pages: [
+              MaterialExtendedPage(child: Text('first child')),
+            ],
+            onPopPage: (route, result) => false,
+          );
+        },
+      ));
+      await tester.pumpAndSettle();
+      expect(find.text('first child'), findsOneWidget);
+
+      await tester.pumpWidget(MaterialApp(
+        builder: (context, child) {
+          return Navigator(
+            pages: [
+              MaterialExtendedPage(child: Text('second child')),
+            ],
+            onPopPage: (route, result) => false,
+          );
+        },
+      ));
+
+      await tester.pumpAndSettle();
+      expect(find.text('second child'), findsOneWidget);
+    });
+
     testWidgets('route is a MaterialExtendedPageRoute',
         (WidgetTester tester) async {
       await tester.pumpWidget(MaterialApp(
@@ -156,6 +186,36 @@ void main() {
       expect(find.text('child'), findsOneWidget);
     });
 
+    testWidgets('navigating to different routes keeping the same page',
+        (WidgetTester tester) async {
+      await tester.pumpWidget(MaterialApp(
+        builder: (context, child) {
+          return Navigator(
+            pages: [
+              CupertinoExtendedPage(child: Text('first child')),
+            ],
+            onPopPage: (route, result) => false,
+          );
+        },
+      ));
+      await tester.pumpAndSettle();
+      expect(find.text('first child'), findsOneWidget);
+
+      await tester.pumpWidget(MaterialApp(
+        builder: (context, child) {
+          return Navigator(
+            pages: [
+              CupertinoExtendedPage(child: Text('second child')),
+            ],
+            onPopPage: (route, result) => false,
+          );
+        },
+      ));
+
+      await tester.pumpAndSettle();
+      expect(find.text('second child'), findsOneWidget);
+    });
+
     testWidgets('route is a CupertinoExtendedPageRoute',
         (WidgetTester tester) async {
       await tester.pumpWidget(MaterialApp(