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

unique marker id

Browse source
This commit is contained in:
Alexander Wang 2025-01-26 14:18:00 -07:00
parent 3c22c46815
commit 0281f726d0
No known key found for this signature in database
GPG key ID: BE3937D0D52D8927
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
d2renderers/d2svg/d2svg.go
View file

@ -100,7 +100,7 @@ func dimensions(diagram *d2target.Diagram, pad int) (left, top, width, height in
return left, top, width, height return left, top, width, height
} }
func arrowheadMarkerID(isTarget bool, connection d2target.Connection) string { func arrowheadMarkerID(diagramHash string, isTarget bool, connection d2target.Connection) string {
var arrowhead d2target.Arrowhead var arrowhead d2target.Arrowhead
if isTarget { if isTarget {
arrowhead = connection.DstArrow arrowhead = connection.DstArrow
@ -108,7 +108,7 @@ func arrowheadMarkerID(isTarget bool, connection d2target.Connection) string {
arrowhead = connection.SrcArrow arrowhead = connection.SrcArrow
} }
return fmt.Sprintf("mk-%s", hash(fmt.Sprintf("%s,%t,%d,%s", return fmt.Sprintf("mk-%s-%s", diagramHash, hash(fmt.Sprintf("%s,%t,%d,%s",
arrowhead, isTarget, connection.StrokeWidth, connection.Stroke, arrowhead, isTarget, connection.StrokeWidth, connection.Stroke,
))) )))
} }
@ -499,7 +499,7 @@ func makeLabelMask(labelTL *geo.Point, width, height int, opacity float64) strin
) )
} }
func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Connection, markers map[string]struct{}, idToShape map[string]d2target.Shape, jsRunner jsrunner.JSRunner, inlineTheme *d2themes.Theme) (labelMask string, _ error) { func drawConnection(writer io.Writer, diagramHash string, connection d2target.Connection, markers map[string]struct{}, idToShape map[string]d2target.Shape, jsRunner jsrunner.JSRunner, inlineTheme *d2themes.Theme) (labelMask string, _ error) {
opacityStyle := "" opacityStyle := ""
if connection.Opacity != 1.0 { if connection.Opacity != 1.0 {
opacityStyle = fmt.Sprintf(" style='opacity:%f'", connection.Opacity) opacityStyle = fmt.Sprintf(" style='opacity:%f'", connection.Opacity)
@ -512,7 +512,7 @@ func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Co
fmt.Fprintf(writer, `<g class="%s"%s%s>`, base64.URLEncoding.EncodeToString([]byte(svg.EscapeText(connection.ID))), opacityStyle, classStr) fmt.Fprintf(writer, `<g class="%s"%s%s>`, base64.URLEncoding.EncodeToString([]byte(svg.EscapeText(connection.ID))), opacityStyle, classStr)
var markerStart string var markerStart string
if connection.SrcArrow != d2target.NoArrowhead { if connection.SrcArrow != d2target.NoArrowhead {
id := arrowheadMarkerID(false, connection) id := arrowheadMarkerID(diagramHash, false, connection)
if _, in := markers[id]; !in { if _, in := markers[id]; !in {
marker := arrowheadMarker(false, id, connection, inlineTheme) marker := arrowheadMarker(false, id, connection, inlineTheme)
if marker == "" { if marker == "" {
@ -526,7 +526,7 @@ func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Co
var markerEnd string var markerEnd string
if connection.DstArrow != d2target.NoArrowhead { if connection.DstArrow != d2target.NoArrowhead {
id := arrowheadMarkerID(true, connection) id := arrowheadMarkerID(diagramHash, true, connection)
if _, in := markers[id]; !in { if _, in := markers[id]; !in {
marker := arrowheadMarker(true, id, connection, inlineTheme) marker := arrowheadMarker(true, id, connection, inlineTheme)
if marker == "" { if marker == "" {
@ -553,7 +553,7 @@ func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Co
srcAdj, dstAdj := getArrowheadAdjustments(connection, idToShape) srcAdj, dstAdj := getArrowheadAdjustments(connection, idToShape)
path := pathData(connection, srcAdj, dstAdj) path := pathData(connection, srcAdj, dstAdj)
mask := fmt.Sprintf(`mask="url(#%s)"`, labelMaskID) mask := fmt.Sprintf(`mask="url(#%s)"`, diagramHash)
if jsRunner != nil { if jsRunner != nil {
out, err := d2sketch.Connection(jsRunner, connection, path, mask) out, err := d2sketch.Connection(jsRunner, connection, path, mask)