ooxml-core 1.10.0 → 1.11.0

package/dist/docx/layout/index.cjs

@@ -4897,6 +4897,74 @@ function widowControlEnabled(value) {
   return value !== false;
 }
 
+// docx/layout/nested-frame-profile.ts
+var equal = (a, b) => a !== void 0 && b !== void 0 && a.style === b.style && a.color === b.color && Math.abs(a.widthPx - b.widthPx) < 1e-6;
+function nestedFrameProfile(table, tableWidthPx = table.widthPx) {
+  const sides = table.rows.flatMap(
+    (row) => row.cells.flatMap(
+      (cell) => ["top", "right", "bottom", "left"].map((side) => cell.borders?.[side])
+    )
+  );
+  if (sides.every((side) => !side)) return { leftPx: 0, rightPx: 0, bottomPx: 0 };
+  if (!sides.every((side) => side?.style === "solid" && side.widthPx > 0)) return void 0;
+  const first3 = table.rows[0], left = first3.cells[0].borders.left, right = first3.cells.at(-1).borders.right;
+  for (const [index, row] of table.rows.entries()) {
+    if (row.cells.length !== first3.cells.length || !equal(row.cells[0]?.borders?.left, left) || !equal(row.cells.at(-1)?.borders?.right, right))
+      return void 0;
+    for (const [column, cell] of row.cells.entries()) {
+      const sourceWidth = cell.widthPx ?? (tableWidthPx === void 0 ? void 0 : tableWidthPx / row.cells.length);
+      const paintWidth = sourceWidth === void 0 ? void 0 : sourceWidth + (cell.borders.left.widthPx - cell.borders.right.widthPx) / 2 + (column === row.cells.length - 1 ? cell.borders.right.widthPx : 0);
+      if (paintWidth !== void 0 && paintWidth <= 0) return void 0;
+      if (!equal(cell.borders?.top, row.cells[0]?.borders?.top) || !equal(cell.borders?.bottom, row.cells[0]?.borders?.bottom))
+        return void 0;
+      if (column && !equal(row.cells[column - 1]?.borders?.right, cell.borders?.left))
+        return void 0;
+      if (index) {
+        const previous = table.rows[index - 1].cells[column];
+        if (previous.xPx !== cell.xPx || previous.widthPx !== cell.widthPx || !equal(previous.borders?.bottom, cell.borders?.top))
+          return void 0;
+      }
+    }
+  }
+  return {
+    leftPx: left.widthPx,
+    rightPx: right.widthPx,
+    bottomPx: table.rows.at(-1).cells[0].borders.bottom.widthPx
+  };
+}
+
+// docx/layout/nested-fragment-edges.ts
+var plain = (paragraph) => !paragraph.keepLines && !paragraph.keepNext && !paragraph.pageBreakBefore && !paragraph.footnotes?.length && !paragraph.runs.some((run) => run.footnoteReferenceId !== void 0 || run.breakAfter);
+function nestedFragmentEdges(table) {
+  if (table.widthPx === void 0 || !Number.isFinite(table.widthPx) || table.widthPx <= 0 || table.rows.length < 2 || !nestedFrameProfile(table, table.widthPx) || table.rows.some(
+    (row) => row.heightPx !== void 0 || row.cantSplit || row.isHeader || row.cells.length !== 2 || row.cells.some(
+      (cell) => cell.verticalAlign && cell.verticalAlign !== "top" || cell.blocks?.some((block) => block.kind !== "paragraph") || !(cell.blocks ?? cell.paragraphs).every(
+        (block) => block.kind === "paragraph" && plain(block)
+      )
+    )
+  ))
+    return void 0;
+  const top = table.rows[0].cells.map((cell) => cell.borders?.top);
+  const bottom = table.rows.at(-1).cells.map((cell) => cell.borders?.bottom);
+  return top.every(Boolean) && bottom.every(Boolean) ? { top, bottom } : void 0;
+}
+function reflowNestedFragments(row) {
+  if (row.heightPx !== void 0 || row.cantSplit || row.isHeader || row.cells.length !== 2)
+    return false;
+  let tables = 0;
+  for (const cell of row.cells) {
+    if (cell.verticalAlign && cell.verticalAlign !== "top") return false;
+    for (const [index, block] of (cell.blocks ?? cell.paragraphs).entries()) {
+      if (block.kind === "paragraph") {
+        if (!plain(block)) return false;
+      } else {
+        if (index !== 0 || !nestedFragmentEdges(block) || ++tables > 1) return false;
+      }
+    }
+  }
+  return tables === 1;
+}
+
 // docx/layout/table-content.ts
 function cellContentBottom(boxes, paddingBottom = 0) {
   return Math.max(
@@ -4930,44 +4998,21 @@ function clipTableFrames(tables, start, end, inset = 0) {
         }
       ];
     });
-    return [{ ...table, yPx: top - start + inset, heightPx: bottom - top, rows }];
-  });
-}
-
-// docx/layout/nested-frame-profile.ts
-var equal = (a, b) => a !== void 0 && b !== void 0 && a.style === b.style && a.color === b.color && Math.abs(a.widthPx - b.widthPx) < 1e-6;
-function nestedFrameProfile(table, tableWidthPx = table.widthPx) {
-  const sides = table.rows.flatMap(
-    (row) => row.cells.flatMap(
-      (cell) => ["top", "right", "bottom", "left"].map((side) => cell.borders?.[side])
-    )
-  );
-  if (sides.every((side) => !side)) return { leftPx: 0, rightPx: 0, bottomPx: 0 };
-  if (!sides.every((side) => side?.style === "solid" && side.widthPx > 0)) return void 0;
-  const first3 = table.rows[0], left = first3.cells[0].borders.left, right = first3.cells.at(-1).borders.right;
-  for (const [index, row] of table.rows.entries()) {
-    if (row.cells.length !== first3.cells.length || !equal(row.cells[0]?.borders?.left, left) || !equal(row.cells.at(-1)?.borders?.right, right))
-      return void 0;
-    for (const [column, cell] of row.cells.entries()) {
-      const sourceWidth = cell.widthPx ?? (tableWidthPx === void 0 ? void 0 : tableWidthPx / row.cells.length);
-      const paintWidth = sourceWidth === void 0 ? void 0 : sourceWidth + (cell.borders.left.widthPx - cell.borders.right.widthPx) / 2 + (column === row.cells.length - 1 ? cell.borders.right.widthPx : 0);
-      if (paintWidth !== void 0 && paintWidth <= 0) return void 0;
-      if (!equal(cell.borders?.top, row.cells[0]?.borders?.top) || !equal(cell.borders?.bottom, row.cells[0]?.borders?.bottom))
-        return void 0;
-      if (column && !equal(row.cells[column - 1]?.borders?.right, cell.borders?.left))
-        return void 0;
-      if (index) {
-        const previous = table.rows[index - 1].cells[column];
-        if (previous.xPx !== cell.xPx || previous.widthPx !== cell.widthPx || !equal(previous.borders?.bottom, cell.borders?.top))
-          return void 0;
+    if (table.fragmentEdges && rows.length) {
+      const edges = table.fragmentEdges;
+      for (const [row, side] of [
+        [rows[0], "top"],
+        [rows.at(-1), "bottom"]
+      ]) {
+        if (row.geometry)
+          row.geometry = row.geometry.map((cell, index) => ({
+            ...cell,
+            borders: { ...cell.borders, [side]: edges[side][index] }
+          }));
       }
     }
-  }
-  return {
-    leftPx: left.widthPx,
-    rightPx: right.widthPx,
-    bottomPx: table.rows.at(-1).cells[0].borders.bottom.widthPx
-  };
+    return [{ ...table, yPx: top - start + inset, heightPx: bottom - top, rows }];
+  });
 }
 
 // docx/layout/table-cell-layout.ts
@@ -4977,7 +5022,7 @@ function cellParagraphs(cell) {
   );
   return cell.blocks ? walk(cell.blocks) : cell.paragraphs;
 }
-function stackCellBlocks(cell, width, measurer, note, top, starts) {
+function stackCellBlocks(cell, width, measurer, note, top, starts, physicalFragments = false) {
   if (!cell.blocks)
     return stackParagraphs(
       starts ? cell.paragraphs.filter((p) => starts.has(p.id)) : cell.paragraphs,
@@ -4998,6 +5043,7 @@ function stackCellBlocks(cell, width, measurer, note, top, starts) {
       y = result.heightPx;
       continue;
     }
+    const edges = physicalFragments ? nestedFragmentEdges(block) : void 0;
     const tableWidth = block.widthPx ?? width;
     const profile = nestedFrameProfile(block, tableWidth);
     const reserveBorders = profile !== void 0;
@@ -5015,13 +5061,21 @@ function stackCellBlocks(cell, width, measurer, note, top, starts) {
       widthPx: paintedWidth,
       yPx: y,
       heightPx: 0,
-      rows: []
+      rows: [],
+      ...edges ? { fragmentEdges: edges } : {}
     };
     for (const row of block.rows) {
       if (starts && !row.cells.some((nested) => cellParagraphs(nested).some((p) => starts.has(p.id))))
         continue;
+      const visibleRow = edges && starts && !frame.rows.length ? {
+        ...row,
+        cells: row.cells.map((cell2, index) => ({
+          ...cell2,
+          borders: { ...cell2.borders, top: edges.top[index] }
+        }))
+      } : row;
       const layout = layoutRow(
-        row,
+        visibleRow,
         tableWidth,
         measurer,
         note,
@@ -5047,6 +5101,7 @@ function stackCellBlocks(cell, width, measurer, note, top, starts) {
             xPx: x + geometry.xPx + geometry.paddingLeftPx + (paragraph.xPx ?? 0),
             widthPx: paragraph.widthPx ?? Math.max(1, geometry.widthPx - geometry.paddingLeftPx - geometry.paddingRightPx),
             readOnly: true,
+            ...edges ? { tableFragmentBottomPx: edges.bottom[index].widthPx } : {},
             tableFrameInsets: {
               top: (paragraph.tableFrameInsets?.top ?? 0) + (reserveBorders ? geometry.borders?.top?.widthPx ?? 0 : 0),
               bottom: (paragraph.tableFrameInsets?.bottom ?? 0) + (reserveBorders ? geometry.borders?.bottom?.widthPx ?? 0 : 0)
@@ -5095,7 +5150,7 @@ function stackParagraphs(paragraphs, widthPx, measurer, note, topPx = 0, startTo
   }
   return { heightPx: y, boxes };
 }
-function layoutRow(row, tableWidthPx, measurer, note, remaining, startTokens, frameBorders = false, frameLeftBorderPx) {
+function layoutRow(row, tableWidthPx, measurer, note, remaining, startTokens, frameBorders = false, frameLeftBorderPx, physicalFragments = reflowNestedFragments(row)) {
   const count = row.cells.length || 1;
   let x = 0;
   const geometry = [];
@@ -5121,7 +5176,8 @@ function layoutRow(row, tableWidthPx, measurer, note, remaining, startTokens, fr
       measurer,
       note,
       padding.top,
-      starts
+      starts,
+      physicalFragments
     );
     const heightPx2 = content2.heightPx + padding.bottom;
     geometry.push({
@@ -5158,16 +5214,16 @@ function splitCellAtHeight(boxes, cutHeightPx, paragraphCuts) {
   let beforeHeightPx = 0;
   for (const box of boxes) {
     const cut = paragraphCuts?.get(box.blockId) ?? cutHeightPx;
-    if (box.yPx + box.heightPx + (box.tableFrameInsets?.bottom ?? 0) <= cut) {
+    if (box.yPx + box.heightPx + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0) <= cut) {
       before.push(box);
       beforeHeightPx = Math.max(
         beforeHeightPx,
-        box.yPx + box.heightPx + (box.tableFrameInsets?.bottom ?? 0)
+        box.yPx + box.heightPx + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0)
       );
       continue;
     }
     const beforeLines = box.lines.filter(
-      (line2) => box.yPx + line2.yPx + line2.heightPx + (box.tableFrameInsets?.bottom ?? 0) <= cut
+      (line2) => box.yPx + line2.yPx + line2.heightPx + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0) <= cut
     );
     const afterLines = box.lines.slice(beforeLines.length);
     if (beforeLines.length) {
@@ -5175,7 +5231,7 @@ function splitCellAtHeight(boxes, cutHeightPx, paragraphCuts) {
       before.push({ ...box, heightPx: bottom, lines: beforeLines });
       beforeHeightPx = Math.max(
         beforeHeightPx,
-        box.yPx + bottom + (box.tableFrameInsets?.bottom ?? 0)
+        box.yPx + bottom + (box.tableFragmentBottomPx ?? box.tableFrameInsets?.bottom ?? 0)
       );
     }
     if (afterLines.length) {
@@ -6022,7 +6078,7 @@ function measuredNoteReferences(paragraphs) {
 }
 
 // docx/layout/table-border-layout.ts
-function layoutBorderedRow(row, width, measurer, note, profile, remaining) {
+function layoutBorderedRow(row, width, measurer, note, profile, remaining, physicalFragments) {
   const reserved = profile !== void 0 && (profile.leftPx > 0 || profile.rightPx > 0 || profile.bottomPx > 0);
   const layout = layoutRow(
     row,
@@ -6032,7 +6088,8 @@ function layoutBorderedRow(row, width, measurer, note, profile, remaining) {
     remaining,
     void 0,
     reserved,
-    profile?.leftPx
+    profile?.leftPx,
+    physicalFragments
   );
   if (!reserved) return layout;
   const bottom = Math.max(0, ...layout.geometry.map((cell) => cell.borders?.bottom?.widthPx ?? 0));
@@ -6332,6 +6389,7 @@ var TableFootnotes = class {
 function placeTable(cursor, table, measurer, note, resolveFootnotes) {
   const firstBodyRow = table.rows.findIndex((row) => !row.isHeader);
   const headerRows = table.rows.slice(0, firstBodyRow < 0 ? table.rows.length : firstBodyRow);
+  const nativeFragments = new Map(table.rows.map((row) => [row, reflowNestedFragments(row)]));
   const xPosition = () => {
     const width = (table.widthPx ?? cursor.columnWidthPx) + (activeBorders ? (profile.leftPx + profile.rightPx) / 2 : 0);
     return table.alignment === "center" ? Math.max(0, (cursor.columnWidthPx - width) / 2) : table.alignment === "right" ? Math.max(0, cursor.columnWidthPx - width) : table.indentPx ?? 0;
@@ -6342,13 +6400,14 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
     note(
       "Ordinary table border occupancy remains approximate for missing edges, non-solid or conflicting shared borders and changing row grids."
     );
-  const layoutRow2 = (row, width, m, n2, remaining) => layoutBorderedRow(
+  const layoutRow2 = (row, width, m, n2, remaining, sourceRow = row) => layoutBorderedRow(
     row,
     activeBorders ? table.widthPx ?? width : width,
     m,
     n2,
     profile,
-    remaining
+    remaining,
+    nativeFragments.get(sourceRow) ?? false
   );
   const fragmentBorders = new TableFragmentBorders();
   let fragmentRows = [];
@@ -6421,7 +6480,8 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
             cursor.columnWidthPx,
             measurer,
             note,
-            remainingRow.cells
+            remainingRow.cells,
+            row
           );
           if (fragmentRows.length) {
             fragmentRows = [];
@@ -6453,7 +6513,8 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
             cursor.columnWidthPx,
             measurer,
             note,
-            after2.cells
+            after2.cells,
+            row
           ) : after2;
           continue;
         }
@@ -6466,7 +6527,8 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
               cursor.columnWidthPx,
               measurer,
               note,
-              remainingRow === initial ? void 0 : remainingRow.cells
+              remainingRow === initial ? void 0 : remainingRow.cells,
+              row
             );
           continue;
         }
@@ -6513,17 +6575,24 @@ function placeTable(cursor, table, measurer, note, resolveFootnotes) {
       const previousWidth = cursor.columnWidthPx;
       if (before.cells.some((cell) => cell.length)) fragmentRows.push(toRowBox(before, false));
       startNewFragment();
-      remainingRow = after && previousWidth !== cursor.columnWidthPx ? layoutRow2(
+      remainingRow = after && (previousWidth !== cursor.columnWidthPx || nativeFragments.get(row)) ? layoutRow2(
         { ...row, heightPx: 0, heightRule: "atLeast" },
         cursor.columnWidthPx,
         measurer,
         note,
-        after.cells
+        after.cells,
+        row
       ) : after;
     }
   }
   for (const row of table.rows) {
     const layout = layoutRow2(row, cursor.columnWidthPx, measurer, note);
+    if (layout.heightPx > cursor.remainingHeightPx() && !nativeFragments.get(row) && row.cells.some(
+      (cell) => cell.blocks?.some((block) => block.kind === "table" && block.rows.length > 1)
+    ))
+      note(
+        "Nested physical border edges at page cuts remain approximate outside automatic, top-aligned tables with two or more two-cell, note-free rows, direct paragraphs and complete shared borders."
+      );
     if (activeBorders && layout.heightPx > cursor.remainingHeightPx() && row.cells.some(
       (cell) => (!measuredNoteReferences(row.cells.flatMap(cellParagraphs)) || !independentNoteStories(cell)) && cell.blocks?.some((block) => block.kind === "table") && cellParagraphs(cell).some((p) => p.footnotes?.length)
     ))
@@ -6787,9 +6856,9 @@ var SectionFlow = class {
     const page = this.cursor.page;
     const exclusions = this.exclusions?.get(page.index);
     if (!exclusions) return void 0;
-    const plain = this.paragraphLayout(index);
+    const plain2 = this.paragraphLayout(index);
     const topPx = page.marginTopPx + this.cursor.y + spacingBeforePx;
-    const bottomPx = topPx + plain.contentHeightPx;
+    const bottomPx = topPx + plain2.contentHeightPx;
     if (!exclusions.some((item) => item.yPx < bottomPx && item.yPx + item.heightPx > topPx))
       return void 0;
     return layoutParagraph(