Skip to content

fix: keep header nav links ahead of utility icons in tab order #1199

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
bluebill1049 merged 2 commits into from
Mar 28, 2026
Merged

fix: keep header nav links ahead of utility icons in tab order #1199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7059a
fix: keep primary nav ahead of utility links in tab order
hiromieguchi802-lab Mar 24, 2026
a39a6c1
Merge branch 'master' into fix/nav-focus-order
bluebill1049 Mar 28, 2026
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
108 changes: 54 additions & 54 deletions src/components/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,60 +43,6 @@ export default function Nav() {

return (
<>
<div className={styles.iconGroup}>
{show && (
<Search focus={isFocusOnSearch} setFocus={setIsFocusOnSearch} />
)}

{showLang && <Toggle />}
</div>

<div className={styles.gitHubButtonWrap}>
<span className={`${styles.icon} desktopOnly`}>
<a
href="https://discord.gg/yYv7GZ8"
target="_blank"
rel="noopener noreferrer"
title="React Hook Form Discord"
>
<svg viewBox="0 0 127.14 96.36">
<path d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z" />
</svg>
</a>
</span>

<span className={`${styles.icon} ${styles.donate}`}>
<a
href="https://opencollective.com/react-hook-form"
target="_blank"
rel="noreferrer noopener"
title="Donate to the project"
>
♥
</a>
</span>

<span className={styles.icon}>
<a
href="https://twitter.com/HookForm"
target="_blank"
rel="noopener noreferrer"
title="React Hook Form Twitter"
>
<svg viewBox="0 0 1200 1227">
<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" />
</svg>
</a>
</span>

<GitHubButton
href="https://github.com/react-hook-form/react-hook-form"
data-size="large"
data-show-count
aria-label="Star react-hook-form on GitHub"
/>
</div>

{showMenu && (
<Animate play start={{ opacity: 0 }} end={{ opacity: 1 }}>
<nav
Expand Down Expand Up @@ -452,6 +398,60 @@ export default function Nav() {
</a>
</nav>
</div>

<div className={styles.iconGroup}>
{show && (
<Search focus={isFocusOnSearch} setFocus={setIsFocusOnSearch} />
)}

{showLang && <Toggle />}
</div>

<div className={styles.gitHubButtonWrap}>
<span className={`${styles.icon} desktopOnly`}>
<a
href="https://discord.gg/yYv7GZ8"
target="_blank"
rel="noopener noreferrer"
title="React Hook Form Discord"
>
<svg viewBox="0 0 127.14 96.36">
<path d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z" />
</svg>
</a>
</span>

<span className={`${styles.icon} ${styles.donate}`}>
<a
href="https://opencollective.com/react-hook-form"
target="_blank"
rel="noreferrer noopener"
title="Donate to the project"
>
♥
</a>
</span>

<span className={styles.icon}>
<a
href="https://twitter.com/HookForm"
target="_blank"
rel="noopener noreferrer"
title="React Hook Form Twitter"
>
<svg viewBox="0 0 1200 1227">
<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" />
</svg>
</a>
</span>

<GitHubButton
href="https://github.com/react-hook-form/react-hook-form"
data-size="large"
data-show-count
aria-label="Star react-hook-form on GitHub"
/>
</div>
</>
)
}
Loading