Skip to content

[Search v1] Report screen in RHP is removed from navigation history after navigating to the chat in CentralPane #44001

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
luacmartins merged 8 commits into from
Jun 20, 2024
Merged

[Search v1] Report screen in RHP is removed from navigation history after navigating to the chat in CentralPane #44001

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3ee9c6
Add isReportInRhpOpened
WojtekBoman Jun 19, 2024
ac222bd
Refactor docs
WojtekBoman Jun 19, 2024
3161cc5
Refactor handling isReportInRhpOpened
WojtekBoman Jun 19, 2024
9b63656
Refactor check isReportInRhpOpened
WojtekBoman Jun 19, 2024
d9dc3d7
Refactor check isReportInRhpOpened
WojtekBoman Jun 19, 2024
ed788a0
Fix types in linkTo
WojtekBoman Jun 19, 2024
8b51309
Merge branch 'main' into search/fix-removing-rhp-report-from-nav-state
WojtekBoman Jun 20, 2024
296e8dd
Refactor check isReportInRhpOpened
WojtekBoman Jun 20, 2024
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
12 changes: 10 additions & 2 deletions src/libs/Navigation/linkTo/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
const extractedPolicyID = extractPolicyIDFromPath(`/${path}`);
const policyIDFromState = getPolicyIDFromState(rootState);
const policyID = extractedPolicyID ?? policyIDFromState ?? policyIDs;
const lastRoute = rootState?.routes?.at(-1);

const isNarrowLayout = getIsNarrowLayout();

const isFullScreenOnTop = rootState.routes?.at(-1)?.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR;
const isFullScreenOnTop = lastRoute?.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR;

// policyIDs is present only on SCREENS.SEARCH.CENTRAL_PANE and it's displayed in the url as a query param, on the other pages this parameter is called policyID and it's shown in the url in the format: /w/:policyID
if (policyID && !isFullScreenOnTop && !policyIDs) {
Expand All @@ -66,9 +67,11 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam

const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig.config);

const isReportInRhpOpened = lastRoute?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute?.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT);

// If action type is different than NAVIGATE we can't change it to the PUSH safely
if (action?.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) {
const topRouteName = rootState?.routes?.at(-1)?.name;
const topRouteName = lastRoute?.name;
const isTargetNavigatorOnTop = topRouteName === action.payload.name;

const isTargetScreenDifferentThanCurrent = !!(!topmostCentralPaneRoute || topmostCentralPaneRoute.name !== action.payload.params?.screen);
Expand Down Expand Up @@ -201,6 +204,11 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
}
}

// When we navigate from the ReportScreen opened in RHP, this page shouldn't be removed from the navigation state to allow users to go back to it.
if (isReportInRhpOpened && action) {
action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
}

if (action !== undefined) {
root.dispatch(action);
} else {
Expand Down