eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 fix highlighting menu items in the left menu bar (#170)

Browse Source
This commit is contained in:
Anton Shepilov
2023-07-27 16:37:55 +02:00
committed by GitHub
parent 857f628874
commit 4409e90e32
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/frontend/src/app/views/client/side-bar/index.tsx
+4 -3
View File
@@ -43,6 +43,7 @@ export default () => {
if ((path || [])[0]?.id === 'user_' + user?.id) folderType = 'personal'; if ((path || [])[0]?.id === 'user_' + user?.id) folderType = 'personal';
if (inTrash) folderType = 'trash'; if (inTrash) folderType = 'trash';
if (sharedWithMe) folderType = 'shared'; if (sharedWithMe) folderType = 'shared';
const { viewId, itemId } = RouterServices.getStateFromRoute();
useEffect(() => { useEffect(() => {
!itemId && viewId && setParentId(viewId); !itemId && viewId && setParentId(viewId);
}, [viewId, itemId]); }, [viewId, itemId]);
@@ -69,7 +70,7 @@ export default () => {
onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: 'user_' + user?.id})); setParentId('user_' + user?.id)}} onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: 'user_' + user?.id})); setParentId('user_' + user?.id)}}
size="lg" size="lg"
theme="white" 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')} <UserIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.my_drive')}
</Button> </Button>
@@ -77,7 +78,7 @@ export default () => {
onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: "root"})); setParentId('root')}} onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: "root"})); setParentId('root')}}
size="lg" size="lg"
theme="white" 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')} <CloudIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.home')}
</Button> </Button>
@@ -85,7 +86,7 @@ export default () => {
onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: "shared_with_me"})); setParentId('shared_with_me')}} onClick={() => {history.push(RouterServices.generateRouteFromState({companyId: company, viewId: "shared_with_me"})); setParentId('shared_with_me')}}
size="lg" size="lg"
theme="white" 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')} <UserGroupIcon className="w-5 h-5 mr-4" /> {Languages.t('components.side_menu.shared_with_me')}
</Button> </Button>