Merge pull request #1822 from dolanmiu/feat/underline-none

#1807 Add underline none

demo/2-declaritive-styles.ts

@@ -222,6 +222,15 @@ const doc = new Document({
                         new TextRun({
                             text: "Underline and Strike",
                         }),
+                        new TextRun({
+                            text: " Override Underline ",
+                            underline: {
+                                type: UnderlineType.NONE,
+                            },
+                        }),
+                        new TextRun({
+                            text: "Strike and Underline",
+                        }),
                     ],
                 }),
                 new Paragraph({

src/file/paragraph/run/run-components/text.spec.ts

@@ -1,6 +1,7 @@
 import { expect } from "chai";
 
 import { Formatter } from "@export/formatter";
+import { SpaceType } from "@file/shared";
 
 import { Text } from "./text";
 
@@ -13,5 +14,26 @@ describe("Text", () => {
                 "w:t": [{ _attr: { "xml:space": "preserve" } }, " this is\n text"],
             });
         });
+
+        it("adds the passed in text to the component with options", () => {
+            const t = new Text({
+                text: " this is\n text",
+                space: SpaceType.PRESERVE,
+            });
+            const f = new Formatter().format(t);
+            expect(f).to.deep.equal({
+                "w:t": [{ _attr: { "xml:space": "preserve" } }, " this is\n text"],
+            });
+        });
+
+        it("adds the passed in text to the component with options and sets default space type", () => {
+            const t = new Text({
+                text: " this is\n text",
+            });
+            const f = new Formatter().format(t);
+            expect(f).to.deep.equal({
+                "w:t": [{ _attr: { "xml:space": "default" } }, " this is\n text"],
+            });
+        });
     });
 });

src/file/paragraph/run/run-components/text.ts

@@ -3,11 +3,31 @@ import { XmlComponent } from "@file/xml-components";
 
 import { TextAttributes } from "../text-attributes";
 
-export class Text extends XmlComponent {
-    public constructor(text: string) {
-        super("w:t");
-        this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
+// <xsd:complexType name="CT_Text">
+//     <xsd:simpleContent>
+//         <xsd:extension base="s:ST_String">
+//             <xsd:attribute ref="xml:space" use="optional" />
+//         </xsd:extension>
+//     </xsd:simpleContent>
+// </xsd:complexType>
 
-        this.root.push(text);
+interface ITextOptions {
+    readonly space?: SpaceType;
+    readonly text?: string;
+}
+
+export class Text extends XmlComponent {
+    public constructor(options: string | ITextOptions) {
+        super("w:t");
+
+        if (typeof options === "string") {
+            this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));
+            this.root.push(options);
+            return;
+        } else {
+            this.root.push(new TextAttributes({ space: options.space ?? SpaceType.DEFAULT }));
+            this.root.push(options.text);
+            return;
+        }
     }
 }

src/file/paragraph/run/underline.ts

@@ -19,6 +19,7 @@ export enum UnderlineType {
     WAVE = "wave",
     WAVYHEAVY = "wavyHeavy",
     WAVYDOUBLE = "wavyDouble",
+    NONE = "none",
 }
 
 export class Underline extends XmlComponent {