Skip to content

Ensures the canvas stays at a fixed size #31475

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

Merged
ibeckermayer merged 2 commits into from
Sep 6, 2023
Merged

Ensures the canvas stays at a fixed size #31475

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
1b54ae1
Ensures the canvas stays at a fixed size
Sep 5, 2023
9d99dee
updating snapshots
Sep 6, 2023
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
1 change: 0 additions & 1 deletion web/packages/teleport/src/DesktopSession/DesktopSession.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ function Session({
<TdpClientCanvas
style={{
display: displayCanvas ? 'flex' : 'none',
flex: 1, // ensures the canvas fills available screen space
}}
tdpCli={tdpClient}
tdpCliInit={initTdpCli}
Expand Down
10 changes: 5 additions & 5 deletions web/packages/teleport/src/DesktopSession/__snapshots__/DesktopSession.story.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ exports[`connected settings false 1`] = `
</div>
</nav>
<canvas
style="display: flex; flex: 1;"
style="display: flex;"
/>
</div>
</div>
Expand Down Expand Up @@ -812,7 +812,7 @@ exports[`connected settings true 1`] = `
</div>
</nav>
<canvas
style="display: flex; flex: 1;"
style="display: flex;"
/>
</div>
</div>
Expand Down Expand Up @@ -1331,7 +1331,7 @@ exports[`disconnected 1`] = `
</div>
</div>
<canvas
style="display: none; flex: 1;"
style="display: none;"
/>
</div>
</div>
Expand Down Expand Up @@ -2035,7 +2035,7 @@ exports[`processing 1`] = `
class="c12"
/>
<canvas
style="display: none; flex: 1;"
style="display: none;"
/>
</div>
</div>
Expand Down Expand Up @@ -2345,7 +2345,7 @@ exports[`tdp processing 1`] = `
class="c12"
/>
<canvas
style="display: none; flex: 1;"
style="display: none;"
/>
</div>
</div>
Expand Down
12 changes: 10 additions & 2 deletions web/packages/teleport/src/DesktopSession/useTdpClientCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,26 @@ export default function useTdpClientCanvas(props: Props) {
setTdpClient(new TdpClient(addr));
}, [clusterId, username, desktopName]);

const syncCanvasSizeToDisplaySize = (canvas: HTMLCanvasElement) => {
const syncCanvasResolutionAndSize = (canvas: HTMLCanvasElement) => {
const { width, height } = getDisplaySize();

// Set a fixed canvas resolution and display size. This ensures
// that neither of these change when the user resizes the browser
// window. Instead, the canvas will remain the same size and the
// browser will add scrollbars if necessary. This is the behavior
// we want until https://github.com/gravitational/teleport/issues/9702
// is resolved.
canvas.width = width;
canvas.height = height;
canvas.style.width = `${width}px`;
canvas.style.height = `${height}px`;
};

// Default TdpClientEvent.TDP_PNG_FRAME handler (buffered)
const onPngFrame = (ctx: CanvasRenderingContext2D, pngFrame: PngFrame) => {
// The first image fragment we see signals a successful tdp connection.
if (!initialTdpConnectionSucceeded.current) {
syncCanvasSizeToDisplaySize(ctx.canvas);
syncCanvasResolutionAndSize(ctx.canvas);
setTdpConnection({ status: 'success' });
initialTdpConnectionSucceeded.current = true;
}
Expand Down