Committed by
GitHub
Merge pull request #1747 from steven-spiel/patch-2
Allow GetRouterOutlet to specify GetDelegate
Showing
1 changed file
with
4 additions
and
1 deletions
| @@ -81,6 +81,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | @@ -81,6 +81,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | ||
| 81 | required String initialRoute, | 81 | required String initialRoute, |
| 82 | Iterable<GetPage> Function(Iterable<GetPage> afterAnchor)? filterPages, | 82 | Iterable<GetPage> Function(Iterable<GetPage> afterAnchor)? filterPages, |
| 83 | GlobalKey<NavigatorState>? key, | 83 | GlobalKey<NavigatorState>? key, |
| 84 | + GetDelegate? delegate, | ||
| 84 | }) : this.pickPages( | 85 | }) : this.pickPages( |
| 85 | pickPages: (config) { | 86 | pickPages: (config) { |
| 86 | Iterable<GetPage<dynamic>> ret; | 87 | Iterable<GetPage<dynamic>> ret; |
| @@ -102,6 +103,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | @@ -102,6 +103,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | ||
| 102 | Get.routeTree.matchRoute(initialRoute).route ?? | 103 | Get.routeTree.matchRoute(initialRoute).route ?? |
| 103 | delegate.notFoundRoute, | 104 | delegate.notFoundRoute, |
| 104 | key: key, | 105 | key: key, |
| 106 | + delegate: delegate, | ||
| 105 | ); | 107 | ); |
| 106 | GetRouterOutlet.pickPages({ | 108 | GetRouterOutlet.pickPages({ |
| 107 | Widget Function(GetDelegate delegate)? emptyWidget, | 109 | Widget Function(GetDelegate delegate)? emptyWidget, |
| @@ -109,6 +111,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | @@ -109,6 +111,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | ||
| 109 | required Iterable<GetPage> Function(GetNavConfig currentNavStack) pickPages, | 111 | required Iterable<GetPage> Function(GetNavConfig currentNavStack) pickPages, |
| 110 | bool Function(Route<dynamic>, dynamic)? onPopPage, | 112 | bool Function(Route<dynamic>, dynamic)? onPopPage, |
| 111 | GlobalKey<NavigatorState>? key, | 113 | GlobalKey<NavigatorState>? key, |
| 114 | + GetDelegate? delegate, | ||
| 112 | }) : super( | 115 | }) : super( |
| 113 | pageBuilder: (context, rDelegate, pages) { | 116 | pageBuilder: (context, rDelegate, pages) { |
| 114 | final pageRes = <GetPage?>[ | 117 | final pageRes = <GetPage?>[ |
| @@ -134,7 +137,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | @@ -134,7 +137,7 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> { | ||
| 134 | return (emptyWidget?.call(rDelegate) ?? SizedBox.shrink()); | 137 | return (emptyWidget?.call(rDelegate) ?? SizedBox.shrink()); |
| 135 | }, | 138 | }, |
| 136 | pickPages: pickPages, | 139 | pickPages: pickPages, |
| 137 | - delegate: Get.rootDelegate, | 140 | + delegate: delegate ?? Get.rootDelegate, |
| 138 | ); | 141 | ); |
| 139 | 142 | ||
| 140 | GetRouterOutlet.builder({ | 143 | GetRouterOutlet.builder({ |
-
Please register or login to post a comment