@afixt/test-utils 1.1.7 → 1.1.8

package/src/getAccessibleText.js

@@ -1,7 +1,9 @@
-const { isEmpty } = require("./stringUtils.js");
+const { isEmpty } = require('./stringUtils.js');
 
 /**
  * Get all accessible text for an element, including aria-labels and content from children.
+ * Traverses the DOM subtree collecting text from text nodes, img alt attributes,
+ * and input[type="image"] alt attributes.
  * @param {Element} el - The DOM element.
  * @returns {string} The accessible text.
  */
@@ -13,55 +15,82 @@ function getAccessibleText(el) {
     if (!el.isConnected) {
         return '';
     }
-    
-    let textContent = "";
-    
-    // Check for element's own text content
-    if (el.textContent) {
-        textContent = el.textContent.trim();
-    }
-    
-    // Check for aria-label
-    if (el.hasAttribute("aria-label")) {
-        const ariaLabel = el.getAttribute("aria-label").trim();
+
+    // Check for aria-label first (highest priority)
+    if (el.hasAttribute('aria-label')) {
+        const ariaLabel = el.getAttribute('aria-label').trim();
         if (ariaLabel) {
-            // Prioritize aria-label if present
             return ariaLabel;
         }
     }
-    
-    // Check for img alt text
-    if (el.tagName.toLowerCase() === "img" && el.hasAttribute("alt")) {
-        return el.getAttribute("alt").trim();
+
+    // Check for img alt text when the element itself is an img
+    if (el.tagName.toLowerCase() === 'img' && el.hasAttribute('alt')) {
+        return el.getAttribute('alt').trim();
+    }
+
+    // Check for input[type="image"] alt text when the element itself is one
+    if (
+        el.tagName.toLowerCase() === 'input' &&
+        el.getAttribute('type') === 'image' &&
+        el.hasAttribute('alt')
+    ) {
+        return el.getAttribute('alt').trim();
     }
-    
-    // Handle other elements by getting visible text
-    if (!textContent) {
-        const walker = document.createTreeWalker(
-            el, 
-            NodeFilter.SHOW_TEXT, 
-            {
-                acceptNode: function (node) {
-                    // Only accept non-empty text nodes
-                    return node.nodeType === Node.TEXT_NODE && !isEmpty(node.nodeValue)
-                        ? NodeFilter.FILTER_ACCEPT
-                        : NodeFilter.FILTER_REJECT;
-                },
+
+    // Collect accessible text from the subtree, including text nodes
+    // and alt text from embedded images
+    const parts = collectSubtreeText(el);
+    return parts.join(' ').replace(/\s+/g, ' ').trim();
+}
+
+/**
+ * Recursively collect accessible text parts from an element's subtree.
+ * Handles text nodes, img alt text, and input[type="image"] alt text.
+ * @param {Node} node - The DOM node to traverse.
+ * @returns {string[]} Array of text parts found in the subtree.
+ */
+function collectSubtreeText(node) {
+    const parts = [];
+
+    for (let child = node.firstChild; child; child = child.nextSibling) {
+        if (child.nodeType === Node.TEXT_NODE) {
+            const text = child.nodeValue.trim();
+            if (!isEmpty(text)) {
+                parts.push(text);
+            }
+        } else if (child.nodeType === Node.ELEMENT_NODE) {
+            const tag = child.tagName.toLowerCase();
+
+            // img with non-empty alt contributes its alt text
+            if (tag === 'img' && child.hasAttribute('alt')) {
+                const alt = child.getAttribute('alt').trim();
+                if (alt) {
+                    parts.push(alt);
+                }
+                continue;
             }
-        );
-        
-        let textNodes = [];
-        let node;
-        
-        while ((node = walker.nextNode())) {
-            textNodes.push(node.nodeValue.trim());
+
+            // input[type="image"] with non-empty alt contributes its alt text
+            if (
+                tag === 'input' &&
+                child.getAttribute('type') === 'image' &&
+                child.hasAttribute('alt')
+            ) {
+                const alt = child.getAttribute('alt').trim();
+                if (alt) {
+                    parts.push(alt);
+                }
+                continue;
+            }
+
+            // Recurse into other element children
+            parts.push(...collectSubtreeText(child));
         }
-        
-        textContent = textNodes.join(" ").trim();
     }
-    
-    return textContent;
+
+    return parts;
 }
 
 // Export for CommonJS module usage
-module.exports = { getAccessibleText };
+module.exports = { getAccessibleText };