wordinweb 0.1.6 → 0.1.7

package/dist/index.js

@@ -15876,28 +15876,30 @@ function resizeTableColumn(doc, tblEl, boundary, deltaPx, renderedWidths) {
       setWidth(right, rw - d);
     }
   }
-  if (!hasSpans(tblEl)) {
-    for (const tr of rowsOf(tblEl)) {
-      const cells = cellsOf(tr);
-      cells.forEach((tc, i) => {
-        if (!cols[i]) return;
-        const w = prefixOf4(tc);
-        let tcPr = child(tc, "tcPr");
-        if (!tcPr) {
-          tcPr = { name: `${w}tcPr`, attrs: {}, children: [], text: "" };
-          tc.children.unshift(tcPr);
-        }
-        let tcW = child(tcPr, "tcW");
-        if (!tcW) {
-          tcW = { name: `${w}tcW`, attrs: { [`${w}type`]: "dxa" }, children: [], text: "" };
-          tcPr.children.unshift(tcW);
-        }
-        const typeKey = Object.keys(tcW.attrs).find((k) => localName(k) === "type");
-        if (!typeKey || tcW.attrs[typeKey] === "dxa") {
-          const wKey = Object.keys(tcW.attrs).find((k) => localName(k) === "w") ?? prefixOf4(tcW) + "w";
-          tcW.attrs[wKey] = String(widthOf2(cols[i]));
-        }
-      });
+  for (const tr of rowsOf(tblEl)) {
+    let col = 0;
+    for (const tc of cellsOf(tr)) {
+      const w = prefixOf4(tc);
+      let tcPr = child(tc, "tcPr");
+      if (!tcPr) {
+        tcPr = { name: `${w}tcPr`, attrs: {}, children: [], text: "" };
+        tc.children.unshift(tcPr);
+      }
+      const gs = child(tcPr, "gridSpan");
+      const gsKey = gs && Object.keys(gs.attrs).find((k) => localName(k) === "val");
+      const span = gs && gsKey ? Math.max(1, parseInt(gs.attrs[gsKey], 10) || 1) : 1;
+      const total = cols.slice(col, col + span).reduce((a, c) => a + widthOf2(c), 0);
+      col += span;
+      if (!total) continue;
+      let tcW = child(tcPr, "tcW");
+      if (!tcW) {
+        tcW = { name: `${w}tcW`, attrs: {}, children: [], text: "" };
+        tcPr.children.unshift(tcW);
+      }
+      const typeKey = Object.keys(tcW.attrs).find((k) => localName(k) === "type") ?? `${w}type`;
+      const wKey = Object.keys(tcW.attrs).find((k) => localName(k) === "w") ?? `${w}w`;
+      tcW.attrs[typeKey] = "dxa";
+      tcW.attrs[wKey] = String(total);
     }
   }
   doc.refresh();