Skip to content

fix navigate function to have two different behaviors #377

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.

Sign up for GitHub

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 1 commit into from
Apr 25, 2021
Merged

fix navigate function to have two different behaviors #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 23 additions & 19 deletions flutter_modular/lib/src/presenters/navigation/modular_router_delegate.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,32 @@ class ModularRouterDelegate extends RouterDelegate<ModularRoute>
router: router,
);

// Fix navigate function to don't replace a route of the same module
final modulePath = page.router.modulePath;
final valideModulePath = modulePath != null;
final routeIsInModule = page.router.path?.contains(modulePath!);

if (_pages.isEmpty || (valideModulePath && (routeIsInModule ?? false))) {
if (_pages.isEmpty) {
_pages.add(page);
} else {
for (var p in _pages) {
p.completePop(null);
removeInject(p.router.path!);
for (var r in p.router.routerOutlet) {
removeInject(r.path!);
}
}
if (replaceAll) {
_pages = [page];
} else if (_pages.last.router.path != router.path) {
_pages.last = page;
// Fix navigate function to don't replace a route of the same module and
// replace all external modules
final _lastPageModule = _pages.last;
final routeIsInModule = _lastPageModule.router.modulePath == page.router.modulePath;

if (routeIsInModule) {
_pages.add(page);
} else {
_pages.last.router.routerOutlet.clear();
_pages.last.router.routerOutlet.add(router.routerOutlet.last);
for (var p in _pages) {
p.completePop(null);
removeInject(p.router.path!);
for (var r in p.router.routerOutlet) {
removeInject(r.path!);
}
}
if (replaceAll) {
_pages = [page];
} else if (_pages.last.router.path != router.path) {
_pages.last = page;
} else {
_pages.last.router.routerOutlet.clear();
_pages.last.router.routerOutlet.add(router.routerOutlet.last);
}
}
}

Expand Down