Skip to content

Commit 9a726df

Browse files
hnshns
committed
8359024: Accessibility bugs in API documentation
Reviewed-by: vyazici, liach
1 parent 2af869b commit 9a726df

File tree

4 files changed

+38
-38
lines changed

4 files changed

+38
-38
lines changed

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@ private Content toContent() {
385385
table.add(getTableBody());
386386
main.add(table);
387387
} else {
388-
var tablist = HtmlTree.DIV(HtmlStyles.tableTabs)
389-
.put(HtmlAttr.ROLE, "tablist")
390-
.put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
388+
var tablist = HtmlTree.DIV(HtmlStyles.tableTabs);
391389

392390
HtmlId defaultTabId = HtmlIds.forTab(id, 0);
393391
if (renderTabs) {
392+
tablist.put(HtmlAttr.ROLE, "tablist")
393+
.put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
394394
tablist.add(createTab(defaultTabId, HtmlStyles.activeTableTab, true, defaultTab));
395395
for (var tab : tabs) {
396396
if (occurringTabs.contains(tab)) {

‎src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
--block-line-height: 1.5;
3030
--code-line-height: 1.6;
3131
/* Text colors for body and block elements */
32-
--body-text-color: #282828;
33-
--block-text-color: #282828;
32+
--body-text-color: #181818;
33+
--block-text-color: #181818;
3434
/* Background colors for various elements */
3535
--body-background-color: #ffffff;
3636
--section-background-color: var(--body-background-color);
@@ -656,14 +656,14 @@ ul.preview-feature-list input {
656656
.class-use-page .caption span,
657657
.package-use-page .caption span,
658658
.constants-summary-page .caption span,
659-
.inherited-list.expanded h3 {
659+
.inherited-list h3 {
660660
background-color: var(--subnav-background-color);
661661
color: var(--block-text-color);
662662
}
663663
.caption a:link,
664664
.caption a:visited,
665-
.inherited-list.expanded h3 a:link,
666-
.inherited-list.expanded h3 a:visited {
665+
.inherited-list h3 a:link,
666+
.inherited-list h3 a:visited {
667667
color:var(--subnav-link-color);
668668
}
669669
div.table-tabs {

‎test/langtools/jdk/javadoc/doclet/testNewApiList/TestNewApiList.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* @test
26-
* @bug 8263468 8269401 8268422 8287524 8325874 8331873 8345555
26+
* @bug 8263468 8269401 8268422 8287524 8325874 8331873 8345555 8359024
2727
* @summary New page for "recent" new API
2828
* @library ../../lib
2929
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -126,7 +126,7 @@ private void checkMultiReleaseNewElements() {
126126
checkOutput("new-list.html", true,
127127
"""
128128
<div id="module">
129-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
129+
<div class="table-tabs">
130130
<div class="caption"><span>New Modules</span></div>
131131
</div>
132132
<div id="module.tabpanel" role="tabpanel" aria-labelledby="module-tab0">
@@ -142,7 +142,7 @@ private void checkMultiReleaseNewElements() {
142142
</div>""",
143143
"""
144144
<div id="package">
145-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
145+
<div class="table-tabs">
146146
<div class="caption"><span>New Packages</span></div>
147147
</div>
148148
<div id="package.tabpanel" role="tabpanel" aria-labelledby="package-tab0">
@@ -158,7 +158,7 @@ private void checkMultiReleaseNewElements() {
158158
</div>""",
159159
"""
160160
<div id="interface">
161-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
161+
<div class="table-tabs">
162162
<div class="caption"><span>New Interfaces</span></div>
163163
</div>
164164
<div id="interface.tabpanel" role="tabpanel" aria-labelledby="interface-tab0">
@@ -174,7 +174,7 @@ private void checkMultiReleaseNewElements() {
174174
</div>""",
175175
"""
176176
<div id="class">
177-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
177+
<div class="table-tabs">
178178
<div class="caption"><span>New Classes</span></div>
179179
</div>
180180
<div id="class.tabpanel" role="tabpanel" aria-labelledby="class-tab0">
@@ -190,7 +190,7 @@ private void checkMultiReleaseNewElements() {
190190
</div>""",
191191
"""
192192
<div id="enum-class">
193-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
193+
<div class="table-tabs">
194194
<div class="caption"><span>New Enum Classes</span></div>
195195
</div>
196196
<div id="enum-class.tabpanel" role="tabpanel" aria-labelledby="enum-class-tab0">
@@ -206,7 +206,7 @@ private void checkMultiReleaseNewElements() {
206206
</div>""",
207207
"""
208208
<div id="exception-class">
209-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
209+
<div class="table-tabs">
210210
<div class="caption"><span>New Exception Classes</span></div>
211211
</div>
212212
<div id="exception-class.tabpanel" role="tabpanel" aria-labelledby="exception-class-tab0">
@@ -228,7 +228,7 @@ private void checkMultiReleaseNewElements() {
228228
</div>""",
229229
"""
230230
<div id="record-class">
231-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
231+
<div class="table-tabs">
232232
<div class="caption"><span>New Record Classes</span></div>
233233
</div>
234234
<div id="record-class.tabpanel" role="tabpanel" aria-labelledby="record-class-tab0">
@@ -244,7 +244,7 @@ private void checkMultiReleaseNewElements() {
244244
</div>""",
245245
"""
246246
<div id="annotation-interface">
247-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
247+
<div class="table-tabs">
248248
<div class="caption"><span>New Annotation Interfaces</span></div>
249249
</div>
250250
<div id="annotation-interface.tabpanel" role="tabpanel" aria-labelledby="annotation-interface-tab0">
@@ -259,7 +259,7 @@ private void checkMultiReleaseNewElements() {
259259
</div>""",
260260
"""
261261
<div id="field">
262-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
262+
<div class="table-tabs">
263263
<div class="caption"><span>New Fields</span></div>
264264
</div>
265265
<div id="field.tabpanel" role="tabpanel" aria-labelledby="field-tab0">
@@ -293,7 +293,7 @@ private void checkMultiReleaseNewElements() {
293293
</div>""",
294294
"""
295295
<div id="method">
296-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
296+
<div class="table-tabs">
297297
<div class="caption"><span>New Methods</span></div>
298298
</div>
299299
<div id="method.tabpanel" role="tabpanel" aria-labelledby="method-tab0">
@@ -359,7 +359,7 @@ private void checkMultiReleaseNewElements() {
359359
</div>""",
360360
"""
361361
<div id="constructor">
362-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
362+
<div class="table-tabs">
363363
<div class="caption"><span>New Constructors</span></div>
364364
</div>
365365
<div id="constructor.tabpanel" role="tabpanel" aria-labelledby="constructor-tab0">
@@ -394,7 +394,7 @@ private void checkMultiReleaseNewElements() {
394394
</div>""",
395395
"""
396396
<div id="enum-constant">
397-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
397+
<div class="table-tabs">
398398
<div class="caption"><span>New Enum Constants</span></div>
399399
</div>
400400
<div id="enum-constant.tabpanel" role="tabpanel" aria-labelledby="enum-constant-tab0">
@@ -428,7 +428,7 @@ private void checkMultiReleaseNewElements() {
428428
</div>""",
429429
"""
430430
<div id="annotation-interface-member">
431-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
431+
<div class="table-tabs">
432432
<div class="caption"><span>New Annotation Interface Elements</span></div>
433433
</div>
434434
<div id="annotation-interface-member.tabpanel" role="tabpanel" aria-labelledby="annotation-interface-member-tab0">
@@ -456,7 +456,7 @@ private void checkMultiReleaseDeprecatedElements() {
456456
checkOutput("deprecated-list.html", true,
457457
"""
458458
<div id="for-removal">
459-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
459+
<div class="table-tabs">
460460
<div class="caption"><span>Terminally Deprecated Elements</span></div>
461461
</div>
462462
<div id="for-removal.tabpanel" role="tabpanel" aria-labelledby="for-removal-tab0">
@@ -471,7 +471,7 @@ private void checkMultiReleaseDeprecatedElements() {
471471
</div>""",
472472
"""
473473
<div id="method">
474-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
474+
<div class="table-tabs">
475475
<div class="caption"><span>Deprecated Methods</span></div>
476476
</div>
477477
<div id="method.tabpanel" role="tabpanel" aria-labelledby="method-tab0">
@@ -486,7 +486,7 @@ private void checkMultiReleaseDeprecatedElements() {
486486
</div>""",
487487
"""
488488
<div id="constructor">
489-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
489+
<div class="table-tabs">
490490
<div class="caption"><span>Deprecated Constructors</span></div>
491491
</div>
492492
<div id="constructor.tabpanel" role="tabpanel" aria-labelledby="constructor-tab0">
@@ -501,7 +501,7 @@ private void checkMultiReleaseDeprecatedElements() {
501501
</div>""",
502502
"""
503503
<div id="enum-constant">
504-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
504+
<div class="table-tabs">
505505
<div class="caption"><span>Deprecated Enum Constants</span></div>
506506
</div>
507507
<div id="enum-constant.tabpanel" role="tabpanel" aria-labelledby="enum-constant-tab0">
@@ -516,7 +516,7 @@ private void checkMultiReleaseDeprecatedElements() {
516516
</div>""",
517517
"""
518518
<div id="annotation-interface-member">
519-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
519+
<div class="table-tabs">
520520
<div class="caption"><span>Deprecated Annotation Interface Elements</span></div>
521521
</div>
522522
<div id="annotation-interface-member.tabpanel" role="tabpanel" aria-labelledby="annotation-interface-member-tab0">
@@ -606,7 +606,7 @@ private void checkSingleReleaseDeprecatedElements() {
606606
</ul>""",
607607
"""
608608
<div id="for-removal">
609-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
609+
<div class="table-tabs">
610610
<div class="caption"><span>Terminally Deprecated Elements</span></div>
611611
</div>
612612
<div id="for-removal.tabpanel" role="tabpanel" aria-labelledby="for-removal-tab0">
@@ -621,7 +621,7 @@ private void checkSingleReleaseDeprecatedElements() {
621621
</div>""",
622622
"""
623623
<div id="method">
624-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
624+
<div class="table-tabs">
625625
<div class="caption"><span>Deprecated Methods</span></div>
626626
</div>
627627
<div id="method.tabpanel" role="tabpanel" aria-labelledby="method-tab0">
@@ -636,7 +636,7 @@ private void checkSingleReleaseDeprecatedElements() {
636636
</div>""",
637637
"""
638638
<div id="constructor">
639-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
639+
<div class="table-tabs">
640640
<div class="caption"><span>Deprecated Constructors</span></div>
641641
</div>
642642
<div id="constructor.tabpanel" role="tabpanel" aria-labelledby="constructor-tab0">
@@ -680,7 +680,7 @@ private void checkPackageNewElements() {
680680
checkOutput("new-list.html", true,
681681
"""
682682
<div id="class">
683-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
683+
<div class="table-tabs">
684684
<div class="caption"><span>New Classes</span></div>
685685
</div>
686686
<div id="class.tabpanel" role="tabpanel" aria-labelledby="class-tab0">
@@ -696,7 +696,7 @@ private void checkPackageNewElements() {
696696
</div>""",
697697
"""
698698
<div id="field">
699-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
699+
<div class="table-tabs">
700700
<div class="caption"><span>New Fields</span></div>
701701
</div>
702702
<div id="field.tabpanel" role="tabpanel" aria-labelledby="field-tab0">
@@ -712,7 +712,7 @@ private void checkPackageNewElements() {
712712
</div>""",
713713
"""
714714
<div id="method">
715-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
715+
<div class="table-tabs">
716716
<div class="caption"><span>New Methods</span></div>
717717
</div>
718718
<div id="method.tabpanel" role="tabpanel" aria-labelledby="method-tab0">
@@ -741,7 +741,7 @@ private void checkPackageNewElements() {
741741
</div>""",
742742
"""
743743
<div id="constructor">
744-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
744+
<div class="table-tabs">
745745
<div class="caption"><span>New Constructors</span></div>
746746
</div>
747747
<div id="constructor.tabpanel" role="tabpanel" aria-labelledby="constructor-tab0">

‎test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/*
2525
* @test
2626
* @bug 8250768 8261976 8277300 8282452 8287597 8325325 8325874 8297879
27-
* 8331947 8281533 8343239 8318416 8346109
27+
* 8331947 8281533 8343239 8318416 8346109 8359024
2828
* @summary test generated docs for items declared using preview
2929
* @library /tools/lib ../../lib
3030
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -104,7 +104,7 @@ public void testPreviewAPIJavadoc() {
104104
""",
105105
"""
106106
<div id="package">
107-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
107+
<div class="table-tabs">
108108
<div class="caption"><span>Packages</span></div>
109109
</div>
110110
<div id="package.tabpanel" role="tabpanel" aria-labelledby="package-tab0">
@@ -122,7 +122,7 @@ public void testPreviewAPIJavadoc() {
122122
""",
123123
"""
124124
<div id="record-class">
125-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
125+
<div class="table-tabs">
126126
<div class="caption"><span>Record Classes</span></div>
127127
</div>
128128
<div id="record-class.tabpanel" role="tabpanel" aria-labelledby="record-class-tab0">
@@ -139,7 +139,7 @@ public void testPreviewAPIJavadoc() {
139139
""",
140140
"""
141141
<div id="method">
142-
<div class="table-tabs" role="tablist" aria-orientation="horizontal">
142+
<div class="table-tabs">
143143
<div class="caption"><span>Methods</span></div>
144144
</div>
145145
<div id="method.tabpanel" role="tabpanel" aria-labelledby="method-tab0">

0 commit comments

Comments
 (0)