Merge pull request #2099 from alixander/theme-overrides

d2cli: fix pptx using theme flags
terrastruct · Sep 16, 2024 · d5734fb · d5734fb
2 parents 25e67cb + c6ac177
commit d5734fb
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -29,3 +29,4 @@
 - CLI: fixes edge case of watch mode links to nested board that had more nested boards not working [#2070](https://github.com/terrastruct/d2/pull/2070)
 - CLI: fixes theme flag not being passed to GIF outputs [#2071](https://github.com/terrastruct/d2/pull/2071)
 - CLI: fixes scale flag not being passed to animated SVG outputs [#2071](https://github.com/terrastruct/d2/pull/2071)
+- CLI: pptx exports use theme flags correctly [#2099](https://github.com/terrastruct/d2/pull/2099)
diff --git a/d2cli/main.go b/d2cli/main.go
@@ -1048,10 +1048,14 @@ func renderPPTX(ctx context.Context, ms *xmain.State, presentation *pptx.Present
 		var err error
 
 		svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{
-			Pad:    opts.Pad,
-			Sketch: opts.Sketch,
-			Center: opts.Center,
-			Scale:  scale,
+			Pad:                opts.Pad,
+			Sketch:             opts.Sketch,
+			Center:             opts.Center,
+			Scale:              scale,
+			ThemeID:            opts.ThemeID,
+			DarkThemeID:        opts.DarkThemeID,
+			ThemeOverrides:     opts.ThemeOverrides,
+			DarkThemeOverrides: opts.DarkThemeOverrides,
 		})
 		if err != nil {
 			return nil, err

diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go
@@ -661,6 +661,43 @@ steps: {
 				assert.Success(t, err)
 			},
 		},
+		{
+			name:   "pptx-theme-overrides",
+			skipCI: true,
+			run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) {
+				writeFile(t, dir, "in.d2", `vars:{
+  d2-config: {
+    theme-overrides: {
+			# All red
+      N1:  "#ff0000"
+      B1:  "#ff0000"
+      B2:  "#ff0000"
+      AA2: "#ff0000"
+      N2:  "#ff0000"
+      N6:  "#ff0000"
+      B4:  "#ff0000"
+      B5:  "#ff0000"
+      B3:  "#ff0000"
+      N4:  "#ff0000"
+      N5:  "#ff0000"
+      AA4: "#ff0000"
+      AB4: "#ff0000"
+      B6:  "#ff0000"
+      N7:  "#ff0000"
+      AA5: "#ff0000"
+      AB5: "#ff0000"
+    }
+  }
+}
+a->z
+a.b.c.d
+`)
+				err := runTestMain(t, ctx, dir, env, "in.d2", "all_red.pptx")
+				assert.Success(t, err)
+				pptx := readFile(t, dir, "all_red.pptx")
+				testdataIgnoreDiff(t, ".pptx", pptx)
+			},
+		},
 		{
 			name:   "one-layer-gif",
 			skipCI: true,

diff --git a/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx