fix(image): add suffix for created rId-attributes to prevent messed svg insertions

Author: singerla

src/automizer.ts

@@ -73,7 +73,7 @@ export default class Automizer implements IPresentationProps {
 
   setStatusTracker(statusTracker: StatusTracker['next']): void {
     const defaultStatusTracker = (status: StatusTracker) => {
-      console.log(status.info + '(' + status.share + '%)');
+      console.log(status.info + ' (' + status.share + '%)');
     };
 
     this.status = {

src/classes/shape.ts

@@ -121,19 +121,21 @@ export class Shape {
     );
   }
 
-  async updateElementRelId(): Promise<void> {
+  async updateElementsRelId(): Promise<void> {
     const targetSlideXml = await XmlHelper.getXmlFromArchive(
       this.targetArchive,
       this.targetSlideFile,
     );
-    const targetElement = await this.getElementByRid(
+    const targetElements = await this.getElementsByRid(
       targetSlideXml,
       this.sourceRid,
     );
 
-    targetElement
-      .getElementsByTagName(this.relRootTag)[0]
-      .setAttribute(this.relAttribute, this.createdRid);
+    targetElements.forEach((targetElement) => {
+      this.relParent(targetElement)
+        .getElementsByTagName(this.relRootTag)[0]
+        .setAttribute(this.relAttribute, this.createdRid);
+    });
 
     await XmlHelper.writeXmlToArchive(
       this.targetArchive,
@@ -142,23 +144,24 @@ export class Shape {
     );
   }
 
-  async updateTargetElementRelId(): Promise<void> {
-    this.targetElement
-      .getElementsByTagName(this.relRootTag)[0]
-      .setAttribute(this.relAttribute, this.createdRid);
-  }
-
-  async getElementByRid(slideXml: Document, rId: string): Promise<Element> {
+  async getElementsByRid(slideXml: Document, rId: string): Promise<Element[]> {
     const sourceList = slideXml
       .getElementsByTagName('p:spTree')[0]
       .getElementsByTagName(this.relRootTag);
-    const sourceElement = XmlHelper.findByAttributeValue(
+
+    const sourceElements = XmlHelper.findByAttributeValue(
       sourceList,
       this.relAttribute,
       rId,
     );
 
-    return this.relParent(sourceElement);
+    return sourceElements;
+  }
+
+  async updateTargetElementRelId(): Promise<void> {
+    this.targetElement
+      .getElementsByTagName(this.relRootTag)[0]
+      .setAttribute(this.relAttribute, this.createdRid);
   }
 
   applyCallbacks(

src/classes/slide.ts

@@ -467,7 +467,6 @@ export class Slide implements ISlide {
       const length = drop.length;
       if (length && length > 0) {
         XmlHelper.sliceCollection(drop, 0);
-        console.log('Removed ' + length + ' unsupported ' + tag + ' elements.');
       }
     });
     await XmlHelper.writeXmlToArchive(this.targetArchive, this.targetPath, xml);

src/helper/modify-xml-helper.ts

@@ -41,7 +41,7 @@ export default class ModifyXmlHelper {
 
       if (element === false) {
         if (isRequired === true) {
-          vd('Could not assert required tag: ' + tag + '@index:' + index);
+          // vd('Could not assert required tag: ' + tag + '@index:' + index);
         }
         return;
       }

src/helper/xml-helper.ts

@@ -91,7 +91,7 @@ export class XmlHelper {
     const relationNodes = presentationRelsXml.documentElement.childNodes;
     const rid = XmlHelper.getMaxId(relationNodes, 'Id', true);
 
-    return increment(rid);
+    return increment(rid) + '-created';
   }
 
   static getMaxId(
@@ -104,7 +104,12 @@ export class XmlHelper {
     for (const i in rels) {
       const rel = rels[i] as Element;
       if (rel.getAttribute !== undefined) {
-        const id = Number(rel.getAttribute(attribute).replace('rId', ''));
+        const id = Number(
+          rel
+            .getAttribute(attribute)
+            .replace('rId', '')
+            .replace('-created', ''),
+        );
         max = id > max ? id : max;
       }
     }
@@ -293,7 +298,7 @@ export class XmlHelper {
     return null;
   }
 
-  static findByAttributeValue(
+  static findFirstByAttributeValue(
     nodes: NodeListOf<ChildNode> | HTMLCollectionOf<Element>,
     attributeName: string,
     attributeValue: string,
@@ -310,6 +315,24 @@ export class XmlHelper {
     return null;
   }
 
+  static findByAttributeValue(
+    nodes: NodeListOf<ChildNode> | HTMLCollectionOf<Element>,
+    attributeName: string,
+    attributeValue: string,
+  ): Element[] {
+    const matchingNodes = <Element[]>[];
+    for (const i in nodes) {
+      const node = <Element>nodes[i];
+      if (
+        node.getAttribute &&
+        node.getAttribute(attributeName) === attributeValue
+      ) {
+        matchingNodes.push(node);
+      }
+    }
+    return matchingNodes;
+  }
+
   static createContentTypeChild(
     archive: JSZip,
     attributes: OverrideAttribute | DefaultAttribute,

src/shapes/chart.ts

@@ -70,7 +70,7 @@ export class Chart extends Shape implements IChart {
     targetSlideNumber: number,
   ): Promise<Chart> {
     await this.prepare(targetTemplate, targetSlideNumber);
-    await this.updateElementRelId();
+    await this.updateElementsRelId();
 
     return this;
   }

src/shapes/image.ts

@@ -38,7 +38,7 @@ export class Image extends Shape implements IImage {
     targetSlideNumber: number,
   ): Promise<Image> {
     await this.prepare(targetTemplate, targetSlideNumber);
-    await this.updateElementRelId();
+    await this.updateElementsRelId();
 
     return this;
   }
@@ -48,7 +48,7 @@ export class Image extends Shape implements IImage {
     targetSlideNumber: number,
   ): Promise<Image> {
     await this.prepare(targetTemplate, targetSlideNumber);
-    await this.updateElementRelId();
+    await this.updateElementsRelId();
 
     return this;
   }