@json-to-office/core-pptx 0.26.0 → 0.27.0

package/dist/core/generationContext.d.ts

@@ -29,10 +29,14 @@ export interface ThemeContextOptions {
     defaultThemeName?: string;
     /**
      * Theme lookup for the base `props.theme` name. The plugin builder passes
-     * its own (customThemes → constructor theme object → built-in); omit it to
-     * use customThemes → built-in.
+     * its own (customThemes → doc-named built-in → constructor theme object →
+     * built-in); omit it to use customThemes → built-in. `authored` is true
+     * when the name came from the document's own `props.theme` (as opposed to
+     * `defaultThemeName` or the 'default' fallback), so the lookup can honor
+     * an explicitly doc-named built-in without the constructor object
+     * swallowing the default name too (#141).
      */
-    resolveNamedTheme?: (name: string) => PptxThemeConfig;
+    resolveNamedTheme?: (name: string, authored: boolean) => PptxThemeConfig;
 }
 export interface GenerationThemeContext {
     /**

package/dist/core/generationContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generationContext.d.ts","sourceRoot":"","sources":["../../src/core/generationContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,+BAA+B,EAC/B,eAAe,EACf,eAAe,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC/C,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,eAAe,CAAC;CACvD;AAED,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,QAAQ,EAAE,+BAA+B,CAAC;IAC1C,KAAK,EAAE,eAAe,CAAC;IACvB;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,+BAA+B,EAC3C,OAAO,GAAE,mBAAwB,GAChC,sBAAsB,CA6DxB"}
+{"version":3,"file":"generationContext.d.ts","sourceRoot":"","sources":["../../src/core/generationContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,+BAA+B,EAC/B,eAAe,EACf,eAAe,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC/C,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;;;;OAQG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,KAAK,eAAe,CAAC;CAC1E;AAED,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,QAAQ,EAAE,+BAA+B,CAAC;IAC1C,KAAK,EAAE,eAAe,CAAC;IACvB;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,+BAA+B,EAC3C,OAAO,GAAE,mBAAwB,GAChC,sBAAsB,CA6DxB"}

package/dist/index.js

@@ -214,6 +214,9 @@ var PPTX_THEMES = {
 function getPptxTheme(name) {
   return PPTX_THEMES[name] || DEFAULT_PPTX_THEME;
 }
+function hasPptxTheme(name) {
+  return Object.prototype.hasOwnProperty.call(PPTX_THEMES, name);
+}
 var pptxThemes = PPTX_THEMES;
 
 // src/utils/componentDefaults.ts
@@ -1927,8 +1930,9 @@ function resolveThemeContext(documentIn, options = {}) {
   if (typeof document.props.theme === "object" && document.props.theme !== null) {
     inlineTheme = document.props.theme;
   }
-  const baseThemeName = inlineTheme ? inlineTheme.name || "inline-theme" : document.props.theme ?? defaultThemeName ?? "default";
-  let theme = inlineTheme ?? (resolveNamedTheme ? resolveNamedTheme(baseThemeName) : customThemes?.[baseThemeName] ?? getPptxTheme(baseThemeName));
+  const authoredThemeName = typeof document.props.theme === "string" ? document.props.theme : void 0;
+  const baseThemeName = inlineTheme ? inlineTheme.name || "inline-theme" : authoredThemeName ?? defaultThemeName ?? "default";
+  let theme = inlineTheme ?? (resolveNamedTheme ? resolveNamedTheme(baseThemeName, authoredThemeName !== void 0) : customThemes?.[baseThemeName] ?? getPptxTheme(baseThemeName));
   const mode = applyExportMode({ doc: document, theme, fonts });
   document = mode.doc;
   theme = mode.theme;
@@ -2499,7 +2503,7 @@ function createBuilderImpl(state) {
         fonts: state.fonts,
         warnings,
         defaultThemeName: typeof state.theme === "string" ? state.theme : void 0,
-        resolveNamedTheme: (name) => state.customThemes?.[name] ?? (typeof state.theme === "object" && state.theme !== null ? state.theme : getPptxTheme(name))
+        resolveNamedTheme: (name, authored) => state.customThemes?.[name] ?? (authored && hasPptxTheme(name) ? getPptxTheme(name) : void 0) ?? (typeof state.theme === "object" && state.theme !== null ? state.theme : getPptxTheme(name))
       });
       const modedRoot = context.document;
       const resolvedTheme = context.theme;