Skip to content

[go _route] fragment parameter added #8232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cc3ac4f
Previously, users had to manually append fragments
AffanShaikhsurab Dec 5, 2024
7a641b4
extensions.dart file formatted using dart format
AffanShaikhsurab Dec 5, 2024
c740df8
Merge branch 'main' into main
AffanShaikhsurab Dec 7, 2024
2a0cf73
Added the the fragment handling to the
AffanShaikhsurab Dec 10, 2024
851905b
Merge branch 'main' of https://github.com/AffanShaikhsurab/packages
AffanShaikhsurab Dec 10, 2024
29d8f6c
Merge branch 'flutter:main' into main
AffanShaikhsurab Dec 10, 2024
3f3adcb
Merge branch 'main' into main
AffanShaikhsurab Dec 12, 2024
b4c2efc
Merge branch 'main' into main
AffanShaikhsurab Dec 12, 2024
080a38e
Merge branch 'main' into main
AffanShaikhsurab Dec 17, 2024
ebb8cdc
Fix: Include fragment in URI generated by GoRouter
AffanShaikhsurab Dec 17, 2024
b6cfe44
Merge branch 'main' of https://github.com/AffanShaikhsurab/packages
AffanShaikhsurab Dec 17, 2024
62b6027
updated changeLog
AffanShaikhsurab Dec 17, 2024
b948c71
Fix: Implement fragment-based redirection in GoRouter test
AffanShaikhsurab Dec 18, 2024
58a1b12
Merge branch 'main' into main
AffanShaikhsurab Dec 18, 2024
0816efd
dart format
AffanShaikhsurab Dec 18, 2024
32555fc
Merge branch 'main' of https://github.com/AffanShaikhsurab/packages
AffanShaikhsurab Dec 18, 2024
0fee133
added anotation
AffanShaikhsurab Dec 18, 2024
8dec200
Merge branch 'main' into main
AffanShaikhsurab Dec 19, 2024
ea4d752
Merge branch 'main' into main
AffanShaikhsurab Dec 25, 2024
362e23e
Merge branch 'main' into main
AffanShaikhsurab Dec 28, 2024
fcb1b91
Merge branch 'main' into main
AffanShaikhsurab Dec 31, 2024
1bcd8b3
Merge branch 'main' into main
AffanShaikhsurab Jan 3, 2025
0b507b0
Merge branch 'main' into main
AffanShaikhsurab Jan 4, 2025
6651f6c
Refactor: Update `namedLocation` method to include `fragment` parameter
AffanShaikhsurab Jan 11, 2025
1ef08a4
Merge branch 'main' of https://github.com/AffanShaikhsurab/packages
AffanShaikhsurab Jan 11, 2025
b6546a4
Delete packages/go_router/log.txt
AffanShaikhsurab Jan 11, 2025
aed6d08
Merge branch 'main' into main
AffanShaikhsurab Jan 11, 2025
a45bb0d
Merge branch 'main' into main
AffanShaikhsurab Jan 17, 2025
feae635
Merge branch 'main' into main
AffanShaikhsurab Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/go_router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 14.7.0

- Adds fragment support to GoRouter, enabling direct specification and automatic handling of fragments in routes.

## 14.6.4

- Rephrases readme.
Expand All @@ -7,6 +11,7 @@
- Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
- Updates readme.


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

additional line?

## 14.6.2

- Replaces deprecated collection method usage.
Expand All @@ -23,7 +28,6 @@

- Adds preload support to StatefulShellRoute, configurable via `preload` parameter on StatefulShellBranch.


## 14.4.1

- Adds `missing_code_block_language_in_doc_comment` lint.
Expand All @@ -42,7 +46,7 @@

## 14.2.8

- Updated custom_stateful_shell_route example to better support swiping in TabView as well as demonstration of the use of PageView.
- Updated custom_stateful_shell_route example to better support swiping in TabView as well as demonstration of the use of PageView.

## 14.2.7

Expand Down Expand Up @@ -1146,3 +1150,4 @@
## 0.1.0

- squatting on the package name (I'm not too proud to admit it)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

additional line?

7 changes: 5 additions & 2 deletions packages/go_router/lib/src/configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,14 @@ class RouteConfiguration {
String name, {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
String? fragment,
}) {
assert(() {
log('getting location for name: '
'"$name"'
'${pathParameters.isEmpty ? '' : ', pathParameters: $pathParameters'}'
'${queryParameters.isEmpty ? '' : ', queryParameters: $queryParameters'}');
'${queryParameters.isEmpty ? '' : ', queryParameters: $queryParameters'}'
'${fragment != null ? ', fragment: $fragment' : ''}');
return true;
}());
assert(_nameToPath.containsKey(name), 'unknown route name: $name');
Expand All @@ -285,7 +287,8 @@ class RouteConfiguration {
final String location = patternToPath(path, encodedParams);
return Uri(
path: location,
queryParameters: queryParameters.isEmpty ? null : queryParameters)
queryParameters: queryParameters.isEmpty ? null : queryParameters,
fragment: fragment)
.toString();
}

Expand Down
17 changes: 10 additions & 7 deletions packages/go_router/lib/src/misc/extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ extension GoRouterHelper on BuildContext {
String name, {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
String? fragment,
}) =>
GoRouter.of(this).namedLocation(name,
pathParameters: pathParameters, queryParameters: queryParameters);
pathParameters: pathParameters,
queryParameters: queryParameters,
fragment: fragment);

/// Navigate to a location.
void go(String location, {Object? extra}) =>
Expand All @@ -30,13 +33,13 @@ extension GoRouterHelper on BuildContext {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
Object? extra,
String? fragment,
}) =>
GoRouter.of(this).goNamed(
name,
pathParameters: pathParameters,
queryParameters: queryParameters,
extra: extra,
);
GoRouter.of(this).goNamed(name,
pathParameters: pathParameters,
queryParameters: queryParameters,
extra: extra,
fragment: fragment);

/// Push a location onto the page stack.
///
Expand Down
17 changes: 11 additions & 6 deletions packages/go_router/lib/src/router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,15 @@ class GoRouter implements RouterConfig<RouteMatchList> {

/// Get a location from route name and parameters.
/// This is useful for redirecting to a named location.
String namedLocation(
String name, {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
}) =>
String namedLocation(String name,
{Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
String? fragment}) =>
configuration.namedLocation(
name,
pathParameters: pathParameters,
queryParameters: queryParameters,
fragment: fragment,
);

/// Navigate to a URI location w/ optional query parameters, e.g.
Expand All @@ -366,10 +366,15 @@ class GoRouter implements RouterConfig<RouteMatchList> {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
Object? extra,
String? fragment,
}) =>

/// Construct location with optional fragment, using null-safe navigation
go(
namedLocation(name,
pathParameters: pathParameters, queryParameters: queryParameters),
pathParameters: pathParameters,
queryParameters: queryParameters,
fragment: fragment),
extra: extra,
);

Expand Down
7 changes: 6 additions & 1 deletion packages/go_router/lib/src/state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,14 @@ class GoRouterState {
String name, {
Map<String, String> pathParameters = const <String, String>{},
Map<String, String> queryParameters = const <String, String>{},
String? fragment,
}) {
// Generate base location using configuration, with optional path and query parameters
// Then conditionally append fragment if it exists and is not empty
return _configuration.namedLocation(name,
pathParameters: pathParameters, queryParameters: queryParameters);
pathParameters: pathParameters,
queryParameters: queryParameters,
fragment: fragment);
}

@override
Expand Down
3 changes: 2 additions & 1 deletion packages/go_router/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: go_router
description: A declarative router for Flutter based on Navigation 2 supporting
deep linking, data-driven routes and more
version: 14.6.4
version: 14.7.0

repository: https://github.com/flutter/packages/tree/main/packages/go_router
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22

Expand Down
52 changes: 52 additions & 0 deletions packages/go_router/test/go_route_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,58 @@ void main() {
expect(tester.takeException(), isAssertionError);
});

testWidgets('redirects to a valid route based on fragment.',
(WidgetTester tester) async {
final GoRouter router = await createRouter(
<RouteBase>[
GoRoute(
path: '/',
builder: (_, __) => const Text('home'),
routes: <RouteBase>[
GoRoute(
path: 'route',
name: 'route',
redirect: (BuildContext context, GoRouterState state) {
// Redirection logic based on the fragment in the URI
if (state.uri.fragment == '1') {
// If fragment is "1", redirect to "/route/1"
return '/route/1';
}
return null; // No redirection for other cases
},
routes: <RouteBase>[
GoRoute(
path: '1',
builder: (_, __) =>
const Text('/route/1'), // Renders "/route/1" text
),
],
),
],
),
],
tester,
);
// Verify that the root route ("/") initially displays the "home" text
expect(find.text('home'), findsOneWidget);

// Generate a location string for the named route "route" with fragment "2"
final String locationWithFragment =
router.namedLocation('route', fragment: '2');
expect(locationWithFragment,
'/route#2'); // Expect the generated location to be "/route#2"

// Navigate to the named route "route" with fragment "1"
router.goNamed('route', fragment: '1');
await tester.pumpAndSettle();

// Verify that navigating to "/route" with fragment "1" redirects to "/route/1"
expect(find.text('/route/1'), findsOneWidget);

// Ensure no exceptions occurred during navigation
expect(tester.takeException(), isNull);
});

testWidgets('throw if sub route does not conform with parent navigator key',
(WidgetTester tester) async {
final GlobalKey<NavigatorState> key1 = GlobalKey<NavigatorState>();
Expand Down
14 changes: 9 additions & 5 deletions packages/go_router/test/test_helpers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,17 @@ class GoRouterNamedLocationSpy extends GoRouter {
String? name;
Map<String, String>? pathParameters;
Map<String, dynamic>? queryParameters;
String? fragment;

@override
String namedLocation(
String name, {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
}) {
String namedLocation(String name,
{Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
String? fragment}) {
this.name = name;
this.pathParameters = pathParameters;
this.queryParameters = queryParameters;
this.fragment = fragment;
return '';
}
}
Expand Down Expand Up @@ -85,18 +86,21 @@ class GoRouterGoNamedSpy extends GoRouter {
Map<String, String>? pathParameters;
Map<String, dynamic>? queryParameters;
Object? extra;
String? fragment;

@override
void goNamed(
String name, {
Map<String, String> pathParameters = const <String, String>{},
Map<String, dynamic> queryParameters = const <String, dynamic>{},
Object? extra,
String? fragment,
}) {
this.name = name;
this.pathParameters = pathParameters;
this.queryParameters = queryParameters;
this.extra = extra;
this.fragment = fragment;
}
}

Expand Down
Loading