feat: Support grid before (#292)

* feat: Support grid before

* fix: snaps

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

@@ -17,8 +17,8 @@ impl TableRow {
         let property = TableRowProperty::new();
         let has_numbering = cells.iter().any(|c| c.has_numbering);
         Self {
-            property,
             cells,
+            property,
             has_numbering,
         }
     }
@@ -33,6 +33,16 @@ impl TableRow {
         self
     }
 
+    pub fn grid_before(mut self, grid_before: u32) -> TableRow {
+        self.property = self.property.grid_before(grid_before);
+        self
+    }
+
+    pub fn width_before(mut self, w: f32) -> TableRow {
+        self.property = self.property.width_before(w);
+        self
+    }
+
     pub fn row_height(mut self, h: f32) -> TableRow {
         self.property = self.property.row_height(h);
         self
@@ -76,7 +86,7 @@ mod tests {
         let r = TableRow::new(vec![TableCell::new()]);
         assert_eq!(
             serde_json::to_string(&r).unwrap(),
-            r#"{"cells":[{"children":[],"property":{"width":null,"borders":null,"gridSpan":null,"verticalMerge":null,"verticalAlign":null,"textDirection":null,"shading":null},"hasNumbering":false}],"hasNumbering":false,"property":{"gridAfter":null,"widthAfter":null,"rowHeight":null,"heightRule":null}}"#
+            r#"{"cells":[{"children":[],"property":{"width":null,"borders":null,"gridSpan":null,"verticalMerge":null,"verticalAlign":null,"textDirection":null,"shading":null},"hasNumbering":false}],"hasNumbering":false,"property":{"gridAfter":null,"widthAfter":null,"gridBefore":null,"widthBefore":null,"rowHeight":null,"heightRule":null}}"#
         );
     }
 }

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

@@ -8,6 +8,8 @@ use crate::{documents::BuildXML, HeightRule};
 pub struct TableRowProperty {
     grid_after: Option<u32>,
     width_after: Option<f32>,
+    grid_before: Option<u32>,
+    width_before: Option<f32>,
     row_height: Option<f32>,
     height_rule: Option<HeightRule>,
 }
@@ -27,6 +29,16 @@ impl TableRowProperty {
         self
     }
 
+    pub fn grid_before(mut self, before: u32) -> Self {
+        self.grid_before = Some(before);
+        self
+    }
+
+    pub fn width_before(mut self, w: f32) -> Self {
+        self.width_before = Some(w);
+        self
+    }
+
     pub fn row_height(mut self, h: f32) -> Self {
         self.row_height = Some(h);
         self
@@ -43,6 +55,8 @@ impl Default for TableRowProperty {
         TableRowProperty {
             grid_after: None,
             width_after: None,
+            grid_before: None,
+            width_before: None,
             row_height: None,
             height_rule: None,
         }

docx-core/src/reader/table_row.rs

@@ -14,6 +14,8 @@ impl ElementReader for TableRow {
         let mut cells = vec![];
         let mut grid_after = None;
         let mut width_after = None;
+        let mut grid_before = None;
+        let mut width_before = None;
         let mut row_height = None;
         let mut height_rule = Some(HeightRule::AtLeast);
         loop {
@@ -41,6 +43,16 @@ impl ElementReader for TableRow {
                                 width_after = Some(v.0 as f32);
                             }
                         }
+                        XMLElement::GridBefore => {
+                            if let Some(v) = read_val(&attributes) {
+                                grid_before = Some(u32::from_str(&v)?);
+                            }
+                        }
+                        XMLElement::WidthBefore => {
+                            if let Ok(v) = read_width(&attributes) {
+                                width_before = Some(v.0 as f32);
+                            }
+                        }
                         XMLElement::HeightRule => {
                             if let Some(v) = read_val(&attributes) {
                                 if let Ok(r) = HeightRule::from_str(&v) {
@@ -67,6 +79,10 @@ impl ElementReader for TableRow {
                             row = row.grid_after(grid_after);
                         }
 
+                        if let Some(grid_before) = grid_before {
+                            row = row.grid_before(grid_before);
+                        }
+
                         if let Some(row_height) = row_height {
                             row = row.row_height(row_height);
                         }
@@ -75,6 +91,10 @@ impl ElementReader for TableRow {
                             row = row.width_after(width_after);
                         }
 
+                        if let Some(width_before) = width_before {
+                            row = row.width_before(width_before);
+                        }
+
                         if let Some(height_rule) = height_rule {
                             row = row.height_rule(height_rule);
                         }

docx-core/src/reader/xml_element.rs

@@ -99,6 +99,8 @@ pub enum XMLElement {
     GridCol,
     GridAfter,
     WidthAfter,
+    GridBefore,
+    WidthBefore,
     Style,
     Next,
     VertAlign,
@@ -247,6 +249,8 @@ impl FromStr for XMLElement {
             "gridSpan" => Ok(XMLElement::TableGridSpan),
             "gridAfter" => Ok(XMLElement::GridAfter),
             "wAfter" => Ok(XMLElement::WidthAfter),
+            "gridBefore" => Ok(XMLElement::GridBefore),
+            "wBefore" => Ok(XMLElement::WidthBefore),
             "textDirection" => Ok(XMLElement::TextDirection),
             "tblW" => Ok(XMLElement::TableWidth),
             "tblInd" => Ok(XMLElement::TableIndent),

docx-wasm/js/json/table.ts

@@ -28,9 +28,11 @@ export type TableCellPropertyJSON = {
 
 export type TableRowPropertyJSON = {
   gridAfter: number | null;
+  gridBefore: number | null;
   rowHeight: number | null;
   heightRule: HeightRule | null;
   widthAfter: number | null;
+  widthBefore: number | null;
 };
 
 export type TableCellJSON = {

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

@@ -2205,9 +2205,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": null,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 970,
                 "widthAfter": null,
+                "widthBefore": null,
               },
             },
             Object {
@@ -2394,9 +2396,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 1,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 55,
                 "widthAfter": 1065,
+                "widthBefore": null,
               },
             },
             Object {
@@ -2583,9 +2587,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 1,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 675,
                 "widthAfter": 1065,
+                "widthBefore": null,
               },
             },
             Object {
@@ -2772,9 +2778,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 2,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 397,
                 "widthAfter": 3717,
+                "widthBefore": null,
               },
             },
             Object {
@@ -2961,9 +2969,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 2,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 397,
                 "widthAfter": 3717,
+                "widthBefore": null,
               },
             },
             Object {
@@ -3239,9 +3249,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 2,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 397,
                 "widthAfter": 3717,
+                "widthBefore": null,
               },
             },
             Object {
@@ -3517,9 +3529,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 2,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 397,
                 "widthAfter": 3717,
+                "widthBefore": null,
               },
             },
             Object {
@@ -3783,9 +3797,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 2,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 397,
                 "widthAfter": 3717,
+                "widthBefore": null,
               },
             },
             Object {
@@ -4061,9 +4077,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": 2,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 397,
                 "widthAfter": 3717,
+                "widthBefore": null,
               },
             },
           ],
@@ -12096,9 +12114,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": null,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": null,
                 "widthAfter": null,
+                "widthBefore": null,
               },
             },
             Object {
@@ -12315,9 +12335,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": null,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": null,
                 "widthAfter": null,
+                "widthBefore": null,
               },
             },
             Object {
@@ -12534,9 +12556,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": null,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": null,
                 "widthAfter": null,
+                "widthBefore": null,
               },
             },
           ],
@@ -13530,9 +13554,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": null,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": 730,
                 "widthAfter": null,
+                "widthBefore": null,
               },
             },
             Object {
@@ -13733,9 +13759,11 @@ Object {
               "hasNumbering": false,
               "property": Object {
                 "gridAfter": null,
+                "gridBefore": null,
                 "heightRule": "atLeast",
                 "rowHeight": null,
                 "widthAfter": null,
+                "widthBefore": null,
               },
             },
           ],