Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions apps/web/src/browser/HostedBrowserWebview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
} from "~/components/preview/thumbButtons";
import { usePreviewBridge } from "~/components/preview/usePreviewBridge";
import { useClientSettingsHydrated } from "~/hooks/useSettings";
import { useViewportSize } from "~/hooks/useViewportSize";
import { cn, isMacPlatform } from "~/lib/utils";

import { resolveBrowserSurfacePanelRect, useBrowserSurfaceStore } from "./browserSurfaceStore";
Expand Down Expand Up @@ -79,6 +80,7 @@ export function HostedBrowserWebview(props: {
serverRendering,
} = props;
const clientSettingsHydrated = useClientSettingsHydrated();
const windowSize = useViewportSize();
const config = usePreviewWebviewConfig(threadRef.environmentId, profileId);
const [initialSrc] = useState(() => initialUrl ?? "about:blank");
const tabLeaseRef = useRef<AcquiredDesktopTab | null>(null);
Expand Down Expand Up @@ -331,6 +333,7 @@ export function HostedBrowserWebview(props: {
zIndex: presentation.zIndex,
rect: lastRect,
hiddenSize: { width: hiddenWidth, height: hiddenHeight },
windowSize,
});

return (
Expand Down
32 changes: 32 additions & 0 deletions apps/web/src/browser/hostedBrowserWebviewStyle.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { expect, it } from "vite-plus/test";

import { resolveHostedBrowserWebviewWrapperStyle } from "./hostedBrowserWebviewStyle";

it.each([
{ hiddenSize: { width: 1440, height: 900 }, windowSize: { width: 1840, height: 1016 }, scale: 1 },
{
hiddenSize: { width: 3440, height: 1440 },
windowSize: { width: 1720, height: 1016 },
scale: 0.5,
},
{
hiddenSize: { width: 1000, height: 2000 },
windowSize: { width: 1840, height: 500 },
scale: 0.25,
},
{ hiddenSize: { width: 3440, height: 1440 }, windowSize: { width: 0, height: 0 }, scale: 1 },
])(
"fits a $hiddenSize.width x $hiddenSize.height capture guest in a $windowSize.width x $windowSize.height window",
({ hiddenSize, windowSize, scale }) => {
const style = resolveHostedBrowserWebviewWrapperStyle({
active: false,
renderingActive: true,
rect: null,
hiddenSize,
windowSize,
});
expect(style).toMatchObject({ left: 0, top: 0, ...hiddenSize, visibility: "visible" });
expect(style.transform).toBe(scale < 1 ? `scale(${scale})` : undefined);
expect(style.transformOrigin).toBe(scale < 1 ? "top left" : undefined);
},
);
12 changes: 11 additions & 1 deletion apps/web/src/browser/hostedBrowserWebviewStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export interface HostedBrowserWebviewWrapperStyle {
readonly pointerEvents: "auto" | "none";
readonly borderRadius?: number;
readonly visibility?: "hidden" | "visible";
readonly transform?: string;
readonly transformOrigin?: "top left";
}

const HIDDEN_BROWSER_WEBVIEW_OFFSET = -100_000;
Expand All @@ -26,6 +28,7 @@ export function resolveHostedBrowserWebviewWrapperStyle(input: {
readonly zIndex?: number;
readonly rect: BrowserSurfaceRect | null;
readonly hiddenSize: HostedBrowserWebviewSize;
readonly windowSize: HostedBrowserWebviewSize;
}): HostedBrowserWebviewWrapperStyle {
const {
active,
Expand All @@ -35,6 +38,7 @@ export function resolveHostedBrowserWebviewWrapperStyle(input: {
rect,
renderingActive,
zIndex = 30,
windowSize,
} = input;
if (active && rect) {
return {
Expand All @@ -49,7 +53,12 @@ export function resolveHostedBrowserWebviewWrapperStyle(input: {
}

if (renderingActive) {
// Electron stops compositing offscreen guests; keep capture-active guests inside the viewport behind the app.
// Electron clips oversized native surfaces; fit the whole guest without changing its DOM viewport.
// A minimized window can report a zero viewport; scale(0) would stop the guest compositing.
const scale =
windowSize.width > 0 && windowSize.height > 0
? Math.min(1, windowSize.width / hiddenSize.width, windowSize.height / hiddenSize.height)
: 1;
return {
left: 0,
top: 0,
Expand All @@ -58,6 +67,7 @@ export function resolveHostedBrowserWebviewWrapperStyle(input: {
zIndex: -1,
pointerEvents: "none",
visibility: "visible",
...(scale < 1 ? { transform: `scale(${scale})`, transformOrigin: "top left" as const } : {}),
};
}

Expand Down
Loading