Adressed issue

Author: mattscepter

lib/commons/dom/create-grid.js

@@ -27,6 +27,9 @@ export default function createGrid(
 ) {
   // Prevent multiple calls per run
   if (cache.get('gridCreated') && !parentVNode) {
+    if (cache.get('gridSize')) {
+      return cache.get('gridSize');
+    }
     return constants.gridSize;
   }
   cache.set('gridCreated', true);
@@ -110,6 +113,10 @@ export default function createGrid(
 
     node = treeWalker.nextNode();
   }
+
+  if (cache.get('gridSize')) {
+    return cache.get('gridSize');
+  }
   return constants.gridSize;
 }
 
@@ -430,6 +437,9 @@ class Grid {
    * @returns {number}
    */
   toGridIndex(num) {
+    if (cache.get('gridSize')) {
+      return Math.floor(num / cache.get('gridSize'));
+    }
     return Math.floor(num / constants.gridSize);
   }
 

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

@@ -1,3 +1,4 @@
+import cache from '../../core/base/cache';
 import memoize from '../../core/utils/memoize';
 
 /**
@@ -17,12 +18,18 @@ const getOverflowHiddenAncestors = memoize(
 
     const overflow = vNode.getComputedStylePropertyValue('overflow');
 
-    if (
-      overflow.includes('hidden') ||
-      overflow.includes('clip') ||
-      overflow.includes('scroll')
-    ) {
-      ancestors.push(vNode);
+    if (cache.get('200%ZoomRule')) {
+      if (
+        overflow.includes('hidden') ||
+        overflow.includes('clip') ||
+        overflow.includes('scroll')
+      ) {
+        ancestors.push(vNode);
+      }
+    } else {
+      if (overflow.includes('hidden')) {
+        ancestors.push(vNode);
+      }
     }
 
     return ancestors.concat(getOverflowHiddenAncestors(vNode.parent));

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

@@ -1,7 +1,8 @@
-import { getNodeFromTree } from '../../core/utils';
+import { getNodeFromTree, memoize } from '../../core/utils';
 import { sanitize } from '../text';
-import { getIntersectionRect } from '../math';
+import { getIntersectionRect, getRectCenter, isPointInRect } from '../math';
 import getOverflowHiddenAncestors from './get-overflow-hidden-ancestors';
+import cache from '../../core/base/cache';
 
 /**
  * Get the visible text client rects of a node.
@@ -10,56 +11,54 @@ import getOverflowHiddenAncestors from './get-overflow-hidden-ancestors';
  * @instance
  * @param {Element} node
  */
-const getVisibleChildTextRects = function getVisibleChildTextRectsMemoized(
-  node
-) {
-  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);
 
-  // console.log("Here");
-  // console.log("Child Nodes are ",  node.childNodes);
+    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 (
+        isOutsideNodeBounds(contentRects, nodeRect) &&
+        !cache.get('200%ZoomRule')
+      ) {
+        return;
+      }
 
-    const contentRects = getContentRects(textNode);
-    // if (isOutsideNodeBounds(contentRects, nodeRect)) {
-    //   return;
-    // }
+      clientRects.push(...filterHiddenRects(contentRects, overflowHiddenNodes));
+    });
 
-    // console.log("Client Rects ate ",  structuredClone(contentRects));
-
-    clientRects.push(...filterHiddenRects(contentRects, overflowHiddenNodes));
-  });
+    if (clientRects.length <= 0 && cache.get('200%ZoomRule')) {
+      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
+     */
 
-  if (clientRects.length <= 0) {
-    return [];
+    // console.log("Node is ", node);
+    // console.log("Client Rects is ", clientRects);
+    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
-   */
-
-  // console.log("Node is ", node);
-  // console.log("Client Rects is ", clientRects);
-  return clientRects.length
-    ? clientRects
-    : filterHiddenRects([nodeRect], overflowHiddenNodes);
-};
+);
 export default getVisibleChildTextRects;
 
 function getContentRects(node) {
@@ -74,12 +73,12 @@ 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) {
-//   return rects.some(rect => {
-//     const centerPoint = getRectCenter(rect);
-//     return !isPointInRect(centerPoint, nodeRect);
-//   });
-// }
+function isOutsideNodeBounds(rects, nodeRect) {
+  return rects.some(rect => {
+    const centerPoint = getRectCenter(rect);
+    return !isPointInRect(centerPoint, nodeRect);
+  });
+}
 
 /**
  * Filter out 0 width and height rects (newline characters) and
@@ -97,9 +96,7 @@ function filterHiddenRects(contentRects, overflowHiddenNodes) {
 
     // update the rect size to fit inside the bounds of all overflow
     // hidden ancestors
-    // console.log("Overflow Hidden nodes are ", overflowHiddenNodes);
     const visibleRect = overflowHiddenNodes.reduce((rect, overflowNode) => {
-      // console.log("Overflow node is ", overflowNode);
       return rect && getIntersectionRect(rect, overflowNode.boundingClientRect);
     }, contentRect);