Skip to content

Commit 512be8a

Browse files
committed
Improved styling logic
1 parent 63c317d commit 512be8a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

components/navbarItem/navbarItem.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import EscapeOutside from "react-escape-outside";
44
import NavbarLink from "../navbarLink/navbarLink";
55
import styles from "../navbar/navbar.module.scss";
66
import NavbarMenu from "../navbarMenu/navbarMenu";
7-
import data from "../../content/components/navbarItems.json";
7+
import data from "../../data/components/navbarItems.json";
88

99
const NavbarItem = ({
1010
itemLabel,
@@ -38,11 +38,13 @@ const NavbarItem = ({
3838
label={itemLabel}
3939
link={itemLink}
4040
styleLink={
41-
(asPath.slice(0, itemLink.length) === itemLink ||
42-
itemLink.slice(0, data.navbarItems[0].reducedSlug.length) ===
43-
asPath.slice(0, data.navbarItems[0].reducedSlug.length)) &&
44-
asPath !== data.navbarItems[2].navbarSubMenuItems[2].link &&
45-
asPath !== data.navbarItems[3].link
41+
asPath !== data.navbarItems[3].link &&
42+
(itemLink === asPath ||
43+
itemMenu?.find(
44+
item =>
45+
item.link === asPath ||
46+
item.subMenuSection?.find(subItem => subItem.link === asPath)
47+
))
4648
? styles.selectedNavbarItem
4749
: undefined
4850
}

0 commit comments

Comments
 (0)