Merge pull request #32 from qualweb/contrast-fix

Contrast rules applicability fix
qualweb · Oct 17, 2023 · 90f49ec · 90f49ec
2 parents 985815b + 7ef6a38
commit 90f49ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qualweb/act-rules",
-  "version": "0.6.16",
+  "version": "0.6.17",
   "description": "ACT rules module for qualweb web accessibility evaluator",
   "main": "dist/act.bundle.js",
   "files": [

diff --git a/src/rules/QW-ACT-R37.ts b/src/rules/QW-ACT-R37.ts
@@ -7,8 +7,7 @@ import {
   ElementHasText,
   ElementIsHTMLElement,
   ElementIsNot,
-  ElementIsVisible,
-  ElementIsNotWidget
+  ElementIsVisible
 } from '../lib/decorator';
 import Test from '../lib/Test.object';
 
@@ -22,7 +21,6 @@ class QW_ACT_R37 extends AtomicRule {
   @ElementIsHTMLElement
   @ElementIsNot(['html', 'head', 'body', 'script', 'style', 'meta'])
   @ElementIsVisible
-  @ElementIsNotWidget
   @ElementHasText
   execute(element: typeof window.qwElement): void {
     const disabledWidgets = window.disabledWidgets;
@@ -47,18 +45,16 @@ class QW_ACT_R37 extends AtomicRule {
       return;
     }
 
-    const isWidget = window.AccessibilityUtils.isElementWidget(element);
-    if (isWidget) {
-      return;
-    }
-
     const elementSelectors = element.getElementSelector();
 
     for (const disableWidget of disabledWidgets || []) {
       const selectors = window.AccessibilityUtils.getAccessibleNameSelector(disableWidget);
       if (disableWidget && selectors && selectors.includes(elementSelectors)) {
         return;
       }
+      if (disableWidget.getElementSelector() === elementSelectors) {
+        return;  
+      }
     }
 
     const role = window.AccessibilityUtils.getElementRole(element);
@@ -288,7 +284,7 @@ class QW_ACT_R37 extends AtomicRule {
   ): boolean {
     if (parsedGradientString.startsWith('linear-gradient')) {
       const gradientDirection = this.getGradientDirection(parsedGradientString);
-      if (gradientDirection === 'to right') {
+      if (gradientDirection === 'to do') {
         const colors = this.parseGradientString(parsedGradientString, opacity);
         let isValid = true;
         let contrastRatio;
@@ -320,7 +316,7 @@ class QW_ACT_R37 extends AtomicRule {
           test.verdict = 'failed';
           test.resultCode = 'F2';
         }
-      } else if (gradientDirection === 'to left') {
+      } else if (gradientDirection === 'to left' || gradientDirection === 'to right') {
         //TODO
         test.verdict = 'warning';
         test.resultCode = 'W3';

diff --git a/src/rules/QW-ACT-R76.ts b/src/rules/QW-ACT-R76.ts
@@ -7,8 +7,7 @@ import {
   ElementHasText,
   ElementIsHTMLElement,
   ElementIsNot,
-  ElementIsVisible,
-  ElementIsNotWidget
+  ElementIsVisible
 } from '../lib/decorator';
 import Test from '../lib/Test.object';
 
@@ -22,7 +21,6 @@ class QW_ACT_R76 extends AtomicRule {
   @ElementIsHTMLElement
   @ElementIsNot(['html', 'head', 'body', 'script', 'style', 'meta'])
   @ElementIsVisible
-  @ElementIsNotWidget
   @ElementHasText
   execute(element: typeof window.qwElement): void {
     const disabledWidgets = window.disabledWidgets;
@@ -47,18 +45,16 @@ class QW_ACT_R76 extends AtomicRule {
       return;
     }
 
-    const isWidget = window.AccessibilityUtils.isElementWidget(element);
-    if (isWidget) {
-      return;
-    }
-
     const elementSelectors = element.getElementSelector();
 
     for (const disableWidget of disabledWidgets || []) {
       const selectors = window.AccessibilityUtils.getAccessibleNameSelector(disableWidget);
       if (disableWidget && selectors && selectors.includes(elementSelectors)) {
         return;
       }
+      if (disableWidget.getElementSelector() === elementSelectors) {
+        return;  
+      }
     }
 
     const role = window.AccessibilityUtils.getElementRole(element);