Merge pull request #129 from hiui-group/hotfix/#128

fix: #128
hiui-group · Feb 1, 2023 · 8867d49 · 8867d49
2 parents f1a3f38 + 5c683cf
commit 8867d49
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/classic-theme",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Classic theme for HIUI",
   "main": "./es/index.js",
   "scripts": {

diff --git a/src/hooks/useMenuCalculator.js b/src/hooks/useMenuCalculator.js
@@ -58,7 +58,7 @@ const useMenuCalculator = (menu, location, history, fallback, onMenuClick, disab
 
   const activeMenuId = useMemo(() => {
     if (!currentMenu.name) {
-      return getNamedParent(currentMenu.path, menu).id
+      return getNamedParent(currentMenu.path, menu)?.id ?? ''
     } else {
       return currentMenu.id
     }

diff --git a/src/util/common.js b/src/util/common.js
@@ -70,6 +70,7 @@ export const getAncestor = (path, data, arr = []) => {
 // 寻找某一节点具有 name 属性的祖先节点
 export const getNamedParent = (path, data) => {
   const parent = getParent(path, data)
+  if (!parent) return null
   if (!parent.name) {
     return getNamedParent(parent.path, data)
   } else {