Remove Navigation.popToTop and add shouldPopToTop to GoBackOptions

software-mansion-labs · Dec 20, 2024 · 17759f4 · 17759f4
1 parent 99fc247
commit 17759f4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
@@ -225,10 +225,17 @@ type GoBackOptions = {
      * In that case we want to goUp to a country picker with any params so we don't compare them.
      */
     compareParams?: boolean;
+
+    /**
+     * Specifies whether goBack should pop to top when invoked.
+     * Additionaly, to execute popToTop, set the value of the global variable ShouldPopAllStateOnUP to true using the setShouldPopAllStateOnUP function.
+     */
+    shouldPopToTop?: boolean;
 };
 
 const defaultGoBackOptions: Required<GoBackOptions> = {
     compareParams: true,
+    shouldPopToTop: false,
 };
 
 /**
@@ -298,6 +305,14 @@ function goBack(fallbackRoute?: Route, options?: GoBackOptions) {
         return;
     }
 
+    if (options?.shouldPopToTop) {
+        if (shouldPopAllStateOnUP) {
+            shouldPopAllStateOnUP = false;
+            navigationRef.current?.dispatch(StackActions.popToTop());
+            return;
+        }
+    }
+
     if (fallbackRoute) {
         goUp(fallbackRoute, options);
         return;

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -2468,7 +2468,7 @@ function navigateToConciergeChatAndDeleteReport(reportID: string, shouldPopToTop
     // @TODO: Check if this method works the same as on the main branch
     if (shouldPopToTop) {
         Navigation.setShouldPopAllStateOnUP(true);
-        Navigation.popToTop();
+        Navigation.goBack(undefined, {shouldPopToTop: true});
     } else {
         Navigation.goBack();
     }

diff --git a/src/libs/navigateAfterJoinRequest/index.desktop.ts b/src/libs/navigateAfterJoinRequest/index.desktop.ts
@@ -4,7 +4,7 @@ import ROUTES from '@src/ROUTES';
 
 const navigateAfterJoinRequest = () => {
     // @TODO: Check if this method works the same as on the main branch
-    Navigation.popToTop();
+    Navigation.goBack(undefined, {shouldPopToTop: true});
     if (getIsSmallScreenWidth()) {
         Navigation.navigate(ROUTES.SETTINGS);
     }

diff --git a/src/libs/navigateAfterJoinRequest/index.ts b/src/libs/navigateAfterJoinRequest/index.ts
@@ -3,7 +3,7 @@ import ROUTES from '@src/ROUTES';
 
 const navigateAfterJoinRequest = () => {
     // @TODO: Check if this method works the same as on the main branch
-    Navigation.popToTop();
+    Navigation.goBack(undefined, {shouldPopToTop: true});
     Navigation.navigate(ROUTES.SETTINGS);
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 };

diff --git a/src/libs/navigateAfterJoinRequest/index.web.ts b/src/libs/navigateAfterJoinRequest/index.web.ts
@@ -4,7 +4,7 @@ import ROUTES from '@src/ROUTES';
 
 const navigateAfterJoinRequest = () => {
     // @TODO: Check if this method works the same as on the main branch
-    Navigation.popToTop();
+    Navigation.goBack(undefined, {shouldPopToTop: true});
     if (getIsSmallScreenWidth()) {
         Navigation.navigate(ROUTES.SETTINGS);
     }

diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
@@ -303,7 +303,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
             return;
         }
         // @TODO: Handle popToTop here
-        Navigation.goBack(ROUTES.HOME);
+        Navigation.goBack(ROUTES.HOME, {shouldPopToTop: true});
     }, [isInNarrowPaneModal]);
 
     let headerView = (
@@ -609,7 +609,7 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
             if (Navigation.getTopmostReportId() === prevOnyxReportID) {
                 Navigation.setShouldPopAllStateOnUP(true);
                 // @TODO: Check if this method works the same as on the main branch
-                Navigation.popToTop();
+                Navigation.goBack(undefined, {shouldPopToTop: true});
             }
             if (prevReport?.parentReportID) {
                 // Prevent navigation to the IOU/Expense Report if it is pending deletion.

diff --git a/src/pages/workspace/WorkspaceJoinUserPage.tsx b/src/pages/workspace/WorkspaceJoinUserPage.tsx
@@ -47,7 +47,7 @@ function WorkspaceJoinUserPage({route, policy}: WorkspaceJoinUserPageProps) {
             Navigation.isNavigationReady().then(() => {
                 // @TODO: Check if this method works the same as on the main branch
                 // NOTE: It probably doesn't need any params. When this method is called, shouldPopAllStateOnUP is always false
-                Navigation.popToTop();
+                Navigation.goBack(undefined, {shouldPopToTop: true});
                 Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID ?? '-1'));
             });
             return;