Skip to content

Commit 6298c1e

Browse files
committed
CCM-8873 Add hidden aria description to markdown examples and update snapshots
1 parent 06cb5eb commit 6298c1e

File tree

10 files changed

+756
-89
lines changed

10 files changed

+756
-89
lines changed

frontend/src/__tests__/components/forms/EmailTemplateForm/__snapshots__/EmailTemplateForm.test.tsx.snap

Lines changed: 320 additions & 32 deletions
Large diffs are not rendered by default.

frontend/src/__tests__/components/forms/NhsAppTemplateForm/__snapshots__/NhsAppTemplateForm.test.tsx.snap

Lines changed: 320 additions & 35 deletions
Large diffs are not rendered by default.

frontend/src/__tests__/components/forms/SmsTemplateForm/__snapshots__/SmsTemplateForm.test.tsx.snap

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,15 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
316316
<p>
317317
For example:
318318
</p>
319-
<code>
319+
<span
320+
class="nhsuk-u-visually-hidden"
321+
id="link-url-description"
322+
>
323+
Markdown example:
324+
</span>
325+
<code
326+
aria-describedby="link-url-description"
327+
>
320328
https://www.nhs.uk/example
321329
</code>
322330
</div>
@@ -663,7 +671,15 @@ exports[`CreateSmsTemplate component renders page with back link if initial stat
663671
<p>
664672
For example:
665673
</p>
666-
<code>
674+
<span
675+
class="nhsuk-u-visually-hidden"
676+
id="link-url-description"
677+
>
678+
Markdown example:
679+
</span>
680+
<code
681+
aria-describedby="link-url-description"
682+
>
667683
https://www.nhs.uk/example
668684
</code>
669685
</div>
@@ -1046,7 +1062,15 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
10461062
<p>
10471063
For example:
10481064
</p>
1049-
<code>
1065+
<span
1066+
class="nhsuk-u-visually-hidden"
1067+
id="link-url-description"
1068+
>
1069+
Markdown example:
1070+
</span>
1071+
<code
1072+
aria-describedby="link-url-description"
1073+
>
10501074
https://www.nhs.uk/example
10511075
</code>
10521076
</div>
@@ -1371,7 +1395,15 @@ exports[`CreateSmsTemplate component renders page with no back link if initial s
13711395
<p>
13721396
For example:
13731397
</p>
1374-
<code>
1398+
<span
1399+
class="nhsuk-u-visually-hidden"
1400+
id="link-url-description"
1401+
>
1402+
Markdown example:
1403+
</span>
1404+
<code
1405+
aria-describedby="link-url-description"
1406+
>
13751407
https://www.nhs.uk/example
13761408
</code>
13771409
</div>
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33

4-
const { boldText } = content.components.messageFormatting;
4+
const { boldText, hiddenCodeBlockDescription } =
5+
content.components.messageFormatting;
56

67
export const BoldText = () => (
78
<Details data-testid='bold-text-details'>
@@ -10,7 +11,12 @@ export const BoldText = () => (
1011
</Details.Summary>
1112
<Details.Text data-testid='bold-text-text'>
1213
<p>{boldText.text}</p>
13-
<code>{boldText.codeBlockText}</code>
14+
<span id='bold-text-description' className='nhsuk-u-visually-hidden'>
15+
{hiddenCodeBlockDescription}
16+
</span>
17+
<code aria-describedby='bold-text-description'>
18+
{boldText.codeBlockText}
19+
</code>
1420
</Details.Text>
1521
</Details>
1622
);

frontend/src/components/molecules/MessageFormatting/formats/BulletList.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33
import styles from '../MessageFormatting.module.scss';
44

5-
const { bulletLists } = content.components.messageFormatting;
5+
const { bulletLists, hiddenCodeBlockDescription } =
6+
content.components.messageFormatting;
67

78
export const BulletList = () => (
89
<Details data-testid='bullet-lists-details'>
@@ -11,7 +12,10 @@ export const BulletList = () => (
1112
</Details.Summary>
1213
<Details.Text data-testid='bullet-lists-text'>
1314
<p>{bulletLists.text}</p>
14-
<code>
15+
<span className='nhsuk-u-visually-hidden' id='bullet-list-description'>
16+
{hiddenCodeBlockDescription}
17+
</span>
18+
<code aria-describedby='bullet-list-description'>
1519
{bulletLists.codeBlockText.map(({ id, item }) => (
1620
<span className={styles.inlineText} key={id}>
1721
{item}
Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33

4-
const { headings } = content.components.messageFormatting;
4+
const { headings, hiddenCodeBlockDescription } =
5+
content.components.messageFormatting;
56

67
export const Headings = () => (
78
<Details data-testid='headings-details'>
@@ -10,9 +11,19 @@ export const Headings = () => (
1011
</Details.Summary>
1112
<Details.Text data-testid='headings-text'>
1213
<p>{headings.text1}</p>
13-
<code>{headings.codeBlock.text1}</code>
14-
<p>{headings.text2}</p>
15-
<code>{headings.codeBlock.text2}</code>
14+
<span className='nhsuk-u-visually-hidden' id='heading-description'>
15+
{hiddenCodeBlockDescription}
16+
</span>
17+
<code aria-describedby='heading-description'>
18+
{headings.codeBlock.text1}
19+
</code>
20+
<p className='nhsuk-u-margin-top-4'>{headings.text2}</p>
21+
<span className='nhsuk-u-visually-hidden' id='subheading-description'>
22+
{hiddenCodeBlockDescription}
23+
</span>
24+
<code aria-describedby='subheading-description'>
25+
{headings.codeBlock.text2}
26+
</code>
1627
</Details.Text>
1728
</Details>
1829
);

frontend/src/components/molecules/MessageFormatting/formats/HorizontalRule.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33
import styles from '../MessageFormatting.module.scss';
44

5-
const { horizontalLine } = content.components.messageFormatting;
5+
const { horizontalLine, hiddenCodeBlockDescription } =
6+
content.components.messageFormatting;
67

78
export const HorizontalRule = () => (
89
<Details data-testid='horizontal-lines-details'>
@@ -11,7 +12,16 @@ export const HorizontalRule = () => (
1112
</Details.Summary>
1213
<Details.Text data-testid='horizontal-lines-text'>
1314
<p>{horizontalLine.text}</p>
14-
<code className={styles.horizontalLine}>
15+
<span
16+
className='nhsuk-u-visually-hidden'
17+
id='horizontal-rule-description'
18+
>
19+
{hiddenCodeBlockDescription}
20+
</span>
21+
<code
22+
className={styles.horizontalLine}
23+
aria-describedby='horizontal-rule-description'
24+
>
1525
{horizontalLine.codeBlockText.map(({ id, item }) => (
1626
<p key={id}>{item}</p>
1727
))}

frontend/src/components/molecules/MessageFormatting/formats/LineBreaksAndParagraphs.tsx

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33
import styles from '../MessageFormatting.module.scss';
44

5-
const { lineBreaksAndParagraphs } = content.components.messageFormatting;
5+
const { lineBreaksAndParagraphs, hiddenCodeBlockDescription } =
6+
content.components.messageFormatting;
67

78
export const LineBreaksAndParagraphs = () => (
89
<Details data-testid='lines-breaks-and-paragraphs-details'>
@@ -11,15 +12,27 @@ export const LineBreaksAndParagraphs = () => (
1112
</Details.Summary>
1213
<Details.Text data-testid='lines-breaks-and-paragraphs-text'>
1314
<p>{lineBreaksAndParagraphs.text1}</p>
14-
<code>
15+
<span className='nhsuk-u-visually-hidden' id='linebreak-description'>
16+
{hiddenCodeBlockDescription}
17+
</span>
18+
<code aria-describedby='linebreak-description'>
1519
{lineBreaksAndParagraphs.codeBlockText.map(({ id, item }) => (
1620
<span className={styles.inlineText} key={id}>
1721
{item}&nbsp;&nbsp;
1822
</span>
1923
))}
2024
</code>
2125
<p className='nhsuk-u-margin-top-4'>{lineBreaksAndParagraphs.text2}</p>
22-
<code className={styles.codeLine}>
26+
<span
27+
className='nhsuk-u-visually-hidden'
28+
id='paragraph-break-description'
29+
>
30+
{hiddenCodeBlockDescription}
31+
</span>
32+
<code
33+
className={styles.codeLine}
34+
aria-describedby='paragraph-break-description'
35+
>
2336
{lineBreaksAndParagraphs.codeBlockText.map(({ id, item }) => (
2437
<p key={id}>{item}</p>
2538
))}

frontend/src/components/molecules/MessageFormatting/formats/LinksAndUrls.tsx

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33
import { JSX } from 'react';
44

5-
const { linksAndUrls } = content.components.messageFormatting;
5+
const { linksAndUrls, hiddenCodeBlockDescription } =
6+
content.components.messageFormatting;
67

78
const LinksAndUrls = ({ children }: { children?: JSX.Element }) => (
89
<Details data-testid='link-and-url-details'>
@@ -12,7 +13,12 @@ const LinksAndUrls = ({ children }: { children?: JSX.Element }) => (
1213
<Details.Text data-testid='link-and-url-text'>
1314
<p>{linksAndUrls.text1}</p>
1415
<p>{linksAndUrls.text2}</p>
15-
<code>{linksAndUrls.codeBlockText.text1}</code>
16+
<span className='nhsuk-u-visually-hidden' id='link-url-description'>
17+
{hiddenCodeBlockDescription}
18+
</span>
19+
<code aria-describedby='link-url-description'>
20+
{linksAndUrls.codeBlockText.text1}
21+
</code>
1622
{children}
1723
</Details.Text>
1824
</Details>
@@ -25,7 +31,15 @@ export const LinksAndUrlsMarkdown = () => (
2531
<>
2632
<p className='nhsuk-u-margin-top-4'>{linksAndUrls.text3}</p>
2733
<p>{linksAndUrls.text4}</p>
28-
<code>{linksAndUrls.codeBlockText.text2}</code>
34+
<span
35+
className='nhsuk-u-visually-hidden'
36+
id='link-url-markdown-description'
37+
>
38+
{hiddenCodeBlockDescription}
39+
</span>
40+
<code aria-describedby='link-url-markdown-description'>
41+
{linksAndUrls.codeBlockText.text2}
42+
</code>
2943
</>
3044
</LinksAndUrls>
3145
);

frontend/src/components/molecules/MessageFormatting/formats/NumberedList.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Details } from 'nhsuk-react-components';
22
import content from '@content/content';
33
import styles from '../MessageFormatting.module.scss';
44

5-
const { numberedLists } = content.components.messageFormatting;
5+
const { numberedLists, hiddenCodeBlockDescription } =
6+
content.components.messageFormatting;
67

78
export const NumberedList = () => (
89
<Details data-testid='numbered-list-details'>
@@ -11,7 +12,10 @@ export const NumberedList = () => (
1112
</Details.Summary>
1213
<Details.Text data-testid='numbered-list-text'>
1314
<p>{numberedLists.text}</p>
14-
<code>
15+
<span className='nhsuk-u-visually-hidden' id='numbered-list-description'>
16+
{hiddenCodeBlockDescription}
17+
</span>
18+
<code aria-describedby='numbered-list-description'>
1519
{numberedLists.codeBlockText.map(({ id, item }) => (
1620
<span className={styles.inlineText} key={id}>
1721
{item}

0 commit comments

Comments
 (0)