msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

slight refactor to use existing utils

Browse Source
pull/5073/head
tanhauhau 4 years ago
parent 5ccd85e9ba
commit d69994b404
4 changed files with 43 additions and 94 deletions
Show Stats Download Patch File Download Diff File

100
src/compiler/compile/nodes/Element.ts
Unescape View File

@ -24,7 +24,7 @@ import { Literal } from 'estree';
import compiler_warnings from '../compiler_warnings';
import compiler_errors from '../compiler_errors';
import { ARIARoleDefintionKey, roles, aria, ARIAPropertyDefinition, ARIAProperty } from 'aria-query';
import { is_interactive_element, is_non_interactive_roles, is_presentation_role, is_interactive_roles } from '../utils/a11y';
import { is_interactive_element, is_non_interactive_roles, is_presentation_role, is_interactive_roles, is_hidden_from_screen_reader } from '../utils/a11y';
const aria_attributes = 'activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby description details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext'.split(' ');
const aria_attribute_set = new Set(aria_attributes);
@ -115,23 +115,6 @@ const a11y_implicit_semantics = new Map([
['ul', 'list']
]);
const a11y_interactive = new Set([
'a',
'button',
'select'
]);
const input_type_interactive = new Set([
'button',
'checkbox',
'color',
'file',
'image',
'radio',
'reset',
'submit'
]);
const invisible_elements = new Set(['meta', 'html', 'script', 'style']);
const valid_modifiers = new Set([
@ -574,65 +557,27 @@ export default class Element extends Node {
// click-events-have-key-events
if (handlers_map.has('click')) {
if (a11y_interactive.has(this.name)) {
return;
}
const type_attribute = attribute_map.get('type');
if (this.name === 'input') {
if (
type_attribute &&
(!type_attribute.is_static ||
input_type_interactive.has(type_attribute.get_static_value()))
) {
return;
const role = attribute_map.get('role');
const is_non_presentation_role = role?.is_static && !is_presentation_role(role.get_static_value() as ARIARoleDefintionKey);
if (
!is_hidden_from_screen_reader(this.name, attribute_map) &&
(!role || is_non_presentation_role) &&
!is_interactive_element(this.name, attribute_map) &&
!this.attributes.find(attr => attr.is_spread)
) {
const has_key_event =
handlers_map.has('keydown') ||
handlers_map.has('keyup') ||
handlers_map.has('keypress');
if (!has_key_event) {
component.warn(
this,
compiler_warnings.a11y_click_events_have_key_events()
);
}
}
if (this.attributes.find((attr) => attr.is_spread)) {
return;
}
const aria_hidden_attribute = attribute_map.get('aria-hidden');
const aria_hidden_value =
aria_hidden_attribute &&
(!aria_hidden_attribute.is_static ||
aria_hidden_attribute.get_static_value());
// aria-hidden value is string, check its boolean value with JSON.parse()
if (aria_hidden_value && JSON.parse(aria_hidden_value)) {
return;
}
const type_value = type_attribute && type_attribute.get_static_value();
if (type_value && type_value === 'hidden') {
return;
}
const role_attribute = attribute_map.get('role');
const role_value = role_attribute && role_attribute.get_static_value();
const presentation_role_value =
role_value === null ||
role_value === 'presentation' ||
role_value === 'none';
if (presentation_role_value) {
return;
}
const has_key_event =
handlers_map.has('keydown') ||
handlers_map.has('keyup') ||
handlers_map.has('keypress');
if (!has_key_event) {
component.warn(
this,
compiler_warnings.a11y_click_events_have_key_events()
);
}
}
// no-noninteractive-tabindex
@ -716,6 +661,7 @@ export default class Element extends Node {
}
if (this.name === 'label') {
<<<<<<< HEAD
const has_input_child = (children: INode[]) => {
if (children.some(child => (child instanceof Element && (a11y_labelable.has(child.name) || child.name === 'slot')))) {
return true;
@ -734,6 +680,10 @@ export default class Element extends Node {
};
if (!attribute_map.has('for') && !has_input_child(this.children)) {
=======
const has_input_child = this.children.some(i => (i instanceof Element && a11y_labelable.has(i.name)));
if (!attribute_map.has('for') && !has_input_child) {
>>>>>>> 72722864e (slight refactor to use existing utils)
component.warn(this, compiler_warnings.a11y_label_has_associated_control);
}
}

16
src/compiler/compile/utils/a11y.ts
Unescape View File

@ -61,6 +61,22 @@ export function is_presentation_role(role: ARIARoleDefintionKey) {
return presentation_roles.has(role);
}
export function is_hidden_from_screen_reader(tag_name: string, attribute_map: Map<string, Attribute>) {
if (tag_name === 'input') {
const type = attribute_map.get('type')?.get_static_value();
if (type && type === 'hidden') {
return true;
}
}
const aria_hidden = attribute_map.get('aria-hidden');
if (!aria_hidden) return false;
if (!aria_hidden.is_static) return true;
const aria_hidden_value = aria_hidden.get_static_value();
return aria_hidden_value === true || aria_hidden_value === 'true';
}
const non_interactive_element_role_schemas: ARIARoleRelationConcept[] = [];
elementRoles.entries().forEach(([schema, roles]) => {

4
test/validator/samples/a11y-click-events-have-key-events/input.svelte
Unescape View File

@ -18,8 +18,6 @@
<header on:click={noop} />
<footer on:click={noop} />
<input type="date" on:click={noop} />
<!-- should not warn -->
<div class="foo" />
@ -39,7 +37,7 @@
<div on:click={noop} on:keypress={noop} on:keydown={noop} />
<div on:click={noop} on:keydown={noop} on:keyup={noop} on:keypress={noop} />
<div on:click={noop} type="hidden" />
<input on:click={noop} type="hidden" />
<div on:click={noop} aria-hidden />
<div on:click={noop} aria-hidden="true" />

15
test/validator/samples/a11y-click-events-have-key-events/warnings.json
Unescape View File

@ -103,20 +103,5 @@
"character": 393
},
"pos": 367
},
{
"code": "a11y-click-events-have-key-events",
"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
"start": {
"line": 21,
"column": 0,
"character": 395
},
"end": {
"line": 21,
"column": 37,
"character": 432
},
"pos": 395
}
]

Write Preview
Loading…
Cancel
Save