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

apply stroke and fill to markdown

Browse source
This commit is contained in:
Gavin Nishizawa 2022-12-17 21:22:33 -08:00
parent d28aed6184
commit 1a3511d632
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2exporter/export.go
View file

@ -45,6 +45,8 @@ func applyStyles(shape *d2target.Shape, obj *d2graph.Object) {
} }
if obj.Attributes.Style.Fill != nil { if obj.Attributes.Style.Fill != nil {
shape.Fill = obj.Attributes.Style.Fill.Value shape.Fill = obj.Attributes.Style.Fill.Value
} else if obj.Attributes.Shape.Value == d2target.ShapeText {
shape.Fill = "transparent"
} }
if obj.Attributes.Style.Stroke != nil { if obj.Attributes.Style.Stroke != nil {
shape.Stroke = obj.Attributes.Style.Stroke.Value shape.Stroke = obj.Attributes.Style.Stroke.Value

5
d2graph/d2graph.go
View file

@ -397,7 +397,10 @@ func (obj *Object) GetFill(theme *d2themes.Theme) string {
func (obj *Object) GetStroke(theme *d2themes.Theme, dashGapSize interface{}) string { func (obj *Object) GetStroke(theme *d2themes.Theme, dashGapSize interface{}) string {
shape := obj.Attributes.Shape.Value shape := obj.Attributes.Shape.Value
if strings.EqualFold(shape, d2target.ShapeCode) || strings.EqualFold(shape, d2target.ShapeClass) || strings.EqualFold(shape, d2target.ShapeSQLTable) { if strings.EqualFold(shape, d2target.ShapeCode) ||
strings.EqualFold(shape, d2target.ShapeClass) ||
strings.EqualFold(shape, d2target.ShapeSQLTable) ||
strings.EqualFold(shape, d2target.ShapeText) {
return theme.Colors.Neutrals.N1 return theme.Colors.Neutrals.N1
} }
if dashGapSize != 0.0 { if dashGapSize != 0.0 {

11
d2renderers/d2svg/d2svg.go
View file

@ -770,7 +770,16 @@ func drawShape(writer io.Writer, targetShape d2target.Shape) (labelMask string,
) )
// we need the self closing form in this svg/xhtml context // we need the self closing form in this svg/xhtml context
render = strings.ReplaceAll(render, "<hr>", "<hr />") render = strings.ReplaceAll(render, "<hr>", "<hr />")
fmt.Fprintf(writer, `<div xmlns="http://www.w3.org/1999/xhtml" class="md">%v</div>`, render)
var mdStyle string
if targetShape.Fill != "" {
mdStyle = fmt.Sprintf("background-color:%s;", targetShape.Fill)
}
if targetShape.Stroke != "" {
mdStyle += fmt.Sprintf("color:%s;", targetShape.Stroke)
}
fmt.Fprintf(writer, `<div xmlns="http://www.w3.org/1999/xhtml" class="md" style="%s">%v</div>`, mdStyle, render)
fmt.Fprint(writer, `</foreignObject></g>`) fmt.Fprint(writer, `</foreignObject></g>`)
} }
default: default: