Commit a55eaeda by PLN (Algolia)

fix: ICP persona report round 1 — trust seams first (2026-11-02 report)

TDAH blockers:
- reload mid-quiz no longer bricks the session: consented survives the mount
  reconstruction, pos persists on every flow navigation (goFlow writes it
  into clarte:v1), and the resume card is the first thing on home
- 'Passer les questions restantes' commits its filled state (onApply) before
  jumping — results and PDF reachable again
- i18n rot: intro.sixMonthsSuffix, recap.share.copy, recap.backHome added to
  both dicts; fr {présentation} tokens unaccented to match the interpolation
- recap rows lose their Tab stop: 70 focusable rows made the actions a
  72-Tab walk

Couple:
- destructive confirms take the focus when they render (full and per-row
  erase, carnet) — no blind Enter near an irreversible wipe
- intro/quiz/recap write ?q=<id>&n=<pos> into history: browser Back is an
  undo, reload and deep links land on the exact screen; #p=/#a= share links
  keep priority
- worksheet screens: Ctrl/⌘+Entrée moves to the next field then the button
  (TextArea forwards refs), keyhint shown, touch spared
- recap band: the steadying line precedes the folded 1980s verbatim quote
- home: journey line drops the 'sur 190' stamina framing, titles wrap on
  two lines, 'Bonjour, moi' placeholder replaced by the plain title

All routes: the AUTO theme pill collapses to an icon below the safe area on
narrow phones. Tests 230/230.
parent 21187992
......@@ -29,7 +29,7 @@ export default async function CoupleVideosPage() {
className="flex w-full items-center gap-4 py-3.5 transition hover:bg-[#faf3ea] focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-[#b85c48]"
>
<span className="min-w-0 flex-1">
<span className="block truncate font-medium text-[#2b2620]">{it.title}</span>
<span className="block font-medium text-[#2b2620] [text-wrap:balance]">{it.title}</span>
{it.summary && (
<span className="mt-0.5 block truncate text-sm text-[#6f675c]">{it.summary}</span>
)}
......
......@@ -16,6 +16,20 @@
cursor: pointer;
}
/* Téléphones étroits : la pastille flottante chevauchait les cibles de la
page (questionnaires, bouton Copier le lien). Elle se réduit à l'icône et
se range sous les safe areas (ICP 2026-11-02). */
@media (max-width: 480px) {
.pill {
bottom: calc(0.5rem + env(safe-area-inset-bottom, 0px));
right: 0.5rem;
padding: 0.35rem 0.5rem;
}
.pill .mode {
display: none;
}
}
.pill:hover {
color: var(--text-primary);
}
......
......@@ -7,20 +7,25 @@
No autofocus: on a small viewport the keyboard overlay would cover the question —
the keyboard opens on tap only. */
import { useEffect, useRef } from 'react';
import { forwardRef, useEffect, useRef } from 'react';
import styles from './text-area.module.css';
import './tokens.module.css';
export default function TextArea({
value,
onChange,
onDebouncedChange,
rows = 3,
maxLength,
placeholder,
ariaLabel,
id,
}) {
/* forwardRef : certains écrans (feuille de travail du couple) pilotent le
passage de champ au clavier et doivent atteindre la textarea réelle. */
const TextArea = forwardRef(function TextArea(
{
value,
onChange,
onDebouncedChange,
rows = 3,
maxLength,
placeholder,
ariaLabel,
id,
},
ref
) {
const timerRef = useRef(null);
// Last typed value, kept in a ref (updated in handleChange, NOT at render — a
// re-render with a stale controlled prop must not clobber what was just typed)
......@@ -55,6 +60,7 @@ export default function TextArea({
return (
<textarea
ref={ref}
id={id}
className={styles.textarea}
value={value ?? ''}
......@@ -66,4 +72,6 @@ export default function TextArea({
onBlur={flush}
/>
);
}
});
export default TextArea;
......@@ -5,7 +5,7 @@
Jamais dans les liens de partage : la donnée reste locale et sort seulement
dans l'export JSON (contrat engine.js couple:v1:pad:<pid>). */
import { useEffect, useState } from 'react';
import { useEffect, useRef, useState } from 'react';
import Link from 'next/link';
import TextArea from '@/components/clarte/TextArea';
import { deletePad, listPads, newPadId, readPad, writePad } from './engine';
......@@ -27,11 +27,17 @@ export default function CarnetView({ trackWrite = function () {} }) {
const [pad, setPad] = useState(null);
const [confirmingDelete, setConfirmingDelete] = useState(false);
const [savedFlash, setSavedFlash] = useState(false);
const deleteConfirmRef = useRef(null);
useEffect(function () {
setPads(listPads());
}, []);
/* La confirmation de destruction prend le focus au rendu (ICP 2026-11-02). */
useEffect(function () {
if (confirmingDelete && deleteConfirmRef.current) deleteConfirmRef.current.focus();
}, [confirmingDelete]);
if (pads === null) return null;
var refresh = function () {
......@@ -133,7 +139,7 @@ export default function CarnetView({ trackWrite = function () {} }) {
{confirmingDelete ? (
<>
{strings.carnet.deleteConfirm}{' '}
<button type="button" className="font-bold text-[#8a3d2e] underline underline-offset-2" onClick={remove}>{strings.carnet.deleteYes}</button>
<button ref={deleteConfirmRef} type="button" className="font-bold text-[#8a3d2e] underline underline-offset-2" onClick={remove}>{strings.carnet.deleteYes}</button>
{' · '}
<button type="button" className="text-[#6f675c] underline underline-offset-2" onClick={function () { setConfirmingDelete(false); }}>{strings.carnet.deleteNo}</button>
</>
......
......@@ -14,7 +14,7 @@
import { useCallback, useEffect, useState } from 'react';
import { COUPLE_DATA } from './data';
import { decodeAnyPayload, readRecord as readRecordLocal, storageAvailable } from './engine';
import { decodeAnyPayload, readRecord as readRecordLocal, sanitizePos, storageAvailable } from './engine';
import { strings } from './strings';
import styles from './couple.module.css';
import HomeView from './HomeView';
......@@ -40,25 +40,63 @@ export default function ClarteCouple() {
const [storageOk, setStorageOk] = useState(true);
const [writeFailed, setWriteFailed] = useState(false);
useEffect(() => {
setMounted(true);
setStorageOk(storageAvailable());
/* URL = état (ICP 2026-11-02, friction 12) : chaque écran du questionnaire
écrit ?q=<id>&n=<pos> dans l'historique — Back devient « annule ce pas »,
reload et lien profond retombent sur l'écran exact. Les liens de partage
restent en #p= / #a= et gardent la priorité au montage. */
const navigate = useCallback(function (next, replace) {
setRoute(next);
if (typeof history === 'undefined') return;
var search = '';
if (next.view === 'intro') search = '?q=' + encodeURIComponent(next.qid);
else if (next.view === 'quiz' || next.view === 'worksheet') search = '?q=' + encodeURIComponent(next.qid) + '&n=' + next.pos;
else if (next.view === 'recap') search = '?q=' + encodeURIComponent(next.qid) + '&n=r';
var url = '/couple' + search;
if (replace) history.replaceState(null, '', url);
else history.pushState(null, '', url);
}, []);
const bootFromUrl = useCallback(function () {
var hash = typeof location !== 'undefined' ? location.hash : '';
if (hash.lastIndexOf('#p=', 0) === 0 || hash.lastIndexOf('#a=', 0) === 0) {
var decoded = decodeAnyPayload(hash.slice(3));
if (!decoded) setRoute({ view: 'sharedError' });
else if (decoded.kind === 'all') setRoute({ view: 'sharedAll', payload: decoded.payload });
else setRoute({ view: 'shared', payload: decoded.payload });
} else {
setRoute({ view: 'home' });
return;
}
var params = new URLSearchParams(typeof location !== 'undefined' ? location.search : '');
var qid = params.get('q');
if (qid && questionnaireById(qid)) {
var n = params.get('n');
if (n === 'r') setRoute({ view: 'recap', qid: qid });
else if (n !== null) {
var q = questionnaireById(qid);
var total = q.sections.reduce(function (a, s) { return a + (s.items || []).length; }, 0);
var p = sanitizePos(n, total);
if (p >= total) setRoute({ view: 'recap', qid: qid });
else setRoute({ view: q.type === 'worksheet' ? 'worksheet' : 'quiz', qid: qid, pos: p });
}
else setRoute({ view: 'intro', qid: qid });
return;
}
setRoute({ view: 'home' });
}, []);
useEffect(() => {
setMounted(true);
setStorageOk(storageAvailable());
bootFromUrl();
var onPop = function () { bootFromUrl(); };
window.addEventListener('popstate', onPop);
return function () { window.removeEventListener('popstate', onPop); };
}, []);
const trackWrite = useCallback((ok) => {
if (!ok) setWriteFailed(true);
}, []);
const goHome = useCallback(() => setRoute({ view: 'home' }), []);
const goHome = useCallback(() => navigate({ view: 'home' }), [navigate]);
const goCompare = useCallback((hash) => {
var decoded = decodeAnyPayload(hash);
if (!decoded) { setRoute({ view: 'home', compareError: true }); return; }
......@@ -77,8 +115,8 @@ export default function ClarteCouple() {
theirBlock: decoded.payload,
});
}, []);
const goIntro = useCallback((qid) => setRoute({ view: 'intro', qid: qid }), []);
const goRecap = useCallback((qid) => setRoute({ view: 'recap', qid: qid }), []);
const goIntro = useCallback((qid) => navigate({ view: 'intro', qid: qid }), [navigate]);
const goRecap = useCallback((qid) => navigate({ view: 'recap', qid: qid }), [navigate]);
const goQuiz = useCallback((qid, pos) => {
// Le focus ne traverse jamais les écrans : un anneau de sélection resté
// sur la pilule cliquée se lirait « déjà répondu » sur la question suivante.
......@@ -91,10 +129,10 @@ export default function ClarteCouple() {
return a + (s.items || []).length;
}, 0);
var p = Math.min(Math.max(0, Math.floor(+pos) || 0), total);
if (p >= total) setRoute({ view: 'recap', qid: qid });
else if (q.type === 'worksheet') setRoute({ view: 'worksheet', qid: qid, pos: p });
else setRoute({ view: 'quiz', qid: qid, pos: p });
}, []);
if (p >= total) navigate({ view: 'recap', qid: qid });
else if (q.type === 'worksheet') navigate({ view: 'worksheet', qid: qid, pos: p });
else navigate({ view: 'quiz', qid: qid, pos: p });
}, [navigate]);
if (!mounted) return null;
......
......@@ -64,7 +64,7 @@ export default function GuideHub({ guide }) {
className="flex w-full items-center gap-4 py-3.5 transition hover:bg-[#faf3ea] focus-visible:outline focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-[#b85c48]"
>
<span className="min-w-0 flex-1">
<span className="block truncate font-medium text-[#2b2620]">{item.title}</span>
<span className="block font-medium text-[#2b2620] [text-wrap:balance]">{item.title}</span>
{item.summary && (
<span className="mt-0.5 block truncate text-sm text-[#6f675c]">{item.summary}</span>
)}
......
......@@ -7,7 +7,7 @@
Toute la logique existante (partage, PDF, comparaison, export, effacement)
est conservée ; les contrats de stockage ne bougent pas. */
import { useEffect, useState } from 'react';
import { useEffect, useRef, useState } from 'react';
import Link from 'next/link';
import Button from '@/components/clarte/Button';
import { COUPLE_DATA } from './data';
......@@ -69,6 +69,8 @@ export default function HomeView({ goIntro, goQuiz, goRecap, trackWrite, goCompa
const [padCount, setPadCount] = useState(0);
const [confirmingDelete, setConfirmingDelete] = useState(false);
const [rowConfirmQid, setRowConfirmQid] = useState(null);
const deleteConfirmRef = useRef(null);
const rowConfirmRef = useRef(null);
const [shareAllOpen, setShareAllOpen] = useState(false);
const [compareLink, setCompareLink] = useState('');
const [compareError, setCompareError] = useState(false);
......@@ -80,6 +82,16 @@ export default function HomeView({ goIntro, goQuiz, goRecap, trackWrite, goCompa
setPadCount(listPads().length);
}, []);
/* Les confirmations de destruction prennent le focus au rendu : un Entrée
aveugle près d'un effacement irréversible ne doit jamais atterrir sur
BODY. (rapport ICP 2026-11-02, friction 11) */
useEffect(function () {
if (confirmingDelete && deleteConfirmRef.current) deleteConfirmRef.current.focus();
}, [confirmingDelete]);
useEffect(function () {
if (rowConfirmQid && rowConfirmRef.current) rowConfirmRef.current.focus();
}, [rowConfirmQid]);
if (!session || !journey) return null;
var handleRespondent = function (event) {
......@@ -129,13 +141,13 @@ export default function HomeView({ goIntro, goQuiz, goRecap, trackWrite, goCompa
{strings.home.brand}
</p>
<h1 className="mt-2 text-4xl font-bold leading-tight tracking-tight text-[#2b2620] sm:text-5xl">
{journey.answered > 0
{journey.answered > 0 && session.respondent_label !== 'moi'
? strings.home.hello(session.respondent_label)
: strings.home.h1}
</h1>
<p className="mt-3 max-w-prose text-lg text-[#6f675c]">
{journey.answered > 0
? strings.home.journeyLine(journey.answered, journey.total, journey.doneCount)
? strings.home.journeyLine(journey.answered, journey.doneCount)
: strings.home.intro}
</p>
......@@ -195,7 +207,7 @@ export default function HomeView({ goIntro, goQuiz, goRecap, trackWrite, goCompa
{rowConfirmQid === q.id ? (
<div className="flex flex-wrap items-baseline gap-x-3 gap-y-1 py-3.5">
<span className="text-sm text-[#8a3d2e]">{strings.home.rowDeleteConfirm}</span>
<button type="button" className="text-sm font-bold text-[#8a3d2e] underline underline-offset-2 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#b85c48]" onClick={function () { handleRowDelete(q.id); }}>
<button ref={rowConfirmRef} type="button" className="text-sm font-bold text-[#8a3d2e] underline underline-offset-2 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#b85c48]" onClick={function () { handleRowDelete(q.id); }}>
{strings.home.rowDeleteYes}
</button>
<button type="button" className="text-sm text-[#6f675c] underline underline-offset-2 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#b85c48]" onClick={function () { setRowConfirmQid(null); }}>
......@@ -210,7 +222,7 @@ export default function HomeView({ goIntro, goQuiz, goRecap, trackWrite, goCompa
onClick={function () { cardClick(q, goIntro, goQuiz, goRecap); }}
>
<span className="min-w-0 flex-1">
<span className="block truncate font-medium text-[#2b2620]">{displayTitle(q.title)}</span>
<span className="block font-medium text-[#2b2620] [text-wrap:balance]">{displayTitle(q.title)}</span>
<span className="mt-1 block h-1 w-full max-w-40 overflow-hidden rounded-full bg-[#eee7da]">
<span
className={'block h-full rounded-full ' + (done ? 'bg-[#5e7d5a]' : 'bg-[#b85c48]')}
......@@ -313,7 +325,7 @@ export default function HomeView({ goIntro, goQuiz, goRecap, trackWrite, goCompa
{confirmingDelete ? (
<>
{strings.home.deleteConfirm}{' '}
<button type="button" className="font-bold text-[#8a3d2e] underline underline-offset-2" onClick={handleDelete}>{strings.home.deleteYes}</button>
<button ref={deleteConfirmRef} type="button" className="font-bold text-[#8a3d2e] underline underline-offset-2" onClick={handleDelete}>{strings.home.deleteYes}</button>
{' · '}
<button type="button" className="text-[#6f675c] underline underline-offset-2" onClick={function () { setConfirmingDelete(false); }}>{strings.home.deleteNo}</button>
</>
......
......@@ -109,16 +109,26 @@ export default function RecapView({ q, goHome, goQuiz, trackWrite }) {
<div className={styles.resultBand}>
{complete && (
<>
<div className={styles.score}>{sc.pct}{' '}%</div>
<div className={styles.score}>{sc.pct}{' '}%</div>
<p>{strings.recap.scoreComplete}</p>
<p className={styles.muted}>
{strings.recap.origLabel} : « {band.label} »
</p>
{/* Le temps des mots rassurants passe devant la citation du
support (ICP 2026-11-02 : la bande verbatim arrive en
dernier, repliée, en lecture secondaire). */}
<p className={styles.muted}>{strings.recap.scoreMusing}</p>
<details className={styles.attribDetails}>
<summary className={styles.attribSummary}>{strings.recap.origLabel}</summary>
<p className={styles.muted}>« {band.label} »</p>
</details>
</>
)}
{!complete && <p>{strings.recap.progressPartial(n, total)}</p>}
{optCount > 0 && <p>{strings.recap.optOutLine(optCount)}</p>}
<p className={styles.muted}>{strings.recap.scoreMusing}</p>
{!complete && (
<>
<p>{strings.recap.progressPartial(n, total)}</p>
{optCount > 0 && <p className={styles.muted}>{strings.recap.optOutLine(optCount)}</p>}
<p className={styles.muted}>{strings.recap.scoreMusing}</p>
</>
)}
{complete && optCount > 0 && <p className={styles.muted}>{strings.recap.optOutLine(optCount)}</p>}
</div>
)}
{/* L'instruction arithmétique du support papier (total à reporter à la main)
......
......@@ -38,6 +38,8 @@ export default function WorksheetView({ q, pos, goQuiz, trackWrite }) {
}, []);
var firstLabelRef = useRef(null);
var textRefs = useRef([]);
var nextBtnRef = useRef(null);
useEffect(function focusFirstLabel() {
if (firstLabelRef.current) firstLabelRef.current.focus();
}, []);
......@@ -100,15 +102,32 @@ export default function WorksheetView({ q, pos, goQuiz, trackWrite }) {
>
{r.item.text}
</p>
<TextArea
value={v && typeof v === 'object' && typeof v.text === 'string' ? v.text : ''}
rows={sizes.rows}
maxLength={sizes.max}
ariaLabel={r.item.text}
onDebouncedChange={function (value) {
saveField(r.key, value);
{/* Ctrl/⌘+Entrée passe au champ suivant, puis au bouton : la
saisie libre garde Entrée pour la nouvelle ligne, le clavier
ne cul-de-sace plus sur l'écran (ICP 2026-11-02, f. 10). */}
<div
onKeyDown={function (event) {
if (event.key !== 'Enter' || !(event.ctrlKey || event.metaKey)) return;
event.preventDefault();
var nextTa = textRefs[i + 1];
if (nextTa && nextTa.focus) {
nextTa.focus();
} else if (nextBtnRef.current) {
nextBtnRef.current.focus();
}
}}
/>
>
<TextArea
ref={function (el) { textRefs[i] = el; }}
value={v && typeof v === 'object' && typeof v.text === 'string' ? v.text : ''}
rows={sizes.rows}
maxLength={sizes.max}
ariaLabel={r.item.text}
onDebouncedChange={function (value) {
saveField(r.key, value);
}}
/>
</div>
</div>
);
})}
......@@ -116,10 +135,13 @@ export default function WorksheetView({ q, pos, goQuiz, trackWrite }) {
<div className={styles.nav}>
{start > 0 && <Button onClick={goPrevWs}>{strings.quiz.prev}</Button>}
<Button onClick={goNextWs}>
{end + 1 < total ? strings.quiz.nextWorksheet : strings.quiz.toRecap}
</Button>
<span ref={nextBtnRef} tabIndex={-1} style={{ display: 'inline-flex' }}>
<Button onClick={goNextWs}>
{end + 1 < total ? strings.quiz.nextWorksheet : strings.quiz.toRecap}
</Button>
</span>
</div>
<p className={styles.keyhintOnly}>{strings.quiz.keyhintText}</p>
</div>
);
}
......@@ -11,9 +11,10 @@ export const strings = {
brand: 'Clarté couple',
h1: 'Espace couple',
hello: (who) => 'Bonjour, ' + who,
journeyLine: (answered, total, done) =>
'Vous avez répondu à ' + answered + ' questions sur ' + total +
(done > 0 ? ', ' + done + ' questionnaire' + (done > 1 ? 's' : '') + ' terminé' + (done > 1 ? 's' : '') : '') + '.',
journeyLine: (answered, done) =>
'Vous avez répondu à ' + answered + ' questions' +
(done > 0 ? ', ' + done + ' questionnaire' + (done > 1 ? 's' : '') + ' terminé' + (done > 1 ? 's' : '') : '') +
'. Reprenez là où vous en étiez.',
resumeCta: 'Reprendre où j’en étais',
beginCta: 'Commencer le premier questionnaire',
listTitle: 'Les questionnaires',
......@@ -73,6 +74,7 @@ export const strings = {
quiz: {
keyhint: 'Au clavier : chiffres pour répondre, Entrée ou flèches pour avancer.',
keyhintText: 'Au clavier : écrivez librement ; Ctrl+Entrée (ou ⌘Entrée) pour passer au champ suivant.',
home: 'Accueil',
prev: 'Précédente',
skip: 'Passer la question',
......
......@@ -6,7 +6,7 @@
currentSection, pos, partBSkipped, lastMilestone?} ; les enregistrements
vanilla existants ({responses, currentSection}) fusionnent sans perte. */
import { useCallback, useEffect, useMemo, useState } from 'react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {
ASRS_PART_A, ASRS_PART_B, DIVA_INATTENTION, DIVA_HYPERACTIVITY,
DIVA_CHILDHOOD, DIVA_IMPAIRMENT, EXEC_CLUSTERS, PART_B_IDS, NOTES,
......@@ -63,8 +63,9 @@ export default function ClarteTdah({ lang }) {
setState(saved
? { responses: saved.responses || {}, pos: typeof saved.pos === 'number' ? saved.pos : 0,
partBSkipped: !!saved.partBSkipped, lastMilestone: saved.lastMilestone || null,
consented: !!saved.consented,
currentSection: saved.currentSection || 'home' }
: { responses: {}, pos: 0, partBSkipped: false, lastMilestone: null, currentSection: 'home' });
: { responses: {}, pos: 0, partBSkipped: false, lastMilestone: null, consented: false, currentSection: 'home' });
}, []);
const persist = useCallback((next) => {
......@@ -78,6 +79,21 @@ export default function ClarteTdah({ lang }) {
}, []);
const [route, setRouteLocal] = useState({ view: 'home' });
/* La position vit dans l'état persisté, pas seulement dans la route :
c'est elle qui rend « Reprendre » fidèle après un reload (ICP 2026-11-02,
bloqueur 1 — avant ce correctif, pos restait à 0 et la reprise
ramenait à l'intro). patch : écriture supplémentaire (partBSkipped…). */
const routeRef = useRef(route);
routeRef.current = route;
const goFlow = useCallback((pos, patch) => {
setState((s) => {
const n = { ...s, pos, ...(patch || {}), currentSection: 'flow' };
writeState(n);
return n;
});
setRouteLocal({ view: 'flow', pos });
}, []);
const nodes = useMemo(
() => (state ? questionnaireNodes(state.partBSkipped, state.responses) : []),
[state && state.partBSkipped, state && !!partBAnswered(state ? state.responses : {}), state && state.responses === state.responses]
......@@ -112,7 +128,7 @@ export default function ClarteTdah({ lang }) {
return (
<HomeView
t={t} state={state} styles={styles} storageOk={storageOk}
onStart={(pos) => { persist({ ...state, currentSection: 'flow' }); setRouteLocal({ view: 'flow', pos }); }}
onStart={(pos) => goFlow(pos)}
onGlossary={() => setRouteLocal({ view: 'glossary' })}
/>
);
......@@ -125,8 +141,8 @@ export default function ClarteTdah({ lang }) {
<ResultsView
t={t} styles={styles} responses={state.responses} lang={lang}
onHome={goHome}
onReview={() => setRouteLocal({ view: 'flow', pos: firstQuestionNode(nodes, state.responses) })}
onRestart={() => { clearState(); setState({ responses: {}, pos: 0, partBSkipped: false, lastMilestone: null, currentSection: 'home' }); setRouteLocal({ view: 'home' }); }}
onReview={() => goFlow(firstQuestionNode(nodes, state.responses))}
onRestart={() => { clearState(); setState({ responses: {}, pos: 0, partBSkipped: false, lastMilestone: null, consented: false, currentSection: 'home' }); setRouteLocal({ view: 'home' }); }}
/>
);
}
......@@ -139,21 +155,22 @@ export default function ClarteTdah({ lang }) {
return (
<RecapView
t={t} styles={styles} state={state} nodes={nodes}
onJump={(i) => setRouteLocal({ view: 'flow', pos: i })}
onJump={(i) => goFlow(i)}
onApply={(next) => { setState(next); writeState(next); }}
onResults={() => { persist({ ...state, currentSection: 'results' }); setRouteLocal({ view: 'results' }); }}
onHome={goHome}
/>
);
}
if (node.type === 'intro' || node.type === 'bridge') {
return <Interstitial node={node} t={t} styles={styles} onNext={() => setRouteLocal({ view: 'flow', pos: pos + 1 })} answeredCount={Object.keys(state.responses).length} total={scope(state.partBSkipped)} lang={lang} />;
return <Interstitial node={node} t={t} styles={styles} onNext={() => goFlow(pos + 1)} answeredCount={Object.keys(state.responses).length} total={scope(state.partBSkipped)} lang={lang} />;
}
if (node.type === 'gate') {
return (
<GateView
t={t} styles={styles}
onAnswer={() => setRouteLocal({ view: 'flow', pos: pos + 1 })}
onSkip={() => { persist({ ...state, partBSkipped: true }); setRouteLocal({ view: 'flow', pos: pos + 1 }); }}
onAnswer={() => goFlow(pos + 1)}
onSkip={() => goFlow(pos + 1, { partBSkipped: true })}
/>
);
}
......@@ -172,13 +189,13 @@ export default function ClarteTdah({ lang }) {
// auto-avance ~350 ms (spec §6.3), jamais sur le dernier écran de bloc
const nextType = nodes[pos + 1] && nodes[pos + 1].type;
if (nextType === 'question') {
setTimeout(() => setRouteLocal((r) => (r.view === 'flow' ? { view: 'flow', pos: pos + 1 } : r)), 350);
setTimeout(() => { if (routeRef.current.view === 'flow') goFlow(pos + 1); }, 350);
} else {
setRouteLocal({ view: 'flow', pos: pos + 1 });
goFlow(pos + 1);
}
}}
onNext={() => setRouteLocal({ view: 'flow', pos: Math.min(pos + 1, nodes.length - 1) })}
onPrev={() => setRouteLocal({ view: 'flow', pos: Math.max(pos - 1, 0) })}
onNext={() => goFlow(Math.min(pos + 1, nodes.length - 1))}
onPrev={() => goFlow(Math.max(pos - 1, 0))}
/>
);
}
......
......@@ -27,6 +27,17 @@ export default function HomeView({ t, state, styles, storageOk, onStart, onGloss
<h2>{t['home.h2']}</h2>
<p>{t['home.intro.p']}</p>
{/* La reprise passe devant tout le reste : celui qui revient cherche un
geste, pas une nouvelle présentation (ICP 2026-11-02, bloqueur 1). */}
{hasProgress && (
<div className={styles.resume}>
<p>{t['resume.count'].replace('{n}', String(answered)).replace('{total}', String(TOTAL_QUESTIONS)).replace(/question\(s\)/, answered > 1 ? 'questions' : 'question')}</p>
<div className={styles.nav}>
<button className={`${styles.primaryBtn} ${styles.btn}`} onClick={start}>{t['resume.primary']}</button>
</div>
</div>
)}
<div className={styles.cards}>
<div className={styles.card}>
<h4>{t['home.card.asrs.h4']}</h4>
......@@ -54,15 +65,6 @@ export default function HomeView({ t, state, styles, storageOk, onStart, onGloss
</ul>
</div>
{hasProgress && (
<div className={styles.resume}>
<p>{t['resume.count'].replace('{n}', String(answered)).replace('{total}', String(TOTAL_QUESTIONS)).replace(/question\(s\)/, answered > 1 ? 'questions' : 'question')}</p>
<div className={styles.nav}>
<button className={`${styles.primaryBtn} ${styles.btn}`} onClick={start}>{t['resume.primary']}</button>
</div>
</div>
)}
{!hasProgress && (
<div className={styles.consent}>
<label>
......
......@@ -13,7 +13,7 @@ import {
} from './data';
import { progressLine } from './QuizScreen';
export default function RecapView({ t, styles, state, nodes, onJump, onResults, onHome }) {
export default function RecapView({ t, styles, state, nodes, onJump, onApply, onResults, onHome }) {
const responses = state.responses;
const groups = useMemo(() => ([
{ label: t['asrs.h2'], qs: [...ASRS_PART_A, ...ASRS_PART_B] },
......@@ -50,6 +50,10 @@ export default function RecapView({ t, styles, state, nodes, onJump, onResults,
});
// note : un saut Partie B est réversible au récapitulatif ; ici les items
// passés sont mis à 0 comme le `|| 0` du POC (spéc §6.4, byte-identique)
// L'état est COMMITTÉ au parent avant le saut — sans lui, le bouton ne
// faisait rien et les résultats restaient inaccessibles (ICP 2026-11-02,
// bloqueur 2).
if (onApply) onApply(next);
onJump(nodes.length - 1);
};
......@@ -70,12 +74,15 @@ export default function RecapView({ t, styles, state, nodes, onJump, onResults,
const idx = nodeIndex[q.id];
return (
<li key={q.id}>
<button type="button" className={styles.recapRow} onClick={() => onJump(idx)}>
{/* Ligne cliquable mais non focusable : 70 arrêts de Tab
avant les actions rendaient le clavier inutilisable
(ICP 2026-11-02) ; les deux boutons d'action suffisent. */}
<div className={styles.recapRow} onClick={() => onJump(idx)}>
<span className={styles.recapText}>{t[q.t]}</span>
<span className={label ? styles.recapChip : styles.recapChipEmpty}>
{label || t['recap.unanswered.chip']}
</span>
</button>
</div>
</li>
);
})}
......
......@@ -226,6 +226,7 @@ export const dict = {
"milestone.half": "You are halfway through.",
"milestone.dsm.done": "Two parts done, one to go.",
"milestone.all.done": "That's everything. Thank you for getting clear.",
"intro.sixMonthsSuffix": "over the past 6 months",
"intro.asrs.h": "The screening",
"intro.asrs.p": "The ASRS is the adult ADHD self-assessment scale validated by the World Health Organization. Six questions first, the strongest indicators; then twelve complementary questions. For each one, think about how you have usually functioned over the past six months.",
"intro.dsm.h": "The official criteria",
......@@ -261,6 +262,8 @@ export const dict = {
"recap.missing.count": "{n} question(s) left.",
"recap.missing.go": "Go to the first unanswered question",
"recap.missing.skip": "Skip the remaining questions",
"recap.share.copy": "Copy the sentence",
"recap.backHome": "Back to home",
"recap.review.fromresults": "Review my answers",
"resume.count": "You had answered {n} of {total} questions.",
"resume.primary": "Resume",
......
......@@ -156,7 +156,7 @@ export const dict = {
"asrs.interpretation.positive": "Vos réponses suggèrent des symptômes très évocateurs du TDAH chez l’adulte, à discuter avec un professionnel de santé.",
"asrs.interpretation.negative": "Le dépistage ne passe pas le seuil. Une évaluation reste utile si ces difficultés vous préoccupent.",
"results.summary.bullet.asrs": "• ASRS (OMS) : seuil de dépistage atteint",
"results.summary.bullet.dsm": "• Critères DSM-5 : {présentation}",
"results.summary.bullet.dsm": "• Critères DSM-5 : {presentation}",
"results.summary.bullet.ef": "• Fonctions exécutives : difficultés de niveau {niveau}",
"results.reco.high": "Prochaine étape : parlez-en à un professionnel de santé (psychiatre ou neurologue). C’est à cette personne de poser, ou non, un diagnostic ; ce rapport est là pour appuyer la conversation. Téléchargez-le et apportez-le à votre rendez-vous.",
"results.reco.low": "Si, malgré tout, ces difficultés pèsent sur votre quotidien, en parler à un médecin reste une bonne idée : d’autres causes sont possibles (stress, sommeil, anxiété).",
......@@ -168,7 +168,7 @@ export const dict = {
"results.card1.inattention": "Inattention : {n}/36 (indicatif)",
"results.card1.hyperactivity": "Hyperactivité/Impulsivité : {n}/36 (indicatif)",
"results.card2.h3": "2. Critères DSM-5",
"results.card2.status": "{présentation}",
"results.card2.status": "{presentation}",
"results.card2.label.A1": "Inattention (A1) / Hyperactivité-Impulsivité (A2)",
"A2": "Inattention (A1) / Hyperactivité-Impulsivité (A2)",
"results.card2.label.B": "Enfance (B)",
......@@ -210,6 +210,7 @@ export const dict = {
"milestone.half": "Vous êtes à la moitié.",
"milestone.dsm.done": "Deux parties terminées, reste la dernière.",
"milestone.all.done": "C’est complet. Merci d’avoir été au clair.",
"intro.sixMonthsSuffix": "sur les 6 derniers mois",
"intro.asrs.h": "Le dépistage",
"intro.asrs.p": "L’ASRS est l’échelle d’auto-évaluation validée par l’Organisation mondiale de la Santé. Six questions d’abord, les plus révélatrices ; puis douze questions complémentaires. Pour chacune, pensez à votre fonctionnement habituel des six derniers mois.",
"intro.dsm.h": "Les critères officiels",
......@@ -245,6 +246,8 @@ export const dict = {
"recap.missing.count": "Il reste {n} question(s).",
"recap.missing.go": "Aller à la première question manquante",
"recap.missing.skip": "Passer les questions restantes",
"recap.share.copy": "Copier la phrase",
"recap.backHome": "Retour à l'accueil",
"recap.review.fromresults": "Réviser mes réponses",
"resume.count": "Vous aviez répondu à {n} question(s).",
"resume.primary": "Reprendre",
......
......@@ -411,10 +411,10 @@ describe('RecapView state machine', () => {
const NB = ' ';
expect(screen.getByText('75' + NB + '%')).toBeInTheDocument();
expect(screen.getByText('Score complet.')).toBeInTheDocument();
const bandLine = screen.getByText(/Lecture du support d’origine/).textContent;
const bandDetails = screen.getByText(/Lecture du support d’origine/).closest('details');
const bands = Q('bonheur_conjugal').scoring.bands;
const first = bands.find((b) => 75 >= b.min);
expect(bandLine.endsWith(first.label + ' »')).toBe(true);
expect(bandDetails.textContent).toContain(first.label);
expect(screen.getByText('Recommencer')).toBeInTheDocument();
fireEvent.keyDown(document, { key: 'Enter' });
expect(Object.keys(JSON.parse(window.localStorage.getItem(LS + 'q:bonheur_conjugal')).answers)).toHaveLength(25);
......@@ -430,7 +430,8 @@ describe('RecapView state machine', () => {
setup('bonheur_conjugal', { answers: fullAnswers(25, 2), pos: 25 });
const bands = Q('bonheur_conjugal').scoring.bands;
const expected = bands.find((b) => 50 >= b.min);
expect(screen.getByText(/Lecture du support d’origine/).textContent.endsWith(expected.label + ' »')).toBe(true);
const bandDetails = screen.getByText(/Lecture du support d’origine/).closest('details');
expect(bandDetails.textContent).toContain(expected.label);
});
it('scoring-null instrument : no score, count-bearing header, hors-échelle kept in the table', () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment