-
Notifications
You must be signed in to change notification settings - Fork 789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(new-rule): Add WCAG 2.2 target-size rule #3616
Merged
Merged
Changes from 25 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
7d9b70c
feat(new-rule): Add WCAG 2.2 target-size rule
WilcoFiers 54817d7
chore: handle rounding errors
WilcoFiers 80299b2
Fix has-visual-overlap test
WilcoFiers 302db49
Fix failing tests?
WilcoFiers 0172fbe
Rename target-size.json file
WilcoFiers 5b1c1a3
Disable target-spacing rule on APG
WilcoFiers a0eaaf8
Improve target-size messaging
WilcoFiers c4029a5
Update is-in-text-block
WilcoFiers 55b037c
Add target-size matches method
WilcoFiers 81feac6
Add integration tests for target-size
WilcoFiers eb27049
Document target-size check options
WilcoFiers 217ac64
put create-grid into its own file
WilcoFiers 10b8972
Make all links focusable
WilcoFiers 297524f
Simplify target-size full rest
WilcoFiers a25d7a0
Try to fix IE issue
WilcoFiers f6b97df
More cleanup and testing
WilcoFiers 8ab55c7
Solve oddities with IE
WilcoFiers 496f227
Rename minSpacing option to minSize
WilcoFiers 8ea60ec
Merge branch 'develop' into target-size-v2
WilcoFiers a5a0512
Remove IE11 xit
WilcoFiers 368d612
Fix off screen grid issues
WilcoFiers b4462e5
Simplify using role types
WilcoFiers 9e7e9b6
cleanup
WilcoFiers 4fefa21
Handle fully obscuring elements
WilcoFiers 7885fe8
fix failing test
WilcoFiers 840cf4e
Resolve last comments
WilcoFiers 1e204c1
fix getRoleType throwing in NodeJS context
WilcoFiers b2f12e8
Editorial test fix
WilcoFiers 17ce8ea
Address review
WilcoFiers d72b683
Merge branch 'develop' into target-size-v2
WilcoFiers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import { findNearbyElms, isFocusable } from '../../commons/dom'; | ||
import { getRoleType } from '../../commons/aria'; | ||
import { getOffset } from '../../commons/math'; | ||
|
||
const roundingMargin = 0.05; | ||
|
||
export default function targetOffsetEvaluate(node, options, vNode) { | ||
const minOffset = options?.minOffset || 24; | ||
const closeNeighbors = []; | ||
let closestOffset = minOffset; | ||
for (const vNeighbor of findNearbyElms(vNode, minOffset)) { | ||
if (getRoleType(vNeighbor) !== 'widget' || !isFocusable(vNeighbor)) { | ||
continue; | ||
} | ||
const offset = roundToSingleDecimal(getOffset(vNode, vNeighbor)); | ||
if (offset + roundingMargin >= minOffset) { | ||
continue; | ||
} | ||
closestOffset = Math.min(closestOffset, offset); | ||
closeNeighbors.push(vNeighbor.actualNode); | ||
} | ||
|
||
this.data({ closestOffset, minOffset }); | ||
if (closeNeighbors.length > 0) { | ||
this.relatedNodes(closeNeighbors); | ||
return false; | ||
} | ||
return true; | ||
} | ||
|
||
function roundToSingleDecimal(num) { | ||
return Math.round(num * 10) / 10; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,14 @@ | ||||||
{ | ||||||
"id": "target-offset", | ||||||
"evaluate": "target-offset-evaluate", | ||||||
"options": { | ||||||
"minOffset": 24 | ||||||
}, | ||||||
"metadata": { | ||||||
"impact": "serious", | ||||||
"messages": { | ||||||
"pass": "Target has sufficiently offset from its closest neighbor (${data.closestOffset}px should be at least ${data.minOffset}px)", | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
"fail": "Target has insufficient offset from its closest neighbor (${data.closestOffset}px should be at least ${data.minOffset}px)" | ||||||
} | ||||||
} | ||||||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
import { findNearbyElms, isFocusable } from '../../commons/dom'; | ||
import { getRoleType } from '../../commons/aria'; | ||
import { splitRects, hasVisualOverlap } from '../../commons/math'; | ||
|
||
const roundingMargin = 0.05; | ||
|
||
/** | ||
* Determine if an element has a minimum size, taking into account | ||
* any elements that may obscure it. | ||
*/ | ||
export default function targetSize(node, options, vNode) { | ||
const minSize = options?.minSize || 24; | ||
const nodeRect = vNode.boundingClientRect; | ||
const hasMinimumSize = ({ width, height }) => { | ||
return ( | ||
width + roundingMargin >= minSize && height + roundingMargin >= minSize | ||
); | ||
}; | ||
|
||
const obscuringElms = []; | ||
for (const vNeighbor of findNearbyElms(vNode)) { | ||
if ( | ||
!hasVisualOverlap(vNode, vNeighbor) || | ||
getCssPointerEvents(vNeighbor) === 'none' | ||
) { | ||
continue; | ||
} | ||
if (isEnclosedRect(vNode, vNeighbor)) { | ||
this.data({ messageKey: 'obscured' }); | ||
return true; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should add the node as a related node |
||
} | ||
obscuringElms.push(vNeighbor); | ||
} | ||
|
||
if (!hasMinimumSize(nodeRect)) { | ||
this.data({ minSize, ...toDecimalSize(nodeRect) }); | ||
return false; | ||
} | ||
|
||
const obscuredWidgets = obscuringElms.filter( | ||
vNeighbor => getRoleType(vNeighbor) === 'widget' && isFocusable(vNeighbor) | ||
); | ||
|
||
if (obscuredWidgets.length === 0) { | ||
this.data({ minSize, ...toDecimalSize(nodeRect) }); | ||
return true; // No obscuring elements; pass | ||
} | ||
|
||
// Find areas of the target that are not obscured | ||
const obscuringRects = obscuredWidgets.map( | ||
({ boundingClientRect: rect }) => rect | ||
); | ||
const unobscuredRects = splitRects(nodeRect, obscuringRects); | ||
|
||
// Of the unobscured inner rects, work out the largest | ||
const largestInnerRect = unobscuredRects.reduce((rectA, rectB) => { | ||
const rectAisMinimum = hasMinimumSize(rectA); | ||
const rectBisMinimum = hasMinimumSize(rectB); | ||
// Prioritize rects that pass the minimum | ||
if (rectAisMinimum !== rectBisMinimum) { | ||
return rectAisMinimum ? rectA : rectB; | ||
} | ||
const areaA = rectA.width * rectA.height; | ||
const areaB = rectB.width * rectB.height; | ||
return areaA > areaB ? rectA : rectB; | ||
}); | ||
|
||
if (!hasMinimumSize(largestInnerRect)) { | ||
this.data({ | ||
messageKey: 'partiallyObscured', | ||
minSize, | ||
...toDecimalSize(largestInnerRect) | ||
}); | ||
this.relatedNodes(obscuredWidgets.map(({ actualNode }) => actualNode)); | ||
// Element is (partially?) obscured, with insufficient space | ||
return false; | ||
} | ||
|
||
this.data({ minSize, ...toDecimalSize(largestInnerRect) }); | ||
return true; | ||
} | ||
|
||
function isEnclosedRect(vNodeA, vNodeB) { | ||
const rectA = vNodeA.boundingClientRect; | ||
const rectB = vNodeB.boundingClientRect; | ||
return ( | ||
rectA.top >= rectB.top && | ||
rectA.left >= rectB.left && | ||
rectA.bottom <= rectB.bottom && | ||
rectA.right <= rectB.right | ||
); | ||
} | ||
|
||
function getCssPointerEvents(vNode) { | ||
return vNode.getComputedStylePropertyValue('pointer-events'); | ||
} | ||
|
||
function toDecimalSize(rect) { | ||
return { | ||
width: Math.round(rect.width * 10) / 10, | ||
height: Math.round(rect.height * 10) / 10 | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{ | ||
"id": "target-size", | ||
"evaluate": "target-size-evaluate", | ||
"options": { | ||
"minSize": 24 | ||
}, | ||
"metadata": { | ||
"impact": "serious", | ||
"messages": { | ||
"pass": { | ||
"default": "Control has sufficient size (${data.width}px by ${data.height}px, should be at least ${data.minSize}px by ${data.minSize}px)", | ||
"obscured": "Control is ignored because it is fully obscured and thus not clickable" | ||
}, | ||
"fail": { | ||
"default": "Element has insufficient size (${data.width}px by ${data.height}px, should be at least ${data.minSize}px by ${data.minSize}px)", | ||
"partiallyObscured": "Element has insufficient size because it is partially obscured (smallest space is ${data.width}px by ${data.height}px, should be at least ${data.minSize}px by ${data.minSize}px)" | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,20 @@ | ||
import standards from '../../standards'; | ||
import AbstractVirtualNode from '../../core/base/virtual-node/abstract-virtual-node'; | ||
|
||
/** | ||
* Get the "type" of role; either widget, composite, abstract, landmark or `null` | ||
* @method getRoleType | ||
* @memberof axe.commons.aria | ||
* @instance | ||
* @param {String} role The role to check | ||
* @param {String|Node|Element} role The role to check, or element to check the role of | ||
* @return {Mixed} String if a matching role and its type are found, otherwise `null` | ||
*/ | ||
function getRoleType(role) { | ||
const roleDef = standards.ariaRoles[role]; | ||
|
||
if (!roleDef) { | ||
return null; | ||
if (role instanceof window.Node || role instanceof AbstractVirtualNode) { | ||
role = axe.commons.aria.getRole(role); | ||
} | ||
|
||
return roleDef.type; | ||
const roleDef = standards.ariaRoles[role]; | ||
return roleDef?.type || null; | ||
} | ||
|
||
export default getRoleType; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want me to pull these into their own PR let me know. It's not unrelated to the PR... but it's not very related either.