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

RussPalms · Nov 17, 2023 · 7c9cf30 · 7c9cf30
1 parent 1e37dbd
commit 7c9cf30
Showing 1 changed file with 15 additions and 1 deletion.
diff --git 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, {