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

Jump to bottom

[CP Staging] fix: 30988 New dot opens when navigate to the staging magic link, not abracadabra page #31014

Merged
merged 2 commits into from
Nov 7, 2023
Merged

[CP Staging] fix: 30988 New dot opens when navigate to the staging magic link, not abracadabra page #31014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24d9f0
fix: 30988 New dot opens when navigate to the staging magic link, not…
tienifr Nov 7, 2023
a253dfc
add comment
tienifr Nov 7, 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
31 changes: 15 additions & 16 deletions src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,24 @@ const defaultProps = {
screenOptions: undefined,
};

function splitRoutes(routes) {
const reportRoutes = [];
const rhpRoutes = [];
const otherRoutes = [];
function reduceReportRoutes(routes) {
const result = [];
let count = 0;
const reverseRoutes = [...routes].reverse();

routes.forEach((route) => {
reverseRoutes.forEach((route) => {
if (route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR) {
reportRoutes.push(route);
} else if (route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
rhpRoutes.push(route);
// Remove all report routes except the last 3. This will improve performance.
if (count < 3) {
result.push(route);
count++;
}
} else {
otherRoutes.push(route);
result.push(route);
}
});

return {reportRoutes, rhpRoutes, otherRoutes};
return result.reverse();
}

function ResponsiveStackNavigator(props) {
Expand All @@ -60,15 +62,12 @@ function ResponsiveStackNavigator(props) {
});

const stateToRender = useMemo(() => {
const {reportRoutes, rhpRoutes, otherRoutes} = splitRoutes(state.routes);

// Remove all report routes except the last 3. This will improve performance.
Copy link
Contributor

Choose a reason for hiding this comment

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

We can keep this comment but just move to here

const limitedReportRoutes = reportRoutes.slice(-3);
const result = reduceReportRoutes(state.routes);

return {
...state,
index: otherRoutes.length + limitedReportRoutes.length + rhpRoutes.length - 1,
routes: [...otherRoutes, ...limitedReportRoutes, ...rhpRoutes],
index: result.length - 1,
routes: [...result],
};
}, [state]);

Expand Down
Loading