Repository navigation
fix(web): detect SPA navigation while find-in-page is active - #398
Merged
Merged
Conversation
🐤 Kanarek · 🟣 merged
App · 1 files |
Reviewer's GuideThe Find overlay now detects SPA pushState/replaceState navigation by polling the active WebView URL and location.href every 300 ms only during the active Find session, closing promptly on URL changes while preventing stale callbacks and data retention. Sequence diagram for Find overlay SPA navigation detectionsequenceDiagram
participant User
participant FindOverlay
participant WebChatScreen
participant WebView
User->>FindOverlay: Open Find
FindOverlay->>WebChatScreen: Start LaunchedEffect(findSession)
loop Every 300 ms while Find is active
WebChatScreen->>WebView: Read webView.url
alt URL differs from activeSearch.pageUrl
WebChatScreen->>FindOverlay: closeFindInPage()
else URL unchanged
WebChatScreen->>WebView: evaluateJavascript(window.location.href)
WebView-->>WebChatScreen: location.href
alt href differs from activeSearch.pageUrl
WebChatScreen->>FindOverlay: closeFindInPage()
end
end
end
User->>FindOverlay: Close Find
FindOverlay-->>WebChatScreen: Clear findSession
WebChatScreen-->>WebChatScreen: Stop polling
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Contributor
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Contributor
|
This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again. |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've found 2 issues
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location path="app/src/main/java/ais/tee/ui/screens/WebChatScreen.kt" line_range="188-189" />
<code_context>
+ while (findSession === activeSearch) {
+ delay(300L)
+ val webView = activeSearch.webView
+ if (webView.url?.let { it != activeSearch.pageUrl } == true) {
+ closeFindInPage()
+ break
+ }
</code_context>
<issue_to_address>
**Find closes before navigation**
When find opens before `webView.url` is assigned, `activeSearch.pageUrl` is null, so the `webView.url` check treats the first assigned URL as navigation, and the `evaluateJavascript` callback compares against `""`; either path calls `closeFindInPage()` and dismisses Find before the user can search the loaded page.
Only treat a URL as changed when `activeSearch.pageUrl` is non-null, in both checks.
Also at `app/src/main/java/ais/tee/ui/screens/WebChatScreen.kt:194-195`.
</issue_to_address>
### Comment 2
<location path="app/src/main/java/ais/tee/ui/screens/WebChatScreen.kt" line_range="183-185" />
<code_context>
}
+ // pushState/replaceState in a SPA do not consistently trigger WebViewClient callbacks.
+ // Watch only while Find is visible; never retain or log the provider URL.
+ LaunchedEffect(findSession) {
+ val activeSearch = findSession ?: return@LaunchedEffect
+ while (findSession === activeSearch) {
+ delay(300L)
+ val webView = activeSearch.webView
</code_context>
<issue_to_address>
**Hidden tab keeps polling**
When the user switches tabs while Find is open, `LaunchedEffect(findSession)` does not check `isActive`, so the loop keeps polling the hidden WebView every 300 ms; a URL change also calls `closeFindInPage()` and loses the retained Find session when the user returns.
Gate the polling effect on `isActive` so it stops while the tab is inactive.
</issue_to_address>Sourcery assessment
Approval pending. 2 findings to address first.
Blocking findings: app/src/main/java/ais/tee/ui/screens/WebChatScreen.kt:189, app/src/main/java/ais/tee/ui/screens/WebChatScreen.kt:185
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configuration
📝 Walkthrough
Priority: ⬇️ Low Merge Risk: 🟠 High · up to
|
| Check name | Status | Explanation |
|---|---|---|
| Title check |  |
标题清楚说明修复目标：在 Find 激活时检测 SPA 导航。标题与主要改动一致。通过。 |
| Description check | |
描述说明轮询 WebView URL、关闭 Find 的条件、停止轮询时机和验证背景。内容与改动相关。通过。 |
| Linked Issues check | |
Check skipped because no linked issues were found for this pull request. |
| Out of Scope Changes check | |
Check skipped because no linked issues were found for this pull request. |
✨ Finishing Touches: 💡 1
-
✨ Simplify code
-
- Commit to this branch
- Create a new PR
🛠️ Fix failing CI checks: 💡
-
- Commit to this branch
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
页面悄悄换了址
监测每三百毫秒看一眼
JavaScript 也报个信
地址不同，Find 就关
会话结束，轮询停
小小守望，不留 URL
Comment @coderabbitai help to get the list of available commands.
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
ℹ️ Review info
⚙️ Run configuration
- Configuration used: Organization UI
- Review profile: QUIET
- Plan: Advanced
- Run ID:
9bf3be4f-d5d4-4cf5-a9ac-66bd38516aac
📒 Files selected for processing: 1
app/src/main/java/ais/tee/ui/screens/WebChatScreen.kt
Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
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
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.
Fix
location.hrefat a bounded 300 ms interval.history.pushStateorreplaceStatewithout triggeringWebViewClientnavigation callbacks.Why
The unchanged Android instrumentation test
WebChatFindTest.sameDocumentConversationNavigationClosesFindtimed out in both Aistee Claude PRs #396 and #397 (71/72 passing). The existingonUrlChangedcallback does not reliably fire for same-document navigation on Android 16 WebView.CI including Android smoke is the validation gate. Profile regeneration unverified; this affects the Find overlay only, not benchmarked startup/provider-switch journeys.