fix(theme): menu render error when configure 2-level navs (#193)

umijs · Jun 2, 2020 · 841619c · 841619c
1 parent e0b525e
commit 841619c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/preset-dumi/src/themes/default/Navbar.tsx b/packages/preset-dumi/src/themes/default/Navbar.tsx
@@ -73,7 +73,7 @@ const Navbar: FC<INavbarProps> = ({ onMobileMenuClick, navPrefix }) => {
           );
 
           return (
-            <NavbarLink href={nav.path} key={nav.path}>
+            <NavbarLink href={nav.path} key={nav.path || nav.title}>
               {nav.title}
               {child}
             </NavbarLink>

diff --git a/packages/preset-dumi/src/themes/default/SideMenu.tsx b/packages/preset-dumi/src/themes/default/SideMenu.tsx
@@ -55,7 +55,7 @@ const SideMenu: FC<INavbarProps> = ({ mobileMenuCollapsed, location }) => {
           <div className="__dumi-default-menu-mobile-area">
             <ul className="__dumi-default-menu-nav-list">
               {navs.map(nav => (
-                <li key={nav.path}>
+                <li key={nav.path || nav.title}>
                   <NavbarLink href={nav.path}>
                     {nav.title}
                     {Boolean(nav.children?.length) && (

diff --git a/packages/preset-dumi/src/themes/default/layout.tsx b/packages/preset-dumi/src/themes/default/layout.tsx
@@ -122,12 +122,15 @@ export default class Layout extends Component<ILayoutProps & RouteProps> {
     if (navs[state.currentLocale]) {
       for (let i = navs[state.currentLocale].length - 1; i >= 0; i -= 1) {
         const nav = navs[state.currentLocale][i];
-
-        if (
-          nav.path &&
-          new RegExp(`^${nav.path.replace(/\.html$/, '')}(/|\.|$)`).test(location.pathname)
-        ) {
-          navPath = nav.path;
+        const items = [nav].concat(nav.children).filter(Boolean);
+        const matched = items.find(
+          item =>
+            item.path &&
+            new RegExp(`^${item.path.replace(/\.html$/, '')}(/|\.|$)`).test(location.pathname),
+        );
+
+        if (matched) {
+          navPath = matched.path;
           break;
         }
       }