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

unique label mask #373

Merged
merged 2 commits into from
Dec 6, 2022
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
18 changes: 13 additions & 5 deletions d2renderers/d2svg/d2svg.go
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ func makeLabelMask(labelTL *geo.Point, width, height int) string {
)
}

func drawConnection(writer io.Writer, connection d2target.Connection, markers map[string]struct{}, idToShape map[string]d2target.Shape) (labelMask string) {
func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Connection, markers map[string]struct{}, idToShape map[string]d2target.Shape) (labelMask string) {
fmt.Fprintf(writer, `<g id="%s">`, escapeText(connection.ID))
var markerStart string
if connection.SrcArrow != d2target.NoArrowhead {
Expand Down Expand Up @@ -413,11 +413,12 @@ func drawConnection(writer io.Writer, connection d2target.Connection, markers ma
}
}

fmt.Fprintf(writer, `<path d="%s" class="connection" style="fill:none;%s" %s%smask="url(#labels)"/>`,
fmt.Fprintf(writer, `<path d="%s" class="connection" style="fill:none;%s" %s%smask="url(#%s)"/>`,
pathData(connection, idToShape),
connectionStyle(connection),
markerStart,
markerEnd,
labelMaskID,
)

if connection.Label != "" {
Expand Down Expand Up @@ -977,6 +978,13 @@ func Render(diagram *d2target.Diagram) ([]byte, error) {
}
}

// Mask URLs are global. So when multiple SVGs attach to a DOM, they share
// the same namespace for mask URLs.
labelMaskID, err := diagram.HashID()
if err != nil {
return nil, err
}

// SVG has no notion of z-index. The z-index is effectively the order it's drawn.
// So draw from the least nested to most nested
idToShape := make(map[string]d2target.Shape)
Expand All @@ -995,7 +1003,7 @@ func Render(diagram *d2target.Diagram) ([]byte, error) {
markers := map[string]struct{}{}
for _, obj := range allObjects {
if c, is := obj.(d2target.Connection); is {
labelMask := drawConnection(buf, c, markers, idToShape)
labelMask := drawConnection(buf, labelMaskID, c, markers, idToShape)
if labelMask != "" {
labelMasks = append(labelMasks, labelMask)
}
Expand All @@ -1013,8 +1021,8 @@ func Render(diagram *d2target.Diagram) ([]byte, error) {

if len(labelMasks) > 0 {
fmt.Fprint(buf, strings.Join([]string{
fmt.Sprintf(`<mask id="labels" maskUnits="userSpaceOnUse" x="0" y="0" width="%d" height="%d">`,
w, h,
fmt.Sprintf(`<mask id="%s" maskUnits="userSpaceOnUse" x="0" y="0" width="%d" height="%d">`,
labelMaskID, w, h,
),
fmt.Sprintf(`<rect x="0" y="0" width="%d" height="%d" fill="white"></rect>`,
w,
Expand Down
17 changes: 17 additions & 0 deletions d2target/d2target.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package d2target

import (
"encoding/json"
"fmt"
"hash/fnv"
"math"
"net/url"
"strings"
Expand All @@ -26,6 +29,20 @@ type Diagram struct {
Connections []Connection `json:"connections"`
}

func (diagram Diagram) HashID() (string, error) {
b1, err := json.Marshal(diagram.Shapes)
if err != nil {
return "", err
}
b2, err := json.Marshal(diagram.Connections)
if err != nil {
return "", err
}
h := fnv.New32a()
h.Write(append(b1, b2...))
return fmt.Sprint(h.Sum32()), nil
}

func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
x1 := int(math.MaxInt64)
y1 := int(math.MaxInt64)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion e2etests/testdata/sanity/basic/dagre/sketch.exp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion e2etests/testdata/sanity/basic/elk/sketch.exp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading