From 4409e90e3264a6bda4da548da3ae7ed85be37794 Mon Sep 17 00:00:00 2001
From: Anton Shepilov <anton.shepilov@gmail.com>
Date: Thu, 27 Jul 2023 16:37:55 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20highlighting=20menu=20item?=
 =?UTF-8?q?s=20in=20the=20left=20menu=20bar=20(#170)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdrive/frontend/src/app/views/client/side-bar/index.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tdrive/frontend/src/app/views/client/side-bar/index.tsx b/tdrive/frontend/src/app/views/client/side-bar/index.tsx
index 805ef988..3c72ceb2 100644
--- a/tdrive/frontend/src/app/views/client/side-bar/index.tsx
+++ b/tdrive/frontend/src/app/views/client/side-bar/index.tsx
@@ -43,6 +43,7 @@ export default () => {
   if ((path || [])[0]?.id === 'user_' + user?.id) folderType = 'personal';
   if (inTrash) folderType = 'trash';
   if (sharedWithMe) folderType = 'shared';
+  const { viewId, itemId } = RouterServices.getStateFromRoute();
   useEffect(() => {
     !itemId && viewId && setParentId(viewId);
   }, [viewId, itemId]);
@@ -69,7 +70,7 @@ export default () => {
           onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: 'user_' + user?.id})); setParentId('user_' + user?.id)}}
           size="lg"
           theme="white"
-          className={'w-full mb-1 ' + (folderType === 'personal' && viewId == '' ? activeClass : '')}
+          className={'w-full mb-1 ' + (folderType === 'personal' && (viewId == '' || 'user_' + user?.id) ? activeClass : '')}
         >
           <UserIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.my_drive')}
         </Button>
@@ -77,7 +78,7 @@ export default () => {
           onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: "root"})); setParentId('root')}}
           size="lg"
           theme="white"
-          className={'w-full mb-1 ' + (folderType === 'home' && viewId == '' ? activeClass : '')}
+          className={'w-full mb-1 ' + (folderType === 'home' && viewId == 'root' ? activeClass : '')}
         >
           <CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')}
         </Button>
@@ -85,7 +86,7 @@ export default () => {
           onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: "shared_with_me"})); setParentId('shared_with_me')}}
           size="lg"
           theme="white"
-          className={'w-full mb-1 ' + (folderType === 'shared' && viewId == ''? activeClass : '')}
+          className={'w-full mb-1 ' + (folderType === 'shared' && viewId == 'shared_with_me'? activeClass : '')}
         >
           <UserGroupIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.shared_with_me')}
         </Button>