From 1a3511d632ea866f7467fcaa0a09e4276ac38a95 Mon Sep 17 00:00:00 2001
From: Gavin Nishizawa <gavin@terrastruct.com>
Date: Sat, 17 Dec 2022 21:22:33 -0800
Subject: [PATCH] apply stroke and fill to markdown

---
 d2exporter/export.go       |  2 ++
 d2graph/d2graph.go         |  5 ++++-
 d2renderers/d2svg/d2svg.go | 11 ++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/d2exporter/export.go b/d2exporter/export.go
index 96900ff01..952a85662 100644
--- a/d2exporter/export.go
+++ b/d2exporter/export.go
@@ -45,6 +45,8 @@ func applyStyles(shape *d2target.Shape, obj *d2graph.Object) {
 	}
 	if obj.Attributes.Style.Fill != nil {
 		shape.Fill = obj.Attributes.Style.Fill.Value
+	} else if obj.Attributes.Shape.Value == d2target.ShapeText {
+		shape.Fill = "transparent"
 	}
 	if obj.Attributes.Style.Stroke != nil {
 		shape.Stroke = obj.Attributes.Style.Stroke.Value
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
index 838ffe6d7..528df55c1 100644
--- a/d2graph/d2graph.go
+++ b/d2graph/d2graph.go
@@ -397,7 +397,10 @@ func (obj *Object) GetFill(theme *d2themes.Theme) string {
 
 func (obj *Object) GetStroke(theme *d2themes.Theme, dashGapSize interface{}) string {
 	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
 	}
 	if dashGapSize != 0.0 {
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index db5b650bc..41a0c63a6 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -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
 				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>`)
 			}
 		default: