Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

fix: make zoomToFit fitToViewport account for sidebar (#7298)

Barnabás Molnár7c9cf30909c6
diff --git a/src/actions/actionCanvas.tsx b/src/actions/actionCanvas.tsx
index 2194f63b12..f61f57dbd3 100644
--- a/src/actions/actionCanvas.tsx
+++ b/src/actions/actionCanvas.tsx
@@ -265,7 +265,21 @@ export const zoomToFit = ({
30.0,
) as NormalizedZoomValue;
- scrollX = (appState.width / 2) * (1 / newZoomValue) - centerX;
+ let appStateWidth = appState.width;
+
+ if (appState.openSidebar) {
+ const sidebarDOMElem = document.querySelector(
+ ".sidebar",
+ ) as HTMLElement | null;
+ const sidebarWidth = sidebarDOMElem?.offsetWidth ?? 0;
+ const isRTL = document.documentElement.getAttribute("dir") === "rtl";
+
+ appStateWidth = !isRTL
+ ? appState.width - sidebarWidth
+ : appState.width + sidebarWidth;
+ }
+
+ scrollX = (appStateWidth / 2) * (1 / newZoomValue) - centerX;
scrollY = (appState.height / 2) * (1 / newZoomValue) - centerY;
} else {
newZoomValue = zoomValueToFitBoundsOnViewport(commonBounds, {