fix

bokuweb · Nov 22, 2024 · 34f9aac · 34f9aac
1 parent 3b1e348
commit 34f9aac
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/docx-core/src/documents/elements/paragraph_property.rs b/docx-core/src/documents/elements/paragraph_property.rs
@@ -197,7 +197,7 @@ impl ParagraphProperty {
     }
 
     pub fn run_property(mut self, s: RunProperty) -> Self {
-        self.run_property = s;
+        self.run_property = Some(s);
         self
     }
 

diff --git a/docx-wasm/js/index.ts b/docx-wasm/js/index.ts
@@ -290,33 +290,35 @@ export class Docx {
       level = level.suffix(wasm.LevelSuffixType.Tab);
     }
 
-    if (l.runProperty._bold) {
-      level = level.bold();
-    }
-
-    if (l.runProperty._italic) {
-      level = level.italic();
-    }
-
-    if (l.runProperty._size) {
-      level = level.size(l.runProperty._size);
-    }
-
-    if (l.runProperty._fonts) {
-      let f = wasm.createRunFonts();
-      if (l.runProperty._fonts._ascii) {
-        f = f.ascii(l.runProperty._fonts._ascii);
+    if (l.runProperty) {
+      if (l.runProperty._bold) {
+        level = level.bold();
       }
-      if (l.runProperty._fonts._hiAnsi) {
-        f = f.hi_ansi(l.runProperty._fonts._hiAnsi);
+
+      if (l.runProperty._italic) {
+        level = level.italic();
       }
-      if (l.runProperty._fonts._cs) {
-        f = f.cs(l.runProperty._fonts._cs);
+
+      if (l.runProperty._size) {
+        level = level.size(l.runProperty._size);
       }
-      if (l.runProperty._fonts._eastAsia) {
-        f = f.east_asia(l.runProperty._fonts._eastAsia);
+
+      if (l.runProperty._fonts) {
+        let f = wasm.createRunFonts();
+        if (l.runProperty._fonts._ascii) {
+          f = f.ascii(l.runProperty._fonts._ascii);
+        }
+        if (l.runProperty._fonts._hiAnsi) {
+          f = f.hi_ansi(l.runProperty._fonts._hiAnsi);
+        }
+        if (l.runProperty._fonts._cs) {
+          f = f.cs(l.runProperty._fonts._cs);
+        }
+        if (l.runProperty._fonts._eastAsia) {
+          f = f.east_asia(l.runProperty._fonts._eastAsia);
+        }
+        level = level.fonts(f);
       }
-      level = level.fonts(f);
     }
 
     if (l.paragraphProperty.indent) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -197,7 +197,7 @@ impl ParagraphProperty { @@
         }
         pub fn run_property(mut self, s: RunProperty) -> Self {
-            self.run_property = s;
+            self.run_property = Some(s);
             self
         }
@@ Expand Down @@