fix: loosen navLink active matching

vuejs · Jan 1, 2021 · 8a2ff33 · 8a2ff33
1 parent c4b4f5a
commit 8a2ff33
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/client/theme-default/composables/navLink.ts b/src/client/theme-default/composables/navLink.ts
@@ -13,8 +13,9 @@ export function useNavLink(item: DefaultTheme.NavItemWithLink) {
   const props = computed(() => {
     return {
       class: {
-        active:
-          normalizePath(withBase(item.link)) === normalizePath(route.path),
+        active: normalizePath(route.path).startsWith(
+          normalizePath(withBase(item.link))
+        ),
         isExternal
       },
       href: isExternal ? item.link : withBase(item.link),
@@ -31,14 +32,8 @@ export function useNavLink(item: DefaultTheme.NavItemWithLink) {
 }
 
 function normalizePath(path: string): string {
-  path = path
+  return path
     .replace(/#.*$/, '')
     .replace(/\?.*$/, '')
-    .replace(/\.html$/, '')
-
-  if (path.endsWith('/')) {
-    path += 'index'
-  }
-
-  return path
+    .replace(/\.(html|md)$/, '')
 }