fix: use shadowRoot for tree walker (#9950)

puppeteer · Mar 31, 2023 · 728547d · 728547d
1 parent 1396274
commit 728547d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/packages/puppeteer-core/src/injected/util.ts b/packages/puppeteer-core/src/injected/util.ts
@@ -49,7 +49,8 @@ export function* pierce(root: Node): IterableIterator<Node | ShadowRoot> {
  * @internal
  */
 export function* pierceAll(root: Node): IterableIterator<Node | ShadowRoot> {
-  yield* pierce(root);
+  root = pierce(root).next().value;
+  yield root;
   const walkers = [document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT)];
   for (const walker of walkers) {
     let node: Element | null;

diff --git a/test/src/queryhandler.spec.ts b/test/src/queryhandler.spec.ts
@@ -404,6 +404,24 @@ describe('Query handler tests', function () {
           })
         ).toBeTruthy();
       }
+      {
+        const elements = await page.$$('#c >>>> div');
+        assert(elements[0], 'Could not find element');
+        expect(
+          await elements[0]?.evaluate(element => {
+            return element.id === 'd';
+          })
+        ).toBeTruthy();
+      }
+      {
+        const elements = await page.$$('#c >>> div');
+        assert(elements[0], 'Could not find element');
+        expect(
+          await elements[0]?.evaluate(element => {
+            return element.id === 'd';
+          })
+        ).toBeTruthy();
+      }
     });
 
     it('should work with text selectors', async () => {