pptx-viewer-core 1.6.5 → 1.6.7

package/dist/index.js

@@ -497,14 +497,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) {
@@ -61009,6 +61047,8 @@ var PptxHandlerRuntime56 = class extends PptxHandlerRuntime55 {
       const existing = merged[key];
       if (value && typeof value === "object" && !Array.isArray(value) && existing && typeof existing === "object" && !Array.isArray(existing)) {
         merged[key] = this.mergeXmlObjects(existing, value, depth + 1);
+      } else if (value === "" && existing !== void 0 && existing !== "" && typeof existing === "object") {
+        merged[key] = existing;
       } else {
         merged[key] = value;
       }
@@ -63791,32 +63831,56 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
     }
     const grpSpPr = group["p:grpSpPr"];
     const xfrm = grpSpPr?.["a:xfrm"];
+    const EMU_PX = _PptxHandlerRuntime.EMU_PER_PX;
     let parentX = 0, parentY = 0, parentW = 0, parentH = 0;
     let chX = 0, chY = 0, chW = 0, chH = 0;
     if (xfrm) {
       const off = xfrm["a:off"];
       if (off) {
-        parentX = Math.round(parseEmuInt2(off["@_x"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        parentY = Math.round(parseEmuInt2(off["@_y"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        parentX = parseEmuInt2(off["@_x"]) / EMU_PX;
+        parentY = parseEmuInt2(off["@_y"]) / EMU_PX;
       }
       const ext = xfrm["a:ext"];
       if (ext) {
-        parentW = Math.round(parseEmuInt2(ext["@_cx"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        parentH = Math.round(parseEmuInt2(ext["@_cy"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        parentW = parseEmuInt2(ext["@_cx"]) / EMU_PX;
+        parentH = parseEmuInt2(ext["@_cy"]) / EMU_PX;
       }
       const chOff = xfrm["a:chOff"];
       if (chOff) {
-        chX = Math.round(parseEmuInt2(chOff["@_x"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        chY = Math.round(parseEmuInt2(chOff["@_y"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        chX = parseEmuInt2(chOff["@_x"]) / EMU_PX;
+        chY = parseEmuInt2(chOff["@_y"]) / EMU_PX;
       }
       const chExt = xfrm["a:chExt"];
       if (chExt) {
-        chW = Math.round(parseEmuInt2(chExt["@_cx"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        chH = Math.round(parseEmuInt2(chExt["@_cy"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        chW = parseEmuInt2(chExt["@_cx"]) / EMU_PX;
+        chH = parseEmuInt2(chExt["@_cy"]) / EMU_PX;
       }
     }
     const scaleX = chW > 0 ? parentW / chW : 1;
     const scaleY = chH > 0 ? parentH / chH : 1;
+    const rawChildXfrm = (childNode) => {
+      if (!childNode) {
+        return void 0;
+      }
+      const childXfrm = childNode["p:spPr"]?.["a:xfrm"] ?? childNode["p:xfrm"];
+      return childXfrm;
+    };
+    const applyRawChildGeometry = (el, childNode) => {
+      const childXfrm = rawChildXfrm(childNode);
+      if (!childXfrm) {
+        return;
+      }
+      const off = childXfrm["a:off"];
+      const ext = childXfrm["a:ext"];
+      if (off) {
+        el.x = parseEmuInt2(off["@_x"]) / EMU_PX;
+        el.y = parseEmuInt2(off["@_y"]) / EMU_PX;
+      }
+      if (ext) {
+        el.width = parseEmuInt2(ext["@_cx"]) / EMU_PX;
+        el.height = parseEmuInt2(ext["@_cy"]) / EMU_PX;
+      }
+    };
     const transformElement = (el) => {
       const relativeX = el.x - chX;
       const relativeY = el.y - chY;
@@ -63874,6 +63938,8 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
           `${baseId}-`
         );
         if (element) {
+          const childNode = this.ensureArray(group[entry.tag])[entry.indexInType];
+          applyRawChildGeometry(element, childNode);
           transformElement(element);
           elements2.push(element);
         }
@@ -64423,6 +64489,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) {
@@ -64433,9 +64533,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");
@@ -64457,9 +64556,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");
@@ -64485,9 +64583,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;
@@ -64514,9 +64611,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 {
@@ -64543,9 +64639,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;
@@ -64572,9 +64667,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 {
@@ -65382,6 +65476,21 @@ var PptxHandlerRuntime74 = class extends PptxHandlerRuntime73 {
             element.id = `master-${element.id}`;
             elements2.push(element);
           }
+        } else if (entry.tag === "p:grpSp") {
+          const groups = this.ensureArray(spTree["p:grpSp"]);
+          const group = groups[entry.indexInType];
+          if (!group) {
+            continue;
+          }
+          const element = await this.parseGroupShapeAsGroup(
+            group,
+            `master-group-${masterToken}-${entry.indexInType}`,
+            masterPath
+          );
+          if (element) {
+            element.id = `master-${element.id}`;
+            elements2.push(element);
+          }
         }
       }
       this.masterCache.set(masterPath, elements2);
@@ -65593,6 +65702,21 @@ var PptxHandlerRuntime76 = class extends PptxHandlerRuntime75 {
             element.id = `layout-${element.id}`;
             elements2.push(element);
           }
+        } else if (entry.tag === "p:grpSp") {
+          const groups = this.ensureArray(spTree["p:grpSp"]);
+          const group = groups[entry.indexInType];
+          if (!group) {
+            continue;
+          }
+          const element = await this.parseGroupShapeAsGroup(
+            group,
+            `layout-group-${layoutToken}-${entry.indexInType}`,
+            layoutPath
+          );
+          if (element) {
+            element.id = `layout-${element.id}`;
+            elements2.push(element);
+          }
         }
       }
       const layoutShowMasterSp = xmlAttr(

package/dist/index.mjs

@@ -492,14 +492,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) {
@@ -61004,6 +61042,8 @@ var PptxHandlerRuntime56 = class extends PptxHandlerRuntime55 {
       const existing = merged[key];
       if (value && typeof value === "object" && !Array.isArray(value) && existing && typeof existing === "object" && !Array.isArray(existing)) {
         merged[key] = this.mergeXmlObjects(existing, value, depth + 1);
+      } else if (value === "" && existing !== void 0 && existing !== "" && typeof existing === "object") {
+        merged[key] = existing;
       } else {
         merged[key] = value;
       }
@@ -63786,32 +63826,56 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
     }
     const grpSpPr = group["p:grpSpPr"];
     const xfrm = grpSpPr?.["a:xfrm"];
+    const EMU_PX = _PptxHandlerRuntime.EMU_PER_PX;
     let parentX = 0, parentY = 0, parentW = 0, parentH = 0;
     let chX = 0, chY = 0, chW = 0, chH = 0;
     if (xfrm) {
       const off = xfrm["a:off"];
       if (off) {
-        parentX = Math.round(parseEmuInt2(off["@_x"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        parentY = Math.round(parseEmuInt2(off["@_y"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        parentX = parseEmuInt2(off["@_x"]) / EMU_PX;
+        parentY = parseEmuInt2(off["@_y"]) / EMU_PX;
       }
       const ext = xfrm["a:ext"];
       if (ext) {
-        parentW = Math.round(parseEmuInt2(ext["@_cx"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        parentH = Math.round(parseEmuInt2(ext["@_cy"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        parentW = parseEmuInt2(ext["@_cx"]) / EMU_PX;
+        parentH = parseEmuInt2(ext["@_cy"]) / EMU_PX;
       }
       const chOff = xfrm["a:chOff"];
       if (chOff) {
-        chX = Math.round(parseEmuInt2(chOff["@_x"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        chY = Math.round(parseEmuInt2(chOff["@_y"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        chX = parseEmuInt2(chOff["@_x"]) / EMU_PX;
+        chY = parseEmuInt2(chOff["@_y"]) / EMU_PX;
       }
       const chExt = xfrm["a:chExt"];
       if (chExt) {
-        chW = Math.round(parseEmuInt2(chExt["@_cx"]) / _PptxHandlerRuntime.EMU_PER_PX);
-        chH = Math.round(parseEmuInt2(chExt["@_cy"]) / _PptxHandlerRuntime.EMU_PER_PX);
+        chW = parseEmuInt2(chExt["@_cx"]) / EMU_PX;
+        chH = parseEmuInt2(chExt["@_cy"]) / EMU_PX;
       }
     }
     const scaleX = chW > 0 ? parentW / chW : 1;
     const scaleY = chH > 0 ? parentH / chH : 1;
+    const rawChildXfrm = (childNode) => {
+      if (!childNode) {
+        return void 0;
+      }
+      const childXfrm = childNode["p:spPr"]?.["a:xfrm"] ?? childNode["p:xfrm"];
+      return childXfrm;
+    };
+    const applyRawChildGeometry = (el, childNode) => {
+      const childXfrm = rawChildXfrm(childNode);
+      if (!childXfrm) {
+        return;
+      }
+      const off = childXfrm["a:off"];
+      const ext = childXfrm["a:ext"];
+      if (off) {
+        el.x = parseEmuInt2(off["@_x"]) / EMU_PX;
+        el.y = parseEmuInt2(off["@_y"]) / EMU_PX;
+      }
+      if (ext) {
+        el.width = parseEmuInt2(ext["@_cx"]) / EMU_PX;
+        el.height = parseEmuInt2(ext["@_cy"]) / EMU_PX;
+      }
+    };
     const transformElement = (el) => {
       const relativeX = el.x - chX;
       const relativeY = el.y - chY;
@@ -63869,6 +63933,8 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
           `${baseId}-`
         );
         if (element) {
+          const childNode = this.ensureArray(group[entry.tag])[entry.indexInType];
+          applyRawChildGeometry(element, childNode);
           transformElement(element);
           elements2.push(element);
         }
@@ -64418,6 +64484,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) {
@@ -64428,9 +64528,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");
@@ -64452,9 +64551,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");
@@ -64480,9 +64578,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;
@@ -64509,9 +64606,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 {
@@ -64538,9 +64634,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;
@@ -64567,9 +64662,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 {
@@ -65377,6 +65471,21 @@ var PptxHandlerRuntime74 = class extends PptxHandlerRuntime73 {
             element.id = `master-${element.id}`;
             elements2.push(element);
           }
+        } else if (entry.tag === "p:grpSp") {
+          const groups = this.ensureArray(spTree["p:grpSp"]);
+          const group = groups[entry.indexInType];
+          if (!group) {
+            continue;
+          }
+          const element = await this.parseGroupShapeAsGroup(
+            group,
+            `master-group-${masterToken}-${entry.indexInType}`,
+            masterPath
+          );
+          if (element) {
+            element.id = `master-${element.id}`;
+            elements2.push(element);
+          }
         }
       }
       this.masterCache.set(masterPath, elements2);
@@ -65588,6 +65697,21 @@ var PptxHandlerRuntime76 = class extends PptxHandlerRuntime75 {
             element.id = `layout-${element.id}`;
             elements2.push(element);
           }
+        } else if (entry.tag === "p:grpSp") {
+          const groups = this.ensureArray(spTree["p:grpSp"]);
+          const group = groups[entry.indexInType];
+          if (!group) {
+            continue;
+          }
+          const element = await this.parseGroupShapeAsGroup(
+            group,
+            `layout-group-${layoutToken}-${entry.indexInType}`,
+            layoutPath
+          );
+          if (element) {
+            element.id = `layout-${element.id}`;
+            elements2.push(element);
+          }
         }
       }
       const layoutShowMasterSp = xmlAttr(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptx-viewer-core",
-	"version": "1.6.5",
+	"version": "1.6.7",
 	"description": "PowerPoint PPTX engine: parse, edit, serialize, and convert .pptx files. Framework-agnostic TypeScript SDK.",
 	"keywords": [
 		"angular",