From a23e4a8bb267e0fd2f91b036dbe877a3239901c6 Mon Sep 17 00:00:00 2001 From: Shunguo Date: Wed, 28 Aug 2024 11:34:48 -0500 Subject: [PATCH 01/71] Code clean up: separate CSSUtil #1974 --- .../v2/checker/accessibility/util/legacy.ts | 14 +- .../src/v4/rules/a_target_warning.ts | 2 +- .../src/v4/rules/a_text_purpose.ts | 2 +- .../src/v4/rules/applet_alt_exists.ts | 2 +- .../rules/application_content_accessible.ts | 2 +- .../src/v4/rules/area_alt_exists.ts | 2 +- .../v4/rules/aria_accessiblename_exists.ts | 2 +- .../v4/rules/aria_activedescendant_valid.ts | 2 +- .../src/v4/rules/aria_application_labelled.ts | 2 +- .../src/v4/rules/aria_attribute_exists.ts | 2 +- .../src/v4/rules/aria_child_tabbable.ts | 2 +- .../src/v4/rules/aria_child_valid.ts | 2 +- .../v4/rules/aria_complementary_labelled.ts | 2 +- .../src/v4/rules/aria_content_in_landmark.ts | 2 +- .../src/v4/rules/aria_descendant_valid.ts | 2 +- .../src/v4/rules/aria_graphic_labelled.ts | 2 +- .../src/v4/rules/aria_id_unique.ts | 2 +- .../src/v4/rules/aria_img_labelled.ts | 2 +- .../v4/rules/aria_keyboard_handler_exists.ts | 2 +- .../src/v4/rules/aria_parent_required.ts | 2 +- .../src/v4/rules/aria_region_labelled.ts | 2 +- .../src/v4/rules/canvas_content_described.ts | 2 +- .../v4/rules/combobox_active_descendant.ts | 2 +- .../v4/rules/combobox_autocomplete_valid.ts | 2 +- .../src/v4/rules/combobox_design_valid.ts | 2 +- .../v4/rules/combobox_focusable_elements.ts | 2 +- .../src/v4/rules/combobox_popup_reference.ts | 2 +- .../rules/download_keyboard_controllable.ts | 2 +- .../v4/rules/draggable_alternative_exists.ts | 2 +- .../v4/rules/element_accesskey_labelled.ts | 2 +- .../src/v4/rules/element_lang_valid.ts | 2 +- .../v4/rules/element_orientation_unlocked.ts | 14 +- .../v4/rules/element_scrollable_tabbable.ts | 8 +- .../v4/rules/element_tabbable_role_valid.ts | 6 +- .../v4/rules/element_tabbable_unobscured.ts | 2 +- .../src/v4/rules/element_tabbable_visible.ts | 14 +- .../src/v4/rules/embed_alt_exists.ts | 2 +- .../src/v4/rules/error_message_exists.ts | 2 +- .../src/v4/rules/fieldset_label_valid.ts | 2 +- .../src/v4/rules/fieldset_legend_valid.ts | 2 +- .../src/v4/rules/figure_label_exists.ts | 2 +- .../src/v4/rules/frame_title_exists.ts | 2 +- .../v4/rules/iframe_interactive_tabbable.ts | 2 +- .../src/v4/rules/imagemap_alt_exists.ts | 2 +- .../src/v4/rules/img_alt_background.ts | 2 +- .../src/v4/rules/img_alt_decorative.ts | 2 +- .../src/v4/rules/img_alt_misuse.ts | 2 +- .../src/v4/rules/img_alt_null.ts | 2 +- .../src/v4/rules/img_alt_valid.ts | 2 +- .../src/v4/rules/img_ismap_misuse.ts | 2 +- .../src/v4/rules/img_longdesc_misuse.ts | 2 +- .../src/v4/rules/input_autocomplete_valid.ts | 2 +- .../src/v4/rules/input_checkboxes_grouped.ts | 2 +- .../src/v4/rules/input_haspopup_conflict.ts | 2 +- .../src/v4/rules/input_label_exists.ts | 2 +- .../src/v4/rules/input_label_visible.ts | 2 +- .../src/v4/rules/label_name_visible.ts | 7 +- .../src/v4/rules/label_ref_valid.ts | 2 +- .../src/v4/rules/list_markup_review.ts | 2 +- .../src/v4/rules/media_alt_brief.ts | 2 +- .../src/v4/rules/media_alt_exists.ts | 2 +- .../src/v4/rules/media_audio_transcribed.ts | 2 +- .../v4/rules/media_keyboard_controllable.ts | 2 +- .../src/v4/rules/media_track_available.ts | 2 +- .../src/v4/rules/noembed_content_exists.ts | 2 +- .../src/v4/rules/object_text_exists.ts | 2 +- .../src/v4/rules/skip_main_described.ts | 2 +- .../src/v4/rules/skip_main_exists.ts | 2 +- .../src/v4/rules/style_before_after_review.ts | 4 +- .../src/v4/rules/style_focus_visible.ts | 16 +- .../src/v4/rules/svg_graphics_labelled.ts | 2 +- .../src/v4/rules/table_headers_ref_valid.ts | 2 +- .../src/v4/rules/table_layout_linearized.ts | 2 +- .../src/v4/rules/table_structure_misuse.ts | 2 +- .../src/v4/rules/target_spacing_sufficient.ts | 8 +- .../src/v4/rules/text_block_heading.ts | 8 +- .../src/v4/rules/text_contrast_sufficient.ts | 10 +- .../src/v4/rules/text_quoted_correctly.ts | 2 +- .../src/v4/rules/text_sensory_misuse.ts | 2 +- .../src/v4/rules/text_spacing_valid.ts | 18 +- .../src/v4/rules/widget_tabbable_exists.ts | 2 +- .../src/v4/rules/widget_tabbable_single.ts | 2 +- .../src/v4/util/CSSUtil.ts | 1219 +++++++++++------ .../src/{v2/dom => v4/util}/ColorUtil.ts | 2 +- .../src/{v2/dom => v4/util}/VisUtil.ts | 6 +- 85 files changed, 908 insertions(+), 586 deletions(-) rename accessibility-checker-engine/src/{v2/dom => v4/util}/ColorUtil.ts (99%) rename accessibility-checker-engine/src/{v2/dom => v4/util}/VisUtil.ts (99%) diff --git a/accessibility-checker-engine/src/v2/checker/accessibility/util/legacy.ts b/accessibility-checker-engine/src/v2/checker/accessibility/util/legacy.ts index a56ec659c..e3b00b837 100644 --- a/accessibility-checker-engine/src/v2/checker/accessibility/util/legacy.ts +++ b/accessibility-checker-engine/src/v2/checker/accessibility/util/legacy.ts @@ -18,9 +18,9 @@ import { getCache, setCache } from "../../../../v4/util/CacheUtil"; import { ARIADefinitions, IDocumentConformanceRequirement } from "../../../aria/ARIADefinitions"; import { ARIAMapper } from "../../../aria/ARIAMapper"; import { DOMWalker } from "../../../dom/DOMWalker"; -import { VisUtil } from "../../../dom/VisUtil"; +import { VisUtil } from "../../../../v4/util/VisUtil"; import { FragmentUtil } from "./fragment"; -import { getDefinedStyles, getComputedStyle } from "../../../../v4/util/CSSUtil"; +import { CSSUtil } from "../../../../v4/util/CSSUtil"; import { DOMUtil } from "../../../dom/DOMUtil"; import { DOMMapper } from "../../../dom/DOMMapper"; @@ -455,7 +455,7 @@ export class RPTUtil { * a target is en element that accept a pointer action (click or touch) * a target is a browser default if it's a native widget (no user defined role) without user style */ - public static isTargetBrowserDefault(element) { + /**public static isTargetBrowserDefault(element) { if (!element) return false; // user defained widget @@ -470,7 +470,7 @@ export class RPTUtil { return false; return true; - } + }*/ /** * an "inline" CSS display property tells the element to fit itself on the same line. An 'inline' element's width and height are ignored. @@ -486,7 +486,7 @@ export class RPTUtil { * * return: if it's inline element and { inline: true | false, text: true | false, violation: null | {node} } */ - public static getInlineStatus(element) { + /**public static getInlineStatus(element) { if (!element) return null; const style = getComputedStyle(element); @@ -577,7 +577,7 @@ export class RPTUtil { } // all other cases return status; - } + }*/ public static tabIndexLEZero(elem) { if (RPTUtil.hasAttribute(elem, "tabindex")) { @@ -1677,7 +1677,7 @@ export class RPTUtil { const node = getCache(walkNode, "RPTUtil_AncestorWithStyles", null); if (node !== null) return node; - const styles = getDefinedStyles(walkNode); + const styles = CSSUtil.getDefinedStyles(walkNode); for (const style in styleProps) { let value = styles[style]; if (value) { diff --git a/accessibility-checker-engine/src/v4/rules/a_target_warning.ts b/accessibility-checker-engine/src/v4/rules/a_target_warning.ts index 2571e52eb..d7962d6d1 100644 --- a/accessibility-checker-engine/src/v4/rules/a_target_warning.ts +++ b/accessibility-checker-engine/src/v4/rules/a_target_warning.ts @@ -12,7 +12,7 @@ *****************************************************************************/ import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; diff --git a/accessibility-checker-engine/src/v4/rules/a_text_purpose.ts b/accessibility-checker-engine/src/v4/rules/a_text_purpose.ts index 95fee11e9..ad23171c6 100644 --- a/accessibility-checker-engine/src/v4/rules/a_text_purpose.ts +++ b/accessibility-checker-engine/src/v4/rules/a_text_purpose.ts @@ -14,7 +14,7 @@ import { ARIAMapper } from "../../v2/aria/ARIAMapper"; import { Rule, RuleResult, RuleFail, RuleContext, RulePass } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; export let a_text_purpose: Rule = { diff --git a/accessibility-checker-engine/src/v4/rules/applet_alt_exists.ts b/accessibility-checker-engine/src/v4/rules/applet_alt_exists.ts index 4aad2cb3b..00dadbe3f 100644 --- a/accessibility-checker-engine/src/v4/rules/applet_alt_exists.ts +++ b/accessibility-checker-engine/src/v4/rules/applet_alt_exists.ts @@ -12,7 +12,7 @@ *****************************************************************************/ import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; diff --git a/accessibility-checker-engine/src/v4/rules/application_content_accessible.ts b/accessibility-checker-engine/src/v4/rules/application_content_accessible.ts index 2df7ed075..a52980eb5 100644 --- a/accessibility-checker-engine/src/v4/rules/application_content_accessible.ts +++ b/accessibility-checker-engine/src/v4/rules/application_content_accessible.ts @@ -12,7 +12,7 @@ *****************************************************************************/ import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; diff --git a/accessibility-checker-engine/src/v4/rules/area_alt_exists.ts b/accessibility-checker-engine/src/v4/rules/area_alt_exists.ts index bd0928f50..4f809d993 100644 --- a/accessibility-checker-engine/src/v4/rules/area_alt_exists.ts +++ b/accessibility-checker-engine/src/v4/rules/area_alt_exists.ts @@ -12,7 +12,7 @@ *****************************************************************************/ import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; diff --git a/accessibility-checker-engine/src/v4/rules/aria_accessiblename_exists.ts b/accessibility-checker-engine/src/v4/rules/aria_accessiblename_exists.ts index 5675d8356..2c621b8fb 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_accessiblename_exists.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_accessiblename_exists.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { ARIADefinitions } from "../../v2/aria/ARIADefinitions"; import { getDeprecatedAriaRoles, getDeprecatedAriaAttributes, getRolesUndefinedByAria} from "../util/CommonUtil"; diff --git a/accessibility-checker-engine/src/v4/rules/aria_activedescendant_valid.ts b/accessibility-checker-engine/src/v4/rules/aria_activedescendant_valid.ts index 729b38b42..510cd2f23 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_activedescendant_valid.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_activedescendant_valid.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, Rul import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { FragmentUtil } from "../../v2/checker/accessibility/util/fragment"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; import { DOMUtil } from "../../v2/dom/DOMUtil"; export let aria_activedescendant_valid: Rule = { diff --git a/accessibility-checker-engine/src/v4/rules/aria_application_labelled.ts b/accessibility-checker-engine/src/v4/rules/aria_application_labelled.ts index 4bdc379a2..98615af95 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_application_labelled.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_application_labelled.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_application_labelled: Rule = { id: "aria_application_labelled", diff --git a/accessibility-checker-engine/src/v4/rules/aria_attribute_exists.ts b/accessibility-checker-engine/src/v4/rules/aria_attribute_exists.ts index b4e17c280..941a81636 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_attribute_exists.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_attribute_exists.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { ARIADefinitions } from "../../v2/aria/ARIADefinitions"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_attribute_exists: Rule = { id: "aria_attribute_exists", diff --git a/accessibility-checker-engine/src/v4/rules/aria_child_tabbable.ts b/accessibility-checker-engine/src/v4/rules/aria_child_tabbable.ts index 78ac0b58d..95be75551 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_child_tabbable.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_child_tabbable.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, Rul import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { ARIADefinitions } from "../../v2/aria/ARIADefinitions"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_child_tabbable: Rule = { id: "aria_child_tabbable", diff --git a/accessibility-checker-engine/src/v4/rules/aria_child_valid.ts b/accessibility-checker-engine/src/v4/rules/aria_child_valid.ts index 9b2617614..f955b1e24 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_child_valid.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_child_valid.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_child_valid: Rule = { id: "aria_child_valid", diff --git a/accessibility-checker-engine/src/v4/rules/aria_complementary_labelled.ts b/accessibility-checker-engine/src/v4/rules/aria_complementary_labelled.ts index 2138e2689..7eb0fb295 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_complementary_labelled.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_complementary_labelled.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_complementary_labelled: Rule = { id: "aria_complementary_labelled", diff --git a/accessibility-checker-engine/src/v4/rules/aria_content_in_landmark.ts b/accessibility-checker-engine/src/v4/rules/aria_content_in_landmark.ts index 57a404e30..7ebeb6497 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_content_in_landmark.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_content_in_landmark.ts @@ -16,7 +16,7 @@ import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { getCache, setCache } from "../util/CacheUtil"; import { DOMWalker } from "../../v2/dom/DOMWalker"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_content_in_landmark: Rule = { id: "aria_content_in_landmark", diff --git a/accessibility-checker-engine/src/v4/rules/aria_descendant_valid.ts b/accessibility-checker-engine/src/v4/rules/aria_descendant_valid.ts index 188bebad6..6655c8fdd 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_descendant_valid.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_descendant_valid.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_descendant_valid: Rule = { id: "aria_descendant_valid", diff --git a/accessibility-checker-engine/src/v4/rules/aria_graphic_labelled.ts b/accessibility-checker-engine/src/v4/rules/aria_graphic_labelled.ts index 3c67e362d..2049e6822 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_graphic_labelled.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_graphic_labelled.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_graphic_labelled: Rule = { id: "aria_graphic_labelled", diff --git a/accessibility-checker-engine/src/v4/rules/aria_id_unique.ts b/accessibility-checker-engine/src/v4/rules/aria_id_unique.ts index 389970751..d37fa480a 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_id_unique.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_id_unique.ts @@ -16,7 +16,7 @@ import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { FragmentUtil } from "../../v2/checker/accessibility/util/fragment"; import { ARIADefinitions } from "../../v2/aria/ARIADefinitions"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_id_unique: Rule = { id: "aria_id_unique", diff --git a/accessibility-checker-engine/src/v4/rules/aria_img_labelled.ts b/accessibility-checker-engine/src/v4/rules/aria_img_labelled.ts index a7f892c4a..744422ae0 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_img_labelled.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_img_labelled.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_img_labelled: Rule = { id: "aria_img_labelled", diff --git a/accessibility-checker-engine/src/v4/rules/aria_keyboard_handler_exists.ts b/accessibility-checker-engine/src/v4/rules/aria_keyboard_handler_exists.ts index 6655d0fe1..03986202b 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_keyboard_handler_exists.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_keyboard_handler_exists.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, Rul import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { ARIADefinitions } from "../../v2/aria/ARIADefinitions"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_keyboard_handler_exists: Rule = { id: "aria_keyboard_handler_exists", diff --git a/accessibility-checker-engine/src/v4/rules/aria_parent_required.ts b/accessibility-checker-engine/src/v4/rules/aria_parent_required.ts index 6f1539b86..541e15671 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_parent_required.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_parent_required.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { ARIADefinitions } from "../../v2/aria/ARIADefinitions"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_parent_required: Rule = { id: "aria_parent_required", diff --git a/accessibility-checker-engine/src/v4/rules/aria_region_labelled.ts b/accessibility-checker-engine/src/v4/rules/aria_region_labelled.ts index 408d71008..2194fc489 100644 --- a/accessibility-checker-engine/src/v4/rules/aria_region_labelled.ts +++ b/accessibility-checker-engine/src/v4/rules/aria_region_labelled.ts @@ -14,7 +14,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let aria_region_labelled: Rule = { id: "aria_region_labelled", diff --git a/accessibility-checker-engine/src/v4/rules/canvas_content_described.ts b/accessibility-checker-engine/src/v4/rules/canvas_content_described.ts index 65968b706..27e5dc716 100644 --- a/accessibility-checker-engine/src/v4/rules/canvas_content_described.ts +++ b/accessibility-checker-engine/src/v4/rules/canvas_content_described.ts @@ -13,7 +13,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule"; import { eRulePolicy, eToolkitLevel } from "../api/IRule"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let canvas_content_described: Rule = { id: "canvas_content_described", diff --git a/accessibility-checker-engine/src/v4/rules/combobox_active_descendant.ts b/accessibility-checker-engine/src/v4/rules/combobox_active_descendant.ts index 3ea18470b..81fce8503 100644 --- a/accessibility-checker-engine/src/v4/rules/combobox_active_descendant.ts +++ b/accessibility-checker-engine/src/v4/rules/combobox_active_descendant.ts @@ -16,7 +16,7 @@ import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { NodeWalker, RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { FragmentUtil } from "../../v2/checker/accessibility/util/fragment"; import { getCache } from "../util/CacheUtil"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let combobox_active_descendant: Rule = { id: "combobox_active_descendant", diff --git a/accessibility-checker-engine/src/v4/rules/combobox_autocomplete_valid.ts b/accessibility-checker-engine/src/v4/rules/combobox_autocomplete_valid.ts index e2afb4f74..2368d7bb8 100644 --- a/accessibility-checker-engine/src/v4/rules/combobox_autocomplete_valid.ts +++ b/accessibility-checker-engine/src/v4/rules/combobox_autocomplete_valid.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, Rul import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { NodeWalker } from "../../v2/checker/accessibility/util/legacy"; import { getCache } from "../util/CacheUtil"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; export let combobox_autocomplete_valid: Rule = { id: "combobox_autocomplete_valid", diff --git a/accessibility-checker-engine/src/v4/rules/combobox_design_valid.ts b/accessibility-checker-engine/src/v4/rules/combobox_design_valid.ts index adde5edbb..c1949c589 100644 --- a/accessibility-checker-engine/src/v4/rules/combobox_design_valid.ts +++ b/accessibility-checker-engine/src/v4/rules/combobox_design_valid.ts @@ -15,7 +15,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, Rul import { eRulePolicy, eToolkitLevel } from "../api/IRule"; import { RPTUtil } from "../../v2/checker/accessibility/util/legacy"; import { getCache, setCache } from "../util/CacheUtil"; -import { VisUtil } from "../../v2/dom/VisUtil"; +import { VisUtil } from "../util/VisUtil"; function patternDetect(elem: Element): String { // check 'explicit' role combobox and that it is not