Skip to content

Commit 1b0f1a8

Browse files
committed
Fix code by prettier
1 parent 90de192 commit 1b0f1a8

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

src/lib/components/Navbar/Navbar.jsx

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import Tooltip from '../Tooltip/Tooltip'
2525
import TextTooltipTemplate from '../TooltipTemplate/TextTooltipTemplate'
2626

2727
import { NAVBAR_WIDTH_OPENED } from '../../constants'
28-
import {localStorageService} from '../../utils'
28+
import { localStorageService } from '../../utils'
2929

3030
import NavbarClosedIcon from '../../images/navbar/navbar-closed-icon.svg?react'
3131
import NavbarOpenedIcon from '../../images/navbar/navbar-opened-icon.svg?react'
@@ -54,20 +54,10 @@ const Navbar = ({ children, id = 'navbar', setIsNavbarPinned }) => {
5454
setIsNavbarPinned(isPinned)
5555
}, [isPinned, setIsNavbarPinned])
5656

57-
58-
5957
return (
60-
<nav
61-
className={navbarClasses}
62-
data-testid={id}
63-
style={navbarStyles}
64-
ref={navbarRef}
65-
>
58+
<nav className={navbarClasses} data-testid={id} style={navbarStyles} ref={navbarRef}>
6659
<div className="navbar__pin-icon">
67-
<div
68-
id="navbar-pin"
69-
onClick={handlePinClick}
70-
>
60+
<div id="navbar-pin" onClick={handlePinClick}>
7161
<Tooltip template={<TextTooltipTemplate text={`${isPinned ? 'Unpin' : 'Pin'} Menu`} />}>
7262
{isPinned ? <NavbarOpenedIcon /> : <NavbarClosedIcon />}
7363
</Tooltip>

src/lib/elements/NavbarLink/NavbarLink.jsx

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,30 @@ import ArrowIcon from '../../images/arrow.svg?react'
2626

2727
import './NavbarLink.scss'
2828

29-
30-
const NavbarLink = ({ externalLink = false, icon = null, index = null, label, link = '', selectedIndex = null, setSelectedIndex, ...props }) => {
29+
const NavbarLink = ({
30+
externalLink = false,
31+
icon = null,
32+
index = null,
33+
label,
34+
link = '',
35+
selectedIndex = null,
36+
setSelectedIndex,
37+
...props
38+
}) => {
3139
const { pathname } = useLocation()
3240

3341
const parentLinkClasses = classNames(
3442
'nav-link__button btn nav-link__parent',
35-
(pathname.includes(props.id || link) || props?.screens && props.screens.some(screen => pathname.includes(screen))) && 'active',
43+
(pathname.includes(props.id || link) ||
44+
(props?.screens && props.screens.some(screen => pathname.includes(screen)))) &&
45+
'active',
3646
index === selectedIndex && 'expended'
3747
)
3848

3949
const handleExpanded = () => {
4050
if (setSelectedIndex) {
4151
if (index !== selectedIndex) {
42-
setSelectedIndex(index)
52+
setSelectedIndex(index)
4353
} else {
4454
setSelectedIndex(null)
4555
}
@@ -63,7 +73,12 @@ const NavbarLink = ({ externalLink = false, icon = null, index = null, label, li
6373
</span>
6474
</div>
6575
) : (
66-
<NavLink to={link} onClick={handleExpanded} className="nav-link__button btn" activeclassname="active">
76+
<NavLink
77+
to={link}
78+
onClick={handleExpanded}
79+
className="nav-link__button btn"
80+
activeclassname="active"
81+
>
6782
<span className="nav-link__icon">{icon}</span>
6883
<span className="nav-link__label">{label}</span>
6984
</NavLink>
@@ -80,7 +95,7 @@ NavbarLink.propTypes = {
8095
nestedLinks: PropTypes.array,
8196
screens: PropTypes.array,
8297
selectedIndex: PropTypes.number,
83-
setSelectedIndex: PropTypes.func,
98+
setSelectedIndex: PropTypes.func
8499
}
85100

86101
export default React.memo(NavbarLink)

0 commit comments

Comments
 (0)