@@ -4,10 +4,8 @@ import 'package:go_router/go_router.dart';
44
55extension Navigators on BuildContext {
66 String ? get currentRoute => ModalRoute .of (this )? .settings.name;
7- (String ? , Object ? ) get currentRouteSettings => (
8- ModalRoute .of (this )? .settings.name,
9- ModalRoute .of (this )? .settings.arguments
10- );
7+ (String ? , Object ? ) get currentRouteSettings =>
8+ (ModalRoute .of (this )? .settings.name, ModalRoute .of (this )? .settings.arguments);
119 void unFocusKeyboard () {
1210 try {
1311 if (mounted) FocusScope .of (this ).unfocus ();
@@ -53,9 +51,7 @@ extension Navigators on BuildContext {
5351
5452 final currentValue = currentRouteSettings.$2;
5553
56- if (currentValue is Map &&
57- currentRoute == path.name &&
58- arguments == currentValue[path.pathParamsName]) {
54+ if (currentValue is Map && currentRoute == path.name && arguments == currentValue[path.pathParamsName]) {
5955 return ;
6056 }
6157 }
@@ -64,13 +60,8 @@ extension Navigators on BuildContext {
6460 .pushNamed (
6561 path.name,
6662 extra: arguments,
67- pathParameters: pathParametersRaw ??
68- (pathParameters.isNotEmpty
69- ? {path.pathParamsName: pathParameters}
70- : {}),
71- queryParameters: queryParameters.isNotEmpty
72- ? {path.queryParamsName: queryParameters}
73- : {},
63+ pathParameters: pathParametersRaw ?? (pathParameters.isNotEmpty ? {path.pathParamsName: pathParameters} : {}),
64+ queryParameters: queryParameters.isNotEmpty ? {path.queryParamsName: queryParameters} : {},
7465 )
7566 .then ((value) {
7667 unFocusKeyboard ();
@@ -87,8 +78,7 @@ extension Navigators on BuildContext {
8778 .pushReplacementNamed (
8879 path.name,
8980 extra: arguments,
90- pathParameters:
91- pathParameters.isEmpty ? {} : {path.pathParamsName: pathParameters},
81+ pathParameters: pathParameters.isEmpty ? {} : {path.pathParamsName: pathParameters},
9282 )
9383 .then ((value) {
9484 unFocusKeyboard ();
@@ -110,8 +100,7 @@ extension Navigators on BuildContext {
110100 .pushReplacementNamed (
111101 path.name,
112102 extra: arguments,
113- pathParameters:
114- pathParameters.isEmpty ? {} : {path.pathParamsName: pathParameters},
103+ pathParameters: pathParameters.isEmpty ? {} : {path.pathParamsName: pathParameters},
115104 )
116105 .then ((value) {
117106 unFocusKeyboard ();
@@ -133,8 +122,7 @@ extension Navigators on BuildContext {
133122 .pushNamed (
134123 path.name,
135124 extra: arguments,
136- pathParameters:
137- pathParameters.isEmpty ? {} : {path.pathParamsName: pathParameters},
125+ pathParameters: pathParameters.isEmpty ? {} : {path.pathParamsName: pathParameters},
138126 )
139127 .then ((value) {
140128 unFocusKeyboard ();
0 commit comments