Updated get-visible-child-text-rects

Author: Pooja0504

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

@@ -1,4 +1,4 @@
-import { getNodeFromTree } from '../../core/utils';
+import { getNodeFromTree, memoize } from '../../core/utils';
 import { sanitize } from '../text';
 import { getIntersectionRect, getRectCenter, isPointInRect } from '../math';
 import getOverflowHiddenAncestors from './get-overflow-hidden-ancestors';
@@ -11,72 +11,49 @@ import cache from '../../core/base/cache';
  * @instance
  * @param {Element} node
  */
-const getVisibleChildTextRects = (node, options = {}) => {
-  const {
-    checkTextRectOutsideNodeBoundingRect = false,
-    includeOutsideBounds = true,
-    includeOverflowHidden = false,
-    checkNoVisibleRectsIdentified = false
-  } = options;
-  const vNode = getNodeFromTree(node);
-  const nodeRect = vNode.boundingClientRect;
-  const clientRects = [];
-  const overflowHiddenNodes = getOverflowHiddenAncestors(vNode);
+const getVisibleChildTextRects = memoize(
+  function getVisibleChildTextRectsMemoized(node) {
+    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;
-    }
+    node.childNodes.forEach(textNode => {
+      if (textNode.nodeType !== 3 || sanitize(textNode.nodeValue) === '') {
+        return;
+      }
 
-    const contentRects = getContentRects(textNode);
-    if (
-      includeOutsideBounds &&
-      isOutsideNodeBounds(
-        contentRects,
-        nodeRect,
-        checkTextRectOutsideNodeBoundingRect
-      ) &&
-      (!cache.get('ruleId') ||
-        cache.get('ruleId') === 'reflow-4x-zoom-scroll' ||
-        cache.get('ruleId') === 'color-contrast')
-    ) {
-      return;
-    }
+      const contentRects = getContentRects(textNode);
+      if (isOutsideNodeBounds(contentRects, nodeRect) && !cache.get('ruleId')) {
+        return;
+      }
 
-    clientRects.push(
-      ...filterHiddenRects(
-        contentRects,
-        includeOverflowHidden ? [] : overflowHiddenNodes
-      )
-    );
-  });
+      clientRects.push(...filterHiddenRects(contentRects, overflowHiddenNodes));
+    });
 
-  // a11y-engine-domforge change
-  if (
-    clientRects.length <= 0 &&
-    ((cache.get('ruleId') && cache.get('ruleId') === 'resize-2x-zoom') ||
-      checkNoVisibleRectsIdentified)
-  ) {
-    return [];
+    // a11y-engine-domforge change
+    if (clientRects.length <= 0) {
+      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);
   }
-  /**
-   * 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) {
@@ -91,20 +68,10 @@ function getContentRects(node) {
  * when determining the rect stack we will also use the midpoint
  * of the text rect to determine out of bounds
  */
-function isOutsideNodeBounds(
-  rects,
-  nodeRect,
-  checkTextRectOutsideNodeBoundingRect = false
-) {
+function isOutsideNodeBounds(rects, nodeRect) {
   return rects.some(rect => {
     const centerPoint = getRectCenter(rect);
-    if (checkTextRectOutsideNodeBoundingRect) {
-      return (
-        !isPointInRect(centerPoint, nodeRect) || rect.right > nodeRect.right
-      );
-    } else {
-      return !isPointInRect(centerPoint, nodeRect);
-    }
+    return !isPointInRect(centerPoint, nodeRect);
   });
 }