@json-to-office/core-docx 4.3.0 → 4.4.1

package/dist/plugin/example/index.js

@@ -3265,6 +3265,7 @@ import {
   Header,
   ImageRun,
   Packer,
+  LineRuleType as LineRuleType2,
   Paragraph as Paragraph2
 } from "docx";
 function createDocxJsRenderer() {
@@ -3518,21 +3519,33 @@ function sectionChildren(section2, resources) {
   const blocks = section2.children.map((block2) => emitBlock(block2, resources));
   const bookmark = section2.bookmark;
   if (!bookmark) return blocks;
-  const out = [];
+  const out = [...blocks];
   if (bookmark.opens) {
-    out.push(
-      new Paragraph2({
-        children: [new BookmarkStart2(bookmark.name, bookmark.id)],
-        spacing: { before: 0, after: 0, line: 0 }
-      })
-    );
+    const start = new BookmarkStart2(bookmark.name, bookmark.id);
+    const first = out[0];
+    if (first instanceof Paragraph2) {
+      first.addRunToFront(start);
+    } else {
+      out.unshift(anchorParagraph(start));
+    }
   }
-  out.push(...blocks);
   if (bookmark.closes) {
-    out.push(new Paragraph2({ children: [new BookmarkEnd2(bookmark.id)] }));
+    const end = new BookmarkEnd2(bookmark.id);
+    const last = out[out.length - 1];
+    if (last instanceof Paragraph2) {
+      last.addChildElement(end);
+    } else {
+      out.push(anchorParagraph(end));
+    }
   }
   return out;
 }
+function anchorParagraph(anchor) {
+  return new Paragraph2({
+    children: [anchor],
+    spacing: { before: 0, after: 0, line: 20, lineRule: LineRuleType2.EXACT }
+  });
+}
 function coreProperties(ir) {
   const { metadata } = ir;
   return {
@@ -9307,6 +9320,15 @@ function compileColumns(component, scope) {
   if (configs.length === 0) return [];
   const available = getAvailableWidthTwips(ctx.theme, ctx.themeName);
   const { widths, gaps } = columnMetrics(configs, props.gap, available);
+  const stated = widths.map(
+    (width, index) => width + gaps[index] / 2 + (index > 0 ? gaps[index - 1] / 2 : 0)
+  );
+  const statedTotal = stated.reduce((sum, cell) => sum + cell, 0);
+  const scale = statedTotal > available ? available / statedTotal : 1;
+  const exact = stated.map((cell) => cell * scale);
+  const cells = exact.map((cell) => Math.round(cell));
+  const total = exact.reduce((sum, cell) => sum + cell, 0);
+  cells[cells.length - 1] += Math.round(total) - cells.reduce((a, b) => a + b, 0);
   const contents = configs.map(() => []);
   const children = component.children ?? [];
   children.forEach((child, index) => {
@@ -9318,7 +9340,7 @@ function compileColumns(component, scope) {
       kind: "table",
       id: scope.id,
       path: path3,
-      columnGrid: { unit: "twips", values: [] },
+      columnGrid: { unit: "twips", values: cells },
       width: { kind: "percent", value: 100 },
       layout: "fixed",
       borders: NO_BORDERS,
@@ -9343,7 +9365,7 @@ function compileColumns(component, scope) {
                   children: []
                 }
               ],
-              widthTwips: widths[index],
+              widthTwips: cells[index],
               margins: {
                 topTwips: 0,
                 rightTwips: gaps[index] / 2,
@@ -11688,12 +11710,6 @@ function determineComponentLayout(component) {
     }
     return "single";
   }
-  if ("children" in component && component.children) {
-    const hasColumns = component.children.some(
-      (child) => isColumnsComponent(child)
-    );
-    return hasColumns ? "multi-column" : "single";
-  }
   return "single";
 }
 function processLayoutComponents(components) {