+ isPathsFirstDirectorySame() to share with `plugins/routerGuard.cl…

…ient.ts` & `app/router.options.ts` @ utils/router.ts @ fe
n0099 · Jun 20, 2024 · d5fcc95 · d5fcc95
1 parent a7fc3b0
commit d5fcc95
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/fe/src/app/router.options.ts b/fe/src/app/router.options.ts
@@ -70,8 +70,7 @@ export default {
             assertRouteNameIsStr(to.name);
             assertRouteNameIsStr(from.name);
 
-            // scroll to top when the prefix of route name changed
-            if (to.name.split('/')[0] !== from.name.split('/')[0])
+            if (isPathsFirstDirectorySame(to.path, from.path))
                 return { top: 0 };
         }
 

diff --git a/fe/src/plugins/routerGuard.client.ts b/fe/src/plugins/routerGuard.client.ts
@@ -5,11 +5,7 @@ export default defineNuxtPlugin(() => {
 
     const router = useRouter();
     router.beforeEach((to, from) => {
-        const getPathFirstDirectory = (path: string) => {
-            const secondSlashIndex = path.indexOf('/', 1);
-            return secondSlashIndex === -1 ? path : path.substring(0, secondSlashIndex);
-        };
-        if (getPathFirstDirectory(to.path) === getPathFirstDirectory(from.path))
+        if (isPathsFirstDirectorySame(to.path, from.path))
             return;
         start();
     });

diff --git a/fe/src/utils/router.ts b/fe/src/utils/router.ts
@@ -26,6 +26,8 @@ export const getNextCursorRoute = (route: RouteLocationNormalized, nextCursor?:
     return { query, name, params: { ...params, cursor: nextCursor } };
 };
 
+export const isPathsFirstDirectorySame = (a: string, b: string) =>
+    a.split('/')[1] === b.split('/')[1];
 const exports = {
     routes: () => [
         {