fix: apply index after Java-side filtering in ElementQuery (#2033) #2035
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When using ElementQuery with conditions like withPropertyValue(), calling first() or get(index) would fail if the element at that DOM position didn't match the condition. This happened because the JavaScript [index] was applied before Java-side condition filtering, so it would extract the wrong element and then filter it out. Fixed by: - Modified get(int index) to check if conditions exist - When conditions exist, fetch all elements and apply index after filtering - When no conditions exist, use the optimized JavaScript [index] path Added integration tests to verify withPropertyValue().first() and withPropertyValue().get(0) work correctly. Fixes #2033
Contributor
|
Fixes #2033. |
tepi
approved these changes
Nov 4, 2025
Contributor
|
Needs formatting + some tests are failing |
Member
Author
|
formatted and merged main, let's see if tests still fail |
Test Results 134 files - 33 134 suites - 33 57s ⏱️ - 1h 3m 44s For more details on these failures, see this check. Results for commit 5c5fcde. ± Comparison against base commit d623dc1. This pull request removes 169 tests.♻️ This comment has been updated with latest results. |
When ElementQuery uses Java-side conditions (like withLabel, withText, withPropertyValue, etc.), the JavaScript query must return ALL matching elements so that Java can apply the predicates for filtering. The tests were incorrectly expecting the script to end with ";return result[0]" for all .first() calls. For queries with conditions, the script correctly ends with ";return result" (all elements), and then Java applies filtering and indexing. Fixed by updating test helper methods findFirstConditionInElement() and findFirstConditionInDocument() to expect SINGLE_RESULT_QUERY_SUFFIX instead of FIRST_RESULT_QUERY_SUFFIX. This fixes 20 failing tests in ElementQueryTest related to condition-based queries. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2033