fix parameters on initialRoute

@@ -30,7 +30,7 @@ class GetInformationParser extends RouteInformationParser<GetNavConfig> {
 
 
     return SynchronousFuture(
     return SynchronousFuture(
       GetNavConfig(
       GetNavConfig(
-        currentTreeBranch: matchResult.treeBranch,
+        currentTreeBranch: matchResult.currentTreeBranch,
         location: location,
         location: location,
         state: routeInformation.state,
         state: routeInformation.state,
       ),
       ),

@@ -46,9 +46,9 @@ class GetNavConfig extends RouteInformation {
 
 
   static GetNavConfig? fromRoute(String route) {
   static GetNavConfig? fromRoute(String route) {
     final res = Get.routeTree.matchRoute(route);
     final res = Get.routeTree.matchRoute(route);
-    if (res.treeBranch.isEmpty) return null;
+    if (res.currentTreeBranch.isEmpty) return null;
     return GetNavConfig(
     return GetNavConfig(
-      currentTreeBranch: res.treeBranch,
+      currentTreeBranch: res.currentTreeBranch,
       location: route,
       location: route,
       state: null,
       state: null,
     );
     );

@@ -308,7 +308,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
 
 
   Future<void> toNamed(
   Future<void> toNamed(
     String page, {
     String page, {
-    dynamic arguments,
+    PageSettings? arguments,
     Map<String, String>? parameters,
     Map<String, String>? parameters,
   }) async {
   }) async {
     if (parameters != null) {
     if (parameters != null) {
@@ -322,7 +322,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
     if (decoder.route != null) {
     if (decoder.route != null) {
       await pushHistory(
       await pushHistory(
         GetNavConfig(
         GetNavConfig(
-          currentTreeBranch: decoder.treeBranch,
+          currentTreeBranch: decoder.currentTreeBranch,
           location: page,
           location: page,
           state: null, //TODO: persist state?
           state: null, //TODO: persist state?
         ),
         ),
@@ -341,7 +341,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
   //pops the previous route (if there is one) and goes to new route
   //pops the previous route (if there is one) and goes to new route
   Future<void> offNamed(
   Future<void> offNamed(
     String page, {
     String page, {
-    dynamic arguments,
+    PageSettings? arguments,
     Map<String, String>? parameters,
     Map<String, String>? parameters,
     PopMode popMode = PopMode.History,
     PopMode popMode = PopMode.History,
   }) async {
   }) async {

@@ -2,16 +2,19 @@ import 'dart:async';
 
 
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 
 
-import '../../../../get.dart';
+import '../../../../get_state_manager/src/simple/get_state.dart';
 import '../../../../get_state_manager/src/simple/list_notifier.dart';
 import '../../../../get_state_manager/src/simple/list_notifier.dart';
+import '../../../../get_utils/src/platform/platform.dart';
+import '../../../../route_manager.dart';
+import '../../root/parse_route.dart';
 import '../url_strategy/url_strategy.dart';
 import '../url_strategy/url_strategy.dart';
 
 
-class GetNavigation extends RouterDelegate<PageSettings>
+class GetNavigation extends RouterDelegate<RouteDecoder>
     with
     with
         ListNotifierSingleMixin,
         ListNotifierSingleMixin,
-        PopNavigatorRouterDelegateMixin<PageSettings>,
+        PopNavigatorRouterDelegateMixin<RouteDecoder>,
         IGetNavigation {
         IGetNavigation {
-  final _activePages = <GetPage>[];
+  final _activePages = <RouteDecoder>[];
   final GetPage _unknownPage;
   final GetPage _unknownPage;
   final List<NavigatorObserver>? navigatorObservers;
   final List<NavigatorObserver>? navigatorObservers;
   final String? restorationScopeId;
   final String? restorationScopeId;
@@ -21,7 +24,7 @@ class GetNavigation extends RouterDelegate<PageSettings>
   static late final GetNavigation instance;
   static late final GetNavigation instance;
 
 
   @override
   @override
-  Future<void> setInitialRoutePath(PageSettings configuration) async {
+  Future<void> setInitialRoutePath(RouteDecoder configuration) async {
     setNewRoutePath(configuration);
     setNewRoutePath(configuration);
   }
   }
 
 
@@ -50,7 +53,7 @@ class GetNavigation extends RouterDelegate<PageSettings>
   }
   }
 
 
   @protected
   @protected
-  GetPage<T>? _getPage<T>(PageSettings arguments) {
+  RouteDecoder? _getRouteDecoder<T>(PageSettings arguments) {
     var page = arguments.uri.path;
     var page = arguments.uri.path;
     final parameters = arguments.params;
     final parameters = arguments.params;
     if (parameters.isNotEmpty) {
     if (parameters.isNotEmpty) {
@@ -59,23 +62,32 @@ class GetNavigation extends RouterDelegate<PageSettings>
     }
     }
 
 
     final decoder = Get.routeTree.matchRoute(page, arguments: arguments);
     final decoder = Get.routeTree.matchRoute(page, arguments: arguments);
-    decoder.replaceArguments(arguments);
+    final route = decoder.route;
+    if (route == null) return null;
+    return _configureRouterDecoder(decoder, arguments);
+    // decoder.replaceArguments(arguments);
     //decoder.replaceParameters(arguments)
     //decoder.replaceParameters(arguments)
 
 
-    return decoder.route as GetPage<T>?;
+    // return decoder;
   }
   }
 
 
   @protected
   @protected
-  GetPage<T> _buildSettings<T>(GetPage<T> page, PageSettings arguments) {
-    return page.copy(
-        completer: _activePages.isEmpty ? null : Completer(),
-        arguments: arguments);
+  RouteDecoder _configureRouterDecoder<T>(
+      RouteDecoder decoder, PageSettings arguments) {
+    // final decoder = Get.routeTree.matchRoute(page.name, arguments: arguments);
+
+    decoder.route = decoder.route?.copy(
+      completer: _activePages.isEmpty ? null : Completer(),
+      arguments: arguments,
+      parameters: arguments.params,
+    );
+    return decoder;
   }
   }
 
 
-  Future<T?> _push<T>(PageSettings arguments, GetPage<T> page) async {
-    final activePage = _buildSettings<T>(page, arguments);
-    final onStackPage = _activePages
-        .firstWhereOrNull((element) => element.key == activePage.key);
+  Future<T?> _push<T>(RouteDecoder activePage) async {
+    // final activePage = _configureRouterDecoder<T>(page, arguments);
+    final onStackPage = _activePages.firstWhereOrNull(
+        (element) => element.route?.key == activePage.route?.key);
 
 
     /// There are no duplicate routes in the stack
     /// There are no duplicate routes in the stack
     if (onStackPage == null) {
     if (onStackPage == null) {
@@ -86,19 +98,33 @@ class GetNavigation extends RouterDelegate<PageSettings>
       _activePages.add(onStackPage);
       _activePages.add(onStackPage);
     }
     }
     refresh();
     refresh();
-    return activePage.completer?.future;
+    return activePage.route?.completer?.future as Future<T?>?;
   }
   }
 
 
   Future<T?> _replace<T>(PageSettings arguments, GetPage<T> page) async {
   Future<T?> _replace<T>(PageSettings arguments, GetPage<T> page) async {
     final index = _activePages.length > 1 ? _activePages.length - 1 : 0;
     final index = _activePages.length > 1 ? _activePages.length - 1 : 0;
-    final activePage = _buildSettings<T>(page, arguments);
-    Get.addPage(activePage);
+    Get.addPage(page);
+
+    final route = _getRouteDecoder(arguments);
+
+    final activePage = _configureRouterDecoder<T>(route!, arguments);
+
     _activePages[index] = activePage;
     _activePages[index] = activePage;
 
 
     refresh();
     refresh();
-    final result = await activePage.completer?.future;
-    Get.removePage(activePage);
+    final result = await activePage.route?.completer?.future as Future<T?>;
+    Get.removePage(page);
+
+    return result;
+  }
+
+  Future<T?> _replaceNamed<T>(RouteDecoder activePage) async {
+    final index = _activePages.length > 1 ? _activePages.length - 1 : 0;
+    // final activePage = _configureRouterDecoder<T>(page, arguments);
+    _activePages[index] = activePage;
 
 
+    refresh();
+    final result = await activePage.route?.completer?.future as Future<T?>;
     return result;
     return result;
   }
   }
 
 
@@ -120,16 +146,16 @@ class GetNavigation extends RouterDelegate<PageSettings>
 
 
   @protected
   @protected
   void _popWithResult<T>([T? result]) {
   void _popWithResult<T>([T? result]) {
-    final completer = _activePages.removeLast().completer;
+    final completer = _activePages.removeLast().route?.completer;
     if (completer?.isCompleted == false) completer!.complete(result);
     if (completer?.isCompleted == false) completer!.complete(result);
   }
   }
 
 
   @override
   @override
   Future<T?> toNamed<T>(String page, [Object? data]) async {
   Future<T?> toNamed<T>(String page, [Object? data]) async {
     final arguments = _buildPageSettings(page, data);
     final arguments = _buildPageSettings(page, data);
-    final route = _getPage<T>(arguments);
+    final route = _getRouteDecoder<T>(arguments);
     if (route != null) {
     if (route != null) {
-      return _push<T>(arguments, route);
+      return _push<T>(route);
     }
     }
     throw 'Route $page not registered';
     throw 'Route $page not registered';
   }
   }
@@ -152,7 +178,7 @@ class GetNavigation extends RouterDelegate<PageSettings>
     double Function(BuildContext context)? gestureWidth,
     double Function(BuildContext context)? gestureWidth,
   }) async {
   }) async {
     routeName = _cleanRouteName("/${page.runtimeType}");
     routeName = _cleanRouteName("/${page.runtimeType}");
-    final route = GetPage<T>(
+    final getPage = GetPage<T>(
       name: routeName,
       name: routeName,
       opaque: opaque ?? true,
       opaque: opaque ?? true,
       page: page,
       page: page,
@@ -165,10 +191,11 @@ class GetNavigation extends RouterDelegate<PageSettings>
       binding: binding,
       binding: binding,
       transitionDuration: duration ?? Get.defaultTransitionDuration,
       transitionDuration: duration ?? Get.defaultTransitionDuration,
     );
     );
-    Get.addPage(route);
+    Get.addPage(getPage);
     final args = _buildPageSettings(routeName, arguments);
     final args = _buildPageSettings(routeName, arguments);
-    final result = await _push<T>(args, route);
-    Get.removePage(route);
+    final route = _getRouteDecoder<T>(args);
+    final result = await _push<T>(route!);
+    Get.removePage(getPage);
     return result;
     return result;
   }
   }
 
 
@@ -244,11 +271,11 @@ class GetNavigation extends RouterDelegate<PageSettings>
 
 
     final newPredicate = predicate ?? (route) => false;
     final newPredicate = predicate ?? (route) => false;
 
 
-    while (_activePages.length > 1 && !newPredicate(_activePages.last)) {
+    while (_activePages.length > 1 && !newPredicate(_activePages.last.route!)) {
       _popWithResult();
       _popWithResult();
     }
     }
 
 
-    return _push(args, route);
+    return _replace(args, route);
   }
   }
 
 
   @override
   @override
@@ -260,26 +287,25 @@ class GetNavigation extends RouterDelegate<PageSettings>
     Map<String, String>? parameters,
     Map<String, String>? parameters,
   }) async {
   }) async {
     final args = _buildPageSettings(page, arguments);
     final args = _buildPageSettings(page, arguments);
-    final route = _getPage<T>(args);
+    final route = _getRouteDecoder<T>(args);
     if (route == null) return null;
     if (route == null) return null;
 
 
     //  final newPredicate = predicate ?? (route) => false;
     //  final newPredicate = predicate ?? (route) => false;
 
 
     while (_activePages.length > 1) {
     while (_activePages.length > 1) {
       _activePages.removeLast();
       _activePages.removeLast();
-      removeLastHistory(null);
     }
     }
 
 
-    return _replace(args, route);
+    return _replaceNamed(route);
   }
   }
 
 
   @override
   @override
   Future<T?> offNamed<T>(String page, [Object? data]) async {
   Future<T?> offNamed<T>(String page, [Object? data]) async {
     final arguments = _buildPageSettings(page, data);
     final arguments = _buildPageSettings(page, data);
-    final route = _getPage<T>(arguments);
+    final route = _getRouteDecoder<T>(arguments);
     if (route == null) return null;
     if (route == null) return null;
     _popWithResult();
     _popWithResult();
-    return _push<T>(arguments, route);
+    return _push<T>(route);
   }
   }
 
 
   @override
   @override
@@ -290,15 +316,15 @@ class GetNavigation extends RouterDelegate<PageSettings>
   ]) async {
   ]) async {
     final arguments = _buildPageSettings(page, data);
     final arguments = _buildPageSettings(page, data);
 
 
-    final route = _getPage<T>(arguments);
+    final route = _getRouteDecoder<T>(arguments);
 
 
     if (route == null) return null;
     if (route == null) return null;
 
 
-    while (_activePages.isNotEmpty && !predicate(_activePages.last)) {
+    while (_activePages.isNotEmpty && !predicate(_activePages.last.route!)) {
       _popWithResult();
       _popWithResult();
     }
     }
 
 
-    return _push<T>(arguments, route);
+    return _push<T>(route);
   }
   }
 
 
   @override
   @override
@@ -312,7 +338,7 @@ class GetNavigation extends RouterDelegate<PageSettings>
     assert(() {
     assert(() {
       if (!canBack) {
       if (!canBack) {
         final last = _activePages.last;
         final last = _activePages.last;
-        final name = last.name;
+        final name = last.route?.name;
         throw 'The page $name cannot be popped';
         throw 'The page $name cannot be popped';
       }
       }
       return true;
       return true;
@@ -323,15 +349,15 @@ class GetNavigation extends RouterDelegate<PageSettings>
   Future<R?> backAndtoNamed<T, R>(String page,
   Future<R?> backAndtoNamed<T, R>(String page,
       {T? result, Object? data}) async {
       {T? result, Object? data}) async {
     final arguments = _buildPageSettings(page, data);
     final arguments = _buildPageSettings(page, data);
-    final route = _getPage<R>(arguments);
+    final route = _getRouteDecoder<R>(arguments);
     if (route == null) return null;
     if (route == null) return null;
     _popWithResult<T>(result);
     _popWithResult<T>(result);
-    return _push<R>(arguments, route);
+    return _push<R>(route);
   }
   }
 
 
   @override
   @override
   void backUntil(bool Function(GetPage) predicate) {
   void backUntil(bool Function(GetPage) predicate) {
-    while (canBack && !predicate(_activePages.last)) {
+    while (canBack && !predicate(_activePages.last.route!)) {
       _popWithResult();
       _popWithResult();
     }
     }
 
 
@@ -341,10 +367,11 @@ class GetNavigation extends RouterDelegate<PageSettings>
   @override
   @override
   void goToUnknownPage([bool clearPages = false]) {
   void goToUnknownPage([bool clearPages = false]) {
     if (clearPages) _activePages.clear();
     if (clearPages) _activePages.clear();
-    final page =
-        _buildSettings(_unknownPage, _buildPageSettings(_unknownPage.name));
-    _activePages.add(page);
-    refresh();
+
+    final pageSettings = _buildPageSettings(_unknownPage.name);
+    final routeDecoder = _getRouteDecoder(pageSettings);
+
+    _push(routeDecoder!);
   }
   }
 
 
   @override
   @override
@@ -364,28 +391,28 @@ class GetNavigation extends RouterDelegate<PageSettings>
       key: navigatorKey,
       key: navigatorKey,
       restorationScopeId: restorationScopeId,
       restorationScopeId: restorationScopeId,
       observers: navigatorObservers,
       observers: navigatorObservers,
-      pages: List.unmodifiable(_activePages),
+      pages: _activePages.map((decoder) => decoder.route!).toList(),
       onPopPage: _onPopPage,
       onPopPage: _onPopPage,
     );
     );
   }
   }
 
 
   @override
   @override
-  Future<void> setNewRoutePath(PageSettings configuration) async {
+  Future<void> setNewRoutePath(RouteDecoder configuration) async {
     // if (_activePages.isEmpty) return;
     // if (_activePages.isEmpty) return;
-    final page = _getPage(configuration);
+    final page = configuration.route;
     if (page == null) {
     if (page == null) {
       goToUnknownPage();
       goToUnknownPage();
       return;
       return;
     } else {
     } else {
-      _push(configuration, page);
+      _push(configuration);
     }
     }
   }
   }
 
 
   @override
   @override
-  PageSettings? get currentConfiguration {
+  RouteDecoder? get currentConfiguration {
     if (_activePages.isEmpty) {
     if (_activePages.isEmpty) {
       return null;
       return null;
     }
     }
-    return _activePages.last.arguments as PageSettings;
+    return _activePages.last;
   }
   }
 }
 }

@@ -2,8 +2,9 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/widgets.dart';
 
 
 import '../../../../get.dart';
 import '../../../../get.dart';
+import '../../root/parse_route.dart';
 
 
-class NewGetInformationParser extends RouteInformationParser<PageSettings> {
+class NewGetInformationParser extends RouteInformationParser<RouteDecoder> {
   final String initialRoute;
   final String initialRoute;
 
 
   NewGetInformationParser({
   NewGetInformationParser({
@@ -12,7 +13,7 @@ class NewGetInformationParser extends RouteInformationParser<PageSettings> {
     Get.log('GetInformationParser is created !');
     Get.log('GetInformationParser is created !');
   }
   }
   @override
   @override
-  SynchronousFuture<PageSettings> parseRouteInformation(
+  SynchronousFuture<RouteDecoder> parseRouteInformation(
     RouteInformation routeInformation,
     RouteInformation routeInformation,
   ) {
   ) {
     var location = routeInformation.location;
     var location = routeInformation.location;
@@ -26,19 +27,27 @@ class NewGetInformationParser extends RouteInformationParser<PageSettings> {
 
 
     Get.log('GetInformationParser: route location: $location');
     Get.log('GetInformationParser: route location: $location');
 
 
-    // final matchResult = Get.routeTree.matchRoute(location ?? initialRoute);
+    final routeName = location ?? initialRoute;
 
 
-    return SynchronousFuture(
-      PageSettings(
-        Uri.parse(location!),
-      ),
+    return SynchronousFuture(_locationToRouteDecoder(routeName));
+  }
+
+  RouteDecoder _locationToRouteDecoder(String location) {
+    var uri = Uri.parse(location);
+    final args = PageSettings(uri);
+    final decoder = Get.routeTree.matchRoute(location, arguments: args);
+    decoder.route = decoder.route?.copy(
+      completer: null,
+      arguments: args,
+      parameters: args.params,
     );
     );
+    return decoder;
   }
   }
 
 
   @override
   @override
-  RouteInformation restoreRouteInformation(PageSettings config) {
+  RouteInformation restoreRouteInformation(RouteDecoder config) {
     return RouteInformation(
     return RouteInformation(
-      location: config.name,
+      location: config.arguments?.name,
       state: null,
       state: null,
     );
     );
   }
   }

 import 'package:flutter/widgets.dart';
 import 'package:flutter/widgets.dart';
 
 
 extension PageArgExt on BuildContext {
 extension PageArgExt on BuildContext {
-  PageSettings get arguments {
-    return ModalRoute.of(this)!.settings.arguments as PageSettings;
+  RouteSettings? get settings {
+    return ModalRoute.of(this)!.settings;
+  }
+
+  PageSettings? get pageSettings {
+    final args = ModalRoute.of(this)?.settings.arguments;
+    if (args is PageSettings) {
+      return args;
+    }
+    return null;
+  }
+
+  dynamic get arguments {
+    final args = settings?.arguments;
+    if (args is PageSettings) {
+      return args.arguments;
+    } else {
+      return args;
+    }
+  }
+
+  Map<String, String> get params {
+    final args = settings?.arguments;
+    if (args is PageSettings) {
+      return args.params;
+    } else {
+      return {};
+    }
+  }
+
+  Router get router {
+    return Router.of(this);
+  }
+
+  String get location {
+    final parser = router.routeInformationParser;
+    final config = delegate.currentConfiguration;
+    return parser?.restoreRouteInformation(config)?.location ?? '/';
+  }
+
+  RouterDelegate get delegate {
+    return router.routerDelegate;
   }
   }
 }
 }
 
 

 import '../../get_navigation.dart';
 import '../../get_navigation.dart';
 
 
-class RouteDecoder<T> {
-  final List<GetPage<T>> treeBranch;
-  GetPage<T>? get route => treeBranch.isEmpty ? null : treeBranch.last;
-  final Map<String, String> parameters;
-  final Object? arguments;
+class RouteDecoder {
   const RouteDecoder(
   const RouteDecoder(
-    this.treeBranch,
-    this.parameters,
+    this.currentTreeBranch,
     this.arguments,
     this.arguments,
   );
   );
-  void replaceArguments(Object? arguments) {
-    final _route = route;
-    if (_route != null) {
-      final index = treeBranch.indexOf(_route);
-      treeBranch[index] = _route.copy(arguments: arguments);
+  final List<GetPage> currentTreeBranch;
+  final PageSettings? arguments;
+
+  GetPage? get route =>
+      currentTreeBranch.isEmpty ? null : currentTreeBranch.last;
+
+  GetPage routeOrUnknown(GetPage onUnknow) =>
+      currentTreeBranch.isEmpty ? onUnknow : currentTreeBranch.last;
+
+  set route(GetPage? getPage) {
+    if (getPage == null) return;
+    if (currentTreeBranch.isEmpty) {
+      currentTreeBranch.add(getPage);
+    } else {
+      currentTreeBranch[currentTreeBranch.length - 1] = getPage;
     }
     }
   }
   }
 
 
-  void replaceParameters(Object? arguments) {
+  List<GetPage>? get currentChildrens => route?.children;
+
+  Map<String, String> get parameters => arguments?.params ?? {};
+
+  void replaceArguments(Object? arguments) {
     final _route = route;
     final _route = route;
     if (_route != null) {
     if (_route != null) {
-      final index = treeBranch.indexOf(_route);
-      treeBranch[index] = _route.copy(parameters: parameters);
+      final index = currentTreeBranch.indexOf(_route);
+      currentTreeBranch[index] = _route.copy(arguments: arguments);
     }
     }
   }
   }
 }
 }
@@ -34,7 +43,7 @@ class ParseRouteTree {
 
 
   final List<GetPage> routes;
   final List<GetPage> routes;
 
 
-  RouteDecoder matchRoute(String name, {Object? arguments}) {
+  RouteDecoder matchRoute(String name, {PageSettings? arguments}) {
     final uri = Uri.parse(name);
     final uri = Uri.parse(name);
     // /home/profile/123 => home,profile,123 => /,/home,/home/profile,/home/profile/123
     // /home/profile/123 => home,profile,123 => /,/home,/home/profile,/home/profile/123
     final split = uri.path.split('/').where((element) => element.isNotEmpty);
     final split = uri.path.split('/').where((element) => element.isNotEmpty);
@@ -77,41 +86,44 @@ class ParseRouteTree {
             ),
             ),
           )
           )
           .toList();
           .toList();
+      arguments?.params.clear();
+      arguments?.params.addAll(params);
       return RouteDecoder(
       return RouteDecoder(
         mappedTreeBranch,
         mappedTreeBranch,
-        params,
         arguments,
         arguments,
       );
       );
     }
     }
 
 
+    arguments?.params.clear();
+    arguments?.params.addAll(params);
+
     //route not found
     //route not found
     return RouteDecoder(
     return RouteDecoder(
       treeBranch.map((e) => e.value).toList(),
       treeBranch.map((e) => e.value).toList(),
-      params,
       arguments,
       arguments,
     );
     );
   }
   }
 
 
-  void addRoutes(List<GetPage> getPages) {
+  void addRoutes<T>(List<GetPage<T>> getPages) {
     for (final route in getPages) {
     for (final route in getPages) {
       addRoute(route);
       addRoute(route);
     }
     }
   }
   }
 
 
-  void removeRoutes(List<GetPage> getPages) {
+  void removeRoutes<T>(List<GetPage<T>> getPages) {
     for (final route in getPages) {
     for (final route in getPages) {
       removeRoute(route);
       removeRoute(route);
     }
     }
   }
   }
 
 
-  void removeRoute(GetPage route) {
+  void removeRoute<T>(GetPage<T> route) {
     routes.remove(route);
     routes.remove(route);
     for (var page in _flattenPage(route)) {
     for (var page in _flattenPage(route)) {
       removeRoute(page);
       removeRoute(page);
     }
     }
   }
   }
 
 
-  void addRoute(GetPage route) {
+  void addRoute<T>(GetPage<T> route) {
     routes.add(route);
     routes.add(route);
 
 
     // Add Page children.
     // Add Page children.
@@ -165,9 +177,11 @@ class ParseRouteTree {
       );
       );
 
 
   GetPage? _findRoute(String name) {
   GetPage? _findRoute(String name) {
-    return routes.firstWhereOrNull(
+    final value = routes.firstWhereOrNull(
       (route) => route.path.regex.hasMatch(name),
       (route) => route.path.regex.hasMatch(name),
     );
     );
+
+    return value;
   }
   }
 
 
   Map<String, String> _parseParams(String path, PathDecoded routePath) {
   Map<String, String> _parseParams(String path, PathDecoded routePath) {

@@ -98,7 +98,7 @@ class GetPage<T> extends Page<T> {
     Duration? transitionDuration,
     Duration? transitionDuration,
     bool? fullscreenDialog,
     bool? fullscreenDialog,
     RouteSettings? settings,
     RouteSettings? settings,
-    List<GetPage>? children,
+    List<GetPage<T>>? children,
     GetPage? unknownRoute,
     GetPage? unknownRoute,
     List<GetMiddleware>? middlewares,
     List<GetMiddleware>? middlewares,
     bool? preventDuplicates,
     bool? preventDuplicates,