fix(color-contrast): correctly handle nested scroll regions (#3212)

* fix(color-contrast): correctly handle nested scroll regions * revert changes from previous pr
dequelabs · Oct 15, 2021 · 22db29c · 22db29c
1 parent 4937bfa
commit 22db29c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/lib/commons/dom/get-rect-stack.js b/lib/commons/dom/get-rect-stack.js
@@ -315,13 +315,13 @@ function findScrollRegionParent(vNode, parentVNode) {
   const checkedNodes = [vNode];
 
   while (parentVNode) {
-    if (parentVNode._scrollRegionParent) {
-      scrollRegionParent = parentVNode._scrollRegionParent;
+    if (getScroll(parentVNode.actualNode)) {
+      scrollRegionParent = parentVNode;
       break;
     }
 
-    if (getScroll(parentVNode.actualNode)) {
-      scrollRegionParent = parentVNode;
+    if (parentVNode._scrollRegionParent) {
+      scrollRegionParent = parentVNode._scrollRegionParent;
       break;
     }
 

diff --git a/test/commons/dom/get-element-stack.js b/test/commons/dom/get-element-stack.js
@@ -572,5 +572,20 @@ describe('dom.getElementStack', function() {
       var stack = mapToIDs(getElementStack(target));
       assert.deepEqual(stack, ['target', '3', '2', '1', 'fixture']);
     });
+
+    it('should use correct scroll region parent', function() {
+      fixture.innerHTML =
+        '<div id="1" style="overflow: scroll; height: 50px;">' +
+        '<div id="2" style="overflow: scroll; height: 100px;">' +
+        '<div id="3">' +
+        '<div id="target" style="margin-top: 200px;">text</div>' +
+        '</div>' +
+        '</div>' +
+        '</div>';
+      axe.testUtils.flatTreeSetup(fixture);
+      var target = fixture.querySelector('#target');
+      var stack = mapToIDs(getElementStack(target));
+      assert.deepEqual(stack, ['target', '3', '2', '1', 'fixture']);
+    });
   });
 });