Skip to content
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

Add logic in get active route #33370

Merged
merged 9 commits into from
Jan 2, 2024
+8 −2
Merged

Add logic in get active route #33370

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
61857e7
Add logic in get active route
dukenv0307 Dec 20, 2023
d649930
fix: slash in native
dukenv0307 Dec 22, 2023
3f7fc64
fix: lint
dukenv0307 Dec 22, 2023
c734dd8
Remove useless logic in get active route
dukenv0307 Dec 25, 2023
de63760
Merge branch 'main' into fix/33001
dukenv0307 Dec 26, 2023
99989a3
fix: add fallback in get active route
dukenv0307 Dec 26, 2023
85430b2
Update src/libs/Navigation/Navigation.ts
dukenv0307 Dec 27, 2023
1eb6e35
fix get active route
dukenv0307 Dec 27, 2023
7163807
fix lint
dukenv0307 Dec 27, 2023
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
10 changes: 8 additions & 2 deletions src/libs/Navigation/Navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ function getActiveRoute(): string {
return '';
}

if (currentRoute?.path) {
return currentRoute.path;
}

Comment on lines +98 to +101
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we remove the rest of the logic and only keep this one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated

Copy link
Contributor

Choose a reason for hiding this comment

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

@dukenv0307 I just found that currentRoute.path is only available for the first navigated route. We may need to use the rootFromState as a fallback here

Screen.Recording.2023-12-25.at.7.53.50.PM.mov

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your comment, I just updated. Please check again

const routeFromState = getPathFromState(navigationRef.getRootState(), linkingConfig.config);

if (routeFromState) {
Expand All @@ -114,8 +118,10 @@ function getActiveRoute(): string {
* @return is active
*/
function isActiveRoute(routePath: Route): boolean {
// We remove First forward slash from the URL before matching
return getActiveRoute().substring(1) === routePath;
let activeRoute = getActiveRoute();
activeRoute = activeRoute.startsWith('/') ? activeRoute.substring(1) : activeRoute;

return activeRoute === routePath;
}

/**
Expand Down
Loading