@superdoc-dev/cli 0.8.0-next.83 → 0.8.0-next.84

package/dist/index.js

@@ -207843,7 +207843,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-DWSadDfS.es.js
+// ../../packages/superdoc/dist/chunks/src-BBPU9hdN.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -255533,16 +255533,43 @@ function layoutDocument(blocks2, measures, options = {}) {
       return Math.max(baseBottomMargin, currentFooterDistance + footerContentHeight);
     return baseBottomMargin;
   };
+  const MIN_BODY_CONTENT_HEIGHT = 1;
+  const clampHeaderFooterInflatedMargins = (topMargin, bottomMargin, baseTopMargin, baseBottomMargin, currentPageHeight) => {
+    const maxMarginTotal = currentPageHeight - MIN_BODY_CONTENT_HEIGHT;
+    if (topMargin + bottomMargin <= maxMarginTotal)
+      return {
+        top: topMargin,
+        bottom: bottomMargin
+      };
+    const baseMarginTotal = baseTopMargin + baseBottomMargin;
+    if (baseMarginTotal >= maxMarginTotal)
+      return {
+        top: topMargin,
+        bottom: bottomMargin
+      };
+    const topInflation = Math.max(0, topMargin - baseTopMargin);
+    const bottomInflation = Math.max(0, bottomMargin - baseBottomMargin);
+    const totalInflation = topInflation + bottomInflation;
+    if (totalInflation <= 0)
+      return {
+        top: topMargin,
+        bottom: bottomMargin
+      };
+    const availableInflation = maxMarginTotal - baseMarginTotal;
+    return {
+      top: baseTopMargin + availableInflation * (topInflation / totalInflation),
+      bottom: baseBottomMargin + availableInflation * (bottomInflation / totalInflation)
+    };
+  };
   const maxHeaderContentHeight = headerContentHeights ? Math.max(0, validateContentHeight(headerContentHeights.default), validateContentHeight(headerContentHeights.first), validateContentHeight(headerContentHeights.even), validateContentHeight(headerContentHeights.odd)) : 0;
   const maxFooterContentHeight = footerContentHeights ? Math.max(0, validateContentHeight(footerContentHeights.default), validateContentHeight(footerContentHeights.first), validateContentHeight(footerContentHeights.even), validateContentHeight(footerContentHeights.odd)) : 0;
   const headerDistance = margins.header ?? margins.top;
   const footerDistance = margins.footer ?? margins.bottom;
   const defaultHeaderHeight = getHeaderHeightForPage("default", undefined, 0);
   const defaultFooterHeight = getFooterHeightForPage("default", undefined, 0);
-  const effectiveTopMargin = calculateEffectiveTopMargin(defaultHeaderHeight, headerDistance, margins.top);
-  const effectiveBottomMargin = calculateEffectiveBottomMargin(defaultFooterHeight, footerDistance, margins.bottom);
-  let activeTopMargin = effectiveTopMargin;
-  let activeBottomMargin = effectiveBottomMargin;
+  const effectiveMargins = clampHeaderFooterInflatedMargins(calculateEffectiveTopMargin(defaultHeaderHeight, headerDistance, margins.top), calculateEffectiveBottomMargin(defaultFooterHeight, footerDistance, margins.bottom), margins.top, margins.bottom, pageSize.h);
+  let activeTopMargin = effectiveMargins.top;
+  let activeBottomMargin = effectiveMargins.bottom;
   let activeLeftMargin = margins.left;
   let activeRightMargin = margins.right;
   let pendingTopMargin = null;
@@ -255974,8 +256001,9 @@ function layoutDocument(blocks2, measures, options = {}) {
           footerRef = defaultFooterRef;
         const headerHeight = getHeaderHeightForPage(effectiveVariantType, headerRef, activeSectionIndex);
         const footerHeight = getFooterHeightForPage(variantType !== "default" && !activeSectionRefs?.footerRefs?.[variantType] ? "default" : variantType, footerRef, activeSectionIndex);
-        activeTopMargin = calculateEffectiveTopMargin(headerHeight, activeHeaderDistance, activeSectionBaseTopMargin);
-        activeBottomMargin = calculateEffectiveBottomMargin(footerHeight, activeFooterDistance, activeSectionBaseBottomMargin);
+        const adjustedMargins = clampHeaderFooterInflatedMargins(calculateEffectiveTopMargin(headerHeight, activeHeaderDistance, activeSectionBaseTopMargin), calculateEffectiveBottomMargin(footerHeight, activeFooterDistance, activeSectionBaseBottomMargin), activeSectionBaseTopMargin, activeSectionBaseBottomMargin, activePageSize.h);
+        activeTopMargin = adjustedMargins.top;
+        activeBottomMargin = adjustedMargins.bottom;
         layoutLog(`[Layout] Page ${newPageNumber}: Using variant '${variantType}' - headerHeight: ${headerHeight}, footerHeight: ${footerHeight}`);
         layoutLog(`[Layout] Page ${newPageNumber}: Adjusted margins - top: ${activeTopMargin}, bottom: ${activeBottomMargin} (base: ${activeSectionBaseTopMargin}, ${activeSectionBaseBottomMargin})`);
         return;
@@ -256879,6 +256907,13 @@ function shouldExcludeFromMeasurement(fragment2, block, fragmentBottom, canvasHe
     if (measurementBand && !rangesIntersect(fragment2.y, fragmentBottom, measurementBand.start, measurementBand.end))
       return true;
   }
+  const fragmentHeight = typeof fragment2.height === "number" ? fragment2.height : fragmentBottom - fragment2.y;
+  const fragmentWidth = typeof fragment2.width === "number" ? fragment2.width : 0;
+  const heightCoversCanvas = Number.isFinite(fragmentHeight) && fragmentHeight >= canvasHeight;
+  const widthCoversCanvas = Number.isFinite(constraints.width) && constraints.width > 0 && fragmentWidth >= constraints.width;
+  const isOverlayWrap = anchoredBlock.wrap?.type === "None";
+  if (kind && heightCoversCanvas && widthCoversCanvas && isOverlayWrap)
+    return true;
   return false;
 }
 function layoutHeaderFooter(blocks2, measures, constraints, kind) {
@@ -300594,7 +300629,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;
-var init_src_DWSadDfS_es = __esm(() => {
+var init_src_BBPU9hdN_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_CzqEoFT1_es();
   init_jszip_C49i9kUs_es();
@@ -338283,7 +338318,7 @@ var init_zipper_BxRAi0_5_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_DWSadDfS_es();
+  init_src_BBPU9hdN_es();
   init_SuperConverter_CzqEoFT1_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.8.0-next.83",
+  "version": "0.8.0-next.84",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -25,20 +25,20 @@
     "@types/ws": "^8.5.13",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
-    "superdoc": "1.31.0"
+    "superdoc": "1.31.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.8.0-next.83",
-    "@superdoc-dev/cli-darwin-x64": "0.8.0-next.83",
-    "@superdoc-dev/cli-linux-x64": "0.8.0-next.83",
-    "@superdoc-dev/cli-windows-x64": "0.8.0-next.83",
-    "@superdoc-dev/cli-linux-arm64": "0.8.0-next.83"
+    "@superdoc-dev/cli-darwin-arm64": "0.8.0-next.84",
+    "@superdoc-dev/cli-linux-x64": "0.8.0-next.84",
+    "@superdoc-dev/cli-darwin-x64": "0.8.0-next.84",
+    "@superdoc-dev/cli-linux-arm64": "0.8.0-next.84",
+    "@superdoc-dev/cli-windows-x64": "0.8.0-next.84"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",