revealjs allow base logo to specify brand resource

or object containing path or resource name
quarto-dev · Nov 15, 2024 · 6b2db81 · 6b2db81
1 parent 5d1bb1e
commit 6b2db81
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 2 deletions.
diff --git a/src/format/reveal/format-reveal.ts b/src/format/reveal/format-reveal.ts
@@ -398,8 +398,25 @@ const determineRevealLogo = (format: Format): string | undefined => {
 function revealMarkdownAfterBody(format: Format) {
   const lines: string[] = [];
   lines.push("::: {.quarto-auto-generated-content style='display: none;'}\n");
-  const revealLogo = (format.metadata[kSlideLogo] as (string | undefined)) ??
-    determineRevealLogo(format);
+  let revealLogo = format
+    .metadata[kSlideLogo] as (string | { path: string } | undefined);
+  if (revealLogo) {
+    if (typeof revealLogo === "object") {
+      revealLogo = revealLogo.path;
+    }
+    if (["small", "medium", "large"].includes(revealLogo)) {
+      const brandData = format.render.brand?.processedData;
+      const logoInfo = brandData?.logo
+        ?.[revealLogo as ("medium" | "small" | "large")];
+      if (typeof logoInfo === "string") {
+        revealLogo = logoInfo;
+      } else {
+        revealLogo = logoInfo?.light.path ?? logoInfo?.dark.path;
+      }
+    }
+  } else {
+    revealLogo = determineRevealLogo(format);
+  }
   if (revealLogo) {
     lines.push(
       `<img src="${revealLogo}" class="slide-logo" />`,

diff --git a/tests/docs/smoke-all/brand/logo/choose-logo-resource.qmd b/tests/docs/smoke-all/brand/logo/choose-logo-resource.qmd
@@ -21,6 +21,11 @@ _quarto:
         -
           - '<img src="posit-logo-2024\.svg" alt="posit logo"'
         - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
 ---
 
 {{< lipsum 4 >}}
diff --git a/tests/docs/smoke-all/brand/logo/default-logo.qmd b/tests/docs/smoke-all/brand/logo/default-logo.qmd
@@ -2,6 +2,7 @@
 title: brand and base logo
 format:
   dashboard: default
+  revealjs: default
 brand:
   logo:
     images:
@@ -20,6 +21,11 @@ _quarto:
         -
           - '<img src="quarto\.png" alt="quarto logo"'
         - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="quarto\.png" class="slide-logo">'
+        - []
 ---
 
 {{< lipsum 4 >}}
diff --git a/tests/docs/smoke-all/brand/logo/override-logo-path-alt.qmd b/tests/docs/smoke-all/brand/logo/override-logo-path-alt.qmd
@@ -23,6 +23,11 @@ _quarto:
         -
           - '<img src="posit-logo-2024\.svg" alt="posit logo"'
         - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
 ---
 
 {{< lipsum 4 >}}
diff --git a/tests/docs/smoke-all/brand/logo/override-logo-path.qmd b/tests/docs/smoke-all/brand/logo/override-logo-path.qmd
@@ -2,6 +2,7 @@
 title: brand and base logo
 format:
   dashboard: default
+  revealjs: default
 brand:
   logo:
     images:
@@ -21,6 +22,11 @@ _quarto:
         -
           - '<img src="posit-logo-2024\.svg" alt=""'
         - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
 ---
 
 {{< lipsum 4 >}}
diff --git a/tests/docs/smoke-all/brand/logo/override-logo-resource.qmd b/tests/docs/smoke-all/brand/logo/override-logo-resource.qmd
@@ -22,6 +22,11 @@ _quarto:
         -
           - '<img src="posit-logo-2024\.svg" alt="posit logo"'
         - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
 ---
 
 {{< lipsum 4 >}}