Skip to content
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.

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

fix zoom in watch mode #944

Merged
merged 2 commits into from
Mar 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions ci/release/changelogs/next.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
#### Bugfixes ⛑️

- Fixes a regression where PNG backgrounds could be cut off in the appendix. [#941](https://github.com/terrastruct/d2/pull/941)
- Fixes zooming not working in watch mode. [#944](https://github.com/terrastruct/d2/pull/944)
10 changes: 0 additions & 10 deletions d2cli/static/watch.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
body {
margin: 0;
}

#d2-svg-container > svg {
position: absolute;
width: 100%;
height: 100%;
}

#d2-err {
/* This style was copied from Chrome's svg parser error style. */
white-space: pre-wrap;
Expand Down
25 changes: 25 additions & 0 deletions d2cli/static/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ function init(reconnectDelay) {
const ws = new WebSocket(
`ws://${window.location.host}${window.location.pathname}watch`
);
let isInit = true;
let ratio;
ws.onopen = () => {
reconnectDelay = 1000;
console.info("watch websocket opened");
Expand All @@ -31,6 +33,29 @@ function init(reconnectDelay) {
// setting innerHTML to only the actual svg innards. However then you also need to parse
// out the width, height and viewbox out of the top level SVG tag and update those manually.
d2SVG.innerHTML = msg.svg;

const svgEl = d2SVG.querySelector("#d2-svg");
// just use inner SVG in watch mode
svgEl.parentElement.replaceWith(svgEl);
let width = parseInt(svgEl.getAttribute("width"), 10);
let height = parseInt(svgEl.getAttribute("height"), 10);
if (isInit) {
if (width > height) {
if (width > window.innerWidth) {
ratio = window.innerWidth / width;
}
} else if (height > window.innerHeight) {
ratio = window.innerHeight / height;
}
// Scale svg fit to zoom
isInit = false;
}
if (ratio) {
// body padding is 8px
svgEl.setAttribute("width", width * ratio - 16);
svgEl.setAttribute("height", height * ratio - 16);
}

d2ErrDiv.style.display = "none";
}
if (msg.err) {
Expand Down