pptx-react-viewer 1.25.1 → 1.25.2

package/dist/{chunk-CYZLRYJV.js → chunk-RPWTP6QP.js}

@@ -7104,14 +7104,52 @@ function extractSourceOrders(xml) {
   }
   return orders;
 }
+function ensureArrayLocal(value) {
+  return Array.isArray(value) ? value : value === void 0 ? [] : [value];
+}
+function countsSignature(counts) {
+  return [...counts.entries()].sort((a, b) => a[0] < b[0] ? -1 : 1).map(([name, count]) => `${name}:${count}`).join(",");
+}
+function pathSignature(path) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const key of Object.keys(path)) {
+    const name = localName(key);
+    if (!PATH_COMMANDS.has(name)) {
+      continue;
+    }
+    counts.set(name, (counts.get(name) ?? 0) + ensureArrayLocal(path[key]).length);
+  }
+  return countsSignature(counts);
+}
+function orderSignature(order) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const name of order) {
+    counts.set(name, (counts.get(name) ?? 0) + 1);
+  }
+  return countsSignature(counts);
+}
 function annotateCustomGeometryCommandOrder(xml, parsed) {
   const orders = extractSourceOrders(xml);
   if (orders.length === 0) {
     return;
   }
   const paths = collectParsedPaths(parsed);
-  for (let index = 0; index < Math.min(paths.length, orders.length); index++) {
-    commandOrder.set(paths[index], orders[index]);
+  const ordersBySignature = /* @__PURE__ */ new Map();
+  for (const order of orders) {
+    const signature = orderSignature(order);
+    const bucket = ordersBySignature.get(signature);
+    if (bucket) {
+      bucket.push(order);
+    } else {
+      ordersBySignature.set(signature, [order]);
+    }
+  }
+  for (const path of paths) {
+    const bucket = ordersBySignature.get(pathSignature(path));
+    const order = bucket?.shift();
+    if (order) {
+      commandOrder.set(path, order);
+    }
   }
 }
 function orderedPathCommandEntries(path, ensureArray16) {
@@ -70295,6 +70333,40 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
     }
     return void 0;
   }
+  /**
+   * Reuse the cached parse of a layout XML part, parsing (and caching) on a
+   * miss. Background resolution runs per slide but the layout/master parts are
+   * large (a themed master can be ~200 KB); re-parsing them for every slide
+   * dominated load time, so share the same parsed object `getLayoutElements`
+   * already populated.
+   */
+  async resolveCachedLayoutXml(layoutPath) {
+    const cached = this.layoutXmlMap.get(layoutPath);
+    if (cached) {
+      return cached;
+    }
+    const xml = await this.zip.file(layoutPath)?.async("string");
+    if (!xml) {
+      return void 0;
+    }
+    const parsed = this.parser.parse(xml);
+    this.layoutXmlMap.set(layoutPath, parsed);
+    return parsed;
+  }
+  /** Reuse the cached parse of a master XML part, parsing (and caching) on a miss. */
+  async resolveCachedMasterXml(masterPath) {
+    const cached = this.masterXmlMap.get(masterPath);
+    if (cached) {
+      return cached;
+    }
+    const xml = await this.zip.file(masterPath)?.async("string");
+    if (!xml) {
+      return void 0;
+    }
+    const parsed = this.parser.parse(xml);
+    this.masterXmlMap.set(masterPath, parsed);
+    return parsed;
+  }
   async getMasterBackgroundImage(layoutPath) {
     const layoutRels = this.slideRelsMap.get(layoutPath);
     if (!layoutRels) {
@@ -70305,9 +70377,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             const masterRelsPath = `${masterPath.replace("slideMasters/", "slideMasters/_rels/")}.rels`;
             await this.loadSlideRelationships(masterPath, masterRelsPath);
             return this.extractBackgroundImage(masterXmlObj, masterPath, "p:sldMaster");
@@ -70329,9 +70400,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutRelsPath = `${layoutPath.replace("slideLayouts/", "slideLayouts/_rels/")}.rels`;
             await this.loadSlideRelationships(layoutPath, layoutRelsPath);
             const bg = this.extractBackgroundImage(layoutXmlObj, layoutPath, "p:sldLayout");
@@ -70357,9 +70427,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutBg = this.extractBackgroundColor(layoutXmlObj, "p:sldLayout");
             if (layoutBg) {
               return layoutBg;
@@ -70386,9 +70455,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             return this.extractBackgroundColor(masterXmlObj, "p:sldMaster");
           }
         } catch {
@@ -70413,9 +70481,8 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutGrad = this.extractBackgroundGradient(layoutXmlObj, "p:sldLayout");
             if (layoutGrad) {
               return layoutGrad;
@@ -70442,9 +70509,8 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             return this.extractBackgroundGradient(masterXmlObj, "p:sldMaster");
           }
         } catch {

package/dist/{chunk-PMGLZ7N4.mjs → chunk-UR4R3CH4.mjs}

@@ -1,4 +1,4 @@
-import { MIN_ELEMENT_SIZE, guideEmuToPx, THEME_COLOR_SCHEME_KEYS, hasShapeProperties, hasTextProperties, createChartElement, getShapeClipPath, getAdjustmentAwareShapeClipPath, getShapeClipPathFromPreset, getCloudPathForRendering, hslToRgb, PRESET_COLOR_MAP, isImageLikeElement, stripXmlOrderSuffix, orderedXmlKey, applyDrawingColorTransforms } from './chunk-M7JHZV3P.mjs';
+import { MIN_ELEMENT_SIZE, guideEmuToPx, THEME_COLOR_SCHEME_KEYS, hasShapeProperties, hasTextProperties, createChartElement, getShapeClipPath, getAdjustmentAwareShapeClipPath, getShapeClipPathFromPreset, getCloudPathForRendering, hslToRgb, PRESET_COLOR_MAP, isImageLikeElement, stripXmlOrderSuffix, orderedXmlKey, applyDrawingColorTransforms } from './chunk-Q2WHYUNV.mjs';
 import DOMPurify from 'dompurify';
 
 var defaultThemeColors = {