Skip to content

feat: allow passing a custom navigator key to routerConfig #26

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/src/navigation/router_delegate.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import 'routefly_page.dart';
class RouteflyRouterDelegate extends RouterDelegate<RouteEntity> //
with
ChangeNotifier {
final _navigatorKey = GlobalKey<NavigatorState>();
final GlobalKey<NavigatorState> _navigatorKey;

/// A list of observers that listen to navigation events.
final List<NavigatorObserver> observers;
Expand All @@ -26,7 +26,7 @@ class RouteflyRouterDelegate extends RouterDelegate<RouteEntity> //
/// Creates an instance of [RouteflyRouterDelegate].
///
/// [observers]: A list of navigation event observers.
RouteflyRouterDelegate(this.observers);
RouteflyRouterDelegate(this.observers, this._navigatorKey);

@override
RouteEntity? currentConfiguration;
Expand Down
12 changes: 8 additions & 4 deletions lib/src/routefly.dart
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ abstract class Routefly {
RouteBuilderWithChild? routeBuilder,
List<NavigatorObserver> observers = const [],
List<RouteMiddleware> middlewares = const [],
GlobalKey<NavigatorState>? navigatorKey,
}) {
defaultRouteBuilder = routeBuilder ?? materialRouteBuilder;

Expand All @@ -290,10 +291,13 @@ abstract class Routefly {
),
);

_delegate ??= RouteflyRouterDelegate([
HeroController(),
...observers,
]);
_delegate ??= RouteflyRouterDelegate(
[
HeroController(),
...observers,
],
navigatorKey ?? GlobalKey(),
);

return RouterConfig(
routerDelegate: _delegate!,
Expand Down