Merge remote-tracking branch 'origin/main'

Author: singerla

package.json

@@ -56,7 +56,7 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@xmldom/xmldom": "^0.8.6",
+    "@xmldom/xmldom": "^0.9.1",
     "extract-zip": "^2.0.1",
     "jszip": "^3.10.1",
     "regexp.escape": "^1.1.0"

src/helper/xml-elements.ts

@@ -15,6 +15,8 @@ export default class XmlElements {
   document: XmlDocument;
   params: XmlElementParams;
   defaultValues: Record<string, string>;
+  paragraphTemplate: XmlElement;
+  runTemplate: XmlElement;
 
   constructor(element: XmlDocument | XmlElement, params?: XmlElementParams) {
     this.element = element;
@@ -47,9 +49,44 @@ export default class XmlElements {
     if (!txBody) {
       txBody = this.document.createElement('p:txBody');
       this.element.appendChild(txBody);
+
+      const bodyPr = this.document.createElement('a:bodyPr');
+      txBody.appendChild(bodyPr);
+
+      const lstStyle = this.document.createElement('a:lstStyle');
+      txBody.appendChild(lstStyle);
+
+      this.paragraphTemplate = this.document.createElement('a:p');
+      txBody.appendChild(this.paragraphTemplate);
+
+      this.runTemplate = this.document.createElement('a:r');
+      const rPr = this.document.createElement('a:rPr');
+      this.runTemplate.appendChild(rPr);
     } else {
-      while (txBody.firstChild) {
-        txBody.removeChild(txBody.firstChild);
+      let bodyPr = txBody.getElementsByTagName('a:bodyPr')[0];
+      if (!bodyPr) {
+        bodyPr = this.document.createElement('a:bodyPr');
+        txBody.insertBefore(bodyPr, txBody.firstChild);
+      }
+
+      let lstStyle = txBody.getElementsByTagName('a:lstStyle')[0];
+      if (!lstStyle) {
+        lstStyle = this.document.createElement('a:lstStyle');
+        txBody.insertBefore(lstStyle, bodyPr.nextSibling);
+      }
+
+      const paragraphs = txBody.getElementsByTagName('a:p');
+      this.paragraphTemplate = paragraphs[0];
+      XmlHelper.sliceCollection(paragraphs, 0);
+
+
+      const runs = this.paragraphTemplate.getElementsByTagName('a:r');
+      if (runs.length > 0) {
+        this.runTemplate = runs[0];
+      } else {
+        this.runTemplate = this.document.createElement('a:r');
+        const rPr = this.document.createElement('a:rPr');
+        this.runTemplate.appendChild(rPr);
       }
     }
     return txBody;
@@ -81,24 +118,39 @@ export default class XmlElements {
   }
 
   createParagraph(level: number): XmlElement {
-    const p = this.document.createElement('a:p');
-    const pPr = this.document.createElement('a:pPr');
-    if (level > 0) {
-      pPr.setAttribute('lvl', String(level));
+    const p = this.paragraphTemplate.cloneNode(true) as XmlElement;
+    const pPr = p.getElementsByTagName('a:pPr')[0];
+    if (pPr) {
+      if (level > 0) {
+        pPr.setAttribute('lvl', String(level));
+        pPr.removeAttribute('indent');
+        pPr.removeAttribute('marL');
+      } else {
+        pPr.removeAttribute('lvl');
+      }
+    } else {
+      const newPPr = this.document.createElement('a:pPr');
+      if (level > 0) {
+        newPPr.setAttribute('lvl', String(level));
+      }
+      p.insertBefore(newPPr, p.firstChild);
     }
-    p.appendChild(pPr);
+    const runs = p.getElementsByTagName('a:r');
+    XmlHelper.sliceCollection(runs, 0);
     return p;
   }
 
   createTextRun(text: string): XmlElement {
-    const r = this.document.createElement('a:r');
-    const rPr = this.document.createElement('a:rPr');
-    r.appendChild(rPr);
-
-    const t = this.document.createElement('a:t');
-    t.textContent = String(text);
+    const r = this.runTemplate.cloneNode(true) as XmlElement;
+    const t = r.getElementsByTagName('a:t')[0];
+    if (t) {
+      t.textContent = text;
+    } else {
+      const newT = this.document.createElement('a:t');
+      newT.textContent = text;
+      r.appendChild(newT);
+    }
 
-    r.appendChild(t);
     return r;
   }
 

yarn.lock

@@ -843,10 +843,10 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@xmldom/xmldom@^0.8.6":
-  version "0.8.10"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
-  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+"@xmldom/xmldom@^0.9.1":
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.9.3.tgz#a5d5362050767d8823b2b74e36cb2f059f58e797"
+  integrity sha512-W7fOe0N+t2eyL9sjDE+7bBNo/NZg6U6aU0Rp8wwQV8TRkzLnX13SvROoyJMAH0Kcm9G1DX9b1XI4LxwKxowsXw==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"