Lint and format src/compiler/compile/utils/a11y.js

pull/8569/head
Simon Holthausen 3 years ago
parent 8d8739cbc4
commit 186b8ebf20

@ -4,7 +4,8 @@ import { regex_whitespaces } from '../../utils/patterns.js';
const aria_roles = roles_map.keys(); const aria_roles = roles_map.keys();
const abstract_roles = new Set(aria_roles.filter((role) => roles_map.get(role).abstract)); const abstract_roles = new Set(aria_roles.filter((role) => roles_map.get(role).abstract));
const non_abstract_roles = aria_roles.filter((name) => !abstract_roles.has(name)); const non_abstract_roles = aria_roles.filter((name) => !abstract_roles.has(name));
const non_interactive_roles = new Set(non_abstract_roles const non_interactive_roles = new Set(
non_abstract_roles
.filter((name) => { .filter((name) => {
const role = roles_map.get(name); const role = roles_map.get(name);
return ( return (
@ -13,32 +14,40 @@ const non_interactive_roles = new Set(non_abstract_roles
// focusable tabpanel elements are recommended if any panels in a set contain content where the first element in the panel is not focusable. // focusable tabpanel elements are recommended if any panels in a set contain content where the first element in the panel is not focusable.
// 'generic' is meant to have no semantic meaning. // 'generic' is meant to have no semantic meaning.
!['toolbar', 'tabpanel', 'generic'].includes(name) && !['toolbar', 'tabpanel', 'generic'].includes(name) &&
!role.superClass.some((classes) => classes.includes('widget'))); !role.superClass.some((classes) => classes.includes('widget'))
}) );
})
.concat( .concat(
// The `progressbar` is descended from `widget`, but in practice, its // The `progressbar` is descended from `widget`, but in practice, its
// value is always `readonly`, so we treat it as a non-interactive role. // value is always `readonly`, so we treat it as a non-interactive role.
'progressbar')); 'progressbar'
const interactive_roles = new Set(non_abstract_roles.filter((name) => !non_interactive_roles.has(name) && )
);
const interactive_roles = new Set(
non_abstract_roles.filter(
(name) =>
!non_interactive_roles.has(name) &&
// 'generic' is meant to have no semantic meaning. // 'generic' is meant to have no semantic meaning.
name !== 'generic')); name !== 'generic'
)
);
/** /**
* @param {ARIARoleDefinitionKey} role * @param {ARIARoleDefinitionKey} role
*/ */
export function is_non_interactive_roles(role) { export function is_non_interactive_roles(role) {
return non_interactive_roles.has(role); return non_interactive_roles.has(role);
} }
/** /**
* @param {ARIARoleDefinitionKey} role * @param {ARIARoleDefinitionKey} role
*/ */
export function is_interactive_roles(role) { export function is_interactive_roles(role) {
return interactive_roles.has(role); return interactive_roles.has(role);
} }
/** /**
* @param {ARIARoleDefinitionKey} role * @param {ARIARoleDefinitionKey} role
*/ */
export function is_abstract_role(role) { export function is_abstract_role(role) {
return abstract_roles.has(role); return abstract_roles.has(role);
@ -46,7 +55,7 @@ export function is_abstract_role(role) {
const presentation_roles = new Set(['presentation', 'none']); const presentation_roles = new Set(['presentation', 'none']);
/** /**
* @param {ARIARoleDefinitionKey} role * @param {ARIARoleDefinitionKey} role
*/ */
export function is_presentation_role(role) { export function is_presentation_role(role) {
return presentation_roles.has(role); return presentation_roles.has(role);
@ -64,16 +73,14 @@ export function is_hidden_from_screen_reader(tag_name, attribute_map) {
} }
} }
const aria_hidden = attribute_map.get('aria-hidden'); const aria_hidden = attribute_map.get('aria-hidden');
if (!aria_hidden) if (!aria_hidden) return false;
return false; if (!aria_hidden.is_static) return true;
if (!aria_hidden.is_static)
return true;
const aria_hidden_value = aria_hidden.get_static_value(); const aria_hidden_value = aria_hidden.get_static_value();
return aria_hidden_value === true || aria_hidden_value === 'true'; return aria_hidden_value === true || aria_hidden_value === 'true';
} }
/** /**
* @param {Map<string, Attribute>} attribute_map * @param {Map<string, Attribute>} attribute_map
*/ */
export function has_disabled_attribute(attribute_map) { export function has_disabled_attribute(attribute_map) {
const disabled_attr = attribute_map.get('disabled'); const disabled_attr = attribute_map.get('disabled');
@ -92,7 +99,7 @@ export function has_disabled_attribute(attribute_map) {
} }
/** /**
* @type {ARIARoleRelationConcept[]} * @type {ARIARoleRelationConcept[]}
*/ */
const non_interactive_element_role_schemas = []; const non_interactive_element_role_schemas = [];
elementRoles.entries().forEach(([schema, roles]) => { elementRoles.entries().forEach(([schema, roles]) => {
@ -102,7 +109,7 @@ elementRoles.entries().forEach(([schema, roles]) => {
}); });
/** /**
* @type {ARIARoleRelationConcept[]} * @type {ARIARoleRelationConcept[]}
*/ */
const interactive_element_role_schemas = []; const interactive_element_role_schemas = [];
elementRoles.entries().forEach(([schema, roles]) => { elementRoles.entries().forEach(([schema, roles]) => {
@ -110,11 +117,17 @@ elementRoles.entries().forEach(([schema, roles]) => {
interactive_element_role_schemas.push(schema); interactive_element_role_schemas.push(schema);
} }
}); });
const interactive_ax_objects = new Set([...AXObjects.keys()].filter((name) => AXObjects.get(name).type === 'widget')); const interactive_ax_objects = new Set(
const non_interactive_ax_objects = new Set([...AXObjects.keys()].filter((name) => ['windows', 'structure'].includes(AXObjects.get(name).type))); [...AXObjects.keys()].filter((name) => AXObjects.get(name).type === 'widget')
);
const non_interactive_ax_objects = new Set(
[...AXObjects.keys()].filter((name) =>
['windows', 'structure'].includes(AXObjects.get(name).type)
)
);
/** /**
* @type {ARIARoleRelationConcept[]} * @type {ARIARoleRelationConcept[]}
*/ */
const interactive_element_ax_object_schemas = []; const interactive_element_ax_object_schemas = [];
elementAXObjects.entries().forEach(([schema, ax_object]) => { elementAXObjects.entries().forEach(([schema, ax_object]) => {
@ -124,7 +137,7 @@ elementAXObjects.entries().forEach(([schema, ax_object]) => {
}); });
/** /**
* @type {ARIARoleRelationConcept[]} * @type {ARIARoleRelationConcept[]}
*/ */
const non_interactive_element_ax_object_schemas = []; const non_interactive_element_ax_object_schemas = [];
elementAXObjects.entries().forEach(([schema, ax_object]) => { elementAXObjects.entries().forEach(([schema, ax_object]) => {
@ -139,14 +152,11 @@ elementAXObjects.entries().forEach(([schema, ax_object]) => {
* @param {Map<string, Attribute>} attribute_map * @param {Map<string, Attribute>} attribute_map
*/ */
function match_schema(schema, tag_name, attribute_map) { function match_schema(schema, tag_name, attribute_map) {
if (schema.name !== tag_name) if (schema.name !== tag_name) return false;
return false; if (!schema.attributes) return true;
if (!schema.attributes)
return true;
return schema.attributes.every((schema_attribute) => { return schema.attributes.every((schema_attribute) => {
const attribute = attribute_map.get(schema_attribute.name); const attribute = attribute_map.get(schema_attribute.name);
if (!attribute) if (!attribute) return false;
return false;
if (schema_attribute.value && schema_attribute.value !== attribute.get_static_value()) { if (schema_attribute.value && schema_attribute.value !== attribute.get_static_value()) {
return false; return false;
} }
@ -155,9 +165,9 @@ function match_schema(schema, tag_name, attribute_map) {
} }
export var ElementInteractivity; export var ElementInteractivity;
(function (ElementInteractivity) { (function (ElementInteractivity) {
ElementInteractivity["Interactive"] = "interactive"; ElementInteractivity['Interactive'] = 'interactive';
ElementInteractivity["NonInteractive"] = "non-interactive"; ElementInteractivity['NonInteractive'] = 'non-interactive';
ElementInteractivity["Static"] = "static"; ElementInteractivity['Static'] = 'static';
})(ElementInteractivity || (ElementInteractivity = {})); })(ElementInteractivity || (ElementInteractivity = {}));
/** /**
@ -166,17 +176,31 @@ export var ElementInteractivity;
* @returns {import("C:/repos/svelte/svelte/a11y.ts-to-jsdoc").ElementInteractivity} * @returns {import("C:/repos/svelte/svelte/a11y.ts-to-jsdoc").ElementInteractivity}
*/ */
export function element_interactivity(tag_name, attribute_map) { export function element_interactivity(tag_name, attribute_map) {
if (interactive_element_role_schemas.some((schema) => match_schema(schema, tag_name, attribute_map))) { if (
interactive_element_role_schemas.some((schema) => match_schema(schema, tag_name, attribute_map))
) {
return ElementInteractivity.Interactive; return ElementInteractivity.Interactive;
} }
if (tag_name !== 'header' && if (
non_interactive_element_role_schemas.some((schema) => match_schema(schema, tag_name, attribute_map))) { tag_name !== 'header' &&
non_interactive_element_role_schemas.some((schema) =>
match_schema(schema, tag_name, attribute_map)
)
) {
return ElementInteractivity.NonInteractive; return ElementInteractivity.NonInteractive;
} }
if (interactive_element_ax_object_schemas.some((schema) => match_schema(schema, tag_name, attribute_map))) { if (
interactive_element_ax_object_schemas.some((schema) =>
match_schema(schema, tag_name, attribute_map)
)
) {
return ElementInteractivity.Interactive; return ElementInteractivity.Interactive;
} }
if (non_interactive_element_ax_object_schemas.some((schema) => match_schema(schema, tag_name, attribute_map))) { if (
non_interactive_element_ax_object_schemas.some((schema) =>
match_schema(schema, tag_name, attribute_map)
)
) {
return ElementInteractivity.NonInteractive; return ElementInteractivity.NonInteractive;
} }
return ElementInteractivity.Static; return ElementInteractivity.Static;
@ -216,10 +240,15 @@ export function is_static_element(tag_name, attribute_map) {
*/ */
export function is_semantic_role_element(role, tag_name, attribute_map) { export function is_semantic_role_element(role, tag_name, attribute_map) {
for (const [schema, ax_object] of elementAXObjects.entries()) { for (const [schema, ax_object] of elementAXObjects.entries()) {
if (schema.name === tag_name && if (
schema.name === tag_name &&
(!schema.attributes || (!schema.attributes ||
schema.attributes.every((attr) => attribute_map.has(attr.name) && schema.attributes.every(
attribute_map.get(attr.name).get_static_value() === attr.value))) { (attr) =>
attribute_map.has(attr.name) &&
attribute_map.get(attr.name).get_static_value() === attr.value
))
) {
for (const name of ax_object) { for (const name of ax_object) {
const roles = AXObjectRoles.get(name); const roles = AXObjectRoles.get(name);
if (roles) { if (roles) {
@ -300,13 +329,12 @@ const autofill_contact_field_name_tokens = new Set([
]); ]);
/** /**
* @param {null | true | string} autocomplete * @param {null | true | string} autocomplete
*/ */
export function is_valid_autocomplete(autocomplete) { export function is_valid_autocomplete(autocomplete) {
if (autocomplete === true) { if (autocomplete === true) {
return false; return false;
} } else if (!autocomplete) {
else if (!autocomplete) {
return true; // dynamic value return true; // dynamic value
} }
const tokens = autocomplete.trim().toLowerCase().split(regex_whitespaces); const tokens = autocomplete.trim().toLowerCase().split(regex_whitespaces);
@ -318,15 +346,13 @@ export function is_valid_autocomplete(autocomplete) {
} }
if (autofill_field_name_tokens.has(tokens[0])) { if (autofill_field_name_tokens.has(tokens[0])) {
tokens.shift(); tokens.shift();
} } else {
else {
if (contact_type_tokens.has(tokens[0])) { if (contact_type_tokens.has(tokens[0])) {
tokens.shift(); tokens.shift();
} }
if (autofill_contact_field_name_tokens.has(tokens[0])) { if (autofill_contact_field_name_tokens.has(tokens[0])) {
tokens.shift(); tokens.shift();
} } else {
else {
return false; return false;
} }
} }
@ -335,7 +361,3 @@ export function is_valid_autocomplete(autocomplete) {
} }
return tokens.length === 0; return tokens.length === 0;
} }

Loading…
Cancel
Save