Skip to content

Commit 16792ed

Browse files
feat(ui): active page indicator (#573)
1 parent ae42d45 commit 16792ed

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

packages/~/app/layout/src/__snapshots__/main.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ exports[`Main Layout 1`] = `
8989
"
9090
class="flex min-h-screen flex-col"
9191
>
92-
<div class="flex flex-1 flex-col"><div class="flex min-h-full flex-grow flex-col"><header role="banner" class="fr-header"><div class="fr-header__body"><div class="fr-container"><div class="fr-header__body-row"><div class="fr-header__brand fr-enlarge-link"><div class="fr-header__brand-top"><div class="fr-header__logo"><p class="fr-logo">République<br/>Française</p></div></div><div class="fr-header__service"><a href="/" title="Accueil "><p class="fr-header__service-title">Hyyypertool</p></a><p class="fr-header__service-tagline">hyyyyyyyypertool</p></div></div><div class="fr-header__tools"><div class="fr-header__tools-links"><ul class="fr-btns-group"><li><a class="fr-btn fr-btn--sm fr-btn--tertiary-no-outline fr-fi-logout-box-r-line fr-btn--icon-left" href="/auth/logout">Lara Croft</a></li></ul></div></div></div></div></div><div class="fr-header__menu fr-modal"><div class="fr-container"><nav class="fr-nav" id="navigation-494" role="navigation" aria-label="Menu principal"><ul class="fr-nav__list"><li class="fr-nav__item"><a class="fr-nav__link" href="/moderations" target="_self">Moderations</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/users" target="_self">Utilisateurs</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/organizations" target="_self">Organisations</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/organizations/domains" target="_self">Domaines à verifier</a></li></ul></nav></div></div></header><div class="relative flex flex-1 flex-col">✅</div></div></div>
92+
<div class="flex flex-1 flex-col"><div class="flex min-h-full flex-grow flex-col"><header role="banner" class="fr-header"><div class="fr-header__body"><div class="fr-container"><div class="fr-header__body-row"><div class="fr-header__brand fr-enlarge-link"><div class="fr-header__brand-top"><div class="fr-header__logo"><p class="fr-logo">République<br/>Française</p></div></div><div class="fr-header__service"><a href="/" title="Accueil "><p class="fr-header__service-title">Hyyypertool</p></a><p class="fr-header__service-tagline">hyyyyyyyypertool</p></div></div><div class="fr-header__tools"><div class="fr-header__tools-links"><ul class="fr-btns-group"><li><a class="fr-btn fr-btn--sm fr-btn--tertiary-no-outline fr-fi-logout-box-r-line fr-btn--icon-left" href="/auth/logout">Lara Croft</a></li></ul></div></div></div></div></div><div class="fr-header__menu fr-modal"><div class="fr-container"><nav class="fr-nav" id="navigation-494" role="navigation" aria-label="Menu principal"><ul class="fr-nav__list"><li class="fr-nav__item"><a aria-current="false" class="fr-nav__link" href="/moderations" target="_self">Moderations</a></li><li class="fr-nav__item"><a aria-current="false" class="fr-nav__link" href="/users" target="_self">Utilisateurs</a></li><li class="fr-nav__item"><a aria-current="false" class="fr-nav__link" href="/organizations" target="_self">Organisations</a></li><li class="fr-nav__item"><a aria-current="false" class="fr-nav__link" href="/organizations/domains" target="_self">Domaines à verifier</a></li></ul></nav></div></div></header><div class="relative flex flex-1 flex-col">✅</div></div></div>
9393
<footer class="container mx-auto flex flex-row justify-between p-2">
9494
<div>© 2222 🇫🇷</div>
9595
<a

packages/~/app/layout/src/main.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ function Tools({ username }: { username?: string | undefined }) {
8383
}
8484

8585
function Nav() {
86+
const { req } = useRequestContext();
87+
8688
return (
8789
<nav
8890
class="fr-nav"
@@ -93,6 +95,7 @@ function Nav() {
9395
<ul class="fr-nav__list">
9496
<li class="fr-nav__item">
9597
<a
98+
aria-current={req.routePath.startsWith("/moderations")}
9699
class="fr-nav__link"
97100
href={urls.moderations.$url().pathname}
98101
target="_self"
@@ -102,6 +105,7 @@ function Nav() {
102105
</li>
103106
<li class="fr-nav__item">
104107
<a
108+
aria-current={req.routePath.startsWith("/users")}
105109
class="fr-nav__link"
106110
href={urls.users.$url().pathname}
107111
target="_self"
@@ -111,6 +115,10 @@ function Nav() {
111115
</li>
112116
<li class="fr-nav__item">
113117
<a
118+
aria-current={
119+
req.routePath.startsWith("/organizations") &&
120+
!req.routePath.startsWith("/organizations/domains")
121+
}
114122
class="fr-nav__link"
115123
href={urls.organizations.$url().pathname}
116124
target="_self"
@@ -120,6 +128,7 @@ function Nav() {
120128
</li>
121129
<li class="fr-nav__item">
122130
<a
131+
aria-current={req.routePath.startsWith("/organizations/domains")}
123132
class="fr-nav__link"
124133
href={urls.organizations.domains.$url().pathname}
125134
target="_self"

0 commit comments

Comments
 (0)