@superdoc-dev/cli 0.17.0-next.4 → 0.17.0-next.5

package/dist/index.js

@@ -233498,7 +233498,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-BU1mfNkI.es.js
+// ../../packages/superdoc/dist/chunks/src-Btvk6jT1.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -278645,7 +278645,10 @@ function calculateBalancedColumnHeight(ctx$1, config2 = DEFAULT_BALANCING_CONFIG
       iterations: 0
     };
   const totalHeight = ctx$1.contentBlocks.reduce((sum, b$1) => sum + b$1.measuredHeight, 0);
-  const maxBlockHeight = ctx$1.contentBlocks.reduce((m$1, b$1) => Math.max(m$1, b$1.measuredHeight), 0);
+  const maxBlockHeight = ctx$1.contentBlocks.reduce((m$1, b$1) => {
+    const indivisible = b$1.canBreak && b$1.lineHeights && b$1.lineHeights.length > 1 ? Math.max(...b$1.lineHeights) : b$1.measuredHeight;
+    return Math.max(m$1, indivisible);
+  }, 0);
   if (totalHeight < config2.minColumnHeight * ctx$1.columnCount)
     return createSingleColumnResult(ctx$1);
   let lo = Math.max(maxBlockHeight, config2.minColumnHeight);
@@ -278815,6 +278818,8 @@ function shouldSkipBalancing(ctx$1, config2 = DEFAULT_BALANCING_CONFIG) {
 }
 function getFragmentHeight(fragment2, measureMap) {
   if (fragment2.kind === "para") {
+    if (fragment2.lines && fragment2.lines.length > 0)
+      return fragment2.lines.reduce((sum$1, l) => sum$1 + (l.lineHeight ?? 0), 0);
     const measure = measureMap.get(fragment2.blockId);
     if (!measure || measure.kind !== "paragraph" || !measure.lines)
       return 0;
@@ -278895,13 +278900,38 @@ function balanceSectionOnPage(args$1) {
       return a2.x - b$1.x;
     return a2.y - b$1.y;
   });
-  const contentBlocks = ordered.map((f2, i4) => ({
-    blockId: `${f2.blockId}#${i4}`,
-    measuredHeight: getBalancingHeight(f2, args$1.measureMap, args$1.sectPrMarkerBlockIds),
-    canBreak: false,
-    keepWithNext: false,
-    keepTogether: true
-  }));
+  const lineHeightsFor = (f2) => {
+    if (f2.kind !== "para")
+      return;
+    if (args$1.sectPrMarkerBlockIds?.has(f2.blockId))
+      return;
+    if (args$1.keepLinesBlockIds?.has(f2.blockId))
+      return;
+    if (f2.lines && f2.lines.length > 0) {
+      if (f2.lines.length <= 1)
+        return;
+      return f2.lines.map((l) => l.lineHeight);
+    }
+    const measure = args$1.measureMap.get(f2.blockId);
+    if (!measure || measure.kind !== "paragraph" || !Array.isArray(measure.lines))
+      return;
+    const fromLine = f2.fromLine ?? 0;
+    const toLine = f2.toLine ?? measure.lines.length;
+    if (toLine - fromLine <= 1)
+      return;
+    return measure.lines.slice(fromLine, toLine).map((l) => l.lineHeight);
+  };
+  const contentBlocks = ordered.map((f2, i4) => {
+    const lineHeights = lineHeightsFor(f2);
+    return {
+      blockId: `${f2.blockId}#${i4}`,
+      measuredHeight: getBalancingHeight(f2, args$1.measureMap, args$1.sectPrMarkerBlockIds),
+      canBreak: lineHeights !== undefined,
+      keepWithNext: false,
+      keepTogether: lineHeights === undefined,
+      lineHeights
+    };
+  });
   if (shouldSkipBalancing({
     columnCount,
     columnWidth,
@@ -278936,6 +278966,39 @@ function balanceSectionOnPage(args$1) {
     f2.x = columnX(col);
     f2.y = colCursors[col];
     f2.width = columnWidth;
+    const bp = result.blockBreakPoints?.get(block.blockId);
+    if (bp && bp.heightAfterBreak > 0 && col < columnCount - 1) {
+      const splitLine = (f2.fromLine ?? 0) + bp.breakAfterLine + 1;
+      const measureLineCount = args$1.measureMap.get(f2.blockId)?.lines?.length ?? splitLine;
+      const originalToLine = f2.toLine ?? measureLineCount;
+      const originalContinuesOnNext = f2.continuesOnNext ?? false;
+      const secondHalf = {
+        ...f2,
+        fromLine: splitLine,
+        toLine: originalToLine,
+        x: columnX(col + 1),
+        y: colCursors[col + 1],
+        width: columnWidth,
+        continuesFromPrev: true,
+        continuesOnNext: originalContinuesOnNext
+      };
+      if (f2.lines && f2.lines.length > 0) {
+        secondHalf.lines = f2.lines.slice(bp.breakAfterLine + 1);
+        f2.lines = f2.lines.slice(0, bp.breakAfterLine + 1);
+      }
+      f2.toLine = splitLine;
+      f2.continuesOnNext = true;
+      colCursors[col] += bp.heightBeforeBreak;
+      colCursors[col + 1] += bp.heightAfterBreak;
+      const fragIdx = fragments.indexOf(f2);
+      if (fragIdx >= 0)
+        fragments.splice(fragIdx + 1, 0, secondHalf);
+      if (colCursors[col] > maxY)
+        maxY = colCursors[col];
+      if (colCursors[col + 1] > maxY)
+        maxY = colCursors[col + 1];
+      continue;
+    }
     colCursors[col] += block.measuredHeight;
     if (colCursors[col] > maxY)
       maxY = colCursors[col];
@@ -280087,6 +280150,7 @@ function layoutDocument(blocks2, measures, options = {}) {
   const sectionTypeIsExplicit = /* @__PURE__ */ new Map;
   let lastSectionIdx = null;
   const sectPrMarkerBlockIds = /* @__PURE__ */ new Set;
+  const keepLinesBlockIds = /* @__PURE__ */ new Set;
   let documentHasExplicitColumnBreak = false;
   let documentHasAnySectionBreak = false;
   const alreadyBalancedSections = /* @__PURE__ */ new Set;
@@ -280120,6 +280184,8 @@ function layoutDocument(blocks2, measures, options = {}) {
       documentHasExplicitColumnBreak = true;
     if (block.kind === "paragraph" && blockWithAttrs.attrs?.sectPrMarker === true)
       sectPrMarkerBlockIds.add(block.id);
+    if (block.kind === "paragraph" && blockWithAttrs.attrs?.keepLines === true)
+      keepLinesBlockIds.add(block.id);
   });
   const anchoredByParagraph = collectAnchoredDrawings(blocks2, measures);
   const anchoredTables = collectAnchoredTables(blocks2, measures);
@@ -280338,7 +280404,8 @@ function layoutDocument(blocks2, measures, options = {}) {
             columnWidth: normalized.width,
             availableHeight,
             measureMap: balancingMeasureMap,
-            sectPrMarkerBlockIds
+            sectPrMarkerBlockIds,
+            keepLinesBlockIds
           });
           if (balanceResult) {
             state.cursorY = balanceResult.maxY;
@@ -280737,7 +280804,9 @@ function layoutDocument(blocks2, measures, options = {}) {
       const isMultiPage = sectionPagesCount > 1;
       if (isMultiPage && !isLast)
         continue;
-      const allowedByMidDocContinuous = endBreakType === "continuous" && !isLast;
+      const nextSectionBeginType = sectionEndBreakType.get(sectionIdx + 1);
+      const nextIsBody = lastSectionIdx !== null && sectionIdx + 1 === lastSectionIdx;
+      const allowedByMidDocContinuous = !isLast && !nextIsBody && nextSectionBeginType === "continuous";
       const allowedByBodyExplicitContinuous = bodyExplicitContinuousIdx !== null && sectionIdx === bodyExplicitContinuousIdx - 1 && !isExplicitNonContinuous;
       if (!allowedByMidDocContinuous && !allowedByBodyExplicitContinuous && !isMultiPage)
         continue;
@@ -280768,7 +280837,8 @@ function layoutDocument(blocks2, measures, options = {}) {
       columnWidth: normalized.width,
       availableHeight: sectionAvailableHeight,
       measureMap: balancingMeasureMap,
-      sectPrMarkerBlockIds
+      sectPrMarkerBlockIds,
+      keepLinesBlockIds
     });
   }
   for (const state of states) {
@@ -330870,7 +330940,7 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions, TRACKED_MARK_NAMES;
-var init_src_BU1mfNkI_es = __esm(() => {
+var init_src_Btvk6jT1_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_BaKhr4cp_es();
   init_jszip_C49i9kUs_es();
@@ -366123,7 +366193,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_BU1mfNkI_es();
+  init_src_Btvk6jT1_es();
   init_SuperConverter_BaKhr4cp_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.17.0-next.4",
+  "version": "0.17.0-next.5",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -33,11 +33,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.17.0-next.4",
-    "@superdoc-dev/cli-darwin-x64": "0.17.0-next.4",
-    "@superdoc-dev/cli-linux-x64": "0.17.0-next.4",
-    "@superdoc-dev/cli-linux-arm64": "0.17.0-next.4",
-    "@superdoc-dev/cli-windows-x64": "0.17.0-next.4"
+    "@superdoc-dev/cli-darwin-arm64": "0.17.0-next.5",
+    "@superdoc-dev/cli-darwin-x64": "0.17.0-next.5",
+    "@superdoc-dev/cli-linux-x64": "0.17.0-next.5",
+    "@superdoc-dev/cli-linux-arm64": "0.17.0-next.5",
+    "@superdoc-dev/cli-windows-x64": "0.17.0-next.5"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",