From 02f5e5397ac64ee99cb6caed10fa9a603864b113 Mon Sep 17 00:00:00 2001
From: mlntcandy <me@mlntcandy.com>
Date: Sun, 26 May 2024 22:25:48 +0300
Subject: [PATCH 1/2] fix route matching in leftsidebar links

---
 src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx b/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx
index d2a32ee5f..7254768b4 100644
--- a/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx
+++ b/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx
@@ -92,7 +92,9 @@ const LeftsideBarList = () => {
                         <LeftsideBarItem
                             {...props}
                             key={props?.id}
-                            isCurrent={location.pathname.includes(props.path)}
+                            isCurrent={
+                                location.pathname === props.path || location.pathname.startsWith(`${props.path}/`)
+                            }
                         />
                     )
                 })}

From a9bdb2e92709c9a35ca426ca3afb856aef2f9f04 Mon Sep 17 00:00:00 2001
From: mlntcandy <me@mlntcandy.com>
Date: Sun, 26 May 2024 23:21:41 +0300
Subject: [PATCH 2/2] moved to regex to include all possible scenarios

---
 .../leftside-bar/ui/organisms/leftside-bar-list.tsx    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx b/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx
index 7254768b4..24f9192a5 100644
--- a/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx
+++ b/src/widgets/leftside-bar/ui/organisms/leftside-bar-list.tsx
@@ -88,14 +88,10 @@ const LeftsideBarList = () => {
             {Object.values(leftsideBarRoutes)
                 .filter(Boolean)
                 .map((props: IRoute) => {
+                    const escapedRoute = props.path.replace(/[^\w]/g, '\\$&')
+                    const routePattern = new RegExp(`^${escapedRoute}([\\/\\?#].*)?$`)
                     return (
-                        <LeftsideBarItem
-                            {...props}
-                            key={props?.id}
-                            isCurrent={
-                                location.pathname === props.path || location.pathname.startsWith(`${props.path}/`)
-                            }
-                        />
+                        <LeftsideBarItem {...props} key={props?.id} isCurrent={routePattern.test(location.pathname)} />
                     )
                 })}
         </LeftsideBarListWrapper>