@json-to-office/core-docx 4.4.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 {