Skip to content

Commit f0c99fe

Browse files
nicki-nhsnicki-nhs
authored
CCM-11390: Proofing accessibility fixes (#593)
1 parent 2341a62 commit f0c99fe

File tree

11 files changed

+91
-65
lines changed

11 files changed

+91
-65
lines changed

‎frontend/src/__tests__/components/atoms/__snapshots__/Filename.test.tsx.snap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports[`Filename component renders component correctly 1`] = `
66
class="container"
77
>
88
<svg
9+
aria-hidden="true"
910
class="icon"
1011
fill="none"
1112
height="26"

‎frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/__snapshots__/LetterTemplateForm.test.tsx.snap‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,7 @@ exports[`Client-side validation triggers 1`] = `
417417
</span>
418418
<input
419419
accept="application/pdf"
420-
aria-describedby="letterTemplatePdf"
421-
class="file-upload"
420+
class="file-upload nhsuk-input"
422421
id="letterTemplatePdf"
423422
name="letterTemplatePdf"
424423
type="file"
@@ -454,8 +453,7 @@ exports[`Client-side validation triggers 1`] = `
454453
>
455454
<input
456455
accept="text/csv"
457-
aria-describedby="letterTemplateCsv"
458-
class="file-upload"
456+
class="file-upload nhsuk-input"
459457
id="letterTemplateCsv"
460458
name="letterTemplateCsv"
461459
type="file"
@@ -844,8 +842,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
844842
>
845843
<input
846844
accept="application/pdf"
847-
aria-describedby="letterTemplatePdf"
848-
class="file-upload"
845+
class="file-upload nhsuk-input"
849846
id="letterTemplatePdf"
850847
name="letterTemplatePdf"
851848
type="file"
@@ -881,8 +878,7 @@ exports[`hides right-to-left language warning when language changes 1`] = `
881878
>
882879
<input
883880
accept="text/csv"
884-
aria-describedby="letterTemplateCsv"
885-
class="file-upload"
881+
class="file-upload nhsuk-input"
886882
id="letterTemplateCsv"
887883
name="letterTemplateCsv"
888884
type="file"
@@ -1328,8 +1324,7 @@ exports[`renders page one error 1`] = `
13281324
>
13291325
<input
13301326
accept="application/pdf"
1331-
aria-describedby="letterTemplatePdf"
1332-
class="file-upload"
1327+
class="file-upload nhsuk-input"
13331328
id="letterTemplatePdf"
13341329
name="letterTemplatePdf"
13351330
type="file"
@@ -1365,8 +1360,7 @@ exports[`renders page one error 1`] = `
13651360
>
13661361
<input
13671362
accept="text/csv"
1368-
aria-describedby="letterTemplateCsv"
1369-
class="file-upload"
1363+
class="file-upload nhsuk-input"
13701364
id="letterTemplateCsv"
13711365
name="letterTemplateCsv"
13721366
type="file"
@@ -1838,8 +1832,7 @@ exports[`renders page with multiple errors 1`] = `
18381832
</span>
18391833
<input
18401834
accept="application/pdf"
1841-
aria-describedby="letterTemplatePdf"
1842-
class="file-upload"
1835+
class="file-upload nhsuk-input"
18431836
id="letterTemplatePdf"
18441837
name="letterTemplatePdf"
18451838
type="file"
@@ -1885,8 +1878,7 @@ exports[`renders page with multiple errors 1`] = `
18851878
</span>
18861879
<input
18871880
accept="text/csv"
1888-
aria-describedby="letterTemplateCsv"
1889-
class="file-upload"
1881+
class="file-upload nhsuk-input"
18901882
id="letterTemplateCsv"
18911883
name="letterTemplateCsv"
18921884
type="file"
@@ -2301,8 +2293,7 @@ exports[`renders page with preloaded field values 1`] = `
23012293
>
23022294
<input
23032295
accept="application/pdf"
2304-
aria-describedby="letterTemplatePdf"
2305-
class="file-upload"
2296+
class="file-upload nhsuk-input"
23062297
id="letterTemplatePdf"
23072298
name="letterTemplatePdf"
23082299
type="file"
@@ -2338,8 +2329,7 @@ exports[`renders page with preloaded field values 1`] = `
23382329
>
23392330
<input
23402331
accept="text/csv"
2341-
aria-describedby="letterTemplateCsv"
2342-
class="file-upload"
2332+
class="file-upload nhsuk-input"
23432333
id="letterTemplateCsv"
23442334
name="letterTemplateCsv"
23452335
type="file"
@@ -2754,8 +2744,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
27542744
>
27552745
<input
27562746
accept="application/pdf"
2757-
aria-describedby="letterTemplatePdf"
2758-
class="file-upload"
2747+
class="file-upload nhsuk-input"
27592748
id="letterTemplatePdf"
27602749
name="letterTemplatePdf"
27612750
type="file"
@@ -2791,8 +2780,7 @@ exports[`shows right-to-left language warning when language changes 1`] = `
27912780
>
27922781
<input
27932782
accept="text/csv"
2794-
aria-describedby="letterTemplateCsv"
2795-
class="file-upload"
2783+
class="file-upload nhsuk-input"
27962784
id="letterTemplateCsv"
27972785
name="letterTemplateCsv"
27982786
type="file"

‎frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateDetails.test.tsx.snap‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ exports[`PreviewTemplateDetailsLetter if status is PROOF_AVAILABLE, but no proof
196196
class="container"
197197
>
198198
<svg
199+
aria-hidden="true"
199200
class="icon"
200201
fill="none"
201202
height="26"
@@ -297,6 +298,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
297298
class="container"
298299
>
299300
<svg
301+
aria-hidden="true"
300302
class="icon"
301303
fill="none"
302304
height="26"
@@ -332,6 +334,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
332334
class="container"
333335
>
334336
<svg
337+
aria-hidden="true"
335338
class="icon"
336339
fill="none"
337340
height="26"
@@ -381,6 +384,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
381384
class="container"
382385
>
383386
<svg
387+
aria-hidden="true"
384388
class="icon"
385389
fill="none"
386390
height="26"
@@ -412,6 +416,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when proofs are present,
412416
class="container"
413417
>
414418
<svg
419+
aria-hidden="true"
415420
class="icon"
416421
fill="none"
417422
height="26"
@@ -499,6 +504,11 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when test data CSV is abs
499504
>
500505
Checking files
501506
</strong>
507+
<small
508+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
509+
>
510+
Refresh the page to update the status
511+
</small>
502512
</dd>
503513
</div>
504514
<div
@@ -516,6 +526,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot when test data CSV is abs
516526
class="container"
517527
>
518528
<svg
529+
aria-hidden="true"
519530
class="icon"
520531
fill="none"
521532
height="26"
@@ -600,6 +611,11 @@ exports[`PreviewTemplateDetailsLetter matches snapshot without proofs 1`] = `
600611
>
601612
Checking files
602613
</strong>
614+
<small
615+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
616+
>
617+
Refresh the page to update the status
618+
</small>
603619
</dd>
604620
</div>
605621
<div
@@ -617,6 +633,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot without proofs 1`] = `
617633
class="container"
618634
>
619635
<svg
636+
aria-hidden="true"
620637
class="icon"
621638
fill="none"
622639
height="26"
@@ -652,6 +669,7 @@ exports[`PreviewTemplateDetailsLetter matches snapshot without proofs 1`] = `
652669
class="container"
653670
>
654671
<svg
672+
aria-hidden="true"
655673
class="icon"
656674
fill="none"
657675
height="26"

‎frontend/src/__tests__/components/molecules/__snapshots__/ViewLetterTemplate.test.tsx.snap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ exports[`ViewLetterTemplate component matches submitted snapshot 1`] = `
110110
class="container"
111111
>
112112
<svg
113+
aria-hidden="true"
113114
class="icon"
114115
fill="none"
115116
height="26"
@@ -159,6 +160,7 @@ exports[`ViewLetterTemplate component matches submitted snapshot 1`] = `
159160
class="container"
160161
>
161162
<svg
163+
aria-hidden="true"
162164
class="icon"
163165
fill="none"
164166
height="26"

‎frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
110110
class="container"
111111
>
112112
<svg
113+
aria-hidden="true"
113114
class="icon"
114115
fill="none"
115116
height="26"
@@ -266,6 +267,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
266267
class="container"
267268
>
268269
<svg
270+
aria-hidden="true"
269271
class="icon"
270272
fill="none"
271273
height="26"
@@ -405,6 +407,11 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
405407
>
406408
Checking files
407409
</strong>
410+
<small
411+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
412+
>
413+
Refresh the page to update the status
414+
</small>
408415
</dd>
409416
</div>
410417
<div
@@ -422,6 +429,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
422429
class="container"
423430
>
424431
<svg
432+
aria-hidden="true"
425433
class="icon"
426434
fill="none"
427435
height="26"
@@ -550,6 +558,11 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
550558
>
551559
Checking files
552560
</strong>
561+
<small
562+
class="preview__statusnote nhsuk-body-s nhsuk-u-margin-top-2 nhsuk-u-secondary-text-color"
563+
>
564+
Refresh the page to update the status
565+
</small>
553566
</dd>
554567
</div>
555568
<div
@@ -567,6 +580,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
567580
class="container"
568581
>
569582
<svg
583+
aria-hidden="true"
570584
class="icon"
571585
fill="none"
572586
height="26"
@@ -712,6 +726,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
712726
class="container"
713727
>
714728
<svg
729+
aria-hidden="true"
715730
class="icon"
716731
fill="none"
717732
height="26"
@@ -761,6 +776,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
761776
class="container"
762777
>
763778
<svg
779+
aria-hidden="true"
764780
class="icon"
765781
fill="none"
766782
height="26"
@@ -1010,6 +1026,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
10101026
class="container"
10111027
>
10121028
<svg
1029+
aria-hidden="true"
10131030
class="icon"
10141031
fill="none"
10151032
height="26"
@@ -1045,6 +1062,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
10451062
class="container"
10461063
>
10471064
<svg
1065+
aria-hidden="true"
10481066
class="icon"
10491067
fill="none"
10501068
height="26"
@@ -1224,6 +1242,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
12241242
class="container"
12251243
>
12261244
<svg
1245+
aria-hidden="true"
12271246
class="icon"
12281247
fill="none"
12291248
height="26"
@@ -1369,6 +1388,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
13691388
class="container"
13701389
>
13711390
<svg
1391+
aria-hidden="true"
13721392
class="icon"
13731393
fill="none"
13741394
height="26"

‎frontend/src/components/atoms/FileUpload/FileUpload.module.scss‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.file-upload {
2+
width: auto;
3+
4+
// The default file upload button in Safari does not
5+
// support setting a custom font-size. Set `-webkit-appearance`
6+
// to `button` to drop out of the native appearance so the
7+
// font-size is set to 19px
8+
// https://bugs.webkit.org/show_bug.cgi?id=224746
9+
&::-webkit-file-upload-button {
10+
-webkit-appearance: button;
11+
color: inherit;
12+
font: inherit;
13+
}
14+
}

‎frontend/src/components/atoms/FileUpload/FileUpload.scss‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)