luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1119 from gavin-ts/windows-crlf

Browse source 
fix watch mode parsing of self-closing div in svg
This commit is contained in:
gavin-ts 2023-03-31 14:30:05 -07:00 committed by GitHub
commit 1b65be64dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ci/release/changelogs/next.md
View file

@ -7,3 +7,4 @@
#### Bugfixes ⛑️ #### Bugfixes ⛑️
- Fix a bug in ID parsing [#322](https://github.com/terrastruct/d2/issues/322) - Fix a bug in ID parsing [#322](https://github.com/terrastruct/d2/issues/322)
- Fix a bug in watch mode parsing SVG [#1119](https://github.com/terrastruct/d2/issues/1119)

11
d2cli/static/watch.js
View file

@ -25,14 +25,9 @@ function init(reconnectDelay) {
console.debug("watch websocket received data"); console.debug("watch websocket received data");
} }
if (msg.svg) { if (msg.svg) {
// We could turn d2SVG into an actual SVG element and use outerHTML to fully replace it // we can't just set `d2SVG.innerHTML = msg.svg` need to parse this as xml not html
// with the result from the renderer but unfortunately that overwrites the #d2-svg ID. const parsedXML = new DOMParser().parseFromString(msg.svg, "text/xml");
// Even if you add another line to set it afterwards. The parsing/interpretation of outerHTML must be async. d2SVG.replaceChildren(parsedXML.documentElement);
//
// There's no way around that short of parsing out the top level svg tag in the msg and
// 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"); const svgEl = d2SVG.querySelector("#d2-svg");
// just use inner SVG in watch mode // just use inner SVG in watch mode