From 4d91eccab279fa05dbb26743b43f11213d5b7ca3 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Sun, 15 Sep 2024 03:34:54 +0000 Subject: [PATCH] improve key selection --- packages/app/src/layouts/components/sidebar/index.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/app/src/layouts/components/sidebar/index.jsx b/packages/app/src/layouts/components/sidebar/index.jsx index 76fc845b..fdb6f5a6 100755 --- a/packages/app/src/layouts/components/sidebar/index.jsx +++ b/packages/app/src/layouts/components/sidebar/index.jsx @@ -168,8 +168,10 @@ export default class Sidebar extends React.Component { } calculateSelectedMenuItem = (path) => { + const items = [...this.state.topItems, ...this.state.bottomItems] + this.setState({ - selectedMenuItem: [...this.state.topItems, ...this.state.bottomItems].find((item) => item.path === path) + selectedMenuItem: items.find((item) => String(item.path).includes(path)), }) } @@ -352,7 +354,7 @@ export default class Sidebar extends React.Component { } render() { - const selectedKeyId = this.state.selectedMenuItem?.id ?? "home" + const selectedKeyId = this.state.selectedMenuItem?.id return