Skip to content

Commit 10efa88

Browse files
isnerWilcoFiers
authored andcommitted
fix(aria-allowed-attr): align rowcount, colcount, and colindex with 1.1 spec (#555)
Allow aria-rowcount and aria-colcount on role=grid; disallow the same on role=row; allow aria-colindex on role=row #547
1 parent a9da35c commit 10efa88

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

lib/commons/aria/index.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ lookupTables.role = {
250250
'columnheader': {
251251
type: 'structure',
252252
attributes: {
253-
allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 'aria-rowspan',
253+
allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 'aria-rowspan',
254254
'aria-required', 'aria-readonly', 'aria-selected', 'aria-sort']
255255
},
256256
owned: null,
@@ -341,7 +341,7 @@ lookupTables.role = {
341341
attributes: {
342342
allowed: ['aria-expanded']
343343
},
344-
owned: {
344+
owned: {
345345
one: ['article']
346346
},
347347
nameFrom: ['author'],
@@ -360,7 +360,8 @@ lookupTables.role = {
360360
'grid': {
361361
type: 'composite',
362362
attributes: {
363-
allowed: ['aria-level', 'aria-multiselectable', 'aria-readonly', 'aria-activedescendant', 'aria-expanded']
363+
allowed: ['aria-activedescendant', 'aria-expanded', 'aria-colcount', 'aria-level',
364+
'aria-multiselectable', 'aria-readonly', 'aria-rowcount']
364365
},
365366
owned: {
366367
one: ['rowgroup', 'row']
@@ -372,7 +373,7 @@ lookupTables.role = {
372373
'gridcell': {
373374
type: 'widget',
374375
attributes: {
375-
allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex',
376+
allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex',
376377
'aria-rowspan', 'aria-selected', 'aria-readonly', 'aria-required']
377378
},
378379
owned: null,
@@ -645,7 +646,8 @@ lookupTables.role = {
645646
'row': {
646647
type: 'structure',
647648
attributes: {
648-
allowed: ['aria-activedescendant', 'aria-colcount', 'aria-expanded', 'aria-level', 'aria-selected', 'aria-rowcount', 'aria-rowindex']
649+
allowed: ['aria-activedescendant', 'aria-colindex', 'aria-expanded',
650+
'aria-level', 'aria-selected', 'aria-rowindex']
649651
},
650652
owned: {
651653
one: ['cell', 'columnheader', 'rowheader', 'gridcell']
@@ -669,7 +671,7 @@ lookupTables.role = {
669671
'rowheader': {
670672
type: 'structure',
671673
attributes: {
672-
allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 'aria-rowspan',
674+
allowed: ['aria-colindex', 'aria-colspan', 'aria-expanded', 'aria-rowindex', 'aria-rowspan',
673675
'aria-required', 'aria-readonly', 'aria-selected', 'aria-sort']
674676
},
675677
owned: null,
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11

22
<div role="alert" aria-selected="true" id="fail1">fail</div>
33
<div role="link" aria-selected="true" id="fail2">fail</div>
4+
<div role="row" aria-colcount="value" id="fail3">fail</div>
5+
<div role="row" aria-rowcount="value" id="fail4">fail</div>

test/integration/rules/aria-allowed-attr/failures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"description": "aria-allowed-attr failing tests",
33
"rule": "aria-allowed-attr",
44
"violations": [
5-
["#fail1"], ["#fail2"]
5+
["#fail1"], ["#fail2"], ["#fail3"], ["#fail4"]
66
]
7-
}
7+
}

test/integration/rules/aria-allowed-attr/passes.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<div role="form" id="pass17" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
3737

38-
<div role="grid" id="pass18" aria-level="value" aria-multiselectable="value" aria-readonly="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
38+
<div role="grid" id="pass18" aria-level="value" aria-multiselectable="value" aria-readonly="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value" aria-colcount="value" aria-rowcount="value">ok</div>
3939

4040
<div role="gridcell" id="pass19" aria-colindex="value" aria-colspan="value" aria-rowindex="value" aria-rowspan="value" aria-selected="value" aria-readonly="value" aria-expanded="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
4141

@@ -85,7 +85,7 @@
8585

8686
<div role="region" id="pass42" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
8787

88-
<div role="row" id="pass43" aria-colcount="value" aria-rowcount="value" aria-rowindex="value" aria-level="value" aria-selected="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
88+
<div role="row" id="pass43" aria-colindex="value" aria-rowindex="value" aria-level="value" aria-selected="value" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
8989

9090
<div role="rowgroup" id="pass44" aria-activedescendant="value" aria-expanded="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-keyshortcuts="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
9191

0 commit comments

Comments
 (0)