#928@patch: Fixes problem with querySelectorAll() not always retirnin…

…g elements in document order.
capricorn86 · May 22, 2023 · 19d540c · 19d540c
1 parent cbdca8b
commit 19d540c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/packages/happy-dom/src/query-selector/QuerySelector.ts b/packages/happy-dom/src/query-selector/QuerySelector.ts
@@ -221,7 +221,7 @@ export default class QuerySelector {
 
 		for (let i = 0, max = children.length; i < max; i++) {
 			const child = children[i];
-			const position = (documentPosition ? documentPosition + '>' : '') + i;
+			const position = (documentPosition ? documentPosition + '>' : '') + String.fromCharCode(i);
 
 			if (selectorItem.match(child)) {
 				if (!nextSelectorItem) {

diff --git a/packages/happy-dom/test/query-selector/QuerySelector.test.ts b/packages/happy-dom/test/query-selector/QuerySelector.test.ts
@@ -128,6 +128,29 @@ describe('QuerySelector', () => {
 				'ccb',
 				'ccc'
 			]);
+
+			element.innerHTML = `
+            <div>0</div>
+            <button>1</button>
+            <div>2</div>
+            <div>3</div>
+            <div>4</div>
+            <div>5</div>
+            <div>6</div>
+            <div>7</div>
+            <button>8</button>
+            <button>9</button>
+            <button>10</button>
+            <button>11</button>
+            `;
+
+			expect(Array.from(element.querySelectorAll('button')).map((div) => div.textContent)).toEqual([
+				'1',
+				'8',
+				'9',
+				'10',
+				'11'
+			]);
 		});
 
 		it('Returns a NodeList with the method item().', () => {