Skip to content

Commit

Permalink
Merge pull request #20222 from KDSBrowne/bbb-20139
Browse files Browse the repository at this point in the history
fix(whiteboard): Inconsistent Zoom Between Live Session And Recording
  • Loading branch information
antobinary committed May 13, 2024
2 parents 5bc104f + cc53fb5 commit 220b0a9
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
Expand Up @@ -468,15 +468,14 @@ export default function Whiteboard(props) {

// change tldraw camera when slidePosition changes
React.useEffect(() => {
const camera = tldrawAPI?.getPageState()?.camera;
if (tldrawAPI && !isPresenter && curPageId && slidePosition) {
const newZoom = calculateZoom(slidePosition.viewBoxWidth, slidePosition.viewBoxHeight);
tldrawAPI?.setCamera([slidePosition.x, slidePosition.y], newZoom, 'zoomed');
}

const camera = tldrawAPI?.getPageState()?.camera;
if (isPresenter && slidePosition && camera) {
const zoomFitSlide = calculateZoom(slidePosition.width, slidePosition.height);
const zoomCamera = (zoomFitSlide * zoomValue) / HUNDRED_PERCENT;
let zoomToolbar = Math.round(
((HUNDRED_PERCENT * camera.zoom) / zoomFitSlide) * 100,
) / 100;
Expand All @@ -487,6 +486,28 @@ export default function Whiteboard(props) {
}
}, [curPageId, slidePosition]);

React.useEffect(() => {
if (isPresenter && slidePosition && !isMounting) {
const zoomFitSlide = calculateZoom(slidePosition?.width, slidePosition?.height);
const zoomCamera = (zoomFitSlide * zoomValue) / HUNDRED_PERCENT;
let viewedRegionW = SlideCalcUtil.calcViewedRegionWidth(
tldrawAPI?.viewport?.width, slidePosition?.width,
);
let viewedRegionH = SlideCalcUtil.calcViewedRegionHeight(
tldrawAPI?.viewport?.height, slidePosition?.height,
);

zoomSlide(
parseInt(curPageId, 10),
podId,
viewedRegionW,
viewedRegionH,
slidePosition?.x,
slidePosition?.y,
);
}
}, [curPageId]);

// update zoom according to toolbar
React.useEffect(() => {
if (tldrawAPI && isPresenter && curPageId && slidePosition && zoom !== zoomValue) {
Expand Down

0 comments on commit 220b0a9

Please sign in to comment.