Added logic for reflow in get-overflow-ancestors

Author: mattscepter

lib/commons/dom/get-overflow-hidden-ancestors.js

@@ -27,10 +27,14 @@ const getOverflowHiddenAncestors = memoize(
       ) {
         ancestors.push(vNode);
       }
-    } else {
-      if (overflow === 'hidden' || overflow.includes('clip')) {
-        ancestors.push(vNode);
-      }
+    } else if (
+      cache.get('ruleId') &&
+      cache.get('ruleId') === 'reflow' &&
+      overflow.includes('hidden')
+    ) {
+      ancestors.push(vNode);
+    } else if (overflow === 'hidden' || overflow.includes('clip')) {
+      ancestors.push(vNode);
     }
 
     return ancestors.concat(getOverflowHiddenAncestors(vNode.parent));

lib/commons/dom/get-visible-child-text-rects.js

@@ -1,4 +1,4 @@
-import { getNodeFromTree, memoize } from '../../core/utils';
+import { getNodeFromTree } from '../../core/utils';
 import { sanitize } from '../text';
 import { getIntersectionRect, getRectCenter, isPointInRect } from '../math';
 import getOverflowHiddenAncestors from './get-overflow-hidden-ancestors';
@@ -11,74 +11,70 @@ import cache from '../../core/base/cache';
  * @instance
  * @param {Element} node
  */
-const getVisibleChildTextRects = memoize(
-  function getVisibleChildTextRectsMemoized(
-    node,
+const getVisibleChildTextRects = (node, options = {}) => {
+  const {
     checkTextRectOutsideNodeBoundingRect = false,
-    checkIsOutsideNodeBounds = true,
-    includeOverflowHiddenRect = false
-  ) {
-    const vNode = getNodeFromTree(node);
-    const nodeRect = vNode.boundingClientRect;
-    const clientRects = [];
-    const overflowHiddenNodes = getOverflowHiddenAncestors(vNode);
-
-    node.childNodes.forEach(textNode => {
-      if (textNode.nodeType !== 3 || sanitize(textNode.nodeValue) === '') {
-        return;
-      }
-
-      const contentRects = getContentRects(textNode);
-      if (checkIsOutsideNodeBounds) {
-        if (
-          isOutsideNodeBounds(
-            contentRects,
-            nodeRect,
-            checkTextRectOutsideNodeBoundingRect
-          ) &&
-          !cache.get('ruleId')
-        ) {
-          return;
-        }
-      }
+    includeOutsideBounds = true,
+    includeOverflowHidden = false,
+    checkNoVisibleRectsIdentified = false
+  } = options;
+  const vNode = getNodeFromTree(node);
+  const nodeRect = vNode.boundingClientRect;
+  const clientRects = [];
+  const overflowHiddenNodes = getOverflowHiddenAncestors(vNode);
 
-      if (includeOverflowHiddenRect) {
-        clientRects.push(...filterHiddenRects(contentRects, []));
-      } else {
-        clientRects.push(
-          ...filterHiddenRects(contentRects, overflowHiddenNodes)
-        );
-      }
-    });
+  node.childNodes.forEach(textNode => {
+    if (textNode.nodeType !== 3 || sanitize(textNode.nodeValue) === '') {
+      return;
+    }
 
-    // a11y-engine-domforge change
+    const contentRects = getContentRects(textNode);
     if (
-      clientRects.length <= 0 &&
-      cache.get('ruleId') &&
-      cache.get('ruleId') === 'resize-2x-zoom' &&
-      checkIsOutsideNodeBounds
+      includeOutsideBounds &&
+      isOutsideNodeBounds(
+        contentRects,
+        nodeRect,
+        checkTextRectOutsideNodeBoundingRect
+      ) &&
+      !cache.get('ruleId')
     ) {
-      return [];
+      return;
     }
-    /**
-     * if all text rects are larger than the bounds of the node,
-     * or goes outside of the bounds of the node, we need to use
-     * the nodes bounding rect so we stay within the bounds of the
-     * element.
-     *
-     * @see https://github.com/dequelabs/axe-core/issues/2178
-     * @see https://github.com/dequelabs/axe-core/issues/2483
-     * @see https://github.com/dequelabs/axe-core/issues/2681
-     *
-     * also need to resize the nodeRect to fit within the bounds of any overflow: hidden ancestors.
-     *
-     * @see https://github.com/dequelabs/axe-core/issues/4253
-     */
-    return clientRects.length
-      ? clientRects
-      : filterHiddenRects([nodeRect], overflowHiddenNodes);
+
+    clientRects.push(
+      ...filterHiddenRects(
+        contentRects,
+        includeOverflowHidden ? [] : overflowHiddenNodes
+      )
+    );
+  });
+
+  // a11y-engine-domforge change
+  if (
+    clientRects.length <= 0 &&
+    ((cache.get('ruleId') && cache.get('ruleId') === 'resize-2x-zoom') ||
+      checkNoVisibleRectsIdentified)
+  ) {
+    return [];
   }
-);
+  /**
+   * if all text rects are larger than the bounds of the node,
+   * or goes outside of the bounds of the node, we need to use
+   * the nodes bounding rect so we stay within the bounds of the
+   * element.
+   *
+   * @see https://github.com/dequelabs/axe-core/issues/2178
+   * @see https://github.com/dequelabs/axe-core/issues/2483
+   * @see https://github.com/dequelabs/axe-core/issues/2681
+   *
+   * also need to resize the nodeRect to fit within the bounds of any overflow: hidden ancestors.
+   *
+   * @see https://github.com/dequelabs/axe-core/issues/4253
+   */
+  return clientRects.length
+    ? clientRects
+    : filterHiddenRects([nodeRect], overflowHiddenNodes);
+};
 export default getVisibleChildTextRects;
 
 function getContentRects(node) {
@@ -101,7 +97,9 @@ function isOutsideNodeBounds(
   return rects.some(rect => {
     const centerPoint = getRectCenter(rect);
     if (checkTextRectOutsideNodeBoundingRect) {
-      !isPointInRect(centerPoint, nodeRect) || rect.right > nodeRect.right;
+      return (
+        !isPointInRect(centerPoint, nodeRect) || rect.right > nodeRect.right
+      );
     } else {
       return !isPointInRect(centerPoint, nodeRect);
     }