Add snap to grid (#744)

* fix: snapToGrid

* fix:

* fix

* fix

* fix

docx-core/src/documents/elements/paragraph_property.rs

@@ -218,9 +218,7 @@ fn inner_build(p: &ParagraphProperty) -> Vec<u8> {
         .add_optional_child(&p.adjust_right_ind);
 
     if let Some(v) = p.snap_to_grid {
-        if v {
+        b = b.snap_to_grid(v)
-            b = b.snap_to_grid()
-        }
     }
 
     if let Some(v) = p.keep_next {

docx-core/src/reader/paragraph_property.rs

@@ -95,9 +95,8 @@ impl ElementReader for ParagraphProperty {
                             continue;
                         }
                         XMLElement::SnapToGrid => {
-                            if read_bool(&attributes) {
+                            let v = read_bool(&attributes);
-                                p.snap_to_grid = Some(true);
+                            p.snap_to_grid = Some(v);
-                            }
                         }
                         XMLElement::KeepNext => {
                             if read_bool(&attributes) {

docx-core/src/xml_builder/elements.rs

@@ -25,6 +25,18 @@ impl XMLBuilder {
         self.close()
     }
 
+    pub(crate) fn snap_to_grid(mut self, v: bool) -> Self {
+        let v = if v {
+            "true".to_string()
+        } else {
+            "false".to_string()
+        };
+        self.writer
+            .write(XmlEvent::start_element("w:snapToGrid").attr("w:val", &v))
+            .expect(EXPECT_MESSAGE);
+        self.close()
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn run_fonts(
         mut self,
@@ -167,7 +179,6 @@ impl XMLBuilder {
     // i.e. <w:szCs ... >
     closed_with_usize!(sz_cs, "w:szCs");
     closed_with_isize!(adjust_right_ind, "w:adjustRightInd");
-    closed!(snap_to_grid, "w:snapToGrid");
     closed_with_str!(text_alignment, "w:textAlignment");
 
     closed!(field_character, "w:fldChar", "w:fldCharType", "w:dirty");

docx-wasm/js/json/paragraph.ts

@@ -65,6 +65,7 @@ export type ParagraphPropertyJSON = {
   divId?: string | null;
   keepNext?: boolean;
   keepLines?: boolean;
+  snapToGrid?: boolean;
   pageBreakBefore?: boolean;
   widowControl?: boolean;
   outlineLvl?: number | null;

docx-wasm/js/paragraph.ts

@@ -149,6 +149,11 @@ export class Paragraph {
     return this;
   }
 
+  snapToGrid(v: boolean) {
+    this.property = { ...this.property, snapToGrid: v };
+    return this;
+  }
+
   keepNext(v: boolean) {
     this.property = { ...this.property, keepNext: v };
     return this;

docx-wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx-wasm",
-  "version": "0.4.18-rc4",
+  "version": "0.4.18-rc8",
   "main": "dist/node/index.js",
   "browser": "dist/web/index.js",
   "author": "bokuweb <bokuweb12@gmail.com>",

docx-wasm/test/__snapshots__/index.test.js.snap

@@ -8493,6 +8493,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -8650,6 +8651,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -11704,6 +11706,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -11861,6 +11864,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -39643,6 +39647,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -39800,6 +39805,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -100409,6 +100415,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -101071,6 +101078,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -101183,6 +101191,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -101440,6 +101449,7 @@ Object {
             "lineRule": "atLeast",
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -101613,6 +101623,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -101778,6 +101789,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -101868,6 +101880,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -101964,6 +101977,7 @@ Object {
             "lineRule": "atLeast",
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -102066,6 +102080,7 @@ Object {
             "lineRule": "atLeast",
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -102165,6 +102180,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -102256,6 +102272,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -102346,6 +102363,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -102437,6 +102455,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -102538,6 +102557,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -102643,6 +102663,7 @@ Object {
             "lineRule": "atLeast",
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
           "textAlignment": "baseline",
         },
@@ -105073,6 +105094,7 @@ Object {
         "paragraphProperty": Object {
           "adjustRightInd": 0,
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -105396,6 +105418,7 @@ Object {
             "startChars": 1400,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -106874,6 +106897,7 @@ Object {
         "paragraphProperty": Object {
           "alignment": "left",
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {},
@@ -107023,6 +107047,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -107637,6 +107662,7 @@ Object {
         "paragraphProperty": Object {
           "alignment": "left",
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {},
@@ -109926,6 +109952,7 @@ Object {
             "level": null,
           },
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {
@@ -169796,6 +169823,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -169956,6 +169984,7 @@ Object {
         "next": null,
         "paragraphProperty": Object {
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [
             Object {
               "leader": null,
@@ -170117,6 +170146,7 @@ Object {
         "paragraphProperty": Object {
           "alignment": "left",
           "runProperty": Object {},
+          "snapToGrid": false,
           "tabs": Array [],
         },
         "runProperty": Object {},