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

package/dist/index.js

@@ -25,6 +25,9 @@ var W = {
   THEME_COLOR_FALLBACK: "THEME_COLOR_FALLBACK",
   UNKNOWN_COLOR: "UNKNOWN_COLOR",
   GRID_POSITION_CLAMPED: "GRID_POSITION_CLAMPED",
+  TEXT_NO_CONTENT: "TEXT_NO_CONTENT",
+  UNKNOWN_PATTERN_PRESET: "UNKNOWN_PATTERN_PRESET",
+  ADVANCED_FILL_FALLBACK: "ADVANCED_FILL_FALLBACK",
   IMAGE_ZERO_BOX: "IMAGE_ZERO_BOX",
   FONT_UNRESOLVED: "FONT_UNRESOLVED"
 };
@@ -384,7 +387,7 @@ function buildSlideIndexMap(children) {
 }
 function processPresentation(document, options) {
   const { props, children = [] } = document;
-  const baseTheme = typeof props.theme === "object" && props.theme !== null ? props.theme : options?.customThemes?.[props.theme ?? "default"] ?? getPptxTheme(props.theme ?? "default");
+  const baseTheme = options?.theme ?? (typeof props.theme === "object" && props.theme !== null ? props.theme : options?.customThemes?.[props.theme ?? "default"] ?? getPptxTheme(props.theme ?? "default"));
   const presDefaults = props.componentDefaults;
   const theme = presDefaults ? {
     ...baseTheme,
@@ -591,6 +594,16 @@ function resolvePagePlaceholders(text, ctx) {
   return text.replace(/\{PAGE_NUMBER\}/g, fmt(slideNumber)).replace(/\{PAGE_COUNT\}/g, fmt(totalSlides));
 }
 function renderTextComponent(slide, props, theme, warnings, slideCtx) {
+  const runs = props.runs && props.runs.length > 0 ? props.runs : void 0;
+  if (props.text === void 0 && !runs) {
+    warn(
+      warnings,
+      W.TEXT_NO_CONTENT,
+      'Text component has neither "text" nor "runs" \u2014 skipped',
+      { component: "text" }
+    );
+    return;
+  }
   const style = props.style ? theme.styles?.[props.style] : void 0;
   const isHeadingStyle = props.style && /^(title|heading)/.test(props.style);
   const opts = {};
@@ -600,7 +613,10 @@ function renderTextComponent(slide, props, theme, warnings, slideCtx) {
   if (props.h !== void 0) opts.h = props.h;
   if (props.h === void 0) {
     const fontSize = props.fontSize ?? theme.defaults.fontSize ?? 18;
-    const lines = (props.text.match(/\n/g)?.length ?? 0) + 1;
+    const lines = runs ? runs.reduce(
+      (count, run) => count + (run.breakLine ? 1 : 0) + (run.text.match(/\n/g)?.length ?? 0),
+      1
+    ) : (props.text.match(/\n/g)?.length ?? 0) + 1;
     opts.h = Math.max(0.5, fontSize / 72 * 1.6 * lines);
     opts.isTextBox = true;
   }
@@ -611,6 +627,7 @@ function renderTextComponent(slide, props, theme, warnings, slideCtx) {
     theme,
     warnings
   );
+  const preAliasFamily = opts.fontFace;
   const bold = props.bold ?? style?.bold;
   const italic = props.italic ?? style?.italic;
   const fontWeight = props.fontWeight ?? style?.fontWeight;
@@ -661,7 +678,11 @@ function renderTextComponent(slide, props, theme, warnings, slideCtx) {
   }
   applyHyperlink(opts, props.hyperlink, "text", warnings);
   const lineSpacing = props.lineSpacing ?? style?.lineSpacing;
-  if (lineSpacing !== void 0) opts.lineSpacing = lineSpacing;
+  if (props.lineSpacingMultiple !== void 0) {
+    opts.lineSpacingMultiple = props.lineSpacingMultiple;
+  } else if (lineSpacing !== void 0) {
+    opts.lineSpacing = lineSpacing;
+  }
   const charSpacing = props.charSpacing ?? style?.charSpacing;
   if (charSpacing !== void 0) opts.charSpacing = charSpacing;
   if (props.paraSpaceBefore !== void 0)
@@ -669,6 +690,49 @@ function renderTextComponent(slide, props, theme, warnings, slideCtx) {
   const paraSpaceAfter = props.paraSpaceAfter ?? style?.paraSpaceAfter;
   if (paraSpaceAfter !== void 0) opts.paraSpaceAfter = paraSpaceAfter;
   if (props.breakLine) opts.breakLine = true;
+  if (runs) {
+    const runSegments = runs.map((run) => {
+      const runOpts = {};
+      if (run.fontSize != null) runOpts.fontSize = run.fontSize;
+      if (run.fontFace != null) runOpts.fontFace = run.fontFace;
+      if (run.color != null)
+        runOpts.color = resolveColor(run.color, theme, warnings);
+      if (run.strike != null) runOpts.strike = run.strike;
+      if (run.underline !== void 0) {
+        if (typeof run.underline === "boolean") {
+          if (run.underline) runOpts.underline = { style: "sng" };
+        } else {
+          runOpts.underline = run.underline;
+        }
+      }
+      if (run.superscript != null) runOpts.superscript = run.superscript;
+      if (run.subscript != null) runOpts.subscript = run.subscript;
+      if (run.charSpacing != null) runOpts.charSpacing = run.charSpacing;
+      if (run.breakLine != null) runOpts.breakLine = run.breakLine;
+      const effWeight = run.fontWeight ?? fontWeight;
+      const effBold = run.bold ?? bold;
+      const effItalic = run.italic ?? italic;
+      if (effBold != null) runOpts.bold = effBold;
+      if (effItalic != null) runOpts.italic = effItalic;
+      if (effWeight != null || effBold === true) {
+        if (run.fontFace == null) {
+          const w = applyFontWeight({
+            family: preAliasFamily,
+            fontWeight: effWeight,
+            italic: effItalic,
+            bold: effBold
+          });
+          if (w.fontFace !== void 0) runOpts.fontFace = w.fontFace;
+          if (w.bold !== void 0) runOpts.bold = w.bold;
+          if (w.italic !== void 0) runOpts.italic = w.italic;
+        }
+      }
+      const runText = slideCtx ? resolvePagePlaceholders(run.text, slideCtx) : run.text;
+      return { text: runText, options: runOpts };
+    });
+    slide.addText(runSegments, opts);
+    return;
+  }
   const text = slideCtx ? resolvePagePlaceholders(props.text, slideCtx) : props.text;
   slide.addText(text, opts);
 }
@@ -842,6 +906,44 @@ async function renderImageComponent(slide, props, theme, warnings, slideWidth =
   slide.addImage(opts);
 }
 
+// src/components/shape.ts
+import { PATTERN_FILL_PRESETS } from "@json-to-office/shared-pptx";
+
+// src/utils/fillXml.ts
+var ANGLE_UNIT = 6e4;
+var PCT_UNIT = 1e3;
+var RADIAL_FOCUS_RECTS = {
+  center: { l: 5e4, t: 5e4, r: 5e4, b: 5e4 },
+  topLeft: { l: 0, t: 0, r: 1e5, b: 1e5 },
+  topRight: { l: 1e5, t: 0, r: 0, b: 1e5 },
+  bottomLeft: { l: 0, t: 1e5, r: 1e5, b: 0 },
+  bottomRight: { l: 1e5, t: 1e5, r: 0, b: 0 }
+};
+function gradientStopXml(color, pos, transparency, theme, warnings) {
+  const hex = resolveColor(color, theme, warnings).toUpperCase();
+  const alpha = transparency !== void 0 ? `<a:alpha val="${Math.round((100 - transparency) * PCT_UNIT)}"/>` : "";
+  return `<a:gs pos="${Math.round(pos * PCT_UNIT)}"><a:srgbClr val="${hex}">${alpha}</a:srgbClr></a:gs>`;
+}
+function buildGradientFillXml(gradient, theme, warnings) {
+  const stops = gradient.stops.map(
+    (stop) => gradientStopXml(stop.color, stop.pos, stop.transparency, theme, warnings)
+  ).join("");
+  let shade;
+  if (gradient.type === "radial") {
+    const rect = RADIAL_FOCUS_RECTS[gradient.focus ?? "center"];
+    shade = `<a:path path="circle"><a:fillToRect l="${rect.l}" t="${rect.t}" r="${rect.r}" b="${rect.b}"/></a:path>`;
+  } else {
+    const angle = ((gradient.angle ?? 0) % 360 + 360) % 360;
+    shade = `<a:lin ang="${Math.round(angle * ANGLE_UNIT)}" scaled="1"/>`;
+  }
+  return `<a:gradFill rotWithShape="1"><a:gsLst>${stops}</a:gsLst>${shade}</a:gradFill>`;
+}
+function buildPatternFillXml(pattern, theme, warnings) {
+  const fg = resolveColor(pattern.foreground, theme, warnings).toUpperCase();
+  const bg = resolveColor(pattern.background, theme, warnings).toUpperCase();
+  return `<a:pattFill prst="${pattern.preset}"><a:fgClr><a:srgbClr val="${fg}"/></a:fgClr><a:bgClr><a:srgbClr val="${bg}"/></a:bgClr></a:pattFill>`;
+}
+
 // src/components/shape.ts
 var SHAPE_TYPE_MAP = {
   rect: "rect",
@@ -860,17 +962,67 @@ var SHAPE_TYPE_MAP = {
   heart: "heart",
   lightning: "lightningBolt"
 };
-function buildShapeOpts(props, theme, warnings) {
+function applyShapeFill(opts, fill, theme, warnings, pendingFills) {
+  let gradient = fill.gradient;
+  let pattern = fill.pattern;
+  if (gradient && pattern) {
+    warn(
+      warnings,
+      W.ADVANCED_FILL_FALLBACK,
+      'Shape fill sets both "gradient" and "pattern" \u2014 using the gradient',
+      { component: "shape" }
+    );
+    pattern = void 0;
+  }
+  let unknownPresetForeground;
+  if (pattern && !PATTERN_FILL_PRESETS.includes(pattern.preset)) {
+    warn(
+      warnings,
+      W.UNKNOWN_PATTERN_PRESET,
+      `Unknown pattern preset "${pattern.preset}" \u2014 falling back to solid foreground`,
+      { component: "shape" }
+    );
+    unknownPresetForeground = pattern.foreground;
+    pattern = void 0;
+  }
+  if (gradient || pattern) {
+    const sentinel = resolveColor(
+      fill.color ?? (gradient ? gradient.stops[0].color : pattern.foreground),
+      theme,
+      warnings
+    );
+    if (pendingFills) {
+      const xml = gradient ? buildGradientFillXml(gradient, theme, warnings) : buildPatternFillXml(pattern, theme, warnings);
+      const objectName = `__jto_fill_${pendingFills.length}__`;
+      pendingFills.push({ objectName, xml });
+      opts.objectName = objectName;
+    } else {
+      warn(
+        warnings,
+        W.ADVANCED_FILL_FALLBACK,
+        `${gradient ? "Gradient" : "Pattern"} fill requires the buffer generation pipeline \u2014 rendering a solid fill instead`,
+        { component: "shape" }
+      );
+    }
+    opts.fill = { color: sentinel };
+    return;
+  }
+  const solid = fill.color ?? unknownPresetForeground;
+  if (solid !== void 0) {
+    opts.fill = { color: resolveColor(solid, theme, warnings) };
+    if (fill.transparency !== void 0) {
+      opts.fill.transparency = fill.transparency;
+    }
+  }
+}
+function buildShapeOpts(props, theme, warnings, pendingFills) {
   const opts = {};
   if (props.x !== void 0) opts.x = props.x;
   if (props.y !== void 0) opts.y = props.y;
   if (props.w !== void 0) opts.w = props.w;
   if (props.h !== void 0) opts.h = props.h;
   if (props.fill) {
-    opts.fill = { color: resolveColor(props.fill.color, theme, warnings) };
-    if (props.fill.transparency !== void 0) {
-      opts.fill.transparency = props.fill.transparency;
-    }
+    applyShapeFill(opts, props.fill, theme, warnings, pendingFills);
   }
   if (props.line) {
     opts.line = {};
@@ -886,6 +1038,9 @@ function buildShapeOpts(props, theme, warnings) {
       opts.line.dashType = props.line.dashType;
   }
   if (props.rotate !== void 0) opts.rotate = props.rotate;
+  if (props.angleRange !== void 0) opts.angleRange = props.angleRange;
+  if (props.flipH !== void 0) opts.flipH = props.flipH;
+  if (props.flipV !== void 0) opts.flipV = props.flipV;
   if (props.rectRadius !== void 0) opts.rectRadius = props.rectRadius;
   if (props.shadow) {
     opts.shadow = {
@@ -899,7 +1054,7 @@ function buildShapeOpts(props, theme, warnings) {
   }
   return opts;
 }
-function renderShapeComponent(slide, props, theme, pptx, warnings) {
+function renderShapeComponent(slide, props, theme, pptx, warnings, ctx) {
   const shapeTypeName = SHAPE_TYPE_MAP[props.type] || props.type;
   const shapeType = pptx.ShapeType[shapeTypeName];
   if (!shapeType) {
@@ -910,7 +1065,7 @@ function renderShapeComponent(slide, props, theme, pptx, warnings) {
   }
   const style = props.style ? theme.styles?.[props.style] : void 0;
   const isHeadingStyle = props.style && /^(title|heading)/.test(props.style);
-  const opts = buildShapeOpts(props, theme, warnings);
+  const opts = buildShapeOpts(props, theme, warnings, ctx?.pendingFills);
   if (props.text && (!Array.isArray(props.text) || props.text.length > 0)) {
     opts.shape = shapeType;
     opts.fontSize = props.fontSize ?? style?.fontSize ?? theme.defaults.fontSize;
@@ -1262,6 +1417,14 @@ var CHART_TYPE_MAP = {
   radar: "radar",
   scatter: "scatter"
 };
+function resolveGridLine(gridLine, theme, warnings) {
+  const resolved = {};
+  if (gridLine.style !== void 0) resolved.style = gridLine.style;
+  if (gridLine.size !== void 0) resolved.size = gridLine.size;
+  if (gridLine.color !== void 0)
+    resolved.color = resolveColor(gridLine.color, theme, warnings);
+  return resolved;
+}
 function renderChartComponent(slide, props, theme, _pptx, warnings) {
   const chartType = CHART_TYPE_MAP[props.type];
   if (!chartType) {
@@ -1319,6 +1482,18 @@ function renderChartComponent(slide, props, theme, _pptx, warnings) {
   opts.legendColor = props.legendColor ? resolveColor(props.legendColor, theme, warnings) : themeTextColor;
   opts.catAxisLabelColor = props.catAxisLabelColor ? resolveColor(props.catAxisLabelColor, theme, warnings) : themeTextColor;
   opts.valAxisLabelColor = props.valAxisLabelColor ? resolveColor(props.valAxisLabelColor, theme, warnings) : themeTextColor;
+  if (props.valAxisLabelFontSize !== void 0)
+    opts.valAxisLabelFontSize = props.valAxisLabelFontSize;
+  if (props.catAxisLineShow !== void 0)
+    opts.catAxisLineShow = props.catAxisLineShow;
+  if (props.valAxisLineShow !== void 0)
+    opts.valAxisLineShow = props.valAxisLineShow;
+  if (props.dataBorder !== void 0) {
+    opts.dataBorder = {
+      pt: props.dataBorder.pt,
+      color: resolveColor(props.dataBorder.color, theme, warnings)
+    };
+  }
   if (props.showLegend !== void 0) opts.showLegend = props.showLegend;
   if (props.showTitle !== void 0) opts.showTitle = props.showTitle;
   if (props.showValue !== void 0) opts.showValue = props.showValue;
@@ -1345,6 +1520,10 @@ function renderChartComponent(slide, props, theme, _pptx, warnings) {
     opts.catAxisLabelRotate = props.catAxisLabelRotate;
   if (props.catAxisLabelFontSize !== void 0)
     opts.catAxisLabelFontSize = props.catAxisLabelFontSize;
+  if (props.catAxisLabelFontFace !== void 0)
+    opts.catAxisLabelFontFace = props.catAxisLabelFontFace;
+  if (props.catGridLine !== void 0)
+    opts.catGridLine = resolveGridLine(props.catGridLine, theme, warnings);
   if (props.valAxisTitle !== void 0) {
     opts.valAxisTitle = props.valAxisTitle;
     opts.showValAxisTitle = true;
@@ -1359,14 +1538,22 @@ function renderChartComponent(slide, props, theme, _pptx, warnings) {
     opts.valAxisLabelFormatCode = props.valAxisLabelFormatCode;
   if (props.valAxisMajorUnit !== void 0)
     opts.valAxisMajorUnit = props.valAxisMajorUnit;
+  if (props.valAxisLabelFontFace !== void 0)
+    opts.valAxisLabelFontFace = props.valAxisLabelFontFace;
+  if (props.valGridLine !== void 0)
+    opts.valGridLine = resolveGridLine(props.valGridLine, theme, warnings);
   if (props.barDir !== void 0) opts.barDir = props.barDir;
   if (props.barGrouping !== void 0) opts.barGrouping = props.barGrouping;
   if (props.barGapWidthPct !== void 0)
     opts.barGapWidthPct = props.barGapWidthPct;
+  if (props.barOverlapPct !== void 0)
+    opts.barOverlapPct = props.barOverlapPct;
   if (props.lineSmooth !== void 0) opts.lineSmooth = props.lineSmooth;
   if (props.lineDataSymbol !== void 0)
     opts.lineDataSymbol = props.lineDataSymbol;
   if (props.lineSize !== void 0) opts.lineSize = props.lineSize;
+  if (props.lineDataSymbolSize !== void 0)
+    opts.lineDataSymbolSize = props.lineDataSymbolSize;
   if (props.firstSliceAng !== void 0)
     opts.firstSliceAng = props.firstSliceAng;
   if (props.holeSize !== void 0) opts.holeSize = props.holeSize;
@@ -1403,7 +1590,7 @@ async function renderComponent(slide, component, theme, pptx, warnings, ctx) {
       );
       break;
     case "shape":
-      renderShapeComponent(slide, p, theme, pptx, warnings);
+      renderShapeComponent(slide, p, theme, pptx, warnings, ctx);
       break;
     case "table":
       renderTableComponent(slide, p, theme, pptx, warnings);
@@ -1460,7 +1647,7 @@ function buildSlideTemplateProps(def, theme, warnings) {
 
 // src/core/render.ts
 import { mergeWithDefaults as mergeWithDefaults3 } from "@json-to-office/shared";
-async function renderPresentation(processed, warnings) {
+async function renderPresentation(processed, warnings, pendingFills) {
   const pptx = new PptxGenJS();
   if (processed.metadata.title) pptx.title = processed.metadata.title;
   if (processed.metadata.author) pptx.author = processed.metadata.author;
@@ -1505,10 +1692,37 @@ async function renderPresentation(processed, warnings) {
       slideCtx,
       services: processed.services,
       slideWidth: processed.slideWidth,
-      slideHeight: processed.slideHeight
+      slideHeight: processed.slideHeight,
+      pendingFills
     };
     const slide = slideData.template ? pptx.addSlide({ masterName: slideData.template }) : pptx.addSlide();
-    if (slideData.background) {
+    const templateDef = slideData.template ? templateMap.get(slideData.template) : void 0;
+    if (slideData.template && !templateDef) {
+      warn(
+        warnings,
+        W.MISSING_TEMPLATE,
+        `Unknown template "${slideData.template}". Available: ${[...templateMap.keys()].join(", ")}`,
+        { slide: slideIdx }
+      );
+    }
+    const backgroundGradient = slideData.background?.gradient ?? (slideData.background ? void 0 : templateDef?.background?.gradient);
+    if (backgroundGradient) {
+      renderShapeComponent(
+        slide,
+        {
+          type: "rect",
+          x: 0,
+          y: 0,
+          w: processed.slideWidth,
+          h: processed.slideHeight,
+          fill: { gradient: backgroundGradient }
+        },
+        processed.theme,
+        pptx,
+        warnings,
+        renderCtx
+      );
+    } else if (slideData.background) {
       if (slideData.background.color) {
         slide.background = {
           color: resolveColor(
@@ -1528,15 +1742,6 @@ async function renderPresentation(processed, warnings) {
     if (slideData.hidden) {
       slide.hidden = true;
     }
-    const templateDef = slideData.template ? templateMap.get(slideData.template) : void 0;
-    if (slideData.template && !templateDef) {
-      warn(
-        warnings,
-        W.MISSING_TEMPLATE,
-        `Unknown template "${slideData.template}". Available: ${[...templateMap.keys()].join(", ")}`,
-        { slide: slideIdx }
-      );
-    }
     const effectiveGrid = mergeGridConfigs(processed.grid, templateDef?.grid);
     if (templateDef?.objects) {
       for (const obj of templateDef.objects) {
@@ -1708,10 +1913,43 @@ async function resolveDocumentFonts(document, theme, warnings, fonts) {
   return resolved;
 }
 
-// src/core/generator.ts
+// src/core/generationContext.ts
 import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
+function resolveThemeContext(documentIn, options = {}) {
+  const { customThemes, fonts, warnings, defaultThemeName, resolveNamedTheme } = options;
+  if (documentIn.props === null) {
+    throw new Error(
+      "Document `props` is null. Omit it, or provide an object \u2014 a null props cannot carry a theme."
+    );
+  }
+  let document = documentIn.props === void 0 ? { ...documentIn, props: {} } : documentIn;
+  let inlineTheme;
+  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 mode = applyExportMode({ doc: document, theme, fonts });
+  document = mode.doc;
+  theme = mode.theme;
+  for (const w of mode.warnings) {
+    warnings?.push({
+      code: w.code,
+      message: w.message,
+      component: "fontRegistry"
+    });
+  }
+  return {
+    document,
+    theme,
+    themeName: scopedThemeName(baseThemeName, fonts?.mode)
+  };
+}
+
+// src/core/generator.ts
 import {
   collectImageSourceConflicts,
+  collectTextContentConflicts,
   validateJsonPresentationDocument,
   validatePresentationDocument
 } from "@json-to-office/shared-pptx";
@@ -1721,6 +1959,23 @@ import JSZip from "jszip";
 var MEDIUM_STYLE_2_ACCENT_1 = "{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}";
 var NO_STYLE_NO_GRID = "{2D5ABB26-0587-4C30-8999-92F81FD0307C}";
 var DEFAULT_GENERATED_AT = "2000-01-01T00:00:00.000Z";
+function applyPendingFills(xml, pendingFills) {
+  let out = xml;
+  for (const [index, fill] of pendingFills.entries()) {
+    const marker = `name="${fill.objectName}"`;
+    const markerIdx = out.indexOf(marker);
+    if (markerIdx === -1) continue;
+    const spEnd = out.indexOf("</p:sp>", markerIdx);
+    const solidStart = out.indexOf("<a:solidFill>", markerIdx);
+    const solidEndTag = "</a:solidFill>";
+    const solidEnd = out.indexOf(solidEndTag, solidStart);
+    if (solidStart !== -1 && solidEnd !== -1 && spEnd !== -1 && solidStart < spEnd) {
+      out = out.slice(0, solidStart) + fill.xml + out.slice(solidEnd + solidEndTag.length);
+    }
+    out = out.slice(0, markerIdx) + `name="Fill ${index + 1}"` + out.slice(markerIdx + marker.length);
+  }
+  return out;
+}
 function resolveGeneratedAt(value) {
   const date = value === void 0 ? new Date(DEFAULT_GENERATED_AT) : new Date(value);
   if (Number.isNaN(date.getTime())) {
@@ -1820,9 +2075,21 @@ async function packagePresentationBuffer(buffer, options = {}) {
   let changed = false;
   for (const [path2, entry] of Object.entries(zip.files)) {
     if (!path2.match(/^ppt\/slides\/slide\d+\.xml$/)) continue;
-    const xml = await entry.async("string");
+    let xml = await entry.async("string");
+    let fileChanged = false;
     if (xml.includes(MEDIUM_STYLE_2_ACCENT_1)) {
-      zip.file(path2, xml.replaceAll(MEDIUM_STYLE_2_ACCENT_1, NO_STYLE_NO_GRID));
+      xml = xml.replaceAll(MEDIUM_STYLE_2_ACCENT_1, NO_STYLE_NO_GRID);
+      fileChanged = true;
+    }
+    if (options.pendingFills?.length) {
+      const withFills = applyPendingFills(xml, options.pendingFills);
+      if (withFills !== xml) {
+        xml = withFills;
+        fileChanged = true;
+      }
+    }
+    if (fileChanged) {
+      zip.file(path2, xml);
       changed = true;
     }
   }
@@ -1858,25 +2125,31 @@ function assertValidPresentation(input, validation) {
     throw new PresentationValidationError(result.errors);
   }
 }
+function assertNoContentConflicts(document) {
+  const sourceConflicts = [
+    ...collectImageSourceConflicts(document),
+    ...collectTextContentConflicts(document)
+  ];
+  if (sourceConflicts.length > 0) {
+    throw new Error(
+      `Document validation failed:
+${sourceConflicts.map((e) => `  - ${e.path}: ${e.message}`).join("\n")}`
+    );
+  }
+}
 function isPresentationComponentDefinition(definition) {
   if (typeof definition !== "object" || definition === null) return false;
   const def = definition;
   return def.name === "pptx" && "props" in def;
 }
-async function generatePresentation(document, options, warnings) {
+async function generatePresentation(document, options, warnings, pendingFills) {
   assertValidPresentation(document, options?.validation);
   if (!document || document.name !== "pptx") {
     throw new Error("Top-level component must be a pptx component");
   }
-  const sourceConflicts = collectImageSourceConflicts(document);
-  if (sourceConflicts.length > 0) {
-    throw new Error(
-      `Document validation failed:
-${sourceConflicts.map((e) => `  - ${e.path}: ${e.message}`).join("\n")}`
-    );
-  }
+  assertNoContentConflicts(document);
   const processed = processPresentation(document, options);
-  return await renderPresentation(processed, warnings);
+  return await renderPresentation(processed, warnings, pendingFills);
 }
 async function generateBufferFromJson(jsonConfig, options) {
   const result = await generateBufferWithWarnings(jsonConfig, options);
@@ -1895,64 +2168,34 @@ async function generateBufferWithWarnings(jsonConfig, options) {
     component = jsonConfig;
   }
   const warnings = [];
-  if (typeof component.props?.theme === "object" && component.props.theme !== null) {
-    const inlineTheme = component.props.theme;
-    const inlineName = inlineTheme.name || "inline-theme";
-    component = {
-      ...component,
-      props: { ...component.props, theme: inlineName }
-    };
-    options = {
-      ...options,
-      customThemes: {
-        ...options?.customThemes ?? {},
-        [inlineName]: inlineTheme
-      }
-    };
-  }
-  const baseThemeName = component.props?.theme ?? "default";
-  let resolvedTheme = options?.customThemes?.[baseThemeName] ?? getPptxTheme(baseThemeName);
-  const mode = applyExportMode({
-    doc: component,
-    theme: resolvedTheme,
-    fonts: options?.fonts
+  const context = resolveThemeContext(component, {
+    customThemes: options?.customThemes,
+    fonts: options?.fonts,
+    warnings
   });
-  component = mode.doc;
-  resolvedTheme = mode.theme;
-  for (const w of mode.warnings) {
-    warnings.push({
-      code: w.code,
-      message: w.message,
-      component: "fontRegistry"
-    });
-  }
+  component = context.document;
   await resolveDocumentFonts(
     component,
-    resolvedTheme,
+    context.theme,
     warnings,
     options?.fonts
   );
-  const themeName = scopedThemeName(baseThemeName, options?.fonts?.mode);
-  if (themeName !== baseThemeName) {
-    component = {
-      ...component,
-      props: { ...component.props, theme: themeName }
-    };
-  }
   const effectiveOptions = {
     ...options,
-    customThemes: {
-      ...options?.customThemes ?? {},
-      [themeName]: resolvedTheme
-    }
+    theme: context.theme
   };
+  const pendingFills = [];
   const pptx = await generatePresentation(
     component,
     effectiveOptions,
-    warnings
+    warnings,
+    pendingFills
   );
   const data = await pptx.write({ outputType: "nodebuffer" });
-  const buffer = await packagePresentationBuffer(data, options);
+  const buffer = await packagePresentationBuffer(data, {
+    ...options,
+    pendingFills
+  });
   return { buffer, warnings };
 }
 async function generateAndSaveFromJson(jsonConfig, outputPath, options) {
@@ -2107,7 +2350,6 @@ async function exportPluginSchema(customComponents, outputPath, options = {}) {
 }
 
 // src/plugin/createPresentationGenerator.ts
-import { applyExportMode as applyExportMode2, scopedThemeName as scopedThemeName2 } from "@json-to-office/shared";
 function createBuilderImpl(state) {
   const componentMap = new Map(state.components.map((c) => [c.name, c]));
   async function processSlideComponents(components, warningsCollector, theme, validateEmitted, parentName, depth = 0) {
@@ -2251,41 +2493,23 @@ function createBuilderImpl(state) {
       } else if (!internalDocument || internalDocument.name !== "pptx") {
         throw new Error("Top-level component must be a pptx component");
       }
-      let inlineTheme;
-      if (typeof internalDocument.props.theme === "object" && internalDocument.props.theme !== null) {
-        inlineTheme = internalDocument.props.theme;
-        internalDocument = {
-          ...internalDocument,
-          props: {
-            ...internalDocument.props,
-            theme: inlineTheme.name || "inline-theme"
-          }
-        };
-      }
-      const docThemeName = internalDocument.props.theme;
-      const baseThemeName = docThemeName ?? (typeof state.theme === "string" ? state.theme : "default");
-      let resolvedTheme = inlineTheme ?? state.customThemes?.[baseThemeName] ?? (typeof state.theme === "object" && state.theme !== null ? state.theme : getPptxTheme(baseThemeName));
       const warnings = [];
-      const mode = applyExportMode2({
-        doc: internalDocument,
-        theme: resolvedTheme,
-        fonts: state.fonts
+      const context = resolveThemeContext(internalDocument, {
+        customThemes: state.customThemes,
+        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))
       });
-      resolvedTheme = mode.theme;
-      for (const w of mode.warnings) {
-        warnings.push({
-          code: w.code,
-          message: w.message,
-          component: "fontRegistry"
-        });
-      }
+      const modedRoot = context.document;
+      const resolvedTheme = context.theme;
       const validateEmitted = validationOptions.enabled === false ? void 0 : (emitted, componentLabel, parentName) => {
         let validationDocument;
         if (parentName === "pptx") {
-          validationDocument = { ...mode.doc, children: emitted };
+          validationDocument = { ...modedRoot, children: emitted };
         } else if (parentName === "slide") {
           validationDocument = {
-            ...mode.doc,
+            ...modedRoot,
             children: [{ name: "slide", props: {}, children: emitted }]
           };
         } else {
@@ -2306,19 +2530,16 @@ function createBuilderImpl(state) {
           );
         }
       };
-      const processedChildren = mode.doc.children ? await processAllSlides(
-        mode.doc.children,
+      const processedChildren = modedRoot.children ? await processAllSlides(
+        modedRoot.children,
         warnings,
         resolvedTheme,
         validateEmitted
       ) : [];
-      const themeName = scopedThemeName2(baseThemeName, state.fonts?.mode);
-      const docWithScopedTheme = themeName !== baseThemeName ? {
-        ...mode.doc,
-        props: { ...mode.doc.props, theme: themeName },
+      const processedDocument = {
+        ...modedRoot,
         children: processedChildren
-      } : { ...mode.doc, children: processedChildren };
-      const processedDocument = docWithScopedTheme;
+      };
       if (validationOptions.enabled !== false) {
         const result = validatePresentation(processedDocument, [], {
           allowUnknownFields: validationOptions.allowUnknownFields
@@ -2339,19 +2560,18 @@ function createBuilderImpl(state) {
         warnings,
         state.fonts
       );
-      const effectiveCustomThemes = {
-        ...state.customThemes ?? {},
-        [themeName]: resolvedTheme
-      };
+      assertNoContentConflicts(processedDocument);
       const processed = processPresentation(processedDocument, {
-        customThemes: effectiveCustomThemes,
+        theme: resolvedTheme,
         services: state.services
       });
-      const pptx = await renderPresentation(processed, warnings);
+      const pendingFills = [];
+      const pptx = await renderPresentation(processed, warnings, pendingFills);
       const data = await pptx.write({ outputType: "nodebuffer" });
       const buffer = await packagePresentationBuffer(data, {
         deterministic: options?.deterministic ?? state.packaging.deterministic,
-        generatedAt: options?.generatedAt ?? state.packaging.generatedAt
+        generatedAt: options?.generatedAt ?? state.packaging.generatedAt,
+        pendingFills
       });
       return { buffer, warnings };
     } catch (error) {