From 43980d528d8bb3cbd8f213768b21b737b13f539c Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:51:09 +0100 Subject: [PATCH] format --- src/compiler/compile/nodes/Element.ts | 10 +++++----- src/compiler/compile/utils/a11y.ts | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts index 05bdf1b478..a5dc74b256 100644 --- a/src/compiler/compile/nodes/Element.ts +++ b/src/compiler/compile/nodes/Element.ts @@ -606,11 +606,11 @@ export default class Element extends Node { if (is_interactive_element(this.name, attribute_map) && (is_non_interactive_roles(current_role) || is_presentation_role(current_role))) { component.warn(this, compiler_warnings.a11y_no_interactive_element_to_noninteractive_role(current_role, this.name)); } - - // no-noninteractive-element-to-interactive-role - if (is_non_interactive_element(this.name, attribute_map) && is_interactive_roles(current_role)) { - component.warn(this, compiler_warnings.a11y_no_noninteractive_element_to_interactive_role(current_role, this.name)); - } + + // no-noninteractive-element-to-interactive-role + if (is_non_interactive_element(this.name, attribute_map) && is_interactive_roles(current_role)) { + component.warn(this, compiler_warnings.a11y_no_noninteractive_element_to_interactive_role(current_role, this.name)); + } }); } } diff --git a/src/compiler/compile/utils/a11y.ts b/src/compiler/compile/utils/a11y.ts index 551b4e849f..d0564b419e 100644 --- a/src/compiler/compile/utils/a11y.ts +++ b/src/compiler/compile/utils/a11y.ts @@ -129,16 +129,16 @@ function match_schema( } export enum ElementInteractivity { - Interactive = 'interactive', - NonInteractive = 'non-interactive', - Static = 'static', + Interactive = 'interactive', + NonInteractive = 'non-interactive', + Static = 'static', } export function element_interactivity( - tag_name: string, - attribute_map: Map + tag_name: string, + attribute_map: Map ): ElementInteractivity { - if ( + if ( interactive_element_role_schemas.some((schema) => match_schema(schema, tag_name, attribute_map) ) @@ -146,7 +146,7 @@ export function element_interactivity( return ElementInteractivity.Interactive; } - if ( + if ( tag_name !== 'header' && non_interactive_element_role_schemas.some((schema) => match_schema(schema, tag_name, attribute_map) @@ -155,7 +155,7 @@ export function element_interactivity( return ElementInteractivity.NonInteractive; } - if ( + if ( interactive_element_ax_object_schemas.some((schema) => match_schema(schema, tag_name, attribute_map) ) @@ -163,7 +163,7 @@ export function element_interactivity( return ElementInteractivity.Interactive; } - if ( + if ( non_interactive_element_ax_object_schemas.some((schema) => match_schema(schema, tag_name, attribute_map) ) @@ -171,19 +171,19 @@ export function element_interactivity( return ElementInteractivity.NonInteractive; } - return ElementInteractivity.Static; + return ElementInteractivity.Static; } export function is_interactive_element(tag_name: string, attribute_map: Map): boolean { - return element_interactivity(tag_name, attribute_map) === ElementInteractivity.Interactive; + return element_interactivity(tag_name, attribute_map) === ElementInteractivity.Interactive; } export function is_non_interactive_element(tag_name: string, attribute_map: Map): boolean { - return element_interactivity(tag_name, attribute_map) === ElementInteractivity.NonInteractive; + return element_interactivity(tag_name, attribute_map) === ElementInteractivity.NonInteractive; } export function is_static_element(tag_name: string, attribute_map: Map): boolean { - return element_interactivity(tag_name, attribute_map) === ElementInteractivity.Static; + return element_interactivity(tag_name, attribute_map) === ElementInteractivity.Static; } export function is_semantic_role_element(role: ARIARoleDefinitionKey, tag_name: string, attribute_map: Map) {