From 220987550460a7e8ffa17bf98c37acbc1fa6cc39 Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Fri, 6 Oct 2023 14:51:56 -0700
Subject: [PATCH 01/11] text node tests for whitespace, etc.

---
 accname/name/comp_text_node.html | 79 ++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 9 deletions(-)

diff --git a/accname/name/comp_text_node.html b/accname/name/comp_text_node.html
index d63bdda82c0d1e..b9b26e6673915c 100644
--- a/accname/name/comp_text_node.html
+++ b/accname/name/comp_text_node.html
@@ -13,23 +13,84 @@
 
 <p>Tests the <a href="https://w3c.github.io/accname/#comp_text_node">#comp_text_node</a> portions of the AccName <em>Name Computation</em> algorithm.</p>
 
-<!-- I'm not certain whether #comp_text_node requires a lot of testing outside of the #comp_name_from_content contexts, -->
-<!-- but I did think of one example where text node versus comment node may make a difference when joining text nodes with a space vs innerText. -->
+<!-- Note: some overlap with the tests in ./comp_name_from_content.html -->
 
-<!-- Skipped (class="ex" removed) until https://github.com/w3c/accname/issues/193 is resolved -->
-<h2 class="ex-skipped" data-expectedlabel="heading label" data-testname="heading with text/comment/text nodes, no space">
-  heading<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
-</h2>
 
+<h1>text/element/text nodes, no space</h1>
+<button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/comment/text nodes, no space">button<span></span>label</button>
+<h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/comment/text nodes, no space">heading<span></span>label</h3>
+<a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/comment/text nodes, no space">link<span></span>label</a>
+<br>
+
+<h1>text/comment/text nodes, no space</h1>
+<!-- Note: This set is not currently to spec until https://github.com/w3c/accname/issues/193 is resolved. -->
+<button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/comment/text nodes, no space">
+  button<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
+</button>
+<h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/comment/text nodes, no space">
+  heading<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
+</h3>
+<a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/comment/text nodes, no space">
+  link<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
+</a>
+<br>
 
-<h2 class="ex" data-expectedlabel="heading label" data-testname="heading with text/comment/text nodes, with space">
+<h1>text/comment/text nodes, with space</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text/comment/text nodes, with space">
+  button
+  <!-- comment node between text nodes with leading/trailing whitespace -->
+  label
+</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text/comment/text nodes, with space">
   heading
   <!-- comment node between text nodes with leading/trailing whitespace -->
   label
-</h2>
+</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text/comment/text nodes, with space">
+  link
+  <!-- comment node between text nodes with leading/trailing whitespace -->
+  label
+</a>
+<br>
+
+<h1>text node, with non-breaking space</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with non-breaking space">button&nbsp;label</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with non-breaking space">heading&nbsp;label</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with non-breaking space">link&nbsp;label</a>
+<br>
+
+<h1>text node, with extra non-breaking space</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with extra non-breaking space">button&nbsp;&nbsp;&nbsp;label</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with extra non-breaking space">heading&nbsp;&nbsp;&nbsp;label</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with extra non-breaking space">link&nbsp;&nbsp;&nbsp;label</a>
+<br>
+
+<h1>text node, with leading/trailing non-breaking space</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with leading/trailing non-breaking space">&nbsp;button&nbsp;label&nbsp;</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with leading/trailing non-breaking space">&nbsp;heading&nbsp;label&nbsp;</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with leading/trailing non-breaking space">&nbsp;link&nbsp;label&nbsp;</a>
+<br>
 
+<h1>text nodes, with deeply nested space</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with deeply nested space">
+button<span><span><span><span><span><span><span> </span></span></span></span></span></span></span>label
+</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with deeply nested space">
+heading<span><span><span><span><span><span><span> </span></span></span></span></span></span></span>label
+</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with deeply nested space">
+link<span><span><span><span><span><span><span> </span></span></span></span></span></span></span>label
+</a>
+<br>
 
-<!-- Todo: test all remaining cases of https://w3c.github.io/accname/#comp_text_node -->
+<h1>text nodes, with single line break</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with single line break">button
+label</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with single line break">heading
+label</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with single line break">link
+label</a>
+<br>
 
 <script>
 AriaUtils.verifyLabelsBySelector(".ex");

From a324df19b10ee6795842f9dae94028c9671f3d21 Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Wed, 11 Oct 2023 15:40:01 -0700
Subject: [PATCH 02/11] normalize interior whitespace after discussion with
 accname editors and other browser accessibility engineers

---
 accname/name/comp_text_node.html |  6 +++---
 wai-aria/scripts/aria-utils.js   | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/accname/name/comp_text_node.html b/accname/name/comp_text_node.html
index b9b26e6673915c..4542bd1589419c 100644
--- a/accname/name/comp_text_node.html
+++ b/accname/name/comp_text_node.html
@@ -17,9 +17,9 @@
 
 
 <h1>text/element/text nodes, no space</h1>
-<button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/comment/text nodes, no space">button<span></span>label</button>
-<h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/comment/text nodes, no space">heading<span></span>label</h3>
-<a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/comment/text nodes, no space">link<span></span>label</a>
+<button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/element/text nodes, no space">button<span></span>label</button>
+<h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/element/text nodes, no space">heading<span></span>label</h3>
+<a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/element/text nodes, no space">link<span></span>label</a>
 <br>
 
 <h1>text/comment/text nodes, no space</h1>
diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index feb71b8398454f..2b790b44bf8e48 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -136,10 +136,17 @@ const AriaUtils = {
       let label = el.getAttribute("data-expectedlabel");
       let testName = el.getAttribute("data-testname") || label; // data-testname optional if label is unique per test file
       promise_test(async t => {
-        const expectedLabel = el.getAttribute("data-expectedlabel");
+        let expectedLabel = el.getAttribute("data-expectedlabel");
         let computedLabel = await test_driver.get_computed_label(el);
-        // Todo: Remove whitespace normalization after https://github.com/w3c/accname/issues/192 is addressed. Change prior line back to `const`, too.
-        computedLabel = computedLabel.trim()
+
+        // See: https://github.com/w3c/accname/issues/192 and https://github.com/w3c/accname/issues/208
+        //
+        // HTML/JS whitespace matches regular space, formfeed (\f), newline (\n), return (\r), tab (\t), vertical tab (\v), 
+        // non-breaking space (\xA0), and a few more Unicode whitespace characters: \u00A0, \u2028, and \u2029.
+        const whitespace = /\s+/g; 
+        expectedLabel = expectedLabel.replace(whitespace, ' ').trim();
+        computedLabel = computedLabel.replace(whitespace, ' ').trim();
+
         assert_equals(computedLabel, expectedLabel, el.outerHTML);
       }, `${testName}`);
     }

From 9e28d6e0f5b31f2f77d613c37d193d2a0079df5e Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Wed, 11 Oct 2023 16:26:51 -0700
Subject: [PATCH 03/11] m. trailing whitespace lint

---
 wai-aria/scripts/aria-utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index 2b790b44bf8e48..28e8861007b279 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -141,9 +141,9 @@ const AriaUtils = {
 
         // See: https://github.com/w3c/accname/issues/192 and https://github.com/w3c/accname/issues/208
         //
-        // HTML/JS whitespace matches regular space, formfeed (\f), newline (\n), return (\r), tab (\t), vertical tab (\v), 
+        // HTML/JS whitespace matches regular space, formfeed (\f), newline (\n), return (\r), tab (\t), vertical tab (\v),
         // non-breaking space (\xA0), and a few more Unicode whitespace characters: \u00A0, \u2028, and \u2029.
-        const whitespace = /\s+/g; 
+        const whitespace = /\s+/g;
         expectedLabel = expectedLabel.replace(whitespace, ' ').trim();
         computedLabel = computedLabel.replace(whitespace, ' ').trim();
 

From 9a7f8a9a57962ba808197b5a2e1fd55ad90bd00c Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Thu, 12 Oct 2023 18:43:20 -0700
Subject: [PATCH 04/11] update whitespace normalization to match 'ascii
 whitespace' as defined by HTML and referenced by ARIA/AccName

---
 accname/name/comp_text_node.html | 34 ++++++++++++++++++++++----------
 wai-aria/scripts/aria-utils.js   | 17 ++++++++++------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/accname/name/comp_text_node.html b/accname/name/comp_text_node.html
index 4542bd1589419c..61d27c024a6c65 100644
--- a/accname/name/comp_text_node.html
+++ b/accname/name/comp_text_node.html
@@ -15,12 +15,13 @@
 
 <!-- Note: some overlap with the tests in ./comp_name_from_content.html -->
 
-
+<!--
 <h1>text/element/text nodes, no space</h1>
 <button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/element/text nodes, no space">button<span></span>label</button>
 <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/element/text nodes, no space">heading<span></span>label</h3>
 <a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/element/text nodes, no space">link<span></span>label</a>
 <br>
+-->
 
 <h1>text/comment/text nodes, no space</h1>
 <!-- Note: This set is not currently to spec until https://github.com/w3c/accname/issues/193 is resolved. -->
@@ -35,6 +36,7 @@ <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with tex
 </a>
 <br>
 
+
 <h1>text/comment/text nodes, with space</h1>
 <button class="ex" data-expectedlabel="button label" data-testname="button with text/comment/text nodes, with space">
   button
@@ -53,22 +55,34 @@ <h3 class="ex" data-expectedlabel="heading label" data-testname="heading with te
 </a>
 <br>
 
+<h1>text node, with tab char</h1>
+<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with tab char">button  label</button>
+<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with tab char">heading label</h3>
+<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with tab char">link	label</a>
+<br>
+
 <h1>text node, with non-breaking space</h1>
-<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with non-breaking space">button&nbsp;label</button>
-<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with non-breaking space">heading&nbsp;label</h3>
-<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with non-breaking space">link&nbsp;label</a>
+<button class="ex" data-expectedlabel="button&nbsp;label" data-testname="button with text node, with non-breaking space">button&nbsp;label</button>
+<h3 class="ex" data-expectedlabel="heading&nbsp;label" data-testname="heading with text node, with non-breaking space">heading&nbsp;label</h3>
+<a href="#" class="ex" data-expectedlabel="link&nbsp;label" data-testname="link with text node, with non-breaking space">link&nbsp;label</a>
 <br>
 
 <h1>text node, with extra non-breaking space</h1>
-<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with extra non-breaking space">button&nbsp;&nbsp;&nbsp;label</button>
-<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with extra non-breaking space">heading&nbsp;&nbsp;&nbsp;label</h3>
-<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with extra non-breaking space">link&nbsp;&nbsp;&nbsp;label</a>
+<button class="ex" data-expectedlabel="button&nbsp;&nbsp;&nbsp;label" data-testname="button with text node, with extra non-breaking space">button&nbsp;&nbsp;&nbsp;label</button>
+<h3 class="ex" data-expectedlabel="heading&nbsp;&nbsp;&nbsp;label" data-testname="heading with text node, with extra non-breaking space">heading&nbsp;&nbsp;&nbsp;label</h3>
+<a href="#" class="ex" data-expectedlabel="link&nbsp;&nbsp;&nbsp;label" data-testname="link with text node, with extra non-breaking space">link&nbsp;&nbsp;&nbsp;label</a>
+<br>
+
+<h1>text node, with leading/trailing non-breaking space</h1>
+<button class="ex" data-expectedlabel="button&nbsp;label" data-testname="button with text node, with leading/trailing non-breaking space">&nbsp;button&nbsp;label&nbsp;</button>
+<h3 class="ex" data-expectedlabel="heading&nbsp;label" data-testname="heading with text node, with leading/trailing non-breaking space">&nbsp;heading&nbsp;label&nbsp;</h3>
+<a href="#" class="ex" data-expectedlabel="link&nbsp;label" data-testname="link with text node, with leading/trailing non-breaking space">&nbsp;link&nbsp;label&nbsp;</a>
 <br>
 
 <h1>text node, with leading/trailing non-breaking space</h1>
-<button class="ex" data-expectedlabel="button label" data-testname="button with text node, with leading/trailing non-breaking space">&nbsp;button&nbsp;label&nbsp;</button>
-<h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with leading/trailing non-breaking space">&nbsp;heading&nbsp;label&nbsp;</h3>
-<a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with leading/trailing non-breaking space">&nbsp;link&nbsp;label&nbsp;</a>
+<button class="ex" data-expectedlabel="button &nbsp; label" data-testname="button with text node, with mixed space and non-breaking space">button   &nbsp;   label</button>
+<h3 class="ex" data-expectedlabel="heading &nbsp; label" data-testname="heading with text node, with mixed space and non-breaking space">heading   &nbsp;   label</h3>
+<a href="#" class="ex" data-expectedlabel="link &nbsp; label" data-testname="link with text node, with mixed space and non-breaking space">link   &nbsp;   label</a>
 <br>
 
 <h1>text nodes, with deeply nested space</h1>
diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index 28e8861007b279..bc284ce656f681 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -139,13 +139,18 @@ const AriaUtils = {
         let expectedLabel = el.getAttribute("data-expectedlabel");
         let computedLabel = await test_driver.get_computed_label(el);
 
-        // See: https://github.com/w3c/accname/issues/192 and https://github.com/w3c/accname/issues/208
+        // See:
+        // - https://github.com/w3c/accname/pull/165
+        // - https://github.com/w3c/accname/issues/192
+        // - https://github.com/w3c/accname/issues/208
         //
-        // HTML/JS whitespace matches regular space, formfeed (\f), newline (\n), return (\r), tab (\t), vertical tab (\v),
-        // non-breaking space (\xA0), and a few more Unicode whitespace characters: \u00A0, \u2028, and \u2029.
-        const whitespace = /\s+/g;
-        expectedLabel = expectedLabel.replace(whitespace, ' ').trim();
-        computedLabel = computedLabel.replace(whitespace, ' ').trim();
+        // AccName reference's HTML's definition of ASCII Whitespace
+        // https://infra.spec.whatwg.org/#ascii-whitespace
+        // which matches tab (\t), newline (\n), formfeed (\f), return (\r), and regular space (\u0020).
+        // but it does NOT match non-breaking space (\xA0,\u00A0) and others matched by the \s 
+        const asciiWhitespace = /\t\n\f\r\u0020+/g;
+        expectedLabel = expectedLabel.replace(asciiWhitespace, '\u0020').trim();
+        computedLabel = computedLabel.replace(asciiWhitespace, '\u0020').trim();
 
         assert_equals(computedLabel, expectedLabel, el.outerHTML);
       }, `${testName}`);

From 35f41ee387a7a890c16fa913aefbb73ca85174e9 Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Thu, 12 Oct 2023 18:47:07 -0700
Subject: [PATCH 05/11] m. extraneous comment from local testing

---
 accname/name/comp_text_node.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/accname/name/comp_text_node.html b/accname/name/comp_text_node.html
index 61d27c024a6c65..2ecd749e5a30be 100644
--- a/accname/name/comp_text_node.html
+++ b/accname/name/comp_text_node.html
@@ -15,13 +15,12 @@
 
 <!-- Note: some overlap with the tests in ./comp_name_from_content.html -->
 
-<!--
+
 <h1>text/element/text nodes, no space</h1>
 <button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/element/text nodes, no space">button<span></span>label</button>
 <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/element/text nodes, no space">heading<span></span>label</h3>
 <a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/element/text nodes, no space">link<span></span>label</a>
 <br>
--->
 
 <h1>text/comment/text nodes, no space</h1>
 <!-- Note: This set is not currently to spec until https://github.com/w3c/accname/issues/193 is resolved. -->
@@ -36,7 +35,6 @@ <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with tex
 </a>
 <br>
 
-
 <h1>text/comment/text nodes, with space</h1>
 <button class="ex" data-expectedlabel="button label" data-testname="button with text/comment/text nodes, with space">
   button

From a9b092b14f763587bc37a388257cd33f31dbdb4d Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Thu, 12 Oct 2023 21:42:30 -0700
Subject: [PATCH 06/11] m. lint

---
 wai-aria/scripts/aria-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index bc284ce656f681..16b5503c1bcbbb 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -147,7 +147,7 @@ const AriaUtils = {
         // AccName reference's HTML's definition of ASCII Whitespace
         // https://infra.spec.whatwg.org/#ascii-whitespace
         // which matches tab (\t), newline (\n), formfeed (\f), return (\r), and regular space (\u0020).
-        // but it does NOT match non-breaking space (\xA0,\u00A0) and others matched by the \s 
+        // but it does NOT match non-breaking space (\xA0,\u00A0) and others matched by \s
         const asciiWhitespace = /\t\n\f\r\u0020+/g;
         expectedLabel = expectedLabel.replace(asciiWhitespace, '\u0020').trim();
         computedLabel = computedLabel.replace(asciiWhitespace, '\u0020').trim();

From 955df07c2ea687b88def2f1aebbd41e83ce72e77 Mon Sep 17 00:00:00 2001
From: James Craig <cookiecrook@users.noreply.github.com>
Date: Thu, 12 Oct 2023 23:11:11 -0700
Subject: [PATCH 07/11] Apply suggestions from code review

don't normalize/trim the expectation, only the result
---
 wai-aria/scripts/aria-utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index 16b5503c1bcbbb..1e8fe266e7937f 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -136,7 +136,7 @@ const AriaUtils = {
       let label = el.getAttribute("data-expectedlabel");
       let testName = el.getAttribute("data-testname") || label; // data-testname optional if label is unique per test file
       promise_test(async t => {
-        let expectedLabel = el.getAttribute("data-expectedlabel");
+        const expectedLabel = el.getAttribute("data-expectedlabel");
         let computedLabel = await test_driver.get_computed_label(el);
 
         // See:
@@ -149,7 +149,6 @@ const AriaUtils = {
         // which matches tab (\t), newline (\n), formfeed (\f), return (\r), and regular space (\u0020).
         // but it does NOT match non-breaking space (\xA0,\u00A0) and others matched by \s
         const asciiWhitespace = /\t\n\f\r\u0020+/g;
-        expectedLabel = expectedLabel.replace(asciiWhitespace, '\u0020').trim();
         computedLabel = computedLabel.replace(asciiWhitespace, '\u0020').trim();
 
         assert_equals(computedLabel, expectedLabel, el.outerHTML);

From d51d6b164cf0f920d2f93c20e7040d0e00a80f43 Mon Sep 17 00:00:00 2001
From: James Craig <cookiecrook@users.noreply.github.com>
Date: Fri, 13 Oct 2023 16:54:20 -0700
Subject: [PATCH 08/11] m. typo

---
 wai-aria/scripts/aria-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index 1e8fe266e7937f..76bc0bac8826e1 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -144,7 +144,7 @@ const AriaUtils = {
         // - https://github.com/w3c/accname/issues/192
         // - https://github.com/w3c/accname/issues/208
         //
-        // AccName reference's HTML's definition of ASCII Whitespace
+        // AccName references HTML's definition of ASCII Whitespace
         // https://infra.spec.whatwg.org/#ascii-whitespace
         // which matches tab (\t), newline (\n), formfeed (\f), return (\r), and regular space (\u0020).
         // but it does NOT match non-breaking space (\xA0,\u00A0) and others matched by \s

From c8399e744374795638118e781cf6ffeeec58e2f6 Mon Sep 17 00:00:00 2001
From: James Craig <cookiecrook@users.noreply.github.com>
Date: Wed, 18 Oct 2023 16:06:20 -0700
Subject: [PATCH 09/11] Apply suggestions from code review

thx jugglinmike

Co-authored-by: jugglinmike <mike@mikepennisi.com>
---
 wai-aria/scripts/aria-utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wai-aria/scripts/aria-utils.js b/wai-aria/scripts/aria-utils.js
index 76bc0bac8826e1..86aed2bae5a699 100644
--- a/wai-aria/scripts/aria-utils.js
+++ b/wai-aria/scripts/aria-utils.js
@@ -148,8 +148,8 @@ const AriaUtils = {
         // https://infra.spec.whatwg.org/#ascii-whitespace
         // which matches tab (\t), newline (\n), formfeed (\f), return (\r), and regular space (\u0020).
         // but it does NOT match non-breaking space (\xA0,\u00A0) and others matched by \s
-        const asciiWhitespace = /\t\n\f\r\u0020+/g;
-        computedLabel = computedLabel.replace(asciiWhitespace, '\u0020').trim();
+        const asciiWhitespace = /[\t\n\f\r\u0020]+/g;
+        computedLabel = computedLabel.replace(asciiWhitespace, '\u0020').replace(/^\u0020|\u0020$/g, '');
 
         assert_equals(computedLabel, expectedLabel, el.outerHTML);
       }, `${testName}`);

From f1b2ca4db5a91b1ef2aa96ef930703e495d82965 Mon Sep 17 00:00:00 2001
From: James Craig <cookiecrook@users.noreply.github.com>
Date: Thu, 26 Oct 2023 12:49:19 -0700
Subject: [PATCH 10/11] m. editorial from jugglinmike

Co-authored-by: jugglinmike <mike@mikepennisi.com>
---
 accname/name/comp_text_node.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accname/name/comp_text_node.html b/accname/name/comp_text_node.html
index 2ecd749e5a30be..4875a812298244 100644
--- a/accname/name/comp_text_node.html
+++ b/accname/name/comp_text_node.html
@@ -77,7 +77,7 @@ <h3 class="ex" data-expectedlabel="heading&nbsp;label" data-testname="heading wi
 <a href="#" class="ex" data-expectedlabel="link&nbsp;label" data-testname="link with text node, with leading/trailing non-breaking space">&nbsp;link&nbsp;label&nbsp;</a>
 <br>
 
-<h1>text node, with leading/trailing non-breaking space</h1>
+<h1>text node, with mixed space and non-breaking space</h1>
 <button class="ex" data-expectedlabel="button &nbsp; label" data-testname="button with text node, with mixed space and non-breaking space">button   &nbsp;   label</button>
 <h3 class="ex" data-expectedlabel="heading &nbsp; label" data-testname="heading with text node, with mixed space and non-breaking space">heading   &nbsp;   label</h3>
 <a href="#" class="ex" data-expectedlabel="link &nbsp; label" data-testname="link with text node, with mixed space and non-breaking space">link   &nbsp;   label</a>

From 260d5e5354a86017d37439503660b90f85c1c856 Mon Sep 17 00:00:00 2001
From: James Craig <jcraig@apple.com>
Date: Thu, 2 Nov 2023 16:07:55 -0700
Subject: [PATCH 11/11] review feedback from rahimabdi; add tests using
 explicit role assignment

---
 accname/name/comp_text_node.html | 45 +++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/accname/name/comp_text_node.html b/accname/name/comp_text_node.html
index 4875a812298244..a31f9e02451f72 100644
--- a/accname/name/comp_text_node.html
+++ b/accname/name/comp_text_node.html
@@ -13,10 +13,17 @@
 
 <p>Tests the <a href="https://w3c.github.io/accname/#comp_text_node">#comp_text_node</a> portions of the AccName <em>Name Computation</em> algorithm.</p>
 
-<!-- Note: some overlap with the tests in ./comp_name_from_content.html -->
+<!--
 
+  Note: some overlap with the tests in:
+  - /accname/name/comp_label.html
+  - /accname/name/comp_name_from_content.html
+
+-->
 
 <h1>text/element/text nodes, no space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="buttonlabel" data-testname="span[role=button] with text/element/text nodes, no space">button<span></span>label</span>
+<div role="heading" class="ex" data-expectedlabel="headinglabel" data-testname="div[role=heading] with text/element/text nodes, no space">heading<span></span>label</div>
 <button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/element/text nodes, no space">button<span></span>label</button>
 <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with text/element/text nodes, no space">heading<span></span>label</h3>
 <a href="#" class="ex" data-expectedlabel="linklabel" data-testname="link with text/element/text nodes, no space">link<span></span>label</a>
@@ -24,6 +31,12 @@ <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with tex
 
 <h1>text/comment/text nodes, no space</h1>
 <!-- Note: This set is not currently to spec until https://github.com/w3c/accname/issues/193 is resolved. -->
+<span role="button" tabindex="0" class="ex" data-expectedlabel="buttonlabel" data-testname="span[role=button] with text/comment/text nodes, no space">
+  button<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
+</span>
+<div role="heading" class="ex" data-expectedlabel="headinglabel" data-testname="div[role=heading] with text/comment/text nodes, no space">
+  heading<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
+</div>
 <button class="ex" data-expectedlabel="buttonlabel" data-testname="button with text/comment/text nodes, no space">
   button<!-- with non-text node splitting concatenated text nodes -->label<!-- [sic] no extra spaces around first comment -->
 </button>
@@ -36,6 +49,16 @@ <h3 class="ex" data-expectedlabel="headinglabel" data-testname="heading with tex
 <br>
 
 <h1>text/comment/text nodes, with space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button label" data-testname="span[role=button] with text/comment/text nodes, with space">
+  button
+  <!-- comment node between text nodes with leading/trailing whitespace -->
+  label
+</span>
+<div role="heading" class="ex" data-expectedlabel="heading label" data-testname="div[role=heading] with text/comment/text nodes, with space">
+  heading
+  <!-- comment node between text nodes with leading/trailing whitespace -->
+  label
+</div>
 <button class="ex" data-expectedlabel="button label" data-testname="button with text/comment/text nodes, with space">
   button
   <!-- comment node between text nodes with leading/trailing whitespace -->
@@ -54,36 +77,52 @@ <h3 class="ex" data-expectedlabel="heading label" data-testname="heading with te
 <br>
 
 <h1>text node, with tab char</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button label" data-testname="span[role=button] with text node, with tab char">button  label</span>
+<div role="heading" class="ex" data-expectedlabel="heading label" data-testname="div[role=heading] with text node, with tab char">heading label</div>
 <button class="ex" data-expectedlabel="button label" data-testname="button with text node, with tab char">button  label</button>
 <h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with tab char">heading label</h3>
 <a href="#" class="ex" data-expectedlabel="link label" data-testname="link with text node, with tab char">link	label</a>
 <br>
 
 <h1>text node, with non-breaking space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button&nbsp;label" data-testname="span[role=button] with text node, with non-breaking space">button&nbsp;label</span>
+<div role="heading" class="ex" data-expectedlabel="heading&nbsp;label" data-testname="div[role=heading] with text node, with non-breaking space">heading&nbsp;label</div>
 <button class="ex" data-expectedlabel="button&nbsp;label" data-testname="button with text node, with non-breaking space">button&nbsp;label</button>
 <h3 class="ex" data-expectedlabel="heading&nbsp;label" data-testname="heading with text node, with non-breaking space">heading&nbsp;label</h3>
 <a href="#" class="ex" data-expectedlabel="link&nbsp;label" data-testname="link with text node, with non-breaking space">link&nbsp;label</a>
 <br>
 
 <h1>text node, with extra non-breaking space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button&nbsp;&nbsp;&nbsp;label" data-testname="span[role=button] with text node, with extra non-breaking space">button&nbsp;&nbsp;&nbsp;label</span>
+<div role="heading" class="ex" data-expectedlabel="heading&nbsp;&nbsp;&nbsp;label" data-testname="div[role=heading] with text node, with extra non-breaking space">heading&nbsp;&nbsp;&nbsp;label</div>
 <button class="ex" data-expectedlabel="button&nbsp;&nbsp;&nbsp;label" data-testname="button with text node, with extra non-breaking space">button&nbsp;&nbsp;&nbsp;label</button>
 <h3 class="ex" data-expectedlabel="heading&nbsp;&nbsp;&nbsp;label" data-testname="heading with text node, with extra non-breaking space">heading&nbsp;&nbsp;&nbsp;label</h3>
 <a href="#" class="ex" data-expectedlabel="link&nbsp;&nbsp;&nbsp;label" data-testname="link with text node, with extra non-breaking space">link&nbsp;&nbsp;&nbsp;label</a>
 <br>
 
 <h1>text node, with leading/trailing non-breaking space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button&nbsp;label" data-testname="span[role=button] with text node, with leading/trailing non-breaking space">&nbsp;button&nbsp;label&nbsp;</span>
+<div role="heading" class="ex" data-expectedlabel="heading&nbsp;label" data-testname="div[role=heading] with text node, with leading/trailing non-breaking space">&nbsp;heading&nbsp;label&nbsp;</div>
 <button class="ex" data-expectedlabel="button&nbsp;label" data-testname="button with text node, with leading/trailing non-breaking space">&nbsp;button&nbsp;label&nbsp;</button>
 <h3 class="ex" data-expectedlabel="heading&nbsp;label" data-testname="heading with text node, with leading/trailing non-breaking space">&nbsp;heading&nbsp;label&nbsp;</h3>
 <a href="#" class="ex" data-expectedlabel="link&nbsp;label" data-testname="link with text node, with leading/trailing non-breaking space">&nbsp;link&nbsp;label&nbsp;</a>
 <br>
 
 <h1>text node, with mixed space and non-breaking space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button &nbsp; label" data-testname="span[role=button] with text node, with mixed space and non-breaking space">button   &nbsp;   label</span>
+<div role="heading" class="ex" data-expectedlabel="heading &nbsp; label" data-testname="div[role=heading] with text node, with mixed space and non-breaking space">heading   &nbsp;   label</div>
 <button class="ex" data-expectedlabel="button &nbsp; label" data-testname="button with text node, with mixed space and non-breaking space">button   &nbsp;   label</button>
 <h3 class="ex" data-expectedlabel="heading &nbsp; label" data-testname="heading with text node, with mixed space and non-breaking space">heading   &nbsp;   label</h3>
 <a href="#" class="ex" data-expectedlabel="link &nbsp; label" data-testname="link with text node, with mixed space and non-breaking space">link   &nbsp;   label</a>
 <br>
 
 <h1>text nodes, with deeply nested space</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button label" data-testname="span[role=button] with text node, with deeply nested space">
+button<span><span><span><span><span><span><span> </span></span></span></span></span></span></span>label
+</span>
+<div role="heading" class="ex" data-expectedlabel="heading label" data-testname="div[role=heading] with text node, with deeply nested space">
+heading<span><span><span><span><span><span><span> </span></span></span></span></span></span></span>label
+</div>
 <button class="ex" data-expectedlabel="button label" data-testname="button with text node, with deeply nested space">
 button<span><span><span><span><span><span><span> </span></span></span></span></span></span></span>label
 </button>
@@ -96,6 +135,10 @@ <h3 class="ex" data-expectedlabel="heading label" data-testname="heading with te
 <br>
 
 <h1>text nodes, with single line break</h1>
+<span role="button" tabindex="0" class="ex" data-expectedlabel="button label" data-testname="span[role=button] with text node, with single line break">button
+label</span>
+<div role="heading" class="ex" data-expectedlabel="heading label" data-testname="div[role=heading] with text node, with single line break">heading
+label</div>
 <button class="ex" data-expectedlabel="button label" data-testname="button with text node, with single line break">button
 label</button>
 <h3 class="ex" data-expectedlabel="heading label" data-testname="heading with text node, with single line break">heading