Skip to content

Commit f3161f3

Browse files
Ta-noshiiclaudejuliusmarminge
authored
fix(web): preview viewports keep their size when the main window is zoomed (pingdotgg#14039)
Co-authored-by: Claude Fable 5.1 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 92a6b43 commit f3161f3

9 files changed

Lines changed: 209 additions & 15 deletions

File tree

‎apps/desktop/src/preload.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
250250
},
251251
getWindowFullscreenState: () =>
252252
ipcRenderer.sendSync(IpcChannels.GET_WINDOW_FULLSCREEN_STATE_CHANNEL) === true,
253+
getWindowZoomFactor: () => webFrame.getZoomFactor(),
253254
onWindowFullscreenStateChange: (listener) => {
254255
const wrappedListener = (_event: Electron.IpcRendererEvent, fullscreen: unknown) => {
255256
if (typeof fullscreen !== "boolean") return;

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

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ import {
55
ThreadId,
66
type ClientSettings,
77
type DesktopPreviewBridge,
8+
type PreviewViewportSetting,
89
} from "@t3tools/contracts";
910
import { act } from "react";
11+
12+
import "~/index.css";
1013
import { createRoot, type Root } from "react-dom/client";
1114
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
1215

@@ -201,3 +204,94 @@ describe("HostedBrowserWebview settings hydration", () => {
201204
expect(mocks.setClientSettings).not.toHaveBeenCalled();
202205
});
203206
});
207+
208+
describe("HostedBrowserWebview viewport layout", () => {
209+
const runtimeTabId = "zoom-layout-tab";
210+
const owner = Symbol("panel");
211+
const panel = { x: 0, y: 0, width: 2000, height: 1600 };
212+
213+
async function renderViewport(viewport: PreviewViewportSetting) {
214+
mocks.getClientSettings.mockResolvedValue({
215+
...DEFAULT_CLIENT_SETTINGS,
216+
browserDefaultZoomFactor: 1.5,
217+
});
218+
root ??= createRoot(container);
219+
await act(async () => {
220+
await ensureClientSettingsHydrated();
221+
root!.render(
222+
<HostedBrowserWebview
223+
threadRef={{
224+
environmentId: EnvironmentId.make("zoom-layout"),
225+
threadId: ThreadId.make("zoom-layout"),
226+
}}
227+
tabId="zoom-layout"
228+
runtimeTabId={runtimeTabId}
229+
initialUrl="about:blank"
230+
viewport={viewport}
231+
pictureInPicture={false}
232+
profileId={undefined}
233+
zoomFactor={1.5}
234+
/>,
235+
);
236+
});
237+
const guest = container.querySelector("webview");
238+
expect(guest).not.toBeNull();
239+
return guest!;
240+
}
241+
242+
it("keeps fixed viewports sized in guest pixels across host zoom and fitted surfaces", async () => {
243+
let windowZoom = 1.25;
244+
vi.stubGlobal("desktopBridge", { getWindowZoomFactor: () => windowZoom });
245+
useBrowserSurfaceStore.getState().claim(runtimeTabId, owner, false);
246+
useBrowserSurfaceStore.getState().present(runtimeTabId, owner, panel, true, 0, 30);
247+
const guest = await renderViewport({ _tag: "freeform", width: 800, height: 600 });
248+
expect(guest.getBoundingClientRect()).toMatchObject({ width: 960, height: 720 });
249+
250+
windowZoom = 0.75;
251+
await act(() => window.dispatchEvent(new Event("resize")));
252+
expect(guest.getBoundingClientRect()).toMatchObject({ width: 1600, height: 1200 });
253+
254+
windowZoom = 1;
255+
await act(() => window.dispatchEvent(new Event("resize")));
256+
expect(guest.getBoundingClientRect()).toMatchObject({ width: 1200, height: 900 });
257+
258+
windowZoom = 1.25;
259+
await act(() => window.dispatchEvent(new Event("resize")));
260+
await renderViewport({ _tag: "preset", presetId: "iphone-se", width: 375, height: 667 });
261+
expect(guest.getBoundingClientRect().width).toBe(450);
262+
expect(guest.getBoundingClientRect().height).toBeCloseTo(800.4, 1);
263+
264+
const miniPlayer = Symbol("mini-player");
265+
await act(() => {
266+
useBrowserSurfaceStore.getState().claim(runtimeTabId, miniPlayer, true);
267+
useBrowserSurfaceStore
268+
.getState()
269+
.present(runtimeTabId, miniPlayer, { x: 0, y: 0, width: 225, height: 401 }, true, 0, 48);
270+
});
271+
expect(guest.offsetWidth).toBe(450);
272+
expect(guest.offsetHeight).toBe(800);
273+
expect(guest.getBoundingClientRect().width).toBe(225);
274+
expect(guest.getBoundingClientRect().height).toBeCloseTo(400.2, 1);
275+
276+
await act(() => {
277+
useBrowserSurfaceStore.getState().claim(runtimeTabId, owner, false);
278+
useBrowserSurfaceStore.getState().present(runtimeTabId, owner, panel, true, 0, 30);
279+
});
280+
await renderViewport(FILL_PREVIEW_VIEWPORT);
281+
expect(guest.getBoundingClientRect()).toMatchObject({ width: 2000, height: 1600 });
282+
expect(mocks.createTab).toHaveBeenCalledExactlyOnceWith(runtimeTabId, {
283+
zoomFactor: 1.5,
284+
colorScheme: DEFAULT_CLIENT_SETTINGS.browserDefaultAppearance,
285+
});
286+
});
287+
288+
it("preserves preview scaling with an older bridge or no desktop bridge", async () => {
289+
vi.stubGlobal("desktopBridge", {});
290+
const guest = await renderViewport({ _tag: "freeform", width: 800, height: 600 });
291+
expect(guest.getBoundingClientRect()).toMatchObject({ width: 1200, height: 900 });
292+
293+
vi.stubGlobal("desktopBridge", undefined);
294+
await act(() => window.dispatchEvent(new Event("resize")));
295+
expect(guest.getBoundingClientRect()).toMatchObject({ width: 1200, height: 900 });
296+
});
297+
});

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { BrowserViewportResizeHandles } from "./BrowserViewportResizeHandles";
2525
import { acquireDesktopTab, type AcquiredDesktopTab, withDesktopTab } from "./desktopTabLifetime";
2626
import { resolveHostedBrowserWebviewWrapperStyle } from "./hostedBrowserWebviewStyle";
2727
import { usePreviewWebviewConfig } from "./previewWebviewConfigState";
28+
import { useBrowserLayoutZoomFactor } from "./useBrowserLayoutZoomFactor";
2829
import { useBrowserViewportResize } from "./useBrowserViewportResize";
2930
import {
3031
INITIAL_WEBVIEW_CRASH_RECOVERY_STATE,
@@ -209,7 +210,7 @@ export function HostedBrowserWebview(props: {
209210

210211
const active = presentation.visible && presentation.rect !== null;
211212
const lastRect = presentation.rect;
212-
const normalizedZoomFactor = Number.isFinite(zoomFactor) && zoomFactor > 0 ? zoomFactor : 1;
213+
const layoutZoomFactor = useBrowserLayoutZoomFactor(zoomFactor);
213214
const viewportWidth = viewport._tag === "fill" ? null : viewport.width;
214215
const viewportHeight = viewport._tag === "fill" ? null : viewport.height;
215216
const viewportAspectRatio =
@@ -222,13 +223,13 @@ export function HostedBrowserWebview(props: {
222223
const content = presentation.content;
223224
const hiddenWidth =
224225
viewport._tag !== "fill"
225-
? viewport.width * normalizedZoomFactor
226+
? viewport.width * layoutZoomFactor
226227
: content
227228
? content.width / content.scale
228229
: (lastRect?.width ?? 1280);
229230
const hiddenHeight =
230231
viewport._tag !== "fill"
231-
? viewport.height * normalizedZoomFactor
232+
? viewport.height * layoutZoomFactor
232233
: content
233234
? content.height / content.scale
234235
: (lastRect?.height ?? 800);
@@ -247,22 +248,18 @@ export function HostedBrowserWebview(props: {
247248
} = useBrowserViewportResize({
248249
tabId: runtimeTabId,
249250
viewport,
250-
zoomFactor,
251+
zoomFactor: layoutZoomFactor,
251252
containerSize,
252253
deviceToolbarVisible,
253254
aspectRatio: lockedAspectRatio,
254255
});
255256
const fittedSourceViewport =
256257
presentation.fitSourceContent && lastRect
257-
? resolveFittedBrowserViewport(
258-
viewport,
259-
presentation.fittedSourceContent,
260-
normalizedZoomFactor,
261-
)
258+
? resolveFittedBrowserViewport(viewport, presentation.fittedSourceContent, layoutZoomFactor)
262259
: null;
263260
const layout =
264261
fittedSourceViewport && lastRect
265-
? resolveBrowserViewportLayout(lastRect, fittedSourceViewport, normalizedZoomFactor)
262+
? resolveBrowserViewportLayout(lastRect, fittedSourceViewport, layoutZoomFactor)
266263
: viewportLayout;
267264

268265
const syncContentPresentation = () => {
@@ -350,14 +347,14 @@ export function HostedBrowserWebview(props: {
350347
fittedSourceViewport
351348
? fittedSourceViewport.width
352349
: effectiveViewport._tag === "fill"
353-
? Math.max(1, Math.round(layout.viewportWidth / normalizedZoomFactor))
350+
? Math.max(1, Math.round(layout.viewportWidth / layoutZoomFactor))
354351
: effectiveViewport.width
355352
}
356353
data-preview-css-height={
357354
fittedSourceViewport
358355
? fittedSourceViewport.height
359356
: effectiveViewport._tag === "fill"
360-
? Math.max(1, Math.round(layout.viewportHeight / normalizedZoomFactor))
357+
? Math.max(1, Math.round(layout.viewportHeight / layoutZoomFactor))
361358
: effectiveViewport.height
362359
}
363360
aria-hidden={active ? undefined : true}

‎apps/web/src/browser/browserViewportLayout.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ export const browserViewportSettingKey = (setting: PreviewViewportSetting): stri
3838
const normalizeZoomFactor = (zoomFactor: number): number =>
3939
Number.isFinite(zoomFactor) && zoomFactor > 0 ? zoomFactor : 1;
4040

41+
// Convert guest CSS pixels to host CSS pixels without changing the guest's page zoom.
42+
export const resolveBrowserLayoutZoomFactor = (
43+
previewZoomFactor: number,
44+
windowZoomFactor: number,
45+
): number => normalizeZoomFactor(previewZoomFactor) / normalizeZoomFactor(windowZoomFactor);
46+
4147
export function resolveFittedBrowserViewport(
4248
setting: PreviewViewportSetting,
4349
sourceContent: {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { useSyncExternalStore } from "react";
2+
3+
import { resolveBrowserLayoutZoomFactor } from "./browserViewportLayout";
4+
5+
// App zoom changes the CSS viewport, so resize also signals zoom changes.
6+
const subscribeToWindowZoom = (onChange: () => void) => {
7+
window.addEventListener("resize", onChange);
8+
return () => window.removeEventListener("resize", onChange);
9+
};
10+
const readWindowZoomFactor = () => window.desktopBridge?.getWindowZoomFactor?.() ?? 1;
11+
12+
export function useBrowserLayoutZoomFactor(previewZoomFactor: number) {
13+
const windowZoomFactor = useSyncExternalStore(subscribeToWindowZoom, readWindowZoomFactor);
14+
return resolveBrowserLayoutZoomFactor(previewZoomFactor, windowZoomFactor);
15+
}

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

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const mocks = vi.hoisted(() => ({
3232
pictureInPicture: false,
3333
showEmptyState: false,
3434
loading: false,
35+
nativeServerTab: false,
3536
serverEpoch: null as string | null,
3637
servers: [] as PreviewableServer[],
3738
recordingTabIds: new Set<string>(),
@@ -115,6 +116,7 @@ vi.mock(import("~/previewStateStore"), async (original) => ({
115116
"tab-1": {
116117
threadId: "thread-1",
117118
tabId: "tab-1",
119+
runtime: mocks.nativeServerTab ? "server" : "desktop",
118120
navStatus: { _tag: "Success", url: "http://example.com/", title: "Example" },
119121
canGoBack: false,
120122
canGoForward: false,
@@ -147,6 +149,15 @@ vi.mock(import("./usePreviewSession"), async (original) => ({
147149
usePreviewSession: () => {},
148150
}));
149151

152+
vi.mock(import("~/browser/previewRuntime"), async (original) => ({
153+
...(await original()),
154+
useRendersServerTabNatively: () => mocks.nativeServerTab,
155+
}));
156+
157+
vi.mock(import("~/browser/browserViewportActions"), { spy: true });
158+
159+
import { commitBrowserViewportChange } from "~/browser/browserViewportActions";
160+
import { useBrowserSurfaceStore } from "~/browser/browserSurfaceStore";
150161
import { useComposerDraftStore } from "~/composerDraftStore";
151162
import { useBrowserPointerStore } from "~/browser/browserPointerStore";
152163
import { previewRuntimeTabId } from "~/browser/previewRuntimeTabId";
@@ -205,13 +216,15 @@ function hasCursor() {
205216

206217
describe("PreviewView", () => {
207218
beforeEach(() => {
219+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
208220
vi.clearAllMocks();
209221
mocks.readEnvironmentScope.mockReset().mockReturnValue(true);
210222
mocks.setAnnotationSendEnabled.mockReset().mockResolvedValue(undefined);
211223
mocks.pickElement.mockReset();
212224
mocks.pictureInPicture = false;
213225
mocks.showEmptyState = false;
214226
mocks.loading = false;
227+
mocks.nativeServerTab = false;
215228
mocks.serverEpoch = null;
216229
mocks.servers = [];
217230
mocks.recordingTabIds = new Set();
@@ -232,6 +245,7 @@ describe("PreviewView", () => {
232245
for (const each of roots.splice(0)) await act(async () => each.unmount());
233246
document.body.replaceChildren();
234247
vi.useRealTimers();
248+
vi.unstubAllGlobals();
235249
});
236250

237251
it("shows the cursor in a replacement browser while the old instance still records", async () => {
@@ -254,6 +268,67 @@ describe("PreviewView", () => {
254268
expect(mocks.recordingTabIds.has(TEST_RUNTIME_TAB_ID)).toBe(true);
255269
});
256270

271+
it.each([false, true])(
272+
"aligns the cursor and responsive viewport after host zoom changes (native server tab: %s)",
273+
async (nativeServerTab) => {
274+
mocks.nativeServerTab = nativeServerTab;
275+
let windowZoom = 1;
276+
vi.stubGlobal("desktopBridge", {
277+
getWindowZoomFactor: () => windowZoom,
278+
getLocalEnvironmentBootstraps: () => [],
279+
});
280+
const commit = vi.mocked(commitBrowserViewportChange).mockResolvedValueOnce(undefined);
281+
try {
282+
await render(view());
283+
await act(() => {
284+
const surfaces = useBrowserSurfaceStore.getState();
285+
const slot = document.querySelector<HTMLElement>("[data-browser-surface-slot]")!;
286+
slot.style.width = "1020px";
287+
slot.style.height = "798px";
288+
surfaces.presentContent(TEST_RUNTIME_TAB_ID, {
289+
x: 20,
290+
y: 40,
291+
width: 500,
292+
height: 375,
293+
scale: 0.5,
294+
scrollLeft: 7,
295+
scrollTop: 11,
296+
});
297+
useBrowserPointerStore.setState({
298+
byTabId: {
299+
[TEST_RUNTIME_TAB_ID]: {
300+
tabId: TEST_RUNTIME_TAB_ID,
301+
phase: "move",
302+
x: 100,
303+
y: 200,
304+
sequence: 1,
305+
createdAt: "2026-07-27T00:00:00Z",
306+
},
307+
},
308+
});
309+
windowZoom = 1.25;
310+
window.dispatchEvent(new Event("resize"));
311+
});
312+
const cursor = document.querySelector("[data-agent-browser-cursor]");
313+
expect(cursor).not.toBeNull();
314+
const position = new DOMMatrixReadOnly(getComputedStyle(cursor!).transform);
315+
expect(position.e).toBe(53);
316+
expect(position.f).toBe(109);
317+
318+
await userEvent.click(page.getByRole("button", { name: "Preview menu" }));
319+
await userEvent.click(page.getByRole("menuitem", { name: "Show device toolbar" }));
320+
expect(commit).toHaveBeenCalledExactlyOnceWith(TEST_RUNTIME_TAB_ID, {
321+
_tag: "freeform",
322+
width: 1250,
323+
height: 938,
324+
});
325+
} finally {
326+
commit.mockReset();
327+
await act(() => useBrowserSurfaceStore.setState({ activityByTabId: {}, byTabId: {} }));
328+
}
329+
},
330+
);
331+
257332
it("does not rerender while loading time passes", async () => {
258333
vi.useFakeTimers();
259334
mocks.loading = true;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ import {
7575
import { browserResponsiveViewportForToggle, useBrowserDefaults } from "~/browser/browserDefaults";
7676
import { BrowserDeviceToolbar } from "~/browser/BrowserDeviceToolbar";
7777
import { BROWSER_DEVICE_TOOLBAR_HEIGHT } from "~/browser/browserViewportLayout";
78+
import { useBrowserLayoutZoomFactor } from "~/browser/useBrowserLayoutZoomFactor";
7879
import { previewRuntimeTabId } from "~/browser/previewRuntimeTabId";
7980
import { BrowserSettingsReadError } from "~/browser/openFileInPreview";
8081
import { PreviewFileNotShown, PreviewUnreachable } from "./PreviewUnreachable";
@@ -221,6 +222,7 @@ export function PreviewView({
221222
const serverInputDisabled = isServerTab && serverControlledTabId !== runtimeTabId;
222223
const [serverFrameTabId, setServerFrameTabId] = useState<string | null>(null);
223224
const desktopOverlay = tabId ? (previewState.desktopByTabId[tabId] ?? null) : null;
225+
const layoutZoomFactor = useBrowserLayoutZoomFactor(desktopOverlay?.zoomFactor ?? 1);
224226
const navStatus = snapshot?.navStatus ?? { _tag: "Idle" as const };
225227
const url = navStatus._tag === "Idle" ? "" : navStatus.url;
226228
const loading = desktopOverlay?.loading ?? navStatus._tag === "Loading";
@@ -391,7 +393,7 @@ export function PreviewView({
391393
browserResponsiveViewportForToggle({
392394
defaults: browserDefaults,
393395
panelRect,
394-
zoomFactor: serverOwnsRendering ? serverZoomFactor : desktopOverlay?.zoomFactor,
396+
zoomFactor: isServerTab ? serverZoomFactor : layoutZoomFactor,
395397
}),
396398
).catch(() => undefined);
397399
};
@@ -1058,7 +1060,7 @@ export function PreviewView({
10581060
!activeRecordingTabIds.has(runtimeTabId) ? (
10591061
<AgentBrowserCursor
10601062
tabId={runtimeTabId}
1061-
zoomFactor={desktopOverlay.zoomFactor}
1063+
zoomFactor={layoutZoomFactor}
10621064
controller={controller}
10631065
/>
10641066
) : null}

0 commit comments

Comments
 (0)