fix(html): properly walk parent nodes for ShadyDOM polyfill

hybridsjs · Jan 8, 2020 · 0b000ed · 0b000ed
1 parent 4771605
commit 0b000ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/template/core.js b/src/template/core.js
@@ -110,7 +110,13 @@ export function createInternalWalker(context) {
       } else if (node.nextSibling) {
         node = node.nextSibling;
       } else {
-        node = node.parentNode.nextSibling;
+        let parentNode = node.parentNode;
+        node = parentNode.nextSibling;
+
+        while (!node && parentNode !== context) {
+          parentNode = parentNode.parentNode;
+          node = parentNode.nextSibling;
+        }
       }
 
       return !!node;

diff --git a/test/spec/html.js b/test/spec/html.js
@@ -694,15 +694,15 @@ describe('html:', () => {
   describe('ShadyDOM polyfill', () => {
     it('uses internal TreeWalker', () => {
       const el = document.createElement('div');
-      el.innerHTML = '<div><div>text</div><div>text<div>text</div></div></div>';
+      el.innerHTML = '<div><div>text</div><div>text<div>text</div></div>text</div>';
 
       const walker = createInternalWalker(el);
       let index = 0;
       while (walker.nextNode()) {
         expect(walker.currentNode).not.toBeNull();
         index += 1;
       }
-      expect(index).toBe(7);
+      expect(index).toBe(8);
     });
   });