fix(desktop): hand keyboard focus back after an automation click (upstream #10982) - #485
Merged
Merged
Conversation
…tream pingdotgg#10982) Imported from pingdotgg#10982 (open upstream, by Mnigos), squashing its three commits 5d24187, b577a83 and a2e44cd. Fixes upstream issue pingdotgg#10980. preview_click dispatches CDP mousePressed into the guest WebContents, which moves the app's keyboard focus into the previewed page and never returns it, so the user's typing lands in the page (even for hidden open:false tabs). The click path now restores the previously focused WebContents through a restoreFocusedWebContents helper shared with preview_press, on success and failure, yielding when focus moved elsewhere or the user left the app. Imported unchanged: apps/desktop/src/preview/Manager.ts and Manager.test.ts (test hunk applied with a 3-way merge; no adaptation needed). Co-Authored-By: Mnigos <makowskiigor@gmail.com> Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
patroza
marked this pull request as ready for review
September 23, 2026 10:50
patroza
enabled auto-merge (squash)
September 23, 2026 10:50
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
1 participant
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.
Imports the open upstream PR pingdotgg#10982 (by @Mnigos), which fixes the accepted upstream bug pingdotgg#10980: an agent's
preview_clickleaves keyboard focus inside the preview page, so the user's typing and pastes go to the page, even for hiddenopen: falsetabs.Provenance
5d24187dd3,b577a8380fanda2e44cd6c2, squashed into one commit.apps/desktop/src/preview/Manager.tsandManager.test.ts. The test file needed a 3-way merge but no changes.Change
The click path now saves and restores the previously focused WebContents through a
restoreFocusedWebContentshelper it shares withpreview_press. The restore runs whether the click succeeds or fails. It does nothing if focus moved to another renderer during the action or the user switched to another app.Tests
Upstream's new Manager tests are included. All 93 tests in
src/preview/Manager.test.tspass locally.🤖 Generated with Claude Code