Skip to content

Commit 4a5408b

Browse files
committed
Fixed error using xpath on puppeteer
Closes #1070
1 parent 0a131eb commit 4a5408b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

RuriLib/Blocks/Puppeteer/Elements/Methods.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,9 @@ public static async Task PuppeteerWaitForElement(BotData data, FindElementBy fin
334334

335335
private static async Task<IElementHandle> GetElement(IFrame frame, FindElementBy findBy, string identifier, int index)
336336
{
337-
var elements = await frame.QuerySelectorAllAsync(BuildSelector(findBy, identifier));
337+
var elements = findBy is FindElementBy.XPath ?
338+
await frame.XPathAsync(identifier) :
339+
await frame.QuerySelectorAllAsync(BuildSelector(findBy, identifier));
338340

339341
if (elements.Length < index + 1)
340342
{
@@ -351,10 +353,8 @@ private static string GetElementsScript(FindElementBy findBy, string identifier)
351353
var script = $"document.evaluate(\"{identifier.Replace("\"", "\\\"")}\", document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)";
352354
return $"Array.from({{ length: {script}.snapshotLength }}, (_, index) => {script}.snapshotItem(index))";
353355
}
354-
else
355-
{
356-
return $"document.querySelectorAll('{BuildSelector(findBy, identifier)}')";
357-
}
356+
357+
return $"document.querySelectorAll('{BuildSelector(findBy, identifier)}')";
358358
}
359359

360360
private static string GetElementScript(FindElementBy findBy, string identifier, int index)

0 commit comments

Comments
 (0)