Merge pull request #108 from dmitri-gb/smart-tags

Parse and render Smart Tags
VolodymyrBaydalka · Apr 16, 2024 · f3fec58 · f3fec58
2 parents b42b380 + 2a08efd
commit f3fec58
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 9 deletions.
diff --git a/dist/docx-preview.js b/dist/docx-preview.js
diff --git a/dist/docx-preview.js.map b/dist/docx-preview.js.map
diff --git a/dist/docx-preview.min.js b/dist/docx-preview.min.js
diff --git a/dist/docx-preview.min.js.map b/dist/docx-preview.min.js.map
diff --git a/dist/docx-preview.min.mjs b/dist/docx-preview.min.mjs
diff --git a/dist/docx-preview.min.mjs.map b/dist/docx-preview.min.mjs.map
diff --git a/dist/docx-preview.mjs b/dist/docx-preview.mjs
@@ -701,6 +701,7 @@ var DomType;
     DomType["Row"] = "row";
     DomType["Cell"] = "cell";
     DomType["Hyperlink"] = "hyperlink";
+    DomType["SmartTag"] = "smartTag";
     DomType["Drawing"] = "drawing";
     DomType["Image"] = "image";
     DomType["Text"] = "text";
@@ -1754,6 +1755,9 @@ class DocumentParser {
                 case "hyperlink":
                     result.children.push(this.parseHyperlink(el, result));
                     break;
+                case "smartTag":
+                    result.children.push(this.parseSmartTag(el, result));
+                    break;
                 case "bookmarkStart":
                     result.children.push(parseBookmarkStart(el, globalXmlParser));
                     break;
@@ -1827,6 +1831,23 @@ class DocumentParser {
         });
         return result;
     }
+    parseSmartTag(node, parent) {
+        var result = { type: DomType.SmartTag, parent, children: [] };
+        var uri = globalXmlParser.attr(node, "uri");
+        var element = globalXmlParser.attr(node, "element");
+        if (uri)
+            result.uri = uri;
+        if (element)
+            result.element = element;
+        xmlUtil.foreach(node, c => {
+            switch (c.localName) {
+                case "r":
+                    result.children.push(this.parseRun(c, result));
+                    break;
+            }
+        });
+        return result;
+    }
     parseRun(node, parent) {
         var result = { type: DomType.Run, parent: parent, children: [] };
         xmlUtil.foreach(node, c => {
@@ -3222,6 +3243,8 @@ section.${c}>footer { z-index: 1; }
                 return this.renderTableCell(elem);
             case DomType.Hyperlink:
                 return this.renderHyperlink(elem);
+            case DomType.SmartTag:
+                return this.renderSmartTag(elem);
             case DomType.Drawing:
                 return this.renderDrawing(elem);
             case DomType.Image:
@@ -3372,6 +3395,11 @@ section.${c}>footer { z-index: 1; }
         }
         return result;
     }
+    renderSmartTag(elem) {
+        var result = this.createElement("span");
+        this.renderChildren(elem, result);
+        return result;
+    }
     renderCommentRangeStart(commentStart) {
         if (!this.options.renderComments)
             return null;

diff --git a/dist/docx-preview.mjs.map b/dist/docx-preview.mjs.map
diff --git a/src/document-parser.ts b/src/document-parser.ts
@@ -1,6 +1,6 @@
 import {
 	DomType, WmlTable, IDomNumbering,
-	WmlHyperlink, IDomImage, OpenXmlElement, WmlTableColumn, WmlTableCell,
+	WmlHyperlink, WmlSmartTag, IDomImage, OpenXmlElement, WmlTableColumn, WmlTableCell,
 	WmlTableRow, NumberingPicBullet, WmlText, WmlSymbol, WmlBreak, WmlNoteReference
 } from './document/dom';
 import { DocumentElement } from './document/document';
@@ -502,6 +502,10 @@ export class DocumentParser {
 				case "hyperlink":
 					result.children.push(this.parseHyperlink(el, result));
 					break;
+
+				case "smartTag":
+					result.children.push(this.parseSmartTag(el, result));
+					break;
 
 				case "bookmarkStart":
 					result.children.push(parseBookmarkStart(el, xml));
@@ -599,6 +603,28 @@ export class DocumentParser {
 
 		return result;
 	}
+
+	parseSmartTag(node: Element, parent?: OpenXmlElement): WmlSmartTag {
+		var result: WmlSmartTag = { type: DomType.SmartTag, parent, children: [] };
+		var uri = xml.attr(node, "uri");
+		var element = xml.attr(node, "element");
+
+		if (uri)
+			result.uri = uri;
+
+		if (element)
+			result.element = element;
+
+		xmlUtil.foreach(node, c => {
+			switch (c.localName) {
+				case "r":
+					result.children.push(this.parseRun(c, result));
+					break;
+			}
+		});
+
+		return result;
+	}
 
 	parseRun(node: Element, parent?: OpenXmlElement): WmlRun {
 		var result: WmlRun = <WmlRun>{ type: DomType.Run, parent: parent, children: [] };

diff --git a/src/document/dom.ts b/src/document/dom.ts
@@ -8,6 +8,7 @@ export enum DomType {
     Row = "row",
     Cell = "cell",
     Hyperlink = "hyperlink",
+    SmartTag = "smartTag",
     Drawing = "drawing",
     Image = "image",
     Text = "text",
@@ -90,6 +91,11 @@ export interface WmlHyperlink extends OpenXmlElement {
     href?: string;
 }
 
+export interface WmlSmartTag extends OpenXmlElement {
+	uri?: string;
+    element?: string;
+}
+
 export interface WmlNoteReference extends OpenXmlElement {
     id: string;
 }

diff --git a/src/html-renderer.ts b/src/html-renderer.ts
@@ -1,7 +1,8 @@
 import { WordDocument } from './word-document';
 import {
 	DomType, WmlTable, IDomNumbering,
-	WmlHyperlink, IDomImage, OpenXmlElement, WmlTableColumn, WmlTableCell, WmlText, WmlSymbol, WmlBreak, WmlNoteReference
+	WmlHyperlink, IDomImage, OpenXmlElement, WmlTableColumn, WmlTableCell, WmlText, WmlSymbol, WmlBreak, WmlNoteReference,
+	WmlSmartTag
 } from './document/dom';
 import { CommonProperties } from './document/common';
 import { Options } from './docx-preview';
@@ -734,6 +735,9 @@ section.${c}>footer { z-index: 1; }
 
 			case DomType.Hyperlink:
 				return this.renderHyperlink(elem);
+
+			case DomType.SmartTag:
+				return this.renderSmartTag(elem);
 
 			case DomType.Drawing:
 				return this.renderDrawing(elem);
@@ -947,7 +951,12 @@ section.${c}>footer { z-index: 1; }
 
 		return result;
 	}
-
+
+	renderSmartTag(elem: WmlSmartTag) {
+		var result = this.createElement("span");
+		this.renderChildren(elem, result);
+		return result;
+	}
 
 	renderCommentRangeStart(commentStart: WmlCommentRangeStart) {
 		if (!this.options.renderComments)