ToPage give a default layout

chen56 · May 2, 2024 · c76a8b0 · c76a8b0
1 parent 031f07d
commit c76a8b0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/you_flutter/lib/src/router.dart b/packages/you_flutter/lib/src/router.dart
@@ -180,7 +180,8 @@ base class ToPage extends RouteBuilder {
 
   @override
   Widget buildPage(BuildContext context, covariant ToPage forPage, RouteUri uri) {
-    return layout == null ? forPage.page!(context) : layout!(context, forPage.page!);
+    if (layout == null) return LayoutDefault(builder: page!, uri: uri);
+    return layout!(context, forPage.page!);
   }
 
   @override
@@ -451,8 +452,8 @@ ${"  " * level}</Route>''';
 
     final List<RouteNode> chain = [this, ...findAncestorsOfSameType<RouteNode>()];
 
-    for (var i in chain) {
-      if (i.forBuild!.hasLayout) return i.forBuild!.buildPage(context, forBuild!, uri);
+    for (var node in chain) {
+      if (node.forBuild!.hasLayout) return node.forBuild!.buildPage(context, forBuild!, uri);
     }
     return forBuild!.buildPage(context, forBuild!, uri);
   }