diff --git a/d2exporter/export.go b/d2exporter/export.go index bbcac39f2..8524e7542 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -62,10 +62,8 @@ func applyTheme(shape *d2target.Shape, obj *d2graph.Object, theme *d2themes.Them if len(obj.ChildrenArray) > 0 { shape.FillPattern = "dots" } - } else if theme.SpecialRules.ContainerPaper { - if len(obj.ChildrenArray) > 0 { - shape.FillPattern = "paper" - } + } else if theme.SpecialRules.AllPaper { + shape.FillPattern = "paper" } if theme.SpecialRules.Mono { shape.FontFamily = "mono" diff --git a/d2themes/d2themes.go b/d2themes/d2themes.go index 12556a8f2..ab5e7ff0d 100644 --- a/d2themes/d2themes.go +++ b/d2themes/d2themes.go @@ -19,7 +19,7 @@ type SpecialRules struct { ContainerDots bool `json:"containerDots"` CapsLock bool `json:"capsLock"` - ContainerPaper bool `json:"containerPaper"` + AllPaper bool `json:"allPaper"` } func (t *Theme) IsDark() bool { diff --git a/d2themes/d2themescatalog/origami.go b/d2themes/d2themescatalog/origami.go index 7b9f33d0d..293136820 100644 --- a/d2themes/d2themescatalog/origami.go +++ b/d2themes/d2themescatalog/origami.go @@ -25,7 +25,7 @@ var Origami = d2themes.Theme{ SpecialRules: d2themes.SpecialRules{ NoCornerRadius: true, OuterContainerDoubleBorder: true, - ContainerPaper: true, + AllPaper: true, }, } diff --git a/e2etests/testdata/themes/origami/dagre/board.exp.json b/e2etests/testdata/themes/origami/dagre/board.exp.json index e6a846264..d317916d9 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -101,6 +101,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "AA5", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, @@ -142,6 +143,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "B6", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, @@ -225,6 +227,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "N5", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, @@ -308,6 +311,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "AA5", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, @@ -349,6 +353,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "B3", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, @@ -390,6 +395,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "B6", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, @@ -431,6 +437,7 @@ "strokeWidth": 2, "borderRadius": 0, "fill": "AB4", + "fillPattern": "paper", "stroke": "B1", "shadow": false, "3d": false, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index dafe452ab..56d38cf2e 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -