Skip to content

fix: use react-router link component for navigation #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2025
Merged

fix: use react-router link component for navigation #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae065a8
fix: use react-router link component for navigation
lee-chase Jun 13, 2025
da8d0e3
fix: remove duplication of dashboard label
lee-chase Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"lint:style": "stylelint './**/*.scss'",
"lint:format": "prettier . --write --ignore-unknown --no-error-on-unmatched-pattern --log-level warn",
"lint:spell": "cspell lint --quiet \"**\"",
"preview:prod": "cross-env NODE_ENV=production node server",
"preview": "cross-env NODE_ENV=local node server",
"preview:prod": "cross-env NODE_ENV=production node src/server.js",
"preview": "cross-env NODE_ENV=local node src/server.js",
"test": "vitest run --coverage",
"test:watch": "vitest --watch",
"prepare": "husky"
Expand Down
12 changes: 10 additions & 2 deletions src/components/nav/Nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ import {
Search,
Switcher as SwitcherIcon,
} from '@carbon/icons-react';
import { useLocation, Link } from 'react-router';

export const Nav = () => {
const location = useLocation();
const [isSideNavExpanded, setIsSideNavExpanded] = useState(false);

const toggleNav = () => {
Expand All @@ -51,11 +53,17 @@ export const Nav = () => {
isActive={isSideNavExpanded}
aria-expanded={isSideNavExpanded}
/>
<HeaderName href="/" prefix="Carbon">
<HeaderName as={Link} to="/" prefix="Carbon">
React starter template
</HeaderName>
<HeaderNavigation aria-label="fed-at-ibm">
<HeaderMenuItem href="/dashboard">Dashboard</HeaderMenuItem>
<HeaderMenuItem
as={Link}
to="/dashboard"
isActive={location.pathname === '/dashboard'}
>
Dashboard
</HeaderMenuItem>
<HeaderMenuItem href="#">Link 2</HeaderMenuItem>
<HeaderMenuItem href="#">Link 3</HeaderMenuItem>
<HeaderMenu aria-label="Link 4" menuLinkName="Link 4">
Expand Down