thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

chore: fixed sidebar highlight not working (#952)

Browse Source
This commit is contained in:
Kunal Vishwakarma 2023-04-25 12:10:05 +05:30 committed by GitHub
parent 8c1ad69f0c
commit 529ed4432c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app/components/project/single-sidebar-project.tsx
View File

@ -171,7 +171,7 @@ export const SingleSidebarProject: React.FC<Props> = ({
<Link key={item.name} href={item.href}>
<a
className={`group flex items-center rounded-md p-2 text-xs font-medium outline-none ${
item.href === router.asPath
router.asPath.includes(item.href)
? "bg-brand-base text-brand-secondary"
: "text-brand-secondary hover:bg-brand-surface-1 hover:text-brand-secondary focus:bg-brand-base focus:text-brand-secondary"
} ${sidebarCollapse ? "justify-center" : ""}`}
@ -179,7 +179,7 @@ export const SingleSidebarProject: React.FC<Props> = ({
<div className="grid place-items-center">
<item.icon
className={`h-5 w-5 flex-shrink-0 ${
item.href === router.asPath
router.asPath.includes(item.href)
? "text-brand-secondary"
: "text-brand-secondary group-hover:text-brand-base"
} ${!sidebarCollapse ? "mr-3" : ""}`}

14
apps/app/components/workspace/sidebar-menu.tsx
View File

@ -42,7 +42,11 @@ export const WorkspaceSidebarMenu: React.FC = () => {
<Link key={index} href={link.href}>
<a
className={`${
link.href === router.asPath
(
link.name === "Dashboard"
? router.asPath === link.href
: router.asPath.includes(link.href)
)
? "bg-brand-base text-brand-base"
: "text-brand-secondary hover:bg-brand-base hover:text-brand-base focus:bg-brand-base"
} group flex w-full items-center gap-3 rounded-md p-2 text-sm font-medium outline-none ${
@ -52,7 +56,13 @@ export const WorkspaceSidebarMenu: React.FC = () => {
<span className="grid h-5 w-5 flex-shrink-0 place-items-center">
<link.icon
className={`${
link.href === router.asPath ? "text-brand-base" : "text-brand-secondary"
(
link.name === "Dashboard"
? router.asPath === link.href
: router.asPath.includes(link.href)
)
? "text-brand-base"
: "text-brand-secondary"
} group-hover:text-brand-base`}
aria-hidden="true"
height="20"