pptx-vue-viewer 1.16.1 → 1.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/CHANGELOG.md +2 -0
  2. package/dist/composables-unstable.cjs +1 -1
  3. package/dist/composables-unstable.cjs.br +0 -0
  4. package/dist/composables-unstable.cjs.gz +0 -0
  5. package/dist/composables-unstable.js +1 -1
  6. package/dist/composables-unstable.js.br +0 -0
  7. package/dist/composables-unstable.js.gz +0 -0
  8. package/dist/{dist-CWpXI8G2.js → dist-BlFqSet9.js} +193 -164
  9. package/dist/dist-BlFqSet9.js.br +0 -0
  10. package/dist/dist-BlFqSet9.js.gz +0 -0
  11. package/dist/{dist-Csq4hmh0.cjs → dist-BrxEgUUb.cjs} +193 -164
  12. package/dist/dist-BrxEgUUb.cjs.br +0 -0
  13. package/dist/dist-BrxEgUUb.cjs.gz +0 -0
  14. package/dist/gif-encoder-B4dzl80i.cjs +2 -0
  15. package/dist/gif-encoder-B4dzl80i.cjs.br +0 -0
  16. package/dist/gif-encoder-B4dzl80i.cjs.gz +0 -0
  17. package/dist/gif-encoder-igqpmICL.js +2 -0
  18. package/dist/gif-encoder-igqpmICL.js.br +0 -0
  19. package/dist/gif-encoder-igqpmICL.js.gz +0 -0
  20. package/dist/index.cjs +1 -1
  21. package/dist/index.cjs.br +0 -0
  22. package/dist/index.cjs.gz +0 -0
  23. package/dist/index.js +2 -2
  24. package/dist/index.js.br +0 -0
  25. package/dist/index.js.gz +0 -0
  26. package/dist/{useViewerSettingsDialog-DYWm56Nq.cjs → useViewerSettingsDialog-B7QEnO9j.cjs} +2832 -2795
  27. package/dist/useViewerSettingsDialog-B7QEnO9j.cjs.br +0 -0
  28. package/dist/useViewerSettingsDialog-B7QEnO9j.cjs.gz +0 -0
  29. package/dist/{useViewerSettingsDialog-C9EnaFCw.js → useViewerSettingsDialog-CtXJ9sbD.js} +2139 -2102
  30. package/dist/useViewerSettingsDialog-CtXJ9sbD.js.br +0 -0
  31. package/dist/useViewerSettingsDialog-CtXJ9sbD.js.gz +0 -0
  32. package/dist/viewer/components/inspector/PresentationSettingsCard.vue.d.ts.map +1 -1
  33. package/dist/viewer/index.cjs +1 -1
  34. package/dist/viewer/index.cjs.br +0 -0
  35. package/dist/viewer/index.cjs.gz +0 -0
  36. package/dist/viewer/index.js +2 -2
  37. package/dist/viewer/index.js.br +0 -0
  38. package/dist/viewer/index.js.gz +0 -0
  39. package/dist/{viewer-CXvPEBjH.js → viewer-BJjXhDAB.js} +2 -2
  40. package/dist/viewer-BJjXhDAB.js.br +0 -0
  41. package/dist/viewer-BJjXhDAB.js.gz +0 -0
  42. package/dist/{viewer-CT81mPA2.cjs → viewer-Cpjl_YpO.cjs} +1 -1
  43. package/dist/viewer-Cpjl_YpO.cjs.br +0 -0
  44. package/dist/viewer-Cpjl_YpO.cjs.gz +0 -0
  45. package/package.json +6 -5
  46. package/dist/dist-CWpXI8G2.js.br +0 -0
  47. package/dist/dist-CWpXI8G2.js.gz +0 -0
  48. package/dist/dist-Csq4hmh0.cjs.br +0 -0
  49. package/dist/dist-Csq4hmh0.cjs.gz +0 -0
  50. package/dist/gif-encoder-BScPa-WB.js +0 -2
  51. package/dist/gif-encoder-BScPa-WB.js.br +0 -0
  52. package/dist/gif-encoder-BScPa-WB.js.gz +0 -0
  53. package/dist/gif-encoder-CW8xHxKQ.cjs +0 -2
  54. package/dist/gif-encoder-CW8xHxKQ.cjs.br +0 -0
  55. package/dist/gif-encoder-CW8xHxKQ.cjs.gz +0 -0
  56. package/dist/useViewerSettingsDialog-C9EnaFCw.js.br +0 -0
  57. package/dist/useViewerSettingsDialog-C9EnaFCw.js.gz +0 -0
  58. package/dist/useViewerSettingsDialog-DYWm56Nq.cjs.br +0 -0
  59. package/dist/useViewerSettingsDialog-DYWm56Nq.cjs.gz +0 -0
  60. package/dist/viewer-CT81mPA2.cjs.br +0 -0
  61. package/dist/viewer-CT81mPA2.cjs.gz +0 -0
  62. package/dist/viewer-CXvPEBjH.js.br +0 -0
  63. package/dist/viewer-CXvPEBjH.js.gz +0 -0
package/CHANGELOG.md CHANGED
@@ -4,6 +4,8 @@ All notable changes to this project are documented here.
4
4
  This file is generated from [Conventional Commits](https://www.conventionalcommits.org)
5
5
  by [git-cliff](https://git-cliff.org); do not edit it by hand.
6
6
 
7
+ ## [1.16.1](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-vue-viewer@1.16.1) - 2026-07-13
8
+
7
9
  ## [1.16.0](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-vue-viewer@1.16.0) - 2026-07-11
8
10
 
9
11
  ## [1.15.0](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-vue-viewer@1.15.0) - 2026-07-11
@@ -1,5 +1,5 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
- const e = require("./useViewerSettingsDialog-DYWm56Nq.cjs");
2
+ const e = require("./useViewerSettingsDialog-B7QEnO9j.cjs");
3
3
  let t = require("vue");
4
4
  function s(e, t, s = 0, o = null) {
5
5
  if (null === e) return 0;
Binary file
Binary file
@@ -1,4 +1,4 @@
1
- import { $ as a, $t as s, A as t, B as e, Bt as l, C as u, Ct as n, D as v, E as o, Et as r, F as i, Ft as c, G as f, Gt as d, H as m, Hn as g, Ht as h, I as p, It as S, J as M, Ji as w, Jt as y, K as I, Kt as x, L as E, Lt as T, M as V, Mt as $, N as b, Nt as j, O as C, P as D, Pt as H, Q as J, Qt as P, R, Rt as k, S as z, St as B, T as F, Tt as G, U as K, Ut as L, V as N, Vn as O, Vt as Q, W as U, Wt as W, X as Y, Y as Z, Yn as _, Z as q, Zt as A, _ as X, _t as aa, a as sa, b as ta, bt as ea, c as la, ct as ua, d as na, dt as va, en as oa, et as ra, f as ia, ft as ca, g as fa, gt as da, h as ma, ht as ga, i as ha, in as pa, it as Sa, j as Ma, k as wa, l as ya, lt as Ia, m as xa, mt as Ea, n as Ta, nn as Va, nt as $a, o as ba, p as ja, pt as Ca, q as Da, r as Ha, rn as Ja, rt as Pa, s as Ra, st as ka, t as za, tn as Ba, tt as Fa, u as Ga, un as Ka, ur as La, ut as Na, v as Oa, vt as Qa, w as Ua, wt as Wa, x as Ya, xt as Za, y as _a, yt as qa, z as Aa, zt as Xa } from "./useViewerSettingsDialog-C9EnaFCw.js";
1
+ import { $ as a, $t as s, A as t, B as e, Bt as l, C as u, Ct as n, D as v, E as o, Et as r, F as i, Ft as c, G as f, Gt as d, H as m, Hn as g, Ht as h, I as p, It as S, J as M, Ji as w, Jt as y, K as I, Kt as x, L as E, Lt as T, M as V, Mt as $, N as b, Nt as j, O as C, P as D, Pt as H, Q as J, Qt as P, R, Rt as k, S as z, St as B, T as F, Tt as G, U as K, Ut as L, V as N, Vn as O, Vt as Q, W as U, Wt as W, X as Y, Y as Z, Yn as _, Z as q, Zt as A, _ as X, _t as aa, a as sa, b as ta, bt as ea, c as la, ct as ua, d as na, dt as va, en as oa, et as ra, f as ia, ft as ca, g as fa, gt as da, h as ma, ht as ga, i as ha, in as pa, it as Sa, j as Ma, k as wa, l as ya, lt as Ia, m as xa, mt as Ea, n as Ta, nn as Va, nt as $a, o as ba, p as ja, pt as Ca, q as Da, r as Ha, rn as Ja, rt as Pa, s as Ra, st as ka, t as za, tn as Ba, tt as Fa, u as Ga, un as Ka, ur as La, ut as Na, v as Oa, vt as Qa, w as Ua, wt as Wa, x as Ya, xt as Za, y as _a, yt as qa, z as Aa, zt as Xa } from "./useViewerSettingsDialog-CtXJ9sbD.js";
2
2
  import { computed as as, onScopeDispose as ss, readonly as ts, ref as es } from "vue";
3
3
  function ls(a) {
4
4
  const s = Math.max(0, Math.floor(a / 1e3)), t = Math.floor(s / 60), e = s % 60;
Binary file
Binary file
@@ -18122,6 +18122,11 @@ var Dh = {
18122
18122
  "Futura",
18123
18123
  "sans-serif"
18124
18124
  ],
18125
+ Oswald: [
18126
+ "Agency FB",
18127
+ "Arial Narrow",
18128
+ "sans-serif"
18129
+ ],
18125
18130
  "Franklin Gothic": [
18126
18131
  "Liberation Sans",
18127
18132
  "Helvetica Neue",
@@ -24280,100 +24285,100 @@ var zm = class extends Hu {
24280
24285
  r && (t.textEffectDagTree = r);
24281
24286
  }
24282
24287
  }, Hm = class t extends Wm {
24283
- extractTextRunStyle(e, n, r) {
24284
- const i = { align: n };
24285
- if (!e) return i;
24286
- if (e["@_sz"]) i.fontSize = parseInt(e["@_sz"]) / 100 * (96 / 72);
24287
- if (void 0 !== e["@_b"] && (i.bold = "1" === e["@_b"]), void 0 !== e["@_i"] && (i.italic = "1" === e["@_i"]), void 0 !== e["@_u"]) {
24288
+ extractTextRunStyle(e, n, r, i = !0) {
24289
+ const o = i ? { align: n } : {};
24290
+ if (!e) return o;
24291
+ if (e["@_sz"]) o.fontSize = parseInt(e["@_sz"]) / 100 * (96 / 72);
24292
+ if (void 0 !== e["@_b"] && (o.bold = "1" === e["@_b"]), void 0 !== e["@_i"] && (o.italic = "1" === e["@_i"]), void 0 !== e["@_u"]) {
24288
24293
  const t = String(e["@_u"] || "").trim().toLowerCase();
24289
- if (i.underline = t.length > 0 && "none" !== t && "0" !== t && "false" !== t, i.underline) {
24294
+ if (o.underline = t.length > 0 && "none" !== t && "0" !== t && "false" !== t, o.underline) {
24290
24295
  const t = String(e["@_u"] || "").trim();
24291
- t.length > 0 && "none" !== t && (i.underlineStyle = t);
24296
+ t.length > 0 && "none" !== t && (o.underlineStyle = t);
24292
24297
  }
24293
24298
  }
24294
- const o = e["a:uFill"], a = e["a:uLn"], s = o?.["a:solidFill"] || a?.["a:solidFill"];
24295
- if (s) {
24296
- const t = this.parseColor(s);
24297
- t && (i.underlineColor = t);
24299
+ const a = e["a:uFill"], s = e["a:uLn"], l = a?.["a:solidFill"] || s?.["a:solidFill"];
24300
+ if (l) {
24301
+ const t = this.parseColor(l);
24302
+ t && (o.underlineColor = t);
24298
24303
  }
24299
24304
  if (void 0 !== e["@_strike"]) {
24300
24305
  const t = String(e["@_strike"] || "").trim().toLowerCase();
24301
- i.strikethrough = t.length > 0 && "nostrike" !== t && "none" !== t && "0" !== t && "false" !== t, i.strikethrough && (i.strikeType = "dblstrike" === t ? "dblStrike" : "sngStrike");
24306
+ o.strikethrough = t.length > 0 && "nostrike" !== t && "none" !== t && "0" !== t && "false" !== t, o.strikethrough && (o.strikeType = "dblstrike" === t ? "dblStrike" : "sngStrike");
24302
24307
  }
24303
- const l = e["a:ln"];
24304
- if (l) {
24305
- const e = Number.parseInt(String(l["@_w"] || ""), 10);
24306
- Number.isFinite(e) && e > 0 && (i.textOutlineWidth = e / t.EMU_PER_PX);
24307
- const n = l["a:solidFill"];
24308
+ const c = e["a:ln"];
24309
+ if (c) {
24310
+ const e = Number.parseInt(String(c["@_w"] || ""), 10);
24311
+ Number.isFinite(e) && e > 0 && (o.textOutlineWidth = e / t.EMU_PER_PX);
24312
+ const n = c["a:solidFill"];
24308
24313
  if (n) {
24309
24314
  const t = this.parseColor(n);
24310
- t && (i.textOutlineColor = t);
24315
+ t && (o.textOutlineColor = t);
24311
24316
  }
24312
24317
  }
24313
- if (void 0 !== e["a:noFill"] && (i.textFillNone = !0), void 0 !== e["@_baseline"]) {
24318
+ if (void 0 !== e["a:noFill"] && (o.textFillNone = !0), void 0 !== e["@_baseline"]) {
24314
24319
  const t = Number.parseInt(String(e["@_baseline"]), 10);
24315
- Number.isFinite(t) && 0 !== t && (i.baseline = t);
24320
+ Number.isFinite(t) && 0 !== t && (o.baseline = t);
24316
24321
  }
24317
24322
  if (void 0 !== e["@_spc"]) {
24318
24323
  const t = Number.parseInt(String(e["@_spc"]), 10);
24319
- Number.isFinite(t) && (i.characterSpacing = t);
24324
+ Number.isFinite(t) && (o.characterSpacing = t);
24320
24325
  }
24321
24326
  if (void 0 !== e["@_kern"]) {
24322
24327
  const t = Number.parseInt(String(e["@_kern"]), 10);
24323
- Number.isFinite(t) && (i.kerning = t);
24328
+ Number.isFinite(t) && (o.kerning = t);
24324
24329
  }
24325
24330
  if (e["a:highlight"]) {
24326
24331
  const t = this.parseColor(Kn(e, "a:highlight"));
24327
- t && (i.highlightColor = t);
24328
- }
24329
- const c = this.extractTextFillVariants(e);
24330
- c.textFillGradient && (i.textFillGradient = c.textFillGradient, i.textFillGradientStops = c.textFillGradientStops, i.textFillGradientAngle = c.textFillGradientAngle, i.textFillGradientType = c.textFillGradientType), c.textFillPattern && (i.textFillPattern = c.textFillPattern, i.textFillPatternForeground = c.textFillPatternForeground, i.textFillPatternBackground = c.textFillPatternBackground);
24331
- const d = this.parseOptionalBooleanAttr(e["@_rtl"]);
24332
- void 0 !== d && (i.rtl = d);
24333
- const h = Kn(e, "a:latin"), p = Kn(e, "a:ea"), u = Kn(e, "a:cs"), m = Jn(h, "typeface") || Jn(p, "typeface") || Jn(u, "typeface"), f = this.resolveThemeTypeface(m);
24334
- f && (i.fontFamily = f);
24335
- const g = this.resolveThemeTypeface(Jn(p, "typeface"));
24336
- g && (i.eastAsiaFont = g);
24332
+ t && (o.highlightColor = t);
24333
+ }
24334
+ const d = this.extractTextFillVariants(e);
24335
+ d.textFillGradient && (o.textFillGradient = d.textFillGradient, o.textFillGradientStops = d.textFillGradientStops, o.textFillGradientAngle = d.textFillGradientAngle, o.textFillGradientType = d.textFillGradientType), d.textFillPattern && (o.textFillPattern = d.textFillPattern, o.textFillPatternForeground = d.textFillPatternForeground, o.textFillPatternBackground = d.textFillPatternBackground);
24336
+ const h = this.parseOptionalBooleanAttr(e["@_rtl"]);
24337
+ void 0 !== h && (o.rtl = h);
24338
+ const p = Kn(e, "a:latin"), u = Kn(e, "a:ea"), m = Kn(e, "a:cs"), f = Jn(p, "typeface") || Jn(u, "typeface") || Jn(m, "typeface"), g = this.resolveThemeTypeface(f);
24339
+ g && (o.fontFamily = g);
24337
24340
  const y = this.resolveThemeTypeface(Jn(u, "typeface"));
24338
- y && (i.complexScriptFont = y);
24339
- const x = Kn(e, "a:solidFill");
24340
- if (x) {
24341
- i.color = this.parseColor(x);
24342
- const t = kr(x);
24343
- t && (i.colorXml = t);
24344
- }
24345
- this.applyHyperlinkStyle(i, e, r);
24346
- const b = String(e["@_cap"] || "").trim().toLowerCase();
24347
- "all" !== b && "small" !== b || (i.textCaps = b);
24348
- const S = Kn(e, "a:sym");
24349
- if (S) {
24350
- const t = this.normalizeTypefaceToken(Jn(S, "typeface") || "");
24351
- t && (i.symbolFont = t);
24352
- }
24353
- const v = String(e["@_lang"] || "").trim();
24354
- v && (i.language = v);
24355
- const w = this.parseOptionalBooleanAttr(e["@_kumimoji"]);
24356
- void 0 !== w && (i.kumimoji = w);
24357
- const T = this.parseOptionalBooleanAttr(e["@_normalizeH"]);
24358
- void 0 !== T && (i.normalizeHeight = T);
24359
- const C = this.parseOptionalBooleanAttr(e["@_noProof"]);
24360
- void 0 !== C && (i.noProof = C);
24361
- const k = this.parseOptionalBooleanAttr(e["@_dirty"]);
24362
- void 0 !== k && (i.dirty = k);
24363
- const _ = this.parseOptionalBooleanAttr(e["@_err"]);
24364
- void 0 !== _ && (i.spellingError = _);
24365
- const P = this.parseOptionalBooleanAttr(e["@_smtClean"]);
24366
- void 0 !== P && (i.smartTagClean = P);
24367
- const M = String(e["@_bmk"] || "").trim();
24368
- M && (i.bookmark = M);
24369
- const I = String(e["@_altLang"] || "").trim();
24370
- if (I && (i.altLanguage = I), void 0 !== e["@_smtId"]) {
24341
+ y && (o.eastAsiaFont = y);
24342
+ const x = this.resolveThemeTypeface(Jn(m, "typeface"));
24343
+ x && (o.complexScriptFont = x);
24344
+ const b = Kn(e, "a:solidFill");
24345
+ if (b) {
24346
+ o.color = this.parseColor(b);
24347
+ const t = kr(b);
24348
+ t && (o.colorXml = t);
24349
+ }
24350
+ this.applyHyperlinkStyle(o, e, r);
24351
+ const S = String(e["@_cap"] || "").trim().toLowerCase();
24352
+ "all" !== S && "small" !== S || (o.textCaps = S);
24353
+ const v = Kn(e, "a:sym");
24354
+ if (v) {
24355
+ const t = this.normalizeTypefaceToken(Jn(v, "typeface") || "");
24356
+ t && (o.symbolFont = t);
24357
+ }
24358
+ const w = String(e["@_lang"] || "").trim();
24359
+ w && (o.language = w);
24360
+ const T = this.parseOptionalBooleanAttr(e["@_kumimoji"]);
24361
+ void 0 !== T && (o.kumimoji = T);
24362
+ const C = this.parseOptionalBooleanAttr(e["@_normalizeH"]);
24363
+ void 0 !== C && (o.normalizeHeight = C);
24364
+ const k = this.parseOptionalBooleanAttr(e["@_noProof"]);
24365
+ void 0 !== k && (o.noProof = k);
24366
+ const _ = this.parseOptionalBooleanAttr(e["@_dirty"]);
24367
+ void 0 !== _ && (o.dirty = _);
24368
+ const P = this.parseOptionalBooleanAttr(e["@_err"]);
24369
+ void 0 !== P && (o.spellingError = P);
24370
+ const M = this.parseOptionalBooleanAttr(e["@_smtClean"]);
24371
+ void 0 !== M && (o.smartTagClean = M);
24372
+ const I = String(e["@_bmk"] || "").trim();
24373
+ I && (o.bookmark = I);
24374
+ const A = String(e["@_altLang"] || "").trim();
24375
+ if (A && (o.altLanguage = A), void 0 !== e["@_smtId"]) {
24371
24376
  const t = Number.parseInt(String(e["@_smtId"]), 10);
24372
- Number.isFinite(t) && (i.smartTagId = t);
24377
+ Number.isFinite(t) && (o.smartTagId = t);
24373
24378
  }
24374
- this.applyTextFontMetadata(i, h, "latin"), this.applyTextFontMetadata(i, p, "eastAsia"), this.applyTextFontMetadata(i, u, "complexScript"), this.applyTextFontMetadata(i, S, "symbol");
24375
- const A = e["a:effectLst"];
24376
- return A && this.applyTextRunEffects(i, A), this.applyTextRunEffectDag(i, e), i;
24379
+ this.applyTextFontMetadata(o, p, "latin"), this.applyTextFontMetadata(o, u, "eastAsia"), this.applyTextFontMetadata(o, m, "complexScript"), this.applyTextFontMetadata(o, v, "symbol");
24380
+ const F = e["a:effectLst"];
24381
+ return F && this.applyTextRunEffects(o, F), this.applyTextRunEffectDag(o, e), o;
24377
24382
  }
24378
24383
  applyTextFontMetadata(t, e, n) {
24379
24384
  if (!e) return;
@@ -27950,9 +27955,10 @@ var cy = class t extends ry {
27950
27955
  if (!t && !e) return !0;
27951
27956
  if (!e) return !1;
27952
27957
  if (!t) return !0;
27953
- if (void 0 !== t.idx && void 0 !== e.idx) return t.idx === e.idx && (!t.type || !e.type || t.type === e.type);
27958
+ const n = t.type === e.type || "ctrtitle" === t.type && "title" === e.type || "subtitle" === t.type && "body" === e.type;
27959
+ if (void 0 !== t.idx && void 0 !== e.idx) return t.idx === e.idx && !(t.type && e.type && !n);
27954
27960
  if (void 0 !== t.idx && void 0 === e.idx) {
27955
- const n = /* @__PURE__ */ new Set([
27961
+ const e = /* @__PURE__ */ new Set([
27956
27962
  "title",
27957
27963
  "ctrtitle",
27958
27964
  "subtitle",
@@ -27960,9 +27966,9 @@ var cy = class t extends ry {
27960
27966
  "ftr",
27961
27967
  "sldnum"
27962
27968
  ]);
27963
- return !(!t.type || !n.has(t.type)) && e.type === t.type;
27969
+ return !(!t.type || !e.has(t.type)) && n;
27964
27970
  }
27965
- return (!t.type || !e.type || t.type === e.type) && !(t.type && !e.type);
27971
+ return !(t.type && e.type && !n) && !(t.type && !e.type);
27966
27972
  }
27967
27973
  }, hy = class extends dy {
27968
27974
  findPlaceholderInShapeTree(t, e) {
@@ -27981,12 +27987,11 @@ var cy = class t extends ry {
27981
27987
  findPlaceholderContext(t, e) {
27982
27988
  const n = this.resolveLayoutPathForSlide(t);
27983
27989
  if (!n) return;
27984
- const r = this.layoutXmlMap.get(n), i = this.findPlaceholderInShapeTree(nr(r, "p:sldLayout", "p:cSld", "p:spTree"), e);
27985
- if (i) return i;
27986
- const o = this.resolveMasterPathForLayout(n);
27987
- if (!o) return;
27988
- const a = this.masterXmlMap.get(o);
27989
- return this.findPlaceholderInShapeTree(nr(a, "p:sldMaster", "p:cSld", "p:spTree"), e);
27990
+ const r = this.layoutXmlMap.get(n), i = this.findPlaceholderInShapeTree(nr(r, "p:sldLayout", "p:cSld", "p:spTree"), e), o = this.resolveMasterPathForLayout(n), a = o ? this.findPlaceholderInShapeTree(nr(this.masterXmlMap.get(o), "p:sldMaster", "p:cSld", "p:spTree"), e) : void 0;
27991
+ return i ? a ? {
27992
+ shape: i.shape || a.shape ? this.mergeXmlObjects(a.shape, i.shape) : void 0,
27993
+ picture: i.picture || a.picture ? this.mergeXmlObjects(a.picture, i.picture) : void 0
27994
+ } : i : a;
27990
27995
  }
27991
27996
  mergeXmlObjects(t, e, n = 0) {
27992
27997
  if (n > 64) {
@@ -28016,39 +28021,44 @@ var cy = class t extends ry {
28016
28021
  };
28017
28022
  }
28018
28023
  buildPlaceholderDefaultsKey(t) {
28019
- return void 0 !== t.idx ? t.type ? `${t.type}_${t.idx}` : `_${t.idx}` : t.type ?? "body";
28024
+ const e = "ctrtitle" === t.type ? "title" : "subtitle" === t.type ? "body" : t.type;
28025
+ return void 0 !== t.idx ? e ? `${e}_${t.idx}` : `_${t.idx}` : e ?? "body";
28020
28026
  }
28021
28027
  lookupPlaceholderDefaults(t, e) {
28022
28028
  const n = this.resolveLayoutPathForSlide(t);
28023
28029
  if (!n) return;
28024
- const r = this.buildPlaceholderDefaultsKey(e), o = this.layoutPlaceholderDefaultsCache.get(n)?.get(r), a = this.resolveMasterPathForLayout(n), l = (a ? this.masterPlaceholderDefaultsCache.get(a) : void 0)?.get(r);
28025
- if (!o && !l) return;
28026
- if (!l) return o;
28027
- if (!o) return l;
28028
- const c = {
28030
+ const r = this.buildPlaceholderDefaultsKey(e), o = this.layoutPlaceholderDefaultsCache.get(n)?.get(r), a = this.resolveMasterPathForLayout(n), l = (a ? this.masterPlaceholderDefaultsCache.get(a) : void 0)?.get(r), c = this.buildPlaceholderDefaultsKey(e).split("_")[0], d = "title" === e.type || "ctrtitle" === e.type ? "title" : "body" === e.type || "obj" === e.type || "subtitle" === e.type ? "body" : "other", h = a ? this.masterTxStylesCache.get(a) : void 0, p = "title" === d ? h?.titleStyle : "body" === d ? h?.bodyStyle : h?.otherStyle, u = p ? {
28031
+ type: l?.type ?? c,
28032
+ ...l,
28033
+ levelStyles: this.mergePlaceholderLevelStyles(p, l?.levelStyles)
28034
+ } : l;
28035
+ if (!o && !u) return;
28036
+ if (!u) return o;
28037
+ if (!o) return u;
28038
+ const m = {
28029
28039
  type: o.type,
28030
- idx: o.idx ?? l.idx,
28031
- bodyInsetLeft: o.bodyInsetLeft ?? l.bodyInsetLeft,
28032
- bodyInsetTop: o.bodyInsetTop ?? l.bodyInsetTop,
28033
- bodyInsetRight: o.bodyInsetRight ?? l.bodyInsetRight,
28034
- bodyInsetBottom: o.bodyInsetBottom ?? l.bodyInsetBottom,
28035
- textAnchor: o.textAnchor ?? l.textAnchor,
28036
- autoFit: o.autoFit ?? l.autoFit,
28037
- textWrap: o.textWrap ?? l.textWrap,
28038
- promptText: o.promptText ?? l.promptText
28040
+ idx: o.idx ?? u.idx,
28041
+ bodyInsetLeft: o.bodyInsetLeft ?? u.bodyInsetLeft,
28042
+ bodyInsetTop: o.bodyInsetTop ?? u.bodyInsetTop,
28043
+ bodyInsetRight: o.bodyInsetRight ?? u.bodyInsetRight,
28044
+ bodyInsetBottom: o.bodyInsetBottom ?? u.bodyInsetBottom,
28045
+ textAnchor: o.textAnchor ?? u.textAnchor,
28046
+ autoFit: o.autoFit ?? u.autoFit,
28047
+ textWrap: o.textWrap ?? u.textWrap,
28048
+ promptText: o.promptText ?? u.promptText
28039
28049
  };
28040
- if (o.levelStyles || l.levelStyles) {
28041
- const t = {}, e = /* @__PURE__ */ new Set([...Object.keys(o.levelStyles ?? {}), ...Object.keys(l.levelStyles ?? {})]);
28042
- for (const n of e) {
28043
- const e = Number.parseInt(n, 10), r = o.levelStyles?.[e], i = l.levelStyles?.[e];
28044
- t[e] = r && i ? {
28045
- ...i,
28046
- ...r
28047
- } : r ?? i;
28048
- }
28049
- c.levelStyles = t;
28050
+ return (o.levelStyles || u.levelStyles) && (m.levelStyles = this.mergePlaceholderLevelStyles(u.levelStyles, o.levelStyles)), m;
28051
+ }
28052
+ mergePlaceholderLevelStyles(t, e) {
28053
+ const n = {};
28054
+ for (const r of /* @__PURE__ */ new Set([...Object.keys(t ?? {}), ...Object.keys(e ?? {})])) {
28055
+ const i = Number.parseInt(r, 10);
28056
+ n[i] = {
28057
+ ...t?.[i],
28058
+ ...e?.[i]
28059
+ };
28050
28060
  }
28051
- return c;
28061
+ return n;
28052
28062
  }
28053
28063
  }, py = class t extends hy {
28054
28064
  parseGeometryAdjustments(t) {
@@ -28679,10 +28689,10 @@ var cy = class t extends ry {
28679
28689
  }
28680
28690
  }, yy = class t extends gy {
28681
28691
  resolveShapeParagraphStyle(e, n, r) {
28682
- const i = e["a:pPr"], o = this.parseOptionalBooleanAttr(i?.["@_rtl"]);
28683
- void 0 !== o && void 0 === n.rtl && (n.rtl = o);
28684
- let a = o ? "right" : "left";
28685
- if (i?.["@_algn"]) a = {
28692
+ const i = this.ensureArray(r.inheritedTxBody?.["a:p"])[0], o = this.mergeXmlObjects(i?.["a:pPr"], e["a:pPr"]), a = this.parseOptionalBooleanAttr(o?.["@_rtl"]);
28693
+ void 0 !== a && void 0 === n.rtl && (n.rtl = a);
28694
+ let s = a ? "right" : "left";
28695
+ if (o?.["@_algn"]) s = {
28686
28696
  l: "left",
28687
28697
  ctr: "center",
28688
28698
  r: "right",
@@ -28691,37 +28701,37 @@ var cy = class t extends ry {
28691
28701
  justLow: "justLow",
28692
28702
  dist: "dist",
28693
28703
  thaiDist: "thaiDist"
28694
- }[i["@_algn"]] || "left", n.align || (n.align = a);
28704
+ }[o["@_algn"]] || "left", n.align || (n.align = s);
28695
28705
  if (void 0 === n.paragraphSpacingBefore) {
28696
- const t = this.parseParagraphSpacingPx(i?.["a:spcBef"]);
28706
+ const t = this.parseParagraphSpacingPx(o?.["a:spcBef"]);
28697
28707
  void 0 !== t && (n.paragraphSpacingBefore = t);
28698
28708
  }
28699
28709
  if (void 0 === n.paragraphSpacingAfter) {
28700
- const t = this.parseParagraphSpacingPx(i?.["a:spcAft"]);
28710
+ const t = this.parseParagraphSpacingPx(o?.["a:spcAft"]);
28701
28711
  void 0 !== t && (n.paragraphSpacingAfter = t);
28702
28712
  }
28703
28713
  if (void 0 === n.lineSpacing && void 0 === n.lineSpacingExactPt) {
28704
- const t = i?.["a:lnSpc"], e = this.parseLineSpacingMultiplier(t);
28714
+ const t = o?.["a:lnSpc"], e = this.parseLineSpacingMultiplier(t);
28705
28715
  if (void 0 !== e) n.lineSpacing = e;
28706
28716
  else {
28707
28717
  const e = this.parseLineSpacingExactPt(t);
28708
28718
  void 0 !== e && (n.lineSpacingExactPt = e);
28709
28719
  }
28710
28720
  }
28711
- if (void 0 === n.paragraphMarginLeft && void 0 !== i?.["@_marL"]) {
28712
- const e = Number.parseInt(String(i["@_marL"]), 10);
28721
+ if (void 0 === n.paragraphMarginLeft && void 0 !== o?.["@_marL"]) {
28722
+ const e = Number.parseInt(String(o["@_marL"]), 10);
28713
28723
  Number.isFinite(e) && (n.paragraphMarginLeft = e / t.EMU_PER_PX);
28714
28724
  }
28715
- if (void 0 === n.paragraphMarginRight && void 0 !== i?.["@_marR"]) {
28716
- const e = Number.parseInt(String(i["@_marR"]), 10);
28725
+ if (void 0 === n.paragraphMarginRight && void 0 !== o?.["@_marR"]) {
28726
+ const e = Number.parseInt(String(o["@_marR"]), 10);
28717
28727
  Number.isFinite(e) && (n.paragraphMarginRight = e / t.EMU_PER_PX);
28718
28728
  }
28719
- if (void 0 === n.paragraphIndent && void 0 !== i?.["@_indent"]) {
28720
- const e = Number.parseInt(String(i["@_indent"]), 10);
28729
+ if (void 0 === n.paragraphIndent && void 0 !== o?.["@_indent"]) {
28730
+ const e = Number.parseInt(String(o["@_indent"]), 10);
28721
28731
  Number.isFinite(e) && (n.paragraphIndent = e / t.EMU_PER_PX);
28722
28732
  }
28723
28733
  if (!n.tabStops) {
28724
- const e = i?.["a:tabLst"];
28734
+ const e = o?.["a:tabLst"];
28725
28735
  if (e) {
28726
28736
  const r = this.ensureArray(e["a:tab"]);
28727
28737
  r.length > 0 && (n.tabStops = r.filter((t) => void 0 !== t?.["@_pos"]).map((e) => {
@@ -28734,48 +28744,49 @@ var cy = class t extends ry {
28734
28744
  }));
28735
28745
  }
28736
28746
  }
28737
- if (void 0 !== i?.["@_defTabSz"] && void 0 === n.defaultTabSize) {
28738
- const e = Number.parseInt(String(i["@_defTabSz"]), 10);
28747
+ if (void 0 !== o?.["@_defTabSz"] && void 0 === n.defaultTabSize) {
28748
+ const e = Number.parseInt(String(o["@_defTabSz"]), 10);
28739
28749
  Number.isFinite(e) && (n.defaultTabSize = e / t.EMU_PER_PX);
28740
28750
  }
28741
- if (void 0 !== i?.["@_eaLnBrk"] && void 0 === n.eaLineBreak) {
28742
- const t = this.parseOptionalBooleanAttr(i["@_eaLnBrk"]);
28751
+ if (void 0 !== o?.["@_eaLnBrk"] && void 0 === n.eaLineBreak) {
28752
+ const t = this.parseOptionalBooleanAttr(o["@_eaLnBrk"]);
28743
28753
  void 0 !== t && (n.eaLineBreak = t);
28744
28754
  }
28745
- if (void 0 !== i?.["@_latinLnBrk"] && void 0 === n.latinLineBreak) {
28746
- const t = this.parseOptionalBooleanAttr(i["@_latinLnBrk"]);
28755
+ if (void 0 !== o?.["@_latinLnBrk"] && void 0 === n.latinLineBreak) {
28756
+ const t = this.parseOptionalBooleanAttr(o["@_latinLnBrk"]);
28747
28757
  void 0 !== t && (n.latinLineBreak = t);
28748
28758
  }
28749
- if (void 0 !== i?.["@_fontAlgn"] && void 0 === n.fontAlignment) {
28750
- const t = String(i["@_fontAlgn"]).trim();
28759
+ if (void 0 !== o?.["@_fontAlgn"] && void 0 === n.fontAlignment) {
28760
+ const t = String(o["@_fontAlgn"]).trim();
28751
28761
  t && (n.fontAlignment = t);
28752
28762
  }
28753
- if (void 0 !== i?.["@_hangingPunct"] && void 0 === n.hangingPunctuation) {
28754
- const t = this.parseOptionalBooleanAttr(i["@_hangingPunct"]);
28763
+ if (void 0 !== o?.["@_hangingPunct"] && void 0 === n.hangingPunctuation) {
28764
+ const t = this.parseOptionalBooleanAttr(o["@_hangingPunct"]);
28755
28765
  void 0 !== t && (n.hangingPunctuation = t);
28756
28766
  }
28757
- const s = this.extractTextRunStyle(i?.["a:defRPr"], a, r.slideRelationshipMap), l = Number.parseInt(String(i?.["@_lvl"] || "0"), 10), c = `a:lvl${Number.isFinite(l) ? Math.min(Math.max(l + 1, 1), 9) : 1}pPr`, d = this.extractTextRunStyle(r.inheritedTxBody?.["a:lstStyle"]?.[c]?.["a:defRPr"], a, r.slideRelationshipMap), h = this.extractTextRunStyle(r.txBody?.["a:lstStyle"]?.[c]?.["a:defRPr"], a, r.slideRelationshipMap), p = this.extractTextRunStyle(e?.["a:endParaRPr"], a, r.slideRelationshipMap), u = {
28767
+ const l = this.extractTextRunStyle(o?.["a:defRPr"], s, r.slideRelationshipMap, !1), c = void 0 === o?.["@_lvl"] ? -1 : Number.parseInt(String(o["@_lvl"]), 10), d = -1 === c ? "a:defPPr" : `a:lvl${Number.isFinite(c) ? Math.min(Math.max(c + 1, 1), 9) : 1}pPr`, h = this.extractTextRunStyle(r.inheritedTxBody?.["a:lstStyle"]?.[d]?.["a:defRPr"], s, r.slideRelationshipMap, !1), p = this.extractTextRunStyle(r.txBody?.["a:lstStyle"]?.[d]?.["a:defRPr"], s, r.slideRelationshipMap, !1), u = this.extractTextRunStyle(e?.["a:endParaRPr"], s, r.slideRelationshipMap, !1), m = {
28758
28768
  ...r.bodyDefaultRunStyle,
28759
- ...d,
28760
28769
  ...h,
28761
28770
  ...p,
28762
- ...s
28771
+ ...u,
28772
+ ...l
28763
28773
  };
28764
28774
  if (r.effectiveLevelStyles) {
28765
- const t = Number.isFinite(l) ? Math.min(Math.max(l, 0), 8) : 0, e = r.effectiveLevelStyles[t] ?? r.effectiveLevelStyles[-1];
28766
- e && (this.applyPlaceholderLevelDefaults(u, e), this.applyPlaceholderLevelDefaults(n, e));
28775
+ const t = -1 === c ? -1 : Number.isFinite(c) ? Math.min(Math.max(c, 0), 8) : 0, e = r.effectiveLevelStyles[t] ?? r.effectiveLevelStyles[-1] ?? (-1 === t ? r.effectiveLevelStyles[0] : void 0);
28776
+ e && (this.applyPlaceholderLevelDefaults(m, e), this.applyPlaceholderLevelDefaults(n, e));
28767
28777
  }
28768
- let m = void 0 !== i?.["@_marL"] ? Number.parseInt(String(i["@_marL"]), 10) / t.EMU_PER_PX : void 0, f = void 0 !== i?.["@_indent"] ? Number.parseInt(String(i["@_indent"]), 10) / t.EMU_PER_PX : void 0;
28778
+ void 0 === o?.["@_algn"] && void 0 !== n.align && (s = n.align);
28779
+ let f = void 0 !== o?.["@_marL"] ? Number.parseInt(String(o["@_marL"]), 10) / t.EMU_PER_PX : void 0, g = void 0 !== o?.["@_indent"] ? Number.parseInt(String(o["@_indent"]), 10) / t.EMU_PER_PX : void 0;
28769
28780
  if (r.effectiveLevelStyles) {
28770
- const t = Number.isFinite(l) ? Math.min(Math.max(l, 0), 8) : 0, e = r.effectiveLevelStyles[t] ?? r.effectiveLevelStyles[-1];
28771
- e && (void 0 === m && void 0 !== e.marginLeft && (m = e.marginLeft), void 0 === f && void 0 !== e.indent && (f = e.indent));
28781
+ const t = -1 === c ? -1 : Number.isFinite(c) ? Math.min(Math.max(c, 0), 8) : 0, e = r.effectiveLevelStyles[t] ?? r.effectiveLevelStyles[-1] ?? (-1 === t ? r.effectiveLevelStyles[0] : void 0);
28782
+ e && (void 0 === f && void 0 !== e.marginLeft && (f = e.marginLeft), void 0 === g && void 0 !== e.indent && (g = e.indent));
28772
28783
  }
28773
28784
  return {
28774
- paraAlign: a,
28775
- mergedDefaultRunStyle: u,
28785
+ paraAlign: s,
28786
+ mergedDefaultRunStyle: m,
28776
28787
  indent: {
28777
- marginLeft: m,
28778
- indent: f
28788
+ marginLeft: f,
28789
+ indent: g
28779
28790
  }
28780
28791
  };
28781
28792
  }
@@ -28858,27 +28869,32 @@ var cy = class t extends ry {
28858
28869
  ]);
28859
28870
  for (const e of Object.keys(t)) {
28860
28871
  if (!y.has(e)) continue;
28861
- const n = this.ensureArray(t[e]);
28862
- for (const l of n) switch (e) {
28872
+ const n = this.ensureArray(t[e]), l = t["a:br"], c = Array.isArray(l) ? l.length : void 0 === l ? 0 : 1, d = "a:r" === e && n.length > 1 && c > 0;
28873
+ for (const [l, h] of n.entries()) switch (e) {
28863
28874
  case "a:r":
28864
- u(l);
28875
+ u(h), d && l < Math.min(n.length - 1, c) && (a.push("\n"), s.push({
28876
+ text: "\n",
28877
+ style: { ...i },
28878
+ isLineBreak: !0
28879
+ }));
28865
28880
  break;
28866
28881
  case "a:fld":
28867
- m(l);
28882
+ m(h);
28868
28883
  break;
28869
28884
  case "a:t":
28870
- p("string" == typeof l ? l : void 0 !== l ? String(l) : "", t["a:rPr"]);
28885
+ p("string" == typeof h ? h : void 0 !== h ? String(h) : "", t["a:rPr"]);
28871
28886
  break;
28872
28887
  case "a14:m":
28873
28888
  case "m:oMathPara":
28874
28889
  case "m:oMath":
28875
- f(l);
28890
+ f(h);
28876
28891
  break;
28877
28892
  case "mc:AlternateContent":
28878
- g(l);
28893
+ g(h);
28879
28894
  break;
28880
28895
  case "a:br": {
28881
- const t = (l ?? {})["a:rPr"], e = {
28896
+ if (d) break;
28897
+ const t = (h ?? {})["a:rPr"], e = {
28882
28898
  ...i,
28883
28899
  ...this.extractTextRunStyle(t, r, o.slideRelationshipMap)
28884
28900
  };
@@ -28967,7 +28983,10 @@ var cy = class t extends ry {
28967
28983
  }, by = class t extends xy {
28968
28984
  parseShape(e, n, r) {
28969
28985
  try {
28970
- const i = e["p:spPr"], o = r ? this.slideRelsMap.get(r) : void 0, a = this.extractPlaceholderInfo(e?.["p:nvSpPr"]?.["p:nvPr"]), s = r && a ? this.findPlaceholderContext(r, a) : void 0, l = s?.shape?.["p:spPr"] || s?.picture?.["p:spPr"], c = this.mergeXmlObjects(l, i), d = c?.["a:xfrm"] || i?.["a:xfrm"] || l?.["a:xfrm"];
28986
+ const i = e["p:spPr"], o = r ? this.slideRelsMap.get(r) : void 0, a = this.extractPlaceholderInfo(e?.["p:nvSpPr"]?.["p:nvPr"]), s = r && a ? this.findPlaceholderContext(r, a) : void 0, l = s?.shape?.["p:spPr"] || s?.picture?.["p:spPr"], c = i ? {
28987
+ ...i,
28988
+ "a:xfrm": this.mergeXmlObjects(l?.["a:xfrm"], i["a:xfrm"])
28989
+ } : l, d = c?.["a:xfrm"] || i?.["a:xfrm"] || l?.["a:xfrm"];
28971
28990
  if (!d) return null;
28972
28991
  const h = Kn(d, "a:off"), p = Kn(d, "a:ext");
28973
28992
  if (!h || !p) return null;
@@ -28987,8 +29006,8 @@ var cy = class t extends ry {
28987
29006
  const $ = e["p:style"] || s?.shape?.["p:style"] || s?.picture?.["p:style"];
28988
29007
  let O = "";
28989
29008
  const j = {}, U = [], X = [], z = {
28990
- ...this.extractTextRunStyle(nr(E, "a:lstStyle", "a:defPPr", "a:defRPr"), "left", o),
28991
- ...this.extractTextRunStyle(nr(N, "a:lstStyle", "a:defPPr", "a:defRPr"), "left", o)
29009
+ ...this.extractTextRunStyle(nr(E, "a:lstStyle", "a:defPPr", "a:defRPr"), "left", o, !1),
29010
+ ...this.extractTextRunStyle(nr(N, "a:lstStyle", "a:defPPr", "a:defRPr"), "left", o, !1)
28992
29011
  };
28993
29012
  Object.assign(j, z);
28994
29013
  const G = $?.["a:fontRef"], W = String(G?.["@_idx"] || "").toLowerCase();
@@ -30236,6 +30255,11 @@ var Ey = class extends By {
30236
30255
  if (!e) continue;
30237
30256
  const i = this.parseGraphicFrame(e, `master-frame-${r}-${t.indexInType}`, n);
30238
30257
  i && (i.id = `master-${i.id}`, c.push(i));
30258
+ } else if ("p:cxnSp" === t.tag) {
30259
+ const e = this.ensureArray(o["p:cxnSp"])[t.indexInType];
30260
+ if (!e) continue;
30261
+ const i = this.parseConnector(e, `master-conn-${r}-${t.indexInType}`, n);
30262
+ i && (i.id = `master-${i.id}`, c.push(i));
30239
30263
  }
30240
30264
  return this.masterCache.set(n, c), c;
30241
30265
  } catch (t) {
@@ -30301,6 +30325,11 @@ var Ey = class extends By {
30301
30325
  if (!e) continue;
30302
30326
  const i = this.parseGraphicFrame(e, `layout-frame-${r}-${t.indexInType}`, n);
30303
30327
  i && (i.id = `layout-${i.id}`, h.push(i));
30328
+ } else if ("p:cxnSp" === t.tag) {
30329
+ const e = this.ensureArray(s["p:cxnSp"])[t.indexInType];
30330
+ if (!e) continue;
30331
+ const i = this.parseConnector(e, `layout-conn-${r}-${t.indexInType}`, n);
30332
+ i && (i.id = `layout-${i.id}`, h.push(i));
30304
30333
  }
30305
30334
  const p = Jn(Kn(e, "p:sldLayout"), "showMasterSp"), u = void 0 === p || "0" !== p.trim().toLowerCase() && "false" !== p.trim().toLowerCase() ? await this.getMasterElements(n) : [];
30306
30335
  this.currentSlideClrMapOverride = a;
@@ -32108,7 +32137,7 @@ var nx = class extends Qy {
32108
32137
  limit: r
32109
32138
  });
32110
32139
  }
32111
- if (this.slideRelsMap.clear(), this.externalRelsMap.clear(), this.slideMap.clear(), this.layoutCache.clear(), this.masterCache.clear(), this.layoutXmlMap.clear(), this.masterXmlMap.clear(), "function" == typeof globalThis.URL?.revokeObjectURL && this.blobUrlCache.size > 0) {
32140
+ if (this.slideRelsMap.clear(), this.externalRelsMap.clear(), this.slideMap.clear(), this.layoutCache.clear(), this.masterCache.clear(), this.layoutXmlMap.clear(), this.masterXmlMap.clear(), this.masterTxStylesCache.clear(), "function" == typeof globalThis.URL?.revokeObjectURL && this.blobUrlCache.size > 0) {
32112
32141
  for (const t of this.blobUrlCache) URL.revokeObjectURL(t);
32113
32142
  this.blobUrlCache.clear();
32114
32143
  }
@@ -32261,13 +32290,11 @@ var nx = class extends Qy {
32261
32290
  }) : [];
32262
32291
  }
32263
32292
  }, cx = class extends lx {
32264
- async buildLoadData(t, e) {
32265
- const n = this.extractHeaderFooter(), r = await this.parsePresentationProperties(), i = this.parseCustomShows(), o = await this.parseTableStyles(), a = await this.getEmbeddedFonts();
32266
- this.loadedEmbeddedFonts = a;
32267
- const s = await this.parseThemeOptions(), l = await this.parseNotesMaster(), c = await this.parseHandoutMaster(), d = await this.parseSlideMasters();
32268
- await this.enrichSlideMastersWithTxStyles(d);
32269
- const h = await this.parseTags(), p = await this.parseCustomProperties(), u = await this.parseCoreProperties(), m = await this.parseAppProperties(), f = this.presentationData ? pi(this.presentationData) : [], g = this.extractPhotoAlbum(), y = this.extractModifyVerifier(), x = this.extractKinsoku(), b = await this.parsePresentationCustomerData();
32270
- return this.thumbnailData = await this.parseThumbnail() ?? null, new Yr().withDimensions(t.width, t.height, this.rawSlideWidthEmu, this.rawSlideHeightEmu).withNotesDimensions(t.notesWidthEmu, t.notesHeightEmu).withSlides(e).withLayoutOptions(this.getLayoutOptions()).withHeaderFooter(n).withPresentationProperties(r).withCustomShows(i).withSections(t.orderedSections.length > 0 ? t.orderedSections : void 0).withWarnings(this.compatibilityService.getWarnings()).withThemeColorMap({ ...this.themeColorMap }).withTheme(this.buildThemeObject()).withThemeOptions(s.length > 0 ? s : void 0).withTableStyleMap(o).withEmbeddedFonts(a.length > 0 ? a : void 0).withMruColors(r?.mruColors).withNotesMaster(l).withHandoutMaster(c).withSlideMasters(d.length > 0 ? d : void 0).withTags(h.length > 0 ? h : void 0).withCustomProperties(p.length > 0 ? p : void 0).withCoreProperties(u).withAppProperties(m).withHasMacros(null !== this.vbaProjectBin || void 0).withHasDigitalSignatures(this.signatureDetection?.hasSignatures || void 0).withDigitalSignatureCount(this.signatureDetection?.signatureCount && this.signatureDetection.signatureCount > 0 ? this.signatureDetection.signatureCount : void 0).withPresentationGuides(f.length > 0 ? f : void 0).withPhotoAlbum(g).withKinsoku(x).withModifyVerifier(y).withCustomXmlParts(this.customXmlParts.length > 0 ? this.customXmlParts : void 0).withCustomerData(b.length > 0 ? b : void 0).withSlideSizeType(this.rawSlideSizeType).withThumbnailData(this.thumbnailData ?? void 0).withCommentAuthors(this.commentAuthorDetails.size > 0 ? Array.from(this.commentAuthorDetails.values()) : void 0).withConformance(this.isStrictOoxml ? "strict" : "transitional").build();
32293
+ async buildLoadData(t, e, n) {
32294
+ const r = this.extractHeaderFooter(), i = await this.parsePresentationProperties(), o = this.parseCustomShows(), a = await this.parseTableStyles(), s = await this.getEmbeddedFonts();
32295
+ this.loadedEmbeddedFonts = s;
32296
+ const l = await this.parseThemeOptions(), c = await this.parseNotesMaster(), d = await this.parseHandoutMaster(), h = await this.parseTags(), p = await this.parseCustomProperties(), u = await this.parseCoreProperties(), m = await this.parseAppProperties(), f = this.presentationData ? pi(this.presentationData) : [], g = this.extractPhotoAlbum(), y = this.extractModifyVerifier(), x = this.extractKinsoku(), b = await this.parsePresentationCustomerData();
32297
+ return this.thumbnailData = await this.parseThumbnail() ?? null, new Yr().withDimensions(t.width, t.height, this.rawSlideWidthEmu, this.rawSlideHeightEmu).withNotesDimensions(t.notesWidthEmu, t.notesHeightEmu).withSlides(e).withLayoutOptions(this.getLayoutOptions()).withHeaderFooter(r).withPresentationProperties(i).withCustomShows(o).withSections(t.orderedSections.length > 0 ? t.orderedSections : void 0).withWarnings(this.compatibilityService.getWarnings()).withThemeColorMap({ ...this.themeColorMap }).withTheme(this.buildThemeObject()).withThemeOptions(l.length > 0 ? l : void 0).withTableStyleMap(a).withEmbeddedFonts(s.length > 0 ? s : void 0).withMruColors(i?.mruColors).withNotesMaster(c).withHandoutMaster(d).withSlideMasters(n.length > 0 ? n : void 0).withTags(h.length > 0 ? h : void 0).withCustomProperties(p.length > 0 ? p : void 0).withCoreProperties(u).withAppProperties(m).withHasMacros(null !== this.vbaProjectBin || void 0).withHasDigitalSignatures(this.signatureDetection?.hasSignatures || void 0).withDigitalSignatureCount(this.signatureDetection?.signatureCount && this.signatureDetection.signatureCount > 0 ? this.signatureDetection.signatureCount : void 0).withPresentationGuides(f.length > 0 ? f : void 0).withPhotoAlbum(g).withKinsoku(x).withModifyVerifier(y).withCustomXmlParts(this.customXmlParts.length > 0 ? this.customXmlParts : void 0).withCustomerData(b.length > 0 ? b : void 0).withSlideSizeType(this.rawSlideSizeType).withThumbnailData(this.thumbnailData ?? void 0).withCommentAuthors(this.commentAuthorDetails.size > 0 ? Array.from(this.commentAuthorDetails.values()) : void 0).withConformance(this.isStrictOoxml ? "strict" : "transitional").build();
32271
32298
  }
32272
32299
  findMaxElementId(t) {
32273
32300
  let e = 0;
@@ -32308,12 +32335,14 @@ var nx = class extends Qy {
32308
32335
  }
32309
32336
  }
32310
32337
  dispose() {
32311
- this.revokeBlobUrls(), this.imageDataCache.clear(), this.slideMap.clear(), this.slideRelsMap.clear(), this.externalRelsMap.clear(), this.layoutCache.clear(), this.masterCache.clear(), this.layoutXmlMap.clear(), this.masterXmlMap.clear(), this.layoutPlaceholderDefaultsCache.clear(), this.masterPlaceholderDefaultsCache.clear(), this.themeOverrideCache.clear(), this.commentAuthorMap.clear(), this.commentAuthorDetails.clear(), this.vbaRelatedParts.clear(), this.presentationData = null, this.thumbnailData = null, this.vbaProjectBin = null, this.customXmlParts = [], this.loadedEmbeddedFonts = [], this.orderedSlidePaths = [], this.zip = null;
32338
+ this.revokeBlobUrls(), this.imageDataCache.clear(), this.slideMap.clear(), this.slideRelsMap.clear(), this.externalRelsMap.clear(), this.layoutCache.clear(), this.masterCache.clear(), this.layoutXmlMap.clear(), this.masterXmlMap.clear(), this.masterTxStylesCache.clear(), this.layoutPlaceholderDefaultsCache.clear(), this.masterPlaceholderDefaultsCache.clear(), this.themeOverrideCache.clear(), this.commentAuthorMap.clear(), this.commentAuthorDetails.clear(), this.vbaRelatedParts.clear(), this.presentationData = null, this.thumbnailData = null, this.vbaProjectBin = null, this.customXmlParts = [], this.loadedEmbeddedFonts = [], this.orderedSlidePaths = [], this.zip = null;
32312
32339
  }
32313
32340
  async load(t, e = {}) {
32314
32341
  await this.initializeLoadSession(t, e), await this.detectAndPreserveVbaProject(), this.detectDigitalSignatureParts(), await this.parseCustomXmlParts();
32315
- const n = await this.loadPresentationState(), r = await this.loadSlidesForPresentation(n.sectionBySlideId), i = this.attachSlideWarnings(r);
32316
- return this.resetElementIdCounter(r), this.buildLoadData(n, i);
32342
+ const n = await this.loadPresentationState(), r = await this.parseSlideMasters();
32343
+ await this.enrichSlideMastersWithTxStyles(r);
32344
+ const i = await this.loadSlidesForPresentation(n.sectionBySlideId), o = this.attachSlideWarnings(i);
32345
+ return this.resetElementIdCounter(i), this.buildLoadData(n, o, r);
32317
32346
  }
32318
32347
  getTemplateBackgroundColor(t) {
32319
32348
  return this.templateBackgroundService.getBackgroundColor({
Binary file
Binary file