ARIA 1.2 and HTML-ARIA 1.0 updates

accessibility-checker-engine/src/v2/aria/ARIAMapper.ts

@@ -397,7 +397,9 @@ export class ARIAMapper extends CommonMapper {
             return null;
         }
         if (elem.hasAttribute("role") && elem.getAttribute("role").trim().length > 0) {
-            return elem.getAttribute("role").trim();
+            let retVal = elem.getAttribute("role").trim();
+            if (retVal === "presentation" || retVal === "none") return null;
+            return retVal;
         }
 
         let nodeName = elem.nodeName.toLowerCase();

accessibility-checker-engine/src/v2/checker/accessibility/rules/rpt-aria-rules.ts

@@ -1275,18 +1275,9 @@ let a11yRulesAria: Rule[] = [{
                     }
                 }
             } else if (allowedRoles.indexOf("any") > -1) {
-                //First check special case: <img> with nonempty alt only allows 'any' except 'presentation/none'
-                if (tagName === "img" && RPTUtil.attributeNonEmpty(ruleContext, "alt") &&
-                    (roles[i] === "presentation" || roles[i] === "none")) {
-                    if (roleTokens.indexOf(roles[i]) === -1) {
-                        roleTokens.push(roles[i]);
-                        passed = false;
-                    }
-                } else
-                    // Then check the normal case 
-                    if (permittedRoles.indexOf(roles[i]) === -1) {
-                        permittedRoles.push(roles[i]);
-                    }
+                if (permittedRoles.indexOf(roles[i]) === -1) {
+                    permittedRoles.push(roles[i]);
+                }
             }
         } // for loop
 

accessibility-checker-engine/src/v2/checker/accessibility/rules/rpt-ariaLabeling-rules.ts

@@ -18,6 +18,7 @@ import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, Rul
 import { RPTUtil } from "../util/legacy";
 import { ARIADefinitions } from "../../../aria/ARIADefinitions";
 import { FragmentUtil } from "../util/fragment";
+import { DOMUtil } from "../../../dom/DOMUtil";
 
 let a11yRulesLabeling: Rule[] = [
     {
@@ -758,15 +759,20 @@ let a11yRulesLabeling: Rule[] = [
             }
 
             let passed = true;
+            let prohibited = false;
             let designPatterns = ARIADefinitions.designPatterns;
             //get attribute roles as well as implicit roles.
             let roles = RPTUtil.getRoles(ruleContext, true);
             let numWidgetsTested = 0;
-
+            let interactiveRoleTypes = ["widget", "liveRegion", "window"];
             for (let i = 0, length = roles.length; passed && i < length; ++i) {
 
                 let pattern = designPatterns[roles[i]];
-                if (pattern && pattern.nameRequired && pattern.roleType && pattern.roleType == "widget") {
+                if (pattern 
+                    && pattern.nameRequired 
+                    && pattern.roleType 
+                    && interactiveRoleTypes.includes(pattern.roleType))
+                { 
                     ++numWidgetsTested;
 
                     // All widgets may have an author supplied accessible name.
@@ -777,13 +783,21 @@ let a11yRulesLabeling: Rule[] = [
                     if (!passed && pattern.nameFrom && pattern.nameFrom.indexOf("contents") >= 0) {
 
                         // See if widget's accessible name is supplied by element's inner text
-                        // nameFrom: ["author", "content"]
+                        // nameFrom: ["author", "contents"]
                         passed = RPTUtil.hasInnerContentOrAlt(ruleContext);
                     }
 
                     if (!passed) { // check if it has implicit label, like <label><input ....>abc </label>
                         passed = RPTUtil.hasImplicitLabel(ruleContext);
                     }
+
+                    if (!passed && ruleContext.tagName.toLowerCase() === "img" && !ruleContext.hasAttribute("role") && ruleContext.hasAttribute("alt")) {
+                        passed = DOMUtil.cleanWhitespace(ruleContext.getAttribute("alt")).trim().length > 0;
+                    }
+
+                    if (pattern.nameFrom.indexOf("prohibited") >= 0) {
+                        prohibited = true;
+                    }
                 }
             }
             //return new ValidationResult(passed, [ruleContext], '', '', []);
@@ -792,7 +806,12 @@ let a11yRulesLabeling: Rule[] = [
             } else if (!passed) {
                 return RuleFail("Fail_1");
             } else {
-                return RulePass("Pass_0");
+                //TODO
+//                if (prohibited) {
+//                    return RuleFail("Fail_2");
+//                } else {
+                    return RulePass("Pass_0");
+//                }
             }
         }
     },

accessibility-checker-engine/src/v2/checker/accessibility/rules/rpt-combobox-rules.ts

@@ -64,7 +64,7 @@ let a11yRulesCombobox: Rule[] = [
             }
 
             let tagName = ruleContext.tagName.toLowerCase();
-            let expanded = RPTUtil.getAriaAttribute(ruleContext, "aria-expanded").trim().toLowerCase() === "true";
+            let expanded = (RPTUtil.getAriaAttribute(ruleContext, "aria-expanded") || "").trim().toLowerCase() === "true";
             let editable = tagName === "input" && (!ruleContext.hasAttribute("type") || ruleContext.getAttribute("type").toLowerCase() === "text");
 
             let key = context["dom"].rolePath;