fix: allow opening duplicate Modal route stacks. (#6235)

OneKeyHQ · Nov 27, 2024 · 54ff092 · 54ff092
1 parent 2d6e686
commit 54ff092
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/kit/src/hooks/useAppNavigation.ts b/packages/kit/src/hooks/useAppNavigation.ts
@@ -108,11 +108,12 @@ function useAppNavigation<
         rootNavigation = rootNavigation.getParent();
       }
 
+      const routeLength = rootNavigation?.getState?.()?.routes?.length ?? 1;
       const existPageIndex = rootNavigation?.getState?.()?.routes?.findIndex(
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         (rootRoute) => params?.screen === rootRoute?.params?.params?.screen,
       );
-      if ((existPageIndex ?? -1) !== -1) {
+      if (existPageIndex !== -1 && existPageIndex === routeLength - 1) {
         return;
       }
 
@@ -150,7 +151,7 @@ function useAppNavigation<
         params?: IModalParamList[T][keyof IModalParamList[T]];
       },
     ) => {
-      pushModalPage(ERootRoutes.Modal, route, params);
+      pushModalPage(ERootRoutes.Modal, route, params as any);
     },
     [pushModalPage],
   );
@@ -163,7 +164,7 @@ function useAppNavigation<
         params?: IModalParamList[T][keyof IModalParamList[T]];
       },
     ) => {
-      pushModalPage(ERootRoutes.iOSFullScreen, route, params);
+      pushModalPage(ERootRoutes.iOSFullScreen, route, params as any);
     },
     [pushModalPage],
   );