wordinweb 0.1.14 → 0.1.16

package/dist/index.d.ts

@@ -1363,6 +1363,14 @@ declare class DocxDocument {
      */
     private rememberOriginalXml;
     private writeModeledXml;
+    /**
+     * Canonicalize producer shorthand that Google Docs otherwise interprets as
+     * a fixed, few-twip table. Word treats `tblW="100%"` plus a placeholder
+     * grid as autofit; Google needs the standard pct value and a usable cached
+     * grid. The cached widths follow the same content-dominant shape and do not
+     * change Word's autofit result.
+     */
+    private normalizePercentageTableGrids;
     save(): Uint8Array;
     /** Fresh unique docPr id for inserted drawings. */
     nextDrawingId(): number;

package/dist/index.js

@@ -6906,7 +6906,95 @@ var DocxDocument = class _DocxDocument {
     const xml = serializeXml(root, true);
     if (xml !== this.originalModeledXml.get(part)) files[part] = strToU82(xml);
   }
+  /**
+   * Canonicalize producer shorthand that Google Docs otherwise interprets as
+   * a fixed, few-twip table. Word treats `tblW="100%"` plus a placeholder
+   * grid as autofit; Google needs the standard pct value and a usable cached
+   * grid. The cached widths follow the same content-dominant shape and do not
+   * change Word's autofit result.
+   */
+  normalizePercentageTableGrids() {
+    const setAttr = (element, name, value) => {
+      const key = Object.keys(element.attrs).find((item) => localName(item) === name);
+      element.attrs[key ?? `${element.name.includes(":") ? element.name.split(":")[0] + ":" : ""}${name}`] = value;
+    };
+    const textLength = (blocks) => {
+      let length = 0;
+      for (const block of blocks) {
+        if (block.type === "table") {
+          for (const row of block.rows) {
+            for (const cell of row.cells) length += textLength(cell.blocks);
+          }
+          continue;
+        }
+        for (const item of block.children) {
+          const runs = item.type === "run" ? [item] : item.runs;
+          for (const run of runs) {
+            for (const content of run.content) {
+              if (content.kind === "text") length += content.text.length;
+              else if (content.kind === "tab") length += 4;
+            }
+          }
+        }
+      }
+      return length;
+    };
+    const normalize = (table2, available) => {
+      const source = table2.src;
+      if (!source) return;
+      const tableProps = child(source, "tblPr");
+      const tableWidth = child(tableProps, "tblW");
+      const rawWidth = attr(tableWidth, "w")?.trim();
+      if (attr(tableWidth, "type") !== "pct" || !rawWidth?.endsWith("%")) return;
+      const percent = Number.parseFloat(rawWidth);
+      if (!Number.isFinite(percent) || percent <= 0) return;
+      setAttr(tableWidth, "w", String(Math.round(percent * 50)));
+      const grid = child(source, "tblGrid");
+      const columns = children(grid, "gridCol");
+      if (columns.length === 0) return;
+      const target = Math.round(pxToTwips(available) * percent / 100);
+      const authoredTotal = columns.reduce((sum2, column) => sum2 + (intAttr(column, "w") ?? 0), 0);
+      if (target <= 0 || authoredTotal >= target * 0.1) return;
+      const floor = 600;
+      const widths = new Array(columns.length).fill(floor);
+      for (const row of table2.rows) {
+        let column = 0;
+        for (const cell of row.cells) {
+          const span = Math.max(1, Math.min(cell.props.gridSpan, columns.length - column));
+          const demand = Math.max(floor * span, textLength(cell.blocks) * 100 + 300);
+          for (let offset = 0; offset < span; offset++) {
+            widths[column + offset] = Math.max(widths[column + offset], demand / span);
+          }
+          column += cell.props.gridSpan;
+          if (column >= columns.length) break;
+        }
+      }
+      const dominant = widths.indexOf(Math.max(...widths));
+      const total = widths.reduce((sum2, width) => sum2 + width, 0);
+      if (total < target) {
+        widths[dominant] += target - total;
+      } else if (total > target) {
+        const slack = widths.reduce((sum2, width) => sum2 + Math.max(0, width - floor), 0);
+        const scale = slack > 0 ? Math.min(1, (total - target) / slack) : 0;
+        for (let index = 0; index < widths.length; index++) {
+          widths[index] -= Math.max(0, widths[index] - floor) * scale;
+        }
+      }
+      const rounded = widths.map(Math.round);
+      rounded[dominant] += target - rounded.reduce((sum2, width) => sum2 + width, 0);
+      columns.forEach((column, index) => setAttr(column, "w", String(rounded[index])));
+    };
+    for (const section of this.sections) {
+      const contentWidth = section.props.pageWidth - section.props.marginLeft - section.props.marginRight - section.props.gutter;
+      const columnCount = Math.max(1, section.props.columns.count);
+      const available = section.props.columns.widths?.[0] ?? (contentWidth - section.props.columns.space * (columnCount - 1)) / columnCount;
+      for (const block of section.blocks) {
+        if (block.type === "table") normalize(block, available);
+      }
+    }
+  }
   save() {
+    this.normalizePercentageTableGrids();
     const files = { ...this.pkg.raw() };
     if (files["docProps/custom.xml"] && this.contentTypesRoot && !this.contentTypesRoot.children.some(
       (item) => localName(item.name) === "Override" && item.attrs.PartName === "/docProps/custom.xml"
@@ -20628,7 +20716,7 @@ function resizeTableRow(doc, tblEl, rowIdx, newHeightPx) {
   doc.refresh();
   return true;
 }
-function moveTableTo(doc, tblEl, xPx, yPx) {
+function moveTableTo(doc, tblEl, xPx, yPx, preservePageStart = false) {
   if (localName(tblEl.name) !== "tbl") return false;
   const w = prefixOf5(tblEl);
   let tblPr = child(tblEl, "tblPr");
@@ -20638,6 +20726,27 @@ function moveTableTo(doc, tblEl, xPx, yPx) {
   }
   let position = child(tblPr, "tblpPr");
   if (!position) {
+    if (preservePageStart) {
+      const parent = doc.findParentOf(tblEl);
+      const tableIndex = parent?.children.indexOf(tblEl) ?? -1;
+      const previous = parent && tableIndex > 0 ? parent.children[tableIndex - 1] : void 0;
+      const breakRun = {
+        name: `${w}r`,
+        attrs: {},
+        children: [{ name: `${w}br`, attrs: { [`${w}type`]: "page" }, children: [], text: "" }],
+        text: ""
+      };
+      if (previous && localName(previous.name) === "p") {
+        previous.children.push(breakRun);
+      } else if (parent && tableIndex >= 0) {
+        parent.children.splice(tableIndex, 0, {
+          name: `${w}p`,
+          attrs: {},
+          children: [breakRun],
+          text: ""
+        });
+      }
+    }
     position = { name: `${w}tblpPr`, attrs: {}, children: [], text: "" };
     const styleIdx = tblPr.children.findIndex((c) => localName(c.name) === "tblStyle");
     tblPr.children.splice(styleIdx + 1, 0, position);
@@ -23514,7 +23623,11 @@ var _DocxEditor = class _DocxEditor {
         const delta = isCol ? dx : dy;
         if ((isMove ? Math.hypot(dx, dy) : Math.abs(delta)) >= 1) {
           this.host.history?.checkpoint();
-          const ok = isMove ? moveTableTo(this.host.doc, grip.item.tbl, grip.item.x + dx, grip.item.y1 + dy) : isCol ? resizeTableColumn(this.host.doc, grip.item.tbl, grip.item.boundary, dx, grip.item.renderedWidths) : resizeTableRow(this.host.doc, grip.item.tbl, grip.item.boundary, (grip.item.rowHeightPx ?? 0) + dy);
+          const page = surface.parentElement;
+          const pages = Array.from(this.host.getHandle()?.root.querySelectorAll(".dxw-page") ?? []);
+          const bodyTop = parseFloat(page?.dataset.bodyTop ?? "");
+          const preservePageStart = isMove && page !== null && pages.indexOf(page) > 0 && Number.isFinite(bodyTop) && Math.abs(grip.item.y1 - bodyTop) <= 1;
+          const ok = isMove ? moveTableTo(this.host.doc, grip.item.tbl, grip.item.x + dx, grip.item.y1 + dy, preservePageStart) : isCol ? resizeTableColumn(this.host.doc, grip.item.tbl, grip.item.boundary, dx, grip.item.renderedWidths) : resizeTableRow(this.host.doc, grip.item.tbl, grip.item.boundary, (grip.item.rowHeightPx ?? 0) + dy);
           if (ok) {
             this.host.rerender(void 0, isMove ? "global" : "local");
             this.positionCaret();