fix: incorrect conventional 2-level nav in localized routes (#1849)

umijs · Aug 25, 2023 · 4ffe77e · 4ffe77e
1 parent 804836f
commit 4ffe77e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/client/theme-api/useNavData.ts b/src/client/theme-api/useNavData.ts
@@ -6,6 +6,7 @@ import type {
   IUserNavItems,
   IUserNavMode,
 } from './types';
+import { getLocaleClearPath } from './useSidebarData';
 import {
   getLocaleNav,
   pickRouteSortMeta,
@@ -64,7 +65,10 @@ export const useNavData = () => {
         .sort(([a], [b]) => a.split('/').length - b.split('/').length)
         // convert sidebar data to nav data
         .reduce<Record<string, INavItems[0]>>((ret, [link, groups]) => {
-          const [, parentPath, restPath] = link.match(/^(\/[^/]+)([^]+)?$/)!;
+          const [, parentPath, restPath] = `/${getLocaleClearPath(
+            link.replace(/^\//, ''),
+            locale,
+          )}`.match(/^(\/[^/]+)([^]+)?$/)!;
           const isNestedNav = Boolean(restPath) && is2LevelNav;
           const [firstMeta, secondMeta] = Object.values(routes).reduce<
             {

diff --git a/src/client/theme-api/useSidebarData.ts b/src/client/theme-api/useSidebarData.ts
@@ -15,7 +15,10 @@ import {
 
 const DEFAULT_GROUP_STUB_TITLE = '$default-group-title';
 
-const getLocaleClearPath = (routePath: string, locale: ILocalesConfig[0]) => {
+export const getLocaleClearPath = (
+  routePath: string,
+  locale: ILocalesConfig[0],
+) => {
   return 'base' in locale
     ? routePath.replace(locale.base.slice(1), '').replace(/^\//, '')
     : routePath;