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

add all appendix items at the end

Browse source
This commit is contained in:
Gavin Nishizawa 2023-07-03 16:45:05 -07:00
parent 5e63713634
commit 6f2eccc325
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
d2renderers/d2svg/d2svg.go
View file

@ -870,7 +870,7 @@ func render3DHexagon(targetShape d2target.Shape) string {
return borderMask + mainShapeRendered + renderedSides + renderedBorder return borderMask + mainShapeRendered + renderedSides + renderedBorder
} }
func drawShape(writer io.Writer, diagramHash string, targetShape d2target.Shape, sketchRunner *d2sketch.Runner) (labelMask string, err error) { func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape d2target.Shape, sketchRunner *d2sketch.Runner) (labelMask string, err error) {
closingTag := "</g>" closingTag := "</g>"
if targetShape.Link != "" { if targetShape.Link != "" {
@ -936,7 +936,7 @@ func drawShape(writer io.Writer, diagramHash string, targetShape d2target.Shape,
} else { } else {
drawClass(writer, diagramHash, targetShape) drawClass(writer, diagramHash, targetShape)
} }
addAppendixItems(writer, targetShape, s) addAppendixItems(appendixWriter, targetShape, s)
fmt.Fprint(writer, `</g>`) fmt.Fprint(writer, `</g>`)
fmt.Fprint(writer, closingTag) fmt.Fprint(writer, closingTag)
return labelMask, nil return labelMask, nil
@ -950,7 +950,7 @@ func drawShape(writer io.Writer, diagramHash string, targetShape d2target.Shape,
} else { } else {
drawTable(writer, diagramHash, targetShape) drawTable(writer, diagramHash, targetShape)
} }
addAppendixItems(writer, targetShape, s) addAppendixItems(appendixWriter, targetShape, s)
fmt.Fprint(writer, `</g>`) fmt.Fprint(writer, `</g>`)
fmt.Fprint(writer, closingTag) fmt.Fprint(writer, closingTag)
return labelMask, nil return labelMask, nil
@ -1341,7 +1341,7 @@ func drawShape(writer io.Writer, diagramHash string, targetShape d2target.Shape,
} }
} }
addAppendixItems(writer, targetShape, s) addAppendixItems(appendixWriter, targetShape, s)
fmt.Fprint(writer, closingTag) fmt.Fprint(writer, closingTag)
return labelMask, nil return labelMask, nil
@ -1746,6 +1746,8 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) {
sortObjects(allObjects) sortObjects(allObjects)
appendixItemBuf := &bytes.Buffer{}
var labelMasks []string var labelMasks []string
markers := map[string]struct{}{} markers := map[string]struct{}{}
for _, obj := range allObjects { for _, obj := range allObjects {
@ -1758,7 +1760,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) {
labelMasks = append(labelMasks, labelMask) labelMasks = append(labelMasks, labelMask)
} }
} else if s, is := obj.(d2target.Shape); is { } else if s, is := obj.(d2target.Shape); is {
labelMask, err := drawShape(buf, diagramHash, s, sketchRunner) labelMask, err := drawShape(buf, appendixItemBuf, diagramHash, s, sketchRunner)
if err != nil { if err != nil {
return nil, err return nil, err
} else if labelMask != "" { } else if labelMask != "" {
@ -1768,6 +1770,8 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) {
return nil, fmt.Errorf("unknown object of type %T", obj) return nil, fmt.Errorf("unknown object of type %T", obj)
} }
} }
// add all appendix items afterwards so they are always on top
fmt.Fprint(buf, appendixItemBuf)
// Note: we always want this since we reference it on connections even if there end up being no masked labels // Note: we always want this since we reference it on connections even if there end up being no masked labels
left, top, w, h := dimensions(diagram, pad) left, top, w, h := dimensions(diagram, pad)