Merge branch 'gh-pages' into issue-361-aria-checked

scottaohara · web-flow · commit c5262ae6e4f9 · 2022-01-16T12:32:21.000-05:00
diff --git a/index.html b/index.html
@@ -3759,10 +3759,7 @@ <h2>
             </ul>
           </td>
           <td>
-            [=Flow content=] but with no <a>main</a> element,
-              [=heading content=],
-              [=sectioning content=],
-              or <a data-cite="html/sections.html#sectioning-root">sectioning roots</a> descendants.
+            [=Phrasing content=]
           </td>
         </tr>
         <tr>
diff --git a/tests/aria-hidden-picture.html b/tests/aria-hidden-picture.html
@@ -70,7 +70,7 @@ <h2>Tests:</h2>
 				<p>Authors MAY use the <code>aria-hidden</code> attribute on the <code>picture</code> element.</p>
 				<div class="testcase">
 			    <picture aria-hidden=true>
-            <img src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C.jpg">
+            <img src="https://www.w3.org/StyleSheets/TR/2021/logos/W3C" width=200>
           </picture>
 
 		
diff --git a/tests/button-combobox.html b/tests/button-combobox.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8">
+		<title >ARIA in HTML - Test Cases</title>
+	  <link rel="stylesheet" href="../results/styles.css">
+		<style>
+			body{
+				font-size: 1em;
+			}
+			.flex {
+				display: flex;
+				flex-wrap: wrap;
+				align-items: stretch;
+			}
+			.widgetDemo {
+				border: 1px solid #EEE;
+				margin: .5em;
+				padding: 5px;
+				flex: 1 0 0;
+				min-width: calc(300px - 1em);
+			}
+			.widgetDemo p {
+				color: #696969;
+				font-size: 1.125em;
+				padding: 0;
+				margin: .75em 0;
+			}
+			.testcase {
+				margin: 2em 0;
+			}
+			h3{
+				margin: .5em 0;
+				border: 0;
+				padding: 0;
+			}
+			h2 {font-size:2em}
+			.testcase > * {
+				border: 1px dotted;
+				padding: .25em;
+			}
+		</style>
+	</head>
+<body>
+
+	<header>
+    <h1>ARIA in HTML - test case for <code>role=combobox</code> on <code>button</code></h1>
+		<p>last updated 15 January 2022</p>
+	</header>
+	<main>
+		<h2>Tests:</h2>
+    <p>Authors MAY use <code>role=combobox</code> on a <code>button</code> element, so long as other required attributes of the combobox role are also specified.</p>
+				
+		<div class="flex">
+			<div class="widgetDemo">
+				<div class="testcase">
+					<label for=b>name 1</label>
+          <button id=b role=combobox>test 1</button>
+				</div>
+
+				<p><strong>Expected result:</strong>
+          This test fails because the button element has a role=combobox, but no other required attributes (aria-controls and aria-expanded).</p>
+			</div>
+      
+      <div class="widgetDemo">
+				<div class="testcase">
+					<label id=t2 for=c>name 2</label>
+          <button id=c role=combobox aria-haspopup=listbox aria-activedescendant aria-autocomplete=list aria-controls=f aria-expanded=false>test 2</button>
+          <div role=listbox id=f hidden aria-labelledby=t2><div role=option aria-selected=false>option1</div></div>
+				</div>
+
+				<p><strong>Expected result:</strong>
+          This test passes. The button element has a role=combobox, 
+          and has the required aria-controls and aria-expanded attributes.</p>
+			</div>
+		</div>
+	</main>
+</body>
+</html>

-Original file line number
+Diff line change
             ul>
           td>
           <td>
 -            [=Flow content=] but with no <a>maina> element,
 -              [=heading content=],
 -              [=sectioning content=],
 -              or <a data-cite="html/sections.html#sectioning-root">sectioning rootsa> descendants.
 +            [=Phrasing content=]
           td>
         tr>
         <tr>