From 8f03e42b1db71f10d8f6269ddd7a3f6e0c8fca24 Mon Sep 17 00:00:00 2001
From: Benjamin Arias <benjamin.j.arias@gmail.com>
Date: Mon, 13 Mar 2023 12:46:20 +0100
Subject: [PATCH] fix: Corrige liens, modal

---
 site/source/components/App.tsx                   | 8 +++++++-
 site/source/components/Feedback/FeedbackForm.tsx | 2 --
 site/source/components/Feedback/index.tsx        | 5 +++++
 site/source/components/layout/Header.tsx         | 2 +-
 site/source/design-system/popover/Popover.tsx    | 4 +++-
 site/source/design-system/typography/link.tsx    | 3 ++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/site/source/components/App.tsx b/site/source/components/App.tsx
index 7fd9b8f53..7c9cf0fbc 100644
--- a/site/source/components/App.tsx
+++ b/site/source/components/App.tsx
@@ -116,7 +116,13 @@ const App = () => {
 			{!isEmbedded && <Header />}
 
 			<main role="main" id="main">
-				<a href={`${fullURL}#footer`} className="skip-link print-hidden">
+				<a
+					href={`${fullURL}#footer`}
+					aria-label={t(
+						'Passer le contenu principal et aller directement au pied de page'
+					)}
+					className="skip-link print-hidden"
+				>
 					{t('Passer le contenu')}
 				</a>
 				<Container>
diff --git a/site/source/components/Feedback/FeedbackForm.tsx b/site/source/components/Feedback/FeedbackForm.tsx
index 76c9198be..4cfa80f00 100644
--- a/site/source/components/Feedback/FeedbackForm.tsx
+++ b/site/source/components/Feedback/FeedbackForm.tsx
@@ -129,8 +129,6 @@ export default function FeedbackForm({
 			{isSubmittedSuccessfully && <FeedbackThankYouContent />}
 			{!isSubmittedSuccessfully && (
 				<>
-					<H1 style={{ marginTop: '1rem' }}>{title}</H1>
-
 					<StyledFeedback>
 						<form
 							onSubmit={(e) => {
diff --git a/site/source/components/Feedback/index.tsx b/site/source/components/Feedback/index.tsx
index d2593f7c0..3cbf6897d 100644
--- a/site/source/components/Feedback/index.tsx
+++ b/site/source/components/Feedback/index.tsx
@@ -177,6 +177,11 @@ const FeedbackButton = ({ isEmbedded }: { isEmbedded?: boolean }) => {
 							setIsShowingSuggestionForm(false)
 							setTimeout(() => setIsFormOpen(false))
 						}}
+						title={
+							isNotSatisfied
+								? t('Vos attentes ne sont pas remplies')
+								: t('Votre avis nous intéresse')
+						}
 					>
 						<FeedbackForm
 							infoSlot={
diff --git a/site/source/components/layout/Header.tsx b/site/source/components/layout/Header.tsx
index 8392676a7..d75fdd296 100644
--- a/site/source/components/layout/Header.tsx
+++ b/site/source/components/layout/Header.tsx
@@ -29,7 +29,7 @@ export default function Header() {
 	return (
 		<header role="banner">
 			<a href={`${fullURL}#main`} className="skip-link print-hidden">
-				{t('Aller au contenu')}
+				{t('Aller au contenu principal')}
 			</a>
 			<Container>
 				<StyledHeader>
diff --git a/site/source/design-system/popover/Popover.tsx b/site/source/design-system/popover/Popover.tsx
index f71f8d70a..17b34910a 100644
--- a/site/source/design-system/popover/Popover.tsx
+++ b/site/source/design-system/popover/Popover.tsx
@@ -72,9 +72,10 @@ export default function Popover(
 	if (offsetTop === undefined) {
 		return null
 	}
+	console.log({ title, titleProps })
 
 	return (
-		<OverlayContainer>
+		<OverlayContainer aria-modal={true}>
 			<Underlay {...underlayProps} $offsetTop={offsetTop}>
 				<Container>
 					<Grid
@@ -98,6 +99,7 @@ export default function Popover(
 									{...overlayProps}
 									$offsetTop={offsetTop}
 									ref={ref}
+									aria-label={title}
 								>
 									{props.isDismissable && (
 										<CloseButtonContainer>
diff --git a/site/source/design-system/typography/link.tsx b/site/source/design-system/typography/link.tsx
index 712398833..f89d438ec 100644
--- a/site/source/design-system/typography/link.tsx
+++ b/site/source/design-system/typography/link.tsx
@@ -69,6 +69,7 @@ export const Link = React.forwardRef<
 		children: React.ReactNode
 		isDisabled?: boolean
 		noUnderline?: boolean
+		to?: string
 	}
 >(function Link(props, forwardedRef) {
 	const { isDisabled, role, noUnderline, ...ariaButtonProps } = props
@@ -77,7 +78,7 @@ export const Link = React.forwardRef<
 	return (
 		<StyledLink
 			{...buttonOrLinkProps}
-			role={role || buttonOrLinkProps?.role}
+			role={role || (props.href || props.to ? undefined : 'button')}
 			type={undefined}
 			$isDisabled={isDisabled}
 			$noUnderline={noUnderline}