@office-kit/pptx 0.18.1 → 0.18.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @office-kit/pptx
 
+## 0.18.2
+
+### Patch Changes
+
+- 78ee67f: fix: theme readers and the preview picked the first theme part by name instead of the slide master's theme
+
+  `getPresentationTheme`, `getPresentationFonts`, `setPresentationTheme`, `setPresentationFonts` and every color resolver built on them (slide backgrounds, `scheme:*` fills, the deck body text color, the preview renderer) read `/ppt/theme/theme1.xml` whenever a package carried more than one theme. Notes and handout masters carry their own theme, and Google Slides exports write the notes theme as `theme1.xml` and the slide theme as `theme2.xml`, so a dark deck rendered on white with black text.
+
+  The deck theme is now the one the first slide master (in `<p:sldMasterIdLst>` order) relates to, then the presentation part's own theme relationship, and only then the first theme part by name.
+
 ## 0.18.1
 
 ### Patch Changes

package/dist/{api-DlzYhUxG.js → api-CXMliYZu.js}

@@ -5034,22 +5034,52 @@ const readSchemeSlot = (parent, local) => {
 	return "";
 };
 /**
-* Returns the first theme's color scheme as `#RRGGBB` strings, or
-* `null` if the package carries no theme. Each accent slot maps
-* directly to the `accent1`–`accent6` chart palette defaults.
+* Returns the deck's color scheme as `#RRGGBB` strings, or `null` if
+* the package carries no theme. Each accent slot maps directly to the
+* `accent1`–`accent6` chart palette defaults.
 *
-* Multi-master decks may carry several themes — v1 surfaces only the
-* first one found (alphabetical by part name). Per-master theme
-* lookup will land if a concrete user need shows up.
+* The deck's theme is the one its first slide master references. A
+* package usually holds more themes than that — notes and handout
+* masters carry their own, and Google Slides exports name the notes
+* theme `theme1.xml` ahead of the slide theme `theme2.xml` — so the
+* slide master relationship decides, not the part name. Multi-master
+* decks surface the first master's theme only; per-master theme lookup
+* will land if a concrete user need shows up.
 */
 const getPresentationTheme = (pres) => themeFromPackage(pres[INTERNAL_PACKAGE]);
+const resolveRelTarget = (from, target) => target.startsWith("/") ? partName(target) : resolveTarget(from, target);
+/** The theme part `from` relates to, or `null` when it has no theme rel. */
+const themePartRelatedTo = (pkg, from) => {
+	const rel = pkg.getRels(from)?.items.find((r) => r.type === REL_TYPES.theme && r.targetMode === "Internal");
+	if (!rel) return null;
+	const part = pkg.getPart(resolveRelTarget(from, rel.target));
+	return part !== null && part.contentType === THEME_CONTENT_TYPE ? part : null;
+};
+/** The first slide master's part name, in `<p:sldMasterIdLst>` order. */
+const firstSlideMasterPartName = (pkg) => {
+	const presPart = pkg.getPart(PRES_PART_NAME);
+	const presRels = pkg.getRels(PRES_PART_NAME);
+	if (presPart === null || presRels === null) return null;
+	const firstId = firstChildElement(parseXml(decode$1(presPart.data)).root, NAME_SLD_MASTER_ID_LST)?.children.find((c) => c.kind === "element");
+	const rId = firstId?.kind === "element" ? getAttrValue(firstId, ATTR_R_ID$1) : null;
+	const rel = presRels.items.find((r) => r.type === REL_TYPES.slideMaster && (rId === null || r.id === rId)) ?? presRels.items.find((r) => r.type === REL_TYPES.slideMaster);
+	return rel ? resolveRelTarget(PRES_PART_NAME, rel.target) : null;
+};
 /**
-* Returns the package's first theme part (by part name, alphabetical),
-* matching the "first theme wins" v1 semantics documented on
-* {@link getPresentationTheme}. Shared by every theme reader/writer so
-* they agree on which theme a multi-master deck exposes.
+* The theme part the slides render with — see {@link getPresentationTheme}
+* for why the slide master's relationship decides. Falls back to the
+* presentation part's own theme rel, then to the first theme part by
+* name for hand-built packages that wire neither. Shared by every theme
+* reader/writer so they agree on which theme a deck exposes.
 */
-const firstThemePart = (pkg) => pkg.parts.filter((p) => p.contentType === THEME_CONTENT_TYPE).sort((a, b) => a.name.localeCompare(b.name))[0];
+const deckThemePart = (pkg) => {
+	const masterName = firstSlideMasterPartName(pkg);
+	const viaMaster = masterName === null ? null : themePartRelatedTo(pkg, masterName);
+	if (viaMaster) return viaMaster;
+	const viaPresentation = themePartRelatedTo(pkg, PRES_PART_NAME);
+	if (viaPresentation) return viaPresentation;
+	return pkg.parts.filter((p) => p.contentType === THEME_CONTENT_TYPE).sort((a, b) => a.name.localeCompare(b.name))[0];
+};
 /**
 * Package-level theme reader behind {@link getPresentationTheme}. Exposed so
 * helpers holding only a package handle (e.g. color baking off a `SlideData`)
@@ -5058,7 +5088,7 @@ const firstThemePart = (pkg) => pkg.parts.filter((p) => p.contentType === THEME_
 * @internal
 */
 const themeFromPackage = (pkg) => {
-	const themePart = firstThemePart(pkg);
+	const themePart = deckThemePart(pkg);
 	if (!themePart) return null;
 	const root = parseXml(decode$1(themePart.data)).root;
 	const themeElements = firstChildElement(root, NAME_THEME_ELEMENTS);
@@ -5090,14 +5120,13 @@ const readTypeface = (parent, local) => {
 	return v;
 };
 /**
-* Returns the first theme's font scheme, or `null` when the package
-* carries no theme. As with `getPresentationTheme`, multi-master
-* decks surface only the first theme found (alphabetical by part
-* name); per-master font lookup will land if needed.
+* Returns the deck theme's font scheme, or `null` when the package
+* carries no theme. As with `getPresentationTheme`, the deck theme is
+* the first slide master's; per-master font lookup will land if needed.
 */
 const getPresentationFonts = (pres) => {
 	const pkg = pres[INTERNAL_PACKAGE];
-	const themePart = firstThemePart(pkg);
+	const themePart = deckThemePart(pkg);
 	if (!themePart) return null;
 	const root = parseXml(decode$1(themePart.data)).root;
 	const themeElements = firstChildElement(root, NAME_THEME_ELEMENTS);
@@ -5116,22 +5145,21 @@ const getPresentationFonts = (pres) => {
 	};
 };
 /**
-* Overwrites the named slots of the package's first theme's color
+* Overwrites the named slots of the deck theme's color
 * scheme (`<a:clrScheme>`), leaving every other slot untouched. Slot
 * values are `#RRGGBB` (or 3-digit `#RGB`) strings; every branded
 * `srgbClr`/`sysClr` slot is normalized to a plain `<a:srgbClr>` on
 * write, since a theme slot is never a scheme-color reference.
 *
 * As with `getPresentationTheme`, multi-master decks are branded via
-* their first theme part only — call this once per theme part if a
-* deck's masters carry different themes.
+* their first slide master's theme only.
 *
 * Throws if the presentation has no theme part, or if a provided color
 * isn't a valid `#RRGGBB` string.
 */
 const setPresentationTheme = (pres, theme) => {
 	const pkg = pres[INTERNAL_PACKAGE];
-	const themePart = firstThemePart(pkg);
+	const themePart = deckThemePart(pkg);
 	if (!themePart) throw new Error("setPresentationTheme: presentation has no theme part");
 	const doc = parseXml(decode$1(themePart.data));
 	const themeElements = firstChildElement(doc.root, NAME_THEME_ELEMENTS);
@@ -5161,16 +5189,16 @@ const setTypeface = (fontCollection, local, typeface) => {
 	el.attrs.push(attr(ATTR_TYPEFACE$1, typeface));
 };
 /**
-* Overwrites the named typefaces of the package's first theme's font
-* scheme (major = headings, minor = body), leaving unset fields
-* untouched. As with `setPresentationTheme`, only the first theme part
-* is branded.
+* Overwrites the named typefaces of the deck theme's font scheme
+* (major = headings, minor = body), leaving unset fields untouched. As
+* with `setPresentationTheme`, only the first slide master's theme is
+* branded.
 *
 * Throws if the presentation has no theme part.
 */
 const setPresentationFonts = (pres, fonts) => {
 	const pkg = pres[INTERNAL_PACKAGE];
-	const themePart = firstThemePart(pkg);
+	const themePart = deckThemePart(pkg);
 	if (!themePart) throw new Error("setPresentationFonts: presentation has no theme part");
 	const doc = parseXml(decode$1(themePart.data));
 	const themeElements = firstChildElement(doc.root, NAME_THEME_ELEMENTS);
@@ -19492,8 +19520,8 @@ const getShapeMedia = (shape) => {
 const findShapesWithMedia = (slide) => slide[SLIDE_SHAPES].filter((shape) => getShapeMedia(shape) !== null);
 //#endregion
 //#region src/api/index.ts
-const VERSION = "0.18.1";
+const VERSION = "0.18.2";
 //#endregion
 export { replaceTokensInPresentation as $, getTableCellAnchor as $a, appendSlideNotes as $i, getShapePreset as $n, getSlideLayoutType as $o, getShapeParagraphCount as $r, findCommentsByAuthor as $s, getShapeStroke as $t, getOutlineText as A, removeSlideNotes as Aa, getShapeImageBiLevelThreshold as Ai, setSlideLayout as An, setTableCellTextFormat as Ao, setShapePatternFill as Ar, getSlideColorMapOverride as As, setShapeText as At, getSlideLayoutCount as B, getPackageSize as Ba, getShapeImagePartName as Bi, getShapeAltTitle as Bn, getPresentationCreated as Bo, getShapeRunFormat as Br, getSlideMasterBackgroundPatternFill as Bs, findShapesByEffect as Bt, setSlideSections as C, getSlidesWithHyperlinks as Ca, emu as Cc, findFlippedShapes as Ci, getShapeSlide as Cn, setTableCellAnchor as Co, setShapeAdjustValues as Cr, getEffectiveColorMap as Cs, getShapeTextColumns as Ct, findSlidesByNotes as D, getSlidesWithTables as Da, findSlidesByLayoutPartName as Di, getSlideShapes as Dn, setTableCellParagraphs as Do, setShapeImageFill as Dr, getSlideBackgroundGradientFill as Ds, setShapeAlignment as Dt, findSlideByTitle as E, getSlidesWithOverlap as Ea, pt as Ec, findSlidesByLayoutName as Ei, getSlideLayout as En, setTableCellMargins as Eo, setShapeGradientFill as Er, getSlideBackground as Es, getShapeTextWrap as Et, getShapeAt as F, setSlideTransition as Fa, getShapeImageDuotone as Fi, getGroupChildren as Fn, getThumbnail as Fo, setShapeStrokeArrow as Fr, getSlideLayoutBackgroundShapes as Fs, setShapeTextDirection as Ft, getSlideXmlString as G, setMediaPartBytes as Ga, setShapeImageContrast as Gi, getShapeDescription as Gn, touchModified as Go, getParagraphBulletImageBytes as Gr, setShapeClickAction as Gs, setShapeShadow as Gt, getSlidePartName as H, getSlideMediaPartNames as Ha, hasShapeText as Hi, getShapeBoundsResolved as Hn, incrementRevision as Ho, resolveDrawingColorOpacity as Hr, setSlideBackground as Hs, getShapeEffects as Ht, getSlideAt as I, _internalPackageOf as Ia, getShapeImageFillBytes as Ii, getGroupTransform as In, removeThumbnail as Io, setShapeStrokeCap as Ir, getSlideLayoutShapes as Is, setShapeTextFormat as It, isSlideHidden as J, clearTableCellFill as Ja, SLIDE_SIZE_16_10 as Ji, getShapeKind as Jn, findSlideLayoutByPartName as Jo, getParagraphIndent as Jr, clearAllSlideComments as Js, getShapeFill as Jt, getSlides as K, slidesUsingMediaPart as Ka, setShapeImageCrop as Ki, getShapeFlip as Kn, findLayoutsWithPlaceholderType as Ko, getParagraphBulletStyle as Kr, setShapeImage as Ks, getShapeGradientFill as Kt, getSlideCount as L, compactPackage as La, getShapeImageFormat as Li, getMaxShapeId as Ln, setThumbnail as Lo, setShapeStrokeCompound as Lr, getSlideMasterBackground as Ls, setShapeTextMargins as Lt, getPresentationText as M, setSlideNotes as Ma, getShapeImageBytes as Mi, centerShapeOnSlide as Mn, setTableRowHeight as Mo, setShapeRotation as Mr, getSlideLayoutBackgroundGradientFill as Ms, setShapeTextAutoFit as Mt, getPresentationTextLength as N, clearSlideTransition as Na, getShapeImageContrast as Ni, findShapesAtPoint as Nn, setTableStyleFlags as No, setShapeSize as Nr, getSlideLayoutBackgroundImageBytes as Ns, setShapeTextBodyRotationDeg as Nt, findSlidesByText as O, getVisibleSlides as Oa, findSlidesByLayoutType as Oi, getSlidesWithEmptyPlaceholders as On, setTableCellText as Oo, setShapeNoFill as Or, getSlideBackgroundImageBytes as Os, setShapeBullets as Ot, getPresentationTextLengthsBySlide as P, getSlideTransition as Pa, getShapeImageCrop as Pi, findShapesInRect as Pn, setTableStyleId as Po, setShapeStroke as Pr, getSlideLayoutBackgroundPatternFill as Ps, setShapeTextColumns as Pt, replaceTextInSlideNotes as Q, getTableCellAlignment as Qa, setSlideSize as Qi, getShapePosition as Qn, getSlideLayoutPlaceholders as Qo, getShapeHyperlinkTooltip as Qr, findCommentsBefore as Qs, getShapeFillOpacity as Qt, getSlideIndex as R, getMediaParts as Ra, getShapeImageLinkUrl as Ri, getMaxShapeIdInPresentation as Rn, getCoreProperties as Ro, setShapeStrokeDash as Rr, getSlideMasterBackgroundGradientFill as Rs, setShapeTextWrap as Rt, getSlideSections as S, getSlidesWithComments as Sa, cm as Sc, setShapeAnimation as Si, getShapeIndex as Sn, setTableCellAlignment as So, getShapeStrokeDash as Sr, setChartSpec as Ss, getShapeTextBodyRotationDeg as St, findSlideByText as T, getSlidesWithNotes as Ta, mm as Tc, findShapesOutsideCanvas as Ti, getShapesBounds as Tn, setTableCellFill as To, setShapeFlip as Tr, clearSlideBackground as Ts, getShapeTextMargins as Tt, getSlideText as U, listPackageParts as Ua, isShapeImageGrayscale as Ui, getShapeCenter as Un, setCoreProperties as Uo, getParagraphAlignment as Ur, setSlideBackgroundImage as Us, getShapeEffectsEffective as Ut, getSlideOutline as V, getPresentationSummary as Va, hasShapeImage as Vi, getShapeBounds as Vn, getPresentationModified as Vo, resolveDrawingColor as Vr, getSlideMasterShapes as Vs, getShapeEffect as Vt, getSlideTextLength as W, readPackagePart as Wa, setShapeImageBrightness as Wi, getShapeCustomGeometry as Wn, setExtendedProperties as Wo, getParagraphBullet as Wr, getShapeClickAction as Ws, setShapeGlow as Wt, replaceTextInPresentation as X, getSlideTables as Xa, SLIDE_SIZE_4_3 as Xi, getShapePlaceholderIdx as Xn, getSlideLayoutName as Xo, getParagraphLineSpacing as Xr, findCommentAuthorByName as Xs, getShapeFillColorResolved as Xt, replaceTextInNotes as Y, getPresentationTableCountsBySlide as Ya, SLIDE_SIZE_16_9 as Yi, getShapeName as Yn, findSlideLayoutByType as Yo, getParagraphLevel as Yr, clearSlideComments as Ys, getShapeFillColor as Yt, replaceTextInSlide as Z, getTableCell as Za, getSlideSize as Zi, getShapePlaceholderType as Zn, getSlideLayoutPartName as Zo, getParagraphSpacing as Zr, findCommentsAfter as Zs, getShapeFillEffective as Zt, moveSlide as _, getPresentationNotesLengthsBySlide as _a, setPresentationFonts as _c, setSlidePlaceholders as _i, findShapesByText as _n, isChartShape as _o, shapesOverlap as _r, getShapeChartKind as _s, appendShapeText as _t, groupShapes as a, findSlidesWithChartTrendlines as aa, getCommentPosition as ac, getShapeRunText as ai, getShapeStrokeJoin as an, getTableCellSpan as ao, getSlideMasterPartNames as ar, getShapeHyperlink as as, addSlideShape as at, sortSlides as b, getSlideNotesLength as ba, loadPresentation as bc, findShapesWithAnimation as bi, findSlidePlaceholderByIdx as bn, removeTableColumn as bo, getShapePatternFill as br, getShapeChartSpec as bs, getShapeTextAutoFit as bt, addContentSlide as c, getAllHyperlinks as ca, getCommentsSortedByDate as cc, setParagraphBullet as ci, findEmptyPlaceholders as cn, getTableCells as co, isShapeHidden as cr, setShapeRunFormat as cs, bringShapeForward as ct, addSlideAt as d, getAllTables as da, getPresentationCommenters as dc, setParagraphSpacing as di, findShapeByText as dn, getTableRowHeights as do, pointInShape as dr, findChartsBySeriesName as ds, copyShape as dt, clearAllHyperlinks as ea, findCommentsByText as ec, getShapeParagraphElements as ei, getShapeStrokeCap as en, getTableCellBorders as eo, getShapeRotation as er, getSlideLayoutUsageCounts as es, searchSlides as et, addTitleSlide as f, getDistinctHyperlinkUrls as fa, getSlideCommentAuthors as fc, setShapeRunHyperlink as fi, findShapeInPresentation as fn, getTableSize as fo, renameShape as fr, findChartsWithDataLabels as fs, getShapeZIndex as ft, mergePresentations as g, getPresentationNotesLength as ga, getPresentationTheme as gc, setSlideBody as gi, findShapesByPreset as gn, insertTableRow as go, setShapeHidden as gr, getShapeChartCategories as gs, setShapeZIndex as gt, importSlide as h, getPresentationHyperlinkCountsBySlide as ha, getPresentationFonts as hc, getSlideTitle as hi, findShapesByName as hn, insertTableColumn as ho, setShapeDescription as hr, getPresentationChartKindCounts as hs, sendShapeToBack as ht, getShapeMedia as i, findSlidesWithChartKind as ia, getCommentDate as ic, getShapeRunHyperlinkTooltip as ii, getShapeStrokeEffective as in, getTableCellPosition as io, getSlideMasterPartName as ir, getParagraphPropertiesEffective as is, addSlideLine as it, getPresentationShapeCountsBySlide as j, replaceHyperlink as ja, getShapeImageBrightness as ji, translateShapes as jn, setTableColumnWidth as jo, setShapePosition as jr, getSlideLayoutBackground as js, setShapeTextAnchor as jt, getAllShapes as k, hasSlideNotes as ka, getPresentationImageCountsBySlide as ki, replaceTokensInSlide as kn, setTableCellTextDirection as ko, setShapeNoStroke as kr, getSlideBackgroundPatternFill as ks, setShapeParagraphs as kt, addSectionHeaderSlide as l, getAllImages as la, getPresentationCommentCountsByAuthor as lc, setParagraphLevel as li, findShapeById as ln, getTableColumnWidths as lo, isShapePlaceholder as lr, addSlideChart as ls, bringShapeToFront as lt, duplicateSlideAt as m, getHiddenSlides as ma, removeSlideComment as mc, getSlideBody as mi, findShapesByKind as mn, getTableStyleId as mo, setShapeBounds as mr, getPresentationChartCountsBySlide as ms, sendShapeBackward as mt, addSlideMedia as n, clearSlideHyperlinks as na, getCommentAuthor as nc, getShapeRunCount as ni, getShapeStrokeColorResolved as nn, getTableCellMargins as no, getShapeText as nr, getSlideLayouts as ns, slideHasAnimations as nt, ungroupShapes as o, getAllCharts as oa, getCommentSlide as oc, isParagraphBulletPicture as oi, getShapeStrokeOpacity as on, getTableCellText as oo, getSlideMasterUsageCounts as or, getShapeRunFormatEffective as os, addSlideTable as ot, duplicateSlide as p, getEmptySlides as pa, getSlideComments as pc, setShapeRunText as pi, findShapesByHyperlink as pn, getTableStyleFlags as po, setShapeAltTitle as pr, findChartsWithTrendlines as ps, removeShape as pt, getSlidesByLayout as q, validatePresentation as qa, setShapeImageOpacity as qi, getShapeId as qn, findSlideLayout as qo, getParagraphEndFormat as qr, addSlideComment as qs, getShapeGradientFillEffective as qt, findShapesWithMedia as r, findSlidesByHyperlink as ra, getCommentAuthors as rc, getShapeRunHyperlink as ri, getShapeStrokeCompound as rn, getTableCellParagraphs as ro, getSlideMasterCount as rr, getUnusedSlideLayouts as rs, addSlideImage as rt, addBlankSlide as s, getAllComments as sa, getCommentText as sc, setParagraphAlignment as si, getShapeStrokeWidth as sn, getTableCellTextDirection as so, getUnusedSlideMasters as sr, setShapeHyperlink as ss, addSlideTextBox as st, VERSION as t, clearAllSlideNotes as ta, findSlidesWithCommentsByAuthor as tc, getShapeRunClickAction as ti, getShapeStrokeColor as tn, getTableCellFill as to, getShapeSize as tr, getSlideLayoutUsageCountsByType as ts, setSlideHidden as tt, addSlide as u, getAllNotes as ua, getPresentationCommentCountsBySlide as uc, setParagraphLineSpacing as ui, findShapeByName as un, getTableDimensions as uo, isShapeTextBox as ur, findChartByKind as us, clearSlideShapes as ut, removeSlide as v, getPresentationNotesText as va, setPresentationTheme as vc, setSlideTitle as vi, findShapesWithHyperlinks as vn, isTableShape as vo, clearShapeFill as vr, getShapeChartSeriesNames as vs, getShapeBodyPrEffective as vt, findSlideByPartName as w, getSlidesWithImages as wa, inches as wc, findOverlappingShapePairs as wi, getShapeXmlString as wn, setTableCellBorders as wo, setShapeFill as wr, resolveDeckBodyTextColor as ws, getShapeTextDirection as wt, swapSlides as x, getSlidesWithCharts as xa, savePresentation as xc, getShapeAnimation as xi, findSlidePlaceholders as xn, removeTableRow as xo, getShapeStrokeArrow as xr, getSlideCharts as xs, getShapeTextAutoFitParams as xt, reverseSlides as y, getSlideNotes as ya, createPresentation as yc, clearSlideAnimations as yi, findSlidePlaceholder as yn, mergeTableCells as yo, clearShapeStroke as yr, getShapeChartSeriesValues as ys, getShapeTextAnchor as yt, getSlideInfo as z, getOrphanMediaPartNames as za, getShapeImageOpacity as zi, getShapeAdjustValues as zn, getExtendedProperties as zo, setShapeStrokeJoin as zr, getSlideMasterBackgroundImageBytes as zs, clearShapeEffects as zt };
 
-//# sourceMappingURL=api-DlzYhUxG.js.map
+//# sourceMappingURL=api-CXMliYZu.js.map