Skip to content

Commit c32d81c

Browse files
committed
fix(web): browser preview viewport no longer scales with window zoom
Agents can't size or screenshot the Browser panel when the app window is zoomed. At 120% View > Zoom, preview_resize to 519x762 renders the page at 623x915, so it times out ("viewport ... was not rendered") and rolls back, and screenshots show the page at the wrong width. The panel sized the webview in app CSS pixels, so window zoom leaked into the page's viewport. The desktop bridge now reports the window's zoom factor, and the panel, device toolbar, agent cursor and floating mini player divide it out. Pages get exactly the viewport that was asked for.
1 parent d2c9281 commit c32d81c

8 files changed

Lines changed: 90 additions & 9 deletions

File tree

‎apps/desktop/src/preload.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
7272
},
7373
getPathForFile: (file: File) => webUtils.getPathForFile(file),
7474
getClientPlatform: () => clientPlatform,
75+
getZoomFactor: () => webFrame.getZoomFactor(),
7576
setNotificationBadge: (badge) =>
7677
ipcRenderer.invoke(IpcChannels.SET_NOTIFICATION_BADGE_CHANNEL, badge),
7778
onNotificationBadgeClear: (listener) => {

‎apps/web/src/browser/HostedBrowserWebview.test.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ beforeEach(() => {
7777
});
7878
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
7979
vi.stubGlobal("window", globalThis);
80+
vi.stubGlobal("addEventListener", vi.fn());
81+
vi.stubGlobal("removeEventListener", vi.fn());
8082
vi.stubGlobal("navigator", { platform: "Linux" });
8183
vi.stubGlobal(
8284
"requestAnimationFrame",

‎apps/web/src/browser/HostedBrowserWebview.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { acquireDesktopTab, type AcquiredDesktopTab } from "./desktopTabLifetime
2222
import { resolveHostedBrowserWebviewWrapperStyle } from "./hostedBrowserWebviewStyle";
2323
import { usePreviewWebviewConfig } from "./previewWebviewConfigState";
2424
import { useBrowserViewportResize } from "./useBrowserViewportResize";
25+
import { usePreviewPageScale } from "./usePreviewPageScale";
2526
import {
2627
INITIAL_WEBVIEW_CRASH_RECOVERY_STATE,
2728
planWebviewCrashRecovery,
@@ -67,6 +68,9 @@ export function HostedBrowserWebview(props: {
6768
zoomFactor,
6869
profileId,
6970
} = props;
71+
// Lay the guest out with the page-to-panel scale, not the tab zoom alone, so
72+
// it gets the exact viewport requested even when the app window is zoomed.
73+
const pageScale = usePreviewPageScale(zoomFactor);
7074
const clientSettingsHydrated = useClientSettingsHydrated();
7175
const config = usePreviewWebviewConfig(threadRef.environmentId, profileId);
7276
const [initialSrc] = useState(() => initialUrl ?? "about:blank");
@@ -181,7 +185,7 @@ export function HostedBrowserWebview(props: {
181185

182186
const active = presentation.visible && presentation.rect !== null;
183187
const lastRect = presentation.rect;
184-
const normalizedZoomFactor = Number.isFinite(zoomFactor) && zoomFactor > 0 ? zoomFactor : 1;
188+
const normalizedZoomFactor = Number.isFinite(pageScale) && pageScale > 0 ? pageScale : 1;
185189
const viewportWidth = viewport._tag === "fill" ? null : viewport.width;
186190
const viewportHeight = viewport._tag === "fill" ? null : viewport.height;
187191
const viewportAspectRatio =
@@ -219,7 +223,7 @@ export function HostedBrowserWebview(props: {
219223
} = useBrowserViewportResize({
220224
tabId: runtimeTabId,
221225
viewport,
222-
zoomFactor,
226+
zoomFactor: pageScale,
223227
containerSize,
224228
deviceToolbarVisible,
225229
aspectRatio: lockedAspectRatio,
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import { resolveBrowserViewportLayout } from "./browserViewportLayout";
4+
import { previewPageScale } from "./usePreviewPageScale";
5+
6+
// Electron's zoom steps are half a zoom level: factor 1.2 ** (level).
7+
const ZOOMED_IN_ONE_STEP = 1.2 ** 0.5;
8+
const ZOOMED_OUT_ONE_STEP = 1.2 ** -0.5;
9+
10+
/** The guest's CSS width for a webview laid out at `hostWidth` window CSS pixels. */
11+
const guestWidth = (hostWidth: number, windowZoomFactor: number) => hostWidth * windowZoomFactor;
12+
13+
describe("previewPageScale", () => {
14+
it.each([
15+
["zoomed in", ZOOMED_IN_ONE_STEP],
16+
["at actual size", 1],
17+
["zoomed out", ZOOMED_OUT_ONE_STEP],
18+
])("gives the page the requested viewport with the app window %s", (_, windowZoomFactor) => {
19+
const layout = resolveBrowserViewportLayout(
20+
{ width: 1600, height: 1000 },
21+
{ _tag: "freeform", width: 1280, height: 800 },
22+
previewPageScale(1, windowZoomFactor),
23+
);
24+
25+
expect(guestWidth(layout.viewportWidth, windowZoomFactor)).toBeCloseTo(1280);
26+
expect(guestWidth(layout.viewportHeight, windowZoomFactor)).toBeCloseTo(800);
27+
});
28+
29+
it("keeps the tab's own zoom on top of the window's", () => {
30+
expect(previewPageScale(1.5, ZOOMED_IN_ONE_STEP)).toBeCloseTo(1.5 / ZOOMED_IN_ONE_STEP);
31+
});
32+
33+
it("treats a missing or invalid window zoom as actual size", () => {
34+
expect(previewPageScale(1.25, Number.NaN)).toBe(1.25);
35+
expect(previewPageScale(1.25, 0)).toBe(1.25);
36+
});
37+
});
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import { useSyncExternalStore } from "react";
2+
3+
const normalizeZoomFactor = (zoomFactor: number | undefined): number =>
4+
zoomFactor !== undefined && Number.isFinite(zoomFactor) && zoomFactor > 0 ? zoomFactor : 1;
5+
6+
/**
7+
* App-window CSS pixels per preview-page CSS pixel.
8+
*
9+
* The preview page keeps its own zoom, but its webview is laid out in this
10+
* window's CSS pixels, which the app's own zoom (View > Zoom) also scales.
11+
* Dividing it out keeps a fixed viewport at exactly the requested size.
12+
*/
13+
export function previewPageScale(tabZoomFactor: number, windowZoomFactor: number): number {
14+
return normalizeZoomFactor(tabZoomFactor) / normalizeZoomFactor(windowZoomFactor);
15+
}
16+
17+
// A zoom step changes the window's CSS viewport, so it always fires resize.
18+
function subscribeToWindowZoom(onChange: () => void): () => void {
19+
window.addEventListener("resize", onChange);
20+
return () => window.removeEventListener("resize", onChange);
21+
}
22+
23+
function readWindowZoomFactor(): number {
24+
return normalizeZoomFactor(window.desktopBridge?.getZoomFactor?.());
25+
}
26+
27+
/** `previewPageScale` for a tab, following the app window's zoom as it changes. */
28+
export function usePreviewPageScale(tabZoomFactor: number): number {
29+
const windowZoomFactor = useSyncExternalStore(
30+
subscribeToWindowZoom,
31+
readWindowZoomFactor,
32+
() => 1,
33+
);
34+
return previewPageScale(tabZoomFactor, windowZoomFactor);
35+
}

‎apps/web/src/components/preview/PreviewView.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import {
5353
} from "~/browser/browserViewportActions";
5454
import { browserResponsiveViewportForToggle, useBrowserDefaults } from "~/browser/browserDefaults";
5555
import { previewRuntimeTabId } from "~/browser/previewRuntimeTabId";
56+
import { usePreviewPageScale } from "~/browser/usePreviewPageScale";
5657
import { BrowserSettingsReadError } from "~/browser/openFileInPreview";
5758
import { PreviewUnreachable } from "./PreviewUnreachable";
5859
import { revealInFileExplorerLabel } from "./fileExplorerLabel";
@@ -151,6 +152,7 @@ export function PreviewView({
151152
: null;
152153
const snapshot = tabId ? (previewState.sessions[tabId] ?? null) : null;
153154
const desktopOverlay = tabId ? (previewState.desktopByTabId[tabId] ?? null) : null;
155+
const pageScale = usePreviewPageScale(desktopOverlay?.zoomFactor ?? 1);
154156
const navStatus = snapshot?.navStatus ?? { _tag: "Idle" as const };
155157
const url = navStatus._tag === "Idle" ? "" : navStatus.url;
156158
const loading = desktopOverlay?.loading ?? navStatus._tag === "Loading";
@@ -290,7 +292,7 @@ export function PreviewView({
290292
browserResponsiveViewportForToggle({
291293
defaults: browserDefaults,
292294
panelRect,
293-
zoomFactor: desktopOverlay?.zoomFactor,
295+
zoomFactor: pageScale,
294296
}),
295297
).catch(() => undefined);
296298
};
@@ -803,11 +805,7 @@ export function PreviewView({
803805
!showEmptyState &&
804806
!isUnreachable &&
805807
!activeRecordingTabIds.has(runtimeTabId) ? (
806-
<AgentBrowserCursor
807-
tabId={runtimeTabId}
808-
zoomFactor={desktopOverlay.zoomFactor}
809-
controller={controller}
810-
/>
808+
<AgentBrowserCursor tabId={runtimeTabId} zoomFactor={pageScale} controller={controller} />
811809
) : null}
812810
{navStatus._tag === "LoadFailed" ? (
813811
<div className="absolute inset-0 z-10 bg-background">

‎apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
import { useBrowserSurfaceStore } from "~/browser/browserSurfaceStore";
2020
import type { BrowserViewportResizeDirection } from "~/browser/browserViewportLayout";
2121
import { previewRuntimeTabId } from "~/browser/previewRuntimeTabId";
22+
import { usePreviewPageScale } from "~/browser/usePreviewPageScale";
2223
import { Button } from "~/components/ui/button";
2324
import { toastManager } from "~/components/ui/toast";
2425
import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
@@ -163,10 +164,11 @@ function BrowserMiniPlayer({
163164
const fittedSourceContent = useBrowserSurfaceStore(
164165
(state) => state.byTabId[runtimeTabId]?.fittedSourceContent ?? null,
165166
);
167+
const pageScale = usePreviewPageScale(desktopOverlay?.zoomFactor ?? 1);
166168
const sourceSize = resolvePreviewMiniPlayerSourceSize(
167169
snapshot?.viewport ?? FILL_PREVIEW_VIEWPORT,
168170
fittedSourceContent,
169-
desktopOverlay?.zoomFactor ?? 1,
171+
pageScale,
170172
);
171173

172174
const openInPanel = () => {

‎packages/contracts/src/ipc.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,8 @@ export interface DesktopBridge {
11271127
getPathForFile?: (file: File) => string;
11281128
/** The desktop client's OS platform, read from Electron's preload process. */
11291129
getClientPlatform?: () => string;
1130+
/** The app window's own zoom factor (View > Zoom), read from Electron's webFrame. */
1131+
getZoomFactor?: () => number;
11301132
setNotificationBadge?: (badge: { count: number; image: string | null }) => Promise<void>;
11311133
onNotificationBadgeClear?: (listener: () => void) => () => void;
11321134
onTrackpadScrollEnd?: (listener: () => void) => () => void;

0 commit comments

Comments
 (0)