@@ -9,7 +9,11 @@ import { usePreviewBridge } from "~/components/preview/usePreviewBridge";
99import { cn } from "~/lib/utils" ;
1010
1111import { resolveBrowserSurfacePanelRect , useBrowserSurfaceStore } from "./browserSurfaceStore" ;
12- import { browserViewportSettingKey , resolveBrowserViewportLayout } from "./browserViewportLayout" ;
12+ import {
13+ browserViewportSettingKey ,
14+ resolveBrowserViewportLayout ,
15+ resolveFittedBrowserViewport ,
16+ } from "./browserViewportLayout" ;
1317import { BrowserDeviceToolbar } from "./BrowserDeviceToolbar" ;
1418import { BrowserViewportResizeHandles } from "./BrowserViewportResizeHandles" ;
1519import { acquireDesktopTab , type AcquiredDesktopTab } from "./desktopTabLifetime" ;
@@ -40,11 +44,12 @@ declare global {
4044export function HostedBrowserWebview ( props : {
4145 readonly threadRef : ScopedThreadRef ;
4246 readonly tabId : string ;
47+ readonly runtimeTabId : string ;
4348 readonly initialUrl : string | null ;
4449 readonly viewport : PreviewViewportSetting ;
4550 readonly zoomFactor : number ;
4651} ) {
47- const { threadRef, tabId, initialUrl, viewport, zoomFactor } = props ;
52+ const { threadRef, tabId, runtimeTabId , initialUrl, viewport, zoomFactor } = props ;
4853 const config = usePreviewWebviewConfig ( threadRef . environmentId ) ;
4954 const [ initialSrc ] = useState ( ( ) => initialUrl ?? "about:blank" ) ;
5055 const tabLeaseRef = useRef < AcquiredDesktopTab | null > ( null ) ;
@@ -54,27 +59,28 @@ export function HostedBrowserWebview(props: {
5459 const [ aspectRatioLocked , setAspectRatioLocked ] = useState ( false ) ;
5560 const presentation = useBrowserSurfaceStore (
5661 useShallow ( ( state ) => {
57- const current = state . byTabId [ tabId ] ;
62+ const current = state . byTabId [ runtimeTabId ] ;
5863 return {
64+ content : current ?. content ?? null ,
5965 cornerRadius : current ?. cornerRadius ?? 0 ,
6066 fitSourceContent : current ?. fitSourceContent ?? false ,
6167 fittedSourceContent : current ?. fittedSourceContent ?? null ,
62- rect : resolveBrowserSurfacePanelRect ( state . byTabId , tabId ) ,
68+ rect : resolveBrowserSurfacePanelRect ( state . byTabId , runtimeTabId ) ,
6369 visible : current ?. visible ?? false ,
6470 } ;
6571 } ) ,
6672 ) ;
67- usePreviewBridge ( { threadRef, tabId } ) ;
73+ usePreviewBridge ( { threadRef, tabId, runtimeTabId } ) ;
6874
6975 useEffect ( ( ) => {
7076 crashRecoveryRef . current = INITIAL_WEBVIEW_CRASH_RECOVERY_STATE ;
71- const lease = acquireDesktopTab ( tabId ) ;
77+ const lease = acquireDesktopTab ( runtimeTabId ) ;
7278 tabLeaseRef . current = lease ;
7379 return ( ) => {
7480 if ( tabLeaseRef . current === lease ) tabLeaseRef . current = null ;
7581 lease . release ( ) ;
7682 } ;
77- } , [ tabId ] ) ;
83+ } , [ runtimeTabId ] ) ;
7884
7985 const [ webviewGeneration , setWebviewGeneration ] = useState ( 0 ) ;
8086 const [ recoverySrc , setRecoverySrc ] = useState ( initialSrc ) ;
@@ -107,7 +113,7 @@ export function HostedBrowserWebview(props: {
107113 if ( disposed || webviewRef . current !== webview ) return ;
108114 const webContentsId = webview . getWebContentsId ( ) ;
109115 if ( Number . isInteger ( webContentsId ) && webContentsId > 0 ) {
110- await bridge . registerWebview ( tabId , webContentsId ) ;
116+ await bridge . registerWebview ( runtimeTabId , webContentsId ) ;
111117 }
112118 } catch {
113119 // did-attach/dom-ready will retry if the guest was not ready yet.
@@ -138,7 +144,7 @@ export function HostedBrowserWebview(props: {
138144 webview . removeEventListener ( "dom-ready" , register ) ;
139145 webview . removeEventListener ( "render-process-gone" , recoverGuest ) ;
140146 } ;
141- } , [ config , initialSrc , tabId , webviewGeneration ] ) ;
147+ } , [ config , initialSrc , runtimeTabId , webviewGeneration ] ) ;
142148
143149 const active = presentation . visible && presentation . rect !== null ;
144150 const lastRect = presentation . rect ;
@@ -152,13 +158,22 @@ export function HostedBrowserWebview(props: {
152158 const handleAspectRatioChange = useCallback ( ( aspectRatio : number | null ) => {
153159 setAspectRatioLocked ( aspectRatio !== null ) ;
154160 } , [ ] ) ;
161+ const hiddenContentSize = presentation . content
162+ ? {
163+ width : presentation . content . width / presentation . content . scale ,
164+ height : presentation . content . height / presentation . content . scale ,
165+ }
166+ : null ;
155167 const hiddenSize =
156168 viewport . _tag !== "fill"
157169 ? {
158170 width : viewport . width * normalizedZoomFactor ,
159171 height : viewport . height * normalizedZoomFactor ,
160172 }
161- : { width : lastRect ?. width ?? 1280 , height : lastRect ?. height ?? 800 } ;
173+ : {
174+ width : hiddenContentSize ?. width ?? lastRect ?. width ?? 1280 ,
175+ height : hiddenContentSize ?. height ?? lastRect ?. height ?? 800 ,
176+ } ;
162177 const containerSize = active && lastRect ? lastRect : hiddenSize ;
163178 const deviceToolbarVisible = active && viewport . _tag !== "fill" && ! presentation . fitSourceContent ;
164179 const {
@@ -169,7 +184,7 @@ export function HostedBrowserWebview(props: {
169184 handleResizePointerDown,
170185 layout : viewportLayout ,
171186 } = useBrowserViewportResize ( {
172- tabId,
187+ tabId : runtimeTabId ,
173188 viewport,
174189 zoomFactor,
175190 containerSize,
@@ -178,31 +193,11 @@ export function HostedBrowserWebview(props: {
178193 } ) ;
179194 const fittedSourceViewport =
180195 presentation . fitSourceContent && lastRect
181- ? presentation . fittedSourceContent
182- ? {
183- _tag : "freeform" as const ,
184- width : Math . max (
185- 1 ,
186- Math . round (
187- presentation . fittedSourceContent . width /
188- presentation . fittedSourceContent . scale /
189- normalizedZoomFactor ,
190- ) ,
191- ) ,
192- height : Math . max (
193- 1 ,
194- Math . round (
195- presentation . fittedSourceContent . height /
196- presentation . fittedSourceContent . scale /
197- normalizedZoomFactor ,
198- ) ,
199- ) ,
200- }
201- : {
202- _tag : "freeform" as const ,
203- width : viewport . _tag === "fill" ? 1280 : viewport . width ,
204- height : viewport . _tag === "fill" ? 800 : viewport . height ,
205- }
196+ ? resolveFittedBrowserViewport (
197+ viewport ,
198+ presentation . fittedSourceContent ,
199+ normalizedZoomFactor ,
200+ )
206201 : null ;
207202 const layout =
208203 fittedSourceViewport && lastRect
@@ -212,7 +207,7 @@ export function HostedBrowserWebview(props: {
212207 const syncContentPresentation = useCallback ( ( ) => {
213208 const wrapper = wrapperRef . current ;
214209 if ( ! wrapper ) return ;
215- useBrowserSurfaceStore . getState ( ) . presentContent ( tabId , {
210+ useBrowserSurfaceStore . getState ( ) . presentContent ( runtimeTabId , {
216211 x : layout . viewportX ,
217212 y : layout . viewportY ,
218213 width : layout . viewportWidth ,
@@ -221,7 +216,7 @@ export function HostedBrowserWebview(props: {
221216 scrollLeft : wrapper . scrollLeft ,
222217 scrollTop : wrapper . scrollTop ,
223218 } ) ;
224- } , [ layout , tabId ] ) ;
219+ } , [ layout , runtimeTabId ] ) ;
225220
226221 useEffect ( ( ) => {
227222 const frameId = window . requestAnimationFrame ( syncContentPresentation ) ;
@@ -232,7 +227,7 @@ export function HostedBrowserWebview(props: {
232227 const wrapper = wrapperRef . current ;
233228 if ( ! wrapper ) return ;
234229 wrapper . scrollTo ( { left : 0 , top : 0 } ) ;
235- } , [ tabId , viewport . _tag , viewportHeight , viewportWidth ] ) ;
230+ } , [ runtimeTabId , viewport . _tag , viewportHeight , viewportWidth ] ) ;
236231
237232 if ( ! config ) return null ;
238233
@@ -249,7 +244,7 @@ export function HostedBrowserWebview(props: {
249244 className = "fixed overflow-hidden bg-muted/35"
250245 style = { { ...wrapperStyle , overscrollBehavior : "contain" } }
251246 onScroll = { syncContentPresentation }
252- data-preview-viewport = { tabId }
247+ data-preview-viewport = { runtimeTabId }
253248 >
254249 < div className = "relative" style = { { width : layout . canvasWidth , height : layout . canvasHeight } } >
255250 { deviceToolbarVisible && effectiveViewport . _tag !== "fill" ? (
@@ -268,7 +263,8 @@ export function HostedBrowserWebview(props: {
268263 partition = { config . partition }
269264 webpreferences = { config . webPreferences }
270265 { ...( config . preloadUrl ? { preload : config . preloadUrl } : { } ) }
271- data-preview-tab = { tabId }
266+ data-preview-tab = { runtimeTabId }
267+ data-preview-server-tab = { tabId }
272268 data-preview-viewport-mode = { effectiveViewport . _tag }
273269 data-preview-viewport-key = { browserViewportSettingKey ( effectiveViewport ) }
274270 data-preview-css-width = {
0 commit comments