Skip to content

fix: area picker click-drag regression and screenshot editor window lifecycle #1950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shashank-sn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: area picker click-drag regression and screenshot editor window lifecycle #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
569e8d4
fix: prevent main window auto-show and webcam activation after screen…
shashank-sn Jun 29, 2026
9be96b9
fix: prevent area picker from immediately releasing click-drag on som…
shashank-sn Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion apps/desktop/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,11 @@ function Inner() {
<Route path="/mode-select" component={ModeSelectPage} />
<Route path="/notifications" component={NotificationsPage} />
<Route path="/recordings-overlay" component={RecordingsOverlayPage} />
<Route path="/screenshot-editor" component={ScreenshotEditorPage} />
<Route
path="/screenshot-editor"
info={{ AUTO_SHOW_WINDOW: false }}
component={ScreenshotEditorPage}
/>
<Route
path="/target-select-overlay"
component={TargetSelectOverlayPage}
Expand Down
6 changes: 5 additions & 1 deletion apps/desktop/src/components/Cropper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,12 @@ export function Cropper(
// While pointer capture is held the drag is still ours even if the window
// loses focus (e.g. another overlay or the camera window grabs it on
// Windows). Real pointer loss arrives via pointercancel/lostpointercapture.
// Defer the capture check by one microtask so setPointerCapture has time
// to finalize before we decide the session is orphaned.
blur: () => {
if (!target.hasPointerCapture?.(pointerId)) finish();
queueMicrotask(() => {
if (!target.hasPointerCapture?.(pointerId)) finish();
});
},
Comment on lines 721 to 725

@tembo tembo Bot Jun 29, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block looks like it got duplicated/partially applied (nested blur + stray lines), which should fail to compile. I think this should just be a single blur handler.

Suggested change
blur: () => {
if (!target.hasPointerCapture?.(pointerId)) finish();
Promise.resolve().then(() => {
if (!target.hasPointerCapture?.(pointerId)) finish();
});
if (!target.hasPointerCapture?.(pointerId)) finish();
blur: () => {
Promise.resolve().then(() => {
if (!target.hasPointerCapture?.(pointerId)) finish();
});
},
Promise.resolve().then(() => {
if (!target.hasPointerCapture?.(pointerId)) finish();
});
},
},
blur: () => {
Promise.resolve().then(() => {
if (!target.hasPointerCapture?.(pointerId)) finish();
});
},

});
createEventListenerMap(target, {
Expand Down