V3 master (#495)

* fix: accessibility * feat:version --------- Co-authored-by: Renaud Genevois <[email protected]> Co-authored-by: Julia Dirand <[email protected]>
InseeFr · Nov 29, 2023 · de77afa · de77afa
1 parent 7b073c2
commit de77afa
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "stromae",
-	"version": "3.0.1",
+	"version": "3.0.3",
 	"private": true,
 	"dependencies": {
 		"@axa-fr/react-oidc": "6.14.0",
 		"@codegouvfr/react-dsfr": "^0.78.1",
 		"@emotion/react": "^11.10.5",
 		"@emotion/styled": "^11.10.5",
 		"@inseefr/lunatic": "2.6.9",
-		"@inseefr/lunatic-dsfr": "1.0.13",
+		"@inseefr/lunatic-dsfr": "1.0.16",
 		"@mui/material": "^5.11.8",
 		"@testing-library/jest-dom": "^5.16.5",
 		"@testing-library/react": "^13.4.0",

diff --git a/src/components/ContinueOrRestart/ModalContinueOrRestart.tsx b/src/components/ContinueOrRestart/ModalContinueOrRestart.tsx
@@ -15,7 +15,7 @@ export function ModalContinueOrRestart(props: {
 			close={props.onClose}
 			last={last.current as HTMLElement}
 		>
-			<h1 className={fr.cx('fr-modal__title')}>Bienvenue</h1>
+			<h1 className={fr.cx('fr-modal__title')}  id="fr-modal-title-modal-1">Bienvenue</h1>
 			<p>
 				Vous avez déjà commencé à renseigner le questionnaire. Souhaitez-vous
 				reprendre là où vous en étiez ou revenir à la première page ?

diff --git a/src/components/ContinueOrRestart/ModalDsfr.tsx b/src/components/ContinueOrRestart/ModalDsfr.tsx
@@ -15,7 +15,7 @@ export function ModalDsfr(props: PropsWithChildren<ModalDsfrProps>) {
 	const { onKeyDown } = useTabulate(first.current as HTMLElement, last);
 
 	return (
-		<dialog id={id} className={fr.cx('fr-modal', 'fr-modal--opened')}>
+		<div  id={id} className={fr.cx('fr-modal', 'fr-modal--opened')} role='dialog' aria-labelledby="fr-modal-title-modal-1" aria-modal="true">
 			<div
 				className={fr.cx(
 					'fr-container',
@@ -44,6 +44,6 @@ export function ModalDsfr(props: PropsWithChildren<ModalDsfrProps>) {
 					</div>
 				</div>
 			</div>
-		</dialog>
+		</div>
 	);
 }
diff --git a/src/components/postSubmit/AdditionalInformation.tsx b/src/components/postSubmit/AdditionalInformation.tsx
@@ -51,7 +51,7 @@ function ProvideFeedback({
 	if (submit && Feedback) {
 		return (
 			<div className={fr.cx('fr-col-12', 'fr-col-lg-5', 'fr-mt-2w')}>
-				<h4 className={fr.cx('fr-h6')}>{title}</h4>
+				<h3 className={fr.cx('fr-h6')}>{title}</h3>
 				<FeedbackLink
 					alt={link.alt}
 					title={link.title}
@@ -84,7 +84,7 @@ function SeeResults({
 					'fr-mt-md-2w'
 				)}
 			>
-				<h4 className={fr.cx('fr-h6')}>{title}</h4>
+				<h3 className={fr.cx('fr-h6')}>{title}</h3>
 				<Link
 					title={link.title}
 					to={link.href}
@@ -122,7 +122,7 @@ export default function AdditionalInformation({
 					<div className={fr.cx('fr-container', 'fr-py-6w')}>
 						<div className={fr.cx('fr-grid-row', 'fr-grid-row--center')}>
 							<div className={fr.cx('fr-col-12')}>
-								<h3 className={fr.cx('fr-h5')}>{TitleAdditionalInformation}</h3>
+								<h2 className={fr.cx('fr-h5')}>{TitleAdditionalInformation}</h2>
 							</div>
 
 							<ProvideFeedback submit={submit} Feedback={Feedback} />

diff --git a/src/components/postSubmit/PostSubmitSurvey.tsx b/src/components/postSubmit/PostSubmitSurvey.tsx
@@ -7,7 +7,6 @@ import { useRemote } from '../orchestrator/useRemote';
 import { loadSourceDataContext } from '../loadSourceData/LoadSourceDataContext';
 import { Skeleton } from '@mui/material';
 import Confirmation from '@codegouvfr/react-dsfr/dsfr/artwork/pictograms/system/success.svg';
-
 import AdditionalInformation from './AdditionalInformation';
 import { MetadataSurvey, SurveyUnitData } from '../../typeStromae/type';
 import { uri404 } from '../../lib/domainUri';

diff --git a/src/pages/deconnexion/Deconnexion.tsx b/src/pages/deconnexion/Deconnexion.tsx
@@ -10,7 +10,7 @@ import { fr } from '@codegouvfr/react-dsfr';
 
 export function Deconnexion() {
 	const { survey, unit } = useParams();
-	useDocumentTitle('Page de déconnexion');
+	useDocumentTitle('Le recensement de la population | Page de déconnexion');
 	const { login, isAuthenticated } = useOidc();
 
 	const navigate = useNavigate();

diff --git a/src/pages/postSubmit/PostSubmit.tsx b/src/pages/postSubmit/PostSubmit.tsx
@@ -7,7 +7,7 @@ import { OidcSecure } from '../../lib/oidc';
 
 export function PostSubmit() {
 	const { survey, unit } = useParams();
-	useDocumentTitle("Page post envoi");
+	useDocumentTitle("Le recensement de la population | Page post envoi");
 
 	return (
 		<OidcSecure>

diff --git a/yarn.lock b/yarn.lock
@@ -1502,10 +1502,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
   integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
 
-"@inseefr/[email protected].13":
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/@inseefr/lunatic-dsfr/-/lunatic-dsfr-1.0.13.tgz#dc4a05e1d664d8f7c4a3ca983dfb626a91524f1f"
-  integrity sha512-T4KOT0fiiHSkCUZfSOROCyQpjnUnQ2PY/ApFAyTvgs5DCXq6wfQ/r2fTUpJ3K/qwRRFjaPxlaAqJB2brZ203zw==
+"@inseefr/[email protected].16":
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/@inseefr/lunatic-dsfr/-/lunatic-dsfr-1.0.16.tgz#6f473d399bac62fbf649c205cf4bb78ea2852b45"
+  integrity sha512-lXm/QAKIhx4JEb6q8BGvc+kLU4PW73YR1G4KujDxO5AX/wqCMZppeVN+FazZ15a6upt71pxlYwx/Xhg1LbCirw==
   dependencies:
     "@emotion/styled" "^11.10.6"
     "@inseefr/lunatic" "2.6.5"