@superdoc-dev/cli 0.16.0-next.13 → 0.16.0-next.14

package/dist/index.js

@@ -229075,7 +229075,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-C8mTdIvv.es.js
+// ../../packages/superdoc/dist/chunks/src-BAgFSihz.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -283976,7 +283976,7 @@ async function measureParagraphBlock(block, maxWidth) {
           toChar: 1,
           width: 0,
           maxFontSize: lastFontSize,
-          maxFontInfo: hasSeenTextRun ? undefined : fallbackFontInfo,
+          maxFontInfo: hasSeenTextRun ? undefined : fallbackFontInfo ?? getFontInfoFromRun(run2),
           maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
           segments: [],
           spaceCount: 0
@@ -310062,20 +310062,39 @@ menclose::after {
   if (!("text" in run2) || !run2.text)
     return null;
   return renderTextRun(run2, context, renderContext, trackedConfig);
-}, renderInlineTabRun = (run2, line, doc$12, layoutEpoch, styleId) => {
+}, getRunUnderline = (run2) => ("underline" in run2) ? run2.underline : undefined, getRunFontSize = (run2) => ("fontSize" in run2) && typeof run2.fontSize === "number" ? run2.fontSize : 16, getRunColor = (run2) => ("color" in run2) && typeof run2.color === "string" ? run2.color : undefined, underlineStyleForRun = (run2) => getRunUnderline(run2)?.style ?? "single", canPaintUnderlineAsBorder = (run2) => {
+  if (!getRunUnderline(run2))
+    return false;
+  const style2 = underlineStyleForRun(run2);
+  return style2 !== "none" && style2 !== "words";
+}, canPaintUnderlineOverlay = (run2) => {
+  if (!canPaintUnderlineAsBorder(run2))
+    return false;
+  const style2 = underlineStyleForRun(run2);
+  return style2 === "single" || style2 === "double" || style2 === "dotted" || style2 === "dashed";
+}, underlineBorderForRun = (run2) => {
+  if (!canPaintUnderlineAsBorder(run2))
+    return;
+  const underlineStyle = underlineStyleForRun(run2);
+  const borderStyle = underlineStyle === "double" || underlineStyle === "dotted" || underlineStyle === "dashed" ? underlineStyle : "solid";
+  const underlineColor = getRunUnderline(run2)?.color ?? getRunColor(run2) ?? "#000000";
+  return `${underlineThicknessPx(getRunFontSize(run2))}px ${borderStyle} ${underlineColor}`;
+}, renderInlineTabRun = (run2, line, doc$12, layoutEpoch, styleId, paintUnderline = true) => {
   const tabEl = doc$12.createElement("span");
   tabEl.classList.add("superdoc-tab");
   const tabWidth = run2.width ?? 48;
   tabEl.style.display = "inline-block";
   tabEl.style.width = `${tabWidth}px`;
-  if (run2.underline) {
+  const shouldPaintUnderline = paintUnderline && canPaintUnderlineAsBorder(run2);
+  if (shouldPaintUnderline) {
     tabEl.style.height = `${underlineOffsetFromLineTop(line)}px`;
     tabEl.style.verticalAlign = "top";
   } else {
     tabEl.style.height = `${line.lineHeight}px`;
     tabEl.style.verticalAlign = "bottom";
   }
-  applyTabUnderlineBorder(tabEl, run2);
+  if (shouldPaintUnderline)
+    applyTabUnderlineBorder(tabEl, run2);
   if (styleId)
     tabEl.setAttribute("styleid", styleId);
   if (run2.pmStart != null)
@@ -310084,7 +310103,7 @@ menclose::after {
     tabEl.dataset.pmEnd = String(run2.pmEnd);
   tabEl.dataset.layoutEpoch = String(layoutEpoch);
   return tabEl;
-}, renderPositionedTabRun = (run2, line, doc$12, layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId) => {
+}, renderPositionedTabRun = (run2, line, doc$12, layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId, paintUnderline = true) => {
   const measuredTabEndX = tabStartX + (run2.width ?? 0);
   const tabEndX = immediateNextSegment?.precedingTabEndX ?? immediateNextSegment?.x ?? measuredTabEndX;
   const actualTabWidth = tabEndX - tabStartX;
@@ -310093,12 +310112,14 @@ menclose::after {
   tabEl.style.left = `${tabStartX + indentOffset}px`;
   tabEl.style.top = "0px";
   tabEl.style.width = `${actualTabWidth}px`;
-  tabEl.style.height = run2.underline ? `${underlineOffsetFromLineTop(line)}px` : `${line.lineHeight}px`;
+  const shouldPaintUnderline = paintUnderline && canPaintUnderlineAsBorder(run2);
+  tabEl.style.height = shouldPaintUnderline ? `${underlineOffsetFromLineTop(line)}px` : `${line.lineHeight}px`;
   tabEl.style.display = "inline-block";
   tabEl.style.pointerEvents = "none";
   tabEl.style.zIndex = "1";
-  applyTabUnderlineBorder(tabEl, run2);
-  if (!run2.underline)
+  if (shouldPaintUnderline)
+    applyTabUnderlineBorder(tabEl, run2);
+  else
     tabEl.style.visibility = "hidden";
   if (styleId)
     tabEl.setAttribute("styleid", styleId);
@@ -310115,13 +310136,10 @@ menclose::after {
 }, underlineOffsetFromLineTop = (line) => {
   return Math.max(0, (line.lineHeight - line.ascent - line.descent) / 2) + line.ascent + Math.min(line.descent, line.lineHeight * 0.08);
 }, applyTabUnderlineBorder = (tabEl, run2) => {
-  if (!run2.underline)
+  const border = underlineBorderForRun(run2);
+  if (!border)
     return;
-  const underlineStyle = run2.underline.style ?? "single";
-  const underlineColor = run2.underline.color ?? "#000000";
-  const borderStyle = underlineStyle === "double" ? "double" : "solid";
-  const fontSize = run2.fontSize ?? 16;
-  tabEl.style.borderBottom = `${underlineThicknessPx(fontSize)}px ${borderStyle} ${underlineColor}`;
+  tabEl.style.borderBottom = border;
 }, applyStyles$1 = (el, styles) => {
   Object.entries(styles).forEach(([key2, value]) => {
     if (value != null && value !== "" && key2 in el.style)
@@ -310226,6 +310244,73 @@ menclose::after {
       break;
     }
   return merged;
+}, isTextRun$5 = (run2) => (run2.kind === "text" || run2.kind === undefined) && ("text" in run2), isOverlaySafeRunKind = (run2) => {
+  const kind = run2.kind ?? "text";
+  return kind === "text" || kind === "tab" || kind === "lineBreak" || kind === "break";
+}, shouldUseLineUnderlineOverlay = (runsForLine) => runsForLine.every(isOverlaySafeRunKind) && runsForLine.some((run2) => run2.kind === "tab" && canPaintUnderlineOverlay(run2)), cloneRunWithoutUnderline = (run2) => ({
+  ...run2,
+  underline: undefined
+}), appendUnderlineOverlaySpan = (spans, from$1, to, border) => {
+  if (!border || to <= from$1)
+    return;
+  const last2 = spans[spans.length - 1];
+  if (last2 && last2.border === border && Math.abs(last2.to - from$1) < 0.5) {
+    last2.to = to;
+    return;
+  }
+  spans.push({
+    from: from$1,
+    to,
+    border
+  });
+}, runInlinePaintWidth = (run2, runIndex, segmentsByRun, spacingPerSpace) => {
+  if (run2.kind === "tab")
+    return run2.width ?? 48;
+  const segments = segmentsByRun.get(runIndex);
+  if (segments?.length)
+    return segments.reduce((sum, segment) => {
+      const text5 = isTextRun$5(run2) ? (run2.text ?? "").slice(segment.fromChar, segment.toChar) : "";
+      return sum + segment.width + spacingPerSpace * countSpaces$1(text5);
+    }, 0);
+  if ("width" in run2 && typeof run2.width === "number")
+    return run2.width;
+  return 0;
+}, buildInlineUnderlineSpans = (block, line, spacingPerSpace, lineTextStartOffsetPx) => {
+  const segmentsByRun = /* @__PURE__ */ new Map;
+  line.segments?.forEach((segment) => {
+    const segments = segmentsByRun.get(segment.runIndex);
+    if (segments)
+      segments.push(segment);
+    else
+      segmentsByRun.set(segment.runIndex, [segment]);
+  });
+  const spans = [];
+  let currentX = lineTextStartOffsetPx;
+  for (let runIndex = line.fromRun;runIndex <= line.toRun; runIndex += 1) {
+    const run2 = block.runs[runIndex];
+    if (!run2)
+      continue;
+    const width = runInlinePaintWidth(run2, runIndex, segmentsByRun, spacingPerSpace);
+    if (canPaintUnderlineOverlay(run2))
+      appendUnderlineOverlaySpan(spans, currentX, currentX + width, underlineBorderForRun(run2));
+    currentX += width;
+  }
+  return spans;
+}, renderUnderlineSpans = (spans, top$1, el, doc$12) => {
+  spans.forEach((span) => {
+    const overlay = doc$12.createElement("div");
+    overlay.classList.add("superdoc-underline-overlay");
+    overlay.setAttribute("aria-hidden", "true");
+    overlay.style.position = "absolute";
+    overlay.style.left = `${span.from}px`;
+    overlay.style.top = `${top$1}px`;
+    overlay.style.width = `${Math.max(0, span.to - span.from)}px`;
+    overlay.style.height = "0px";
+    overlay.style.borderTop = span.border;
+    overlay.style.pointerEvents = "none";
+    overlay.style.zIndex = "2";
+    el.appendChild(overlay);
+  });
 }, renderLine = ({ block, line, context, availableWidthOverride, lineIndex, skipJustify, preExpandedRuns, resolvedListTextStartPx, indentOffsetOverride, paragraphMarkLeftOffsetOverride, runContext }) => {
   const expandedBlock = {
     ...block,
@@ -310320,6 +310405,11 @@ menclose::after {
     shouldJustify: justifyShouldApply
   });
   const lineContainsInlineImage = runsForLine.some((run2) => isImageRun$1(run2));
+  const useSegmentPositioning = shouldUseSegmentPositioning(hasExplicitPositioning ?? false, Boolean(line.segments), isRtl);
+  const overlayAlignment = block.attrs?.alignment;
+  const overlayIndent = block.attrs?.indent;
+  const inlineOverlayOriginMatchesContent = overlayAlignment !== "center" && overlayAlignment !== "right" && (overlayIndent?.hanging ?? 0) === 0 && (overlayIndent?.left ?? 0) >= 0;
+  const useLineUnderlineOverlay = Boolean(line.segments) && !isRtl && shouldUseLineUnderlineOverlay(runsForLine) && (useSegmentPositioning || inlineOverlayOriginMatchesContent);
   const resolveLineIndentOffset = () => {
     if (indentOffsetOverride != null)
       return indentOffsetOverride;
@@ -310339,7 +310429,8 @@ menclose::after {
   const paragraphMarkLeftOffsetPx = lineTextStartOffsetPx;
   if (spacingPerSpace !== 0)
     el.style.wordSpacing = `${spacingPerSpace}px`;
-  if (shouldUseSegmentPositioning(hasExplicitPositioning ?? false, Boolean(line.segments), isRtl))
+  const underlineSpans = [];
+  if (useSegmentPositioning)
     renderExplicitlyPositionedRuns({
       block,
       line,
@@ -310350,9 +310441,11 @@ menclose::after {
       styleId,
       runContext,
       trackedConfig,
-      lineContainsInlineImage
+      lineContainsInlineImage,
+      useLineUnderlineOverlay,
+      underlineSpanCollector: useLineUnderlineOverlay ? underlineSpans : undefined
     });
-  else
+  else {
     renderInlineRuns({
       runsForLine,
       line,
@@ -310361,8 +310454,14 @@ menclose::after {
       styleId,
       runContext,
       trackedConfig,
-      lineContainsInlineImage
+      lineContainsInlineImage,
+      useLineUnderlineOverlay
     });
+    if (useLineUnderlineOverlay)
+      underlineSpans.push(...buildInlineUnderlineSpans(expandedBlock, line, spacingPerSpace, lineTextStartOffsetPx));
+  }
+  if (useLineUnderlineOverlay && underlineSpans.length > 0)
+    renderUnderlineSpans(underlineSpans, underlineOffsetFromLineTop(line), el, runContext.doc);
   appendFormattingParagraphMark(el, line, expandedBlock.runs, paragraphMarkLeftOffsetPx, availableWidth, hasExplicitPositioning ?? false, runContext.doc, runContext.showFormattingMarks);
   el.querySelectorAll("a[href]").forEach((anchor) => {
     const pendingTooltip = runContext.pendingTooltips.get(anchor);
@@ -310372,7 +310471,7 @@ menclose::after {
     }
   });
   return el;
-}, renderExplicitlyPositionedRuns = ({ block, line, context, el, lineTextStartOffsetPx, spacingPerSpace, styleId, runContext, trackedConfig, lineContainsInlineImage }) => {
+}, renderExplicitlyPositionedRuns = ({ block, line, context, el, lineTextStartOffsetPx, spacingPerSpace, styleId, runContext, trackedConfig, lineContainsInlineImage, useLineUnderlineOverlay, underlineSpanCollector }) => {
   const indentOffset = lineTextStartOffsetPx;
   let cumulativeX = 0;
   const segments = line.segments;
@@ -310441,8 +310540,11 @@ menclose::after {
     if (baseRun.kind === "tab") {
       const immediateNextSegment = findImmediateNextSegment(runIndex);
       const tabStartX = cumulativeX;
-      const { element: tabEl, tabEndX, actualTabWidth } = renderPositionedTabRun(baseRun, line, runContext.doc, runContext.layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId);
+      const coveredByOverlay$1 = useLineUnderlineOverlay && canPaintUnderlineOverlay(baseRun);
+      const { element: tabEl, tabEndX, actualTabWidth } = renderPositionedTabRun(baseRun, line, runContext.doc, runContext.layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId, !coveredByOverlay$1);
       appendToLineGeo(tabEl, baseRun, tabStartX + indentOffset, actualTabWidth);
+      if (coveredByOverlay$1 && underlineSpanCollector)
+        appendUnderlineOverlaySpan(underlineSpanCollector, tabStartX + indentOffset, tabStartX + indentOffset + actualTabWidth, underlineBorderForRun(baseRun));
       cumulativeX = tabEndX;
       continue;
     }
@@ -310521,6 +310623,7 @@ menclose::after {
     const baseText = baseRun.text ?? "";
     const runPmStart = baseRun.pmStart ?? null;
     const fallbackPmEnd = runPmStart != null && baseRun.pmEnd == null ? runPmStart + baseText.length : baseRun.pmEnd ?? null;
+    const coveredByOverlay = useLineUnderlineOverlay && canPaintUnderlineOverlay(baseRun);
     runSegments.forEach((segment) => {
       const segmentText = baseText.slice(segment.fromChar, segment.toChar);
       if (!segmentText)
@@ -310531,10 +310634,13 @@ menclose::after {
         ...baseRun,
         text: segmentText,
         pmStart: pmSliceStart,
-        pmEnd: pmSliceEnd
+        pmEnd: pmSliceEnd,
+        ...coveredByOverlay ? { underline: undefined } : {}
       };
       const elem = renderRun(segmentRun, context, runContext, trackedConfig);
       if (elem) {
+        if (coveredByOverlay)
+          elem.style.textDecorationLine = segmentRun.strike ? "line-through" : "none";
         if (styleId)
           elem.setAttribute("styleid", styleId);
         alignNormalTextBesideInlineImage(elem, segmentRun, lineContainsInlineImage);
@@ -310544,6 +310650,8 @@ menclose::after {
         elem.style.left = `${xPos}px`;
         appendToLineGeo(elem, segmentRun, xPos, segment.width);
         const visualWidth = segment.width + (spacingPerSpace !== 0 ? spacingPerSpace * countSpaces$1(segmentText) : 0);
+        if (coveredByOverlay && underlineSpanCollector)
+          appendUnderlineOverlaySpan(underlineSpanCollector, xPos, xPos + visualWidth, underlineBorderForRun(baseRun));
         cumulativeX = baseX + visualWidth;
         if (geoSdtWrapper)
           geoSdtMaxRight = Math.max(geoSdtMaxRight, xPos + visualWidth);
@@ -310551,7 +310659,7 @@ menclose::after {
     });
   }
   closeGeoSdtWrapper();
-}, renderInlineRuns = ({ runsForLine, line, context, el, styleId, runContext, trackedConfig, lineContainsInlineImage }) => {
+}, renderInlineRuns = ({ runsForLine, line, context, el, styleId, runContext, trackedConfig, lineContainsInlineImage, useLineUnderlineOverlay }) => {
   let currentInlineSdtWrapper = null;
   let currentInlineSdtId = null;
   const closeCurrentWrapper = () => {
@@ -310566,11 +310674,15 @@ menclose::after {
     const runSdtId = resolved?.sdtId ?? null;
     if (runSdtId !== currentInlineSdtId)
       closeCurrentWrapper();
-    const elem = run2.kind === "tab" ? renderInlineTabRun(run2, line, runContext.doc, runContext.layoutEpoch, styleId) : renderRun(run2, context, runContext, trackedConfig);
+    const suppressUnderline = useLineUnderlineOverlay && canPaintUnderlineOverlay(run2);
+    const runForRender = suppressUnderline ? cloneRunWithoutUnderline(run2) : run2;
+    const elem = run2.kind === "tab" ? renderInlineTabRun(runForRender, line, runContext.doc, runContext.layoutEpoch, styleId, !suppressUnderline) : renderRun(runForRender, context, runContext, trackedConfig);
     if (elem) {
+      if (suppressUnderline && run2.kind !== "tab")
+        elem.style.textDecorationLine = "strike" in runForRender && runForRender.strike ? "line-through" : "none";
       if (styleId)
         elem.setAttribute("styleid", styleId);
-      alignNormalTextBesideInlineImage(elem, run2, lineContainsInlineImage);
+      alignNormalTextBesideInlineImage(elem, runForRender, lineContainsInlineImage);
       if (resolved) {
         if (!currentInlineSdtWrapper) {
           currentInlineSdtWrapper = runContext.createInlineSdtWrapper(resolved.sdt);
@@ -313429,7 +313541,13 @@ menclose::after {
           run2.text ?? "",
           "tab",
           run2.underline?.style ?? "",
-          run2.underline?.color ?? ""
+          run2.underline?.color ?? "",
+          run2.fontSize ?? "",
+          run2.fontFamily ?? "",
+          run2.bold ? 1 : 0,
+          run2.italic ? 1 : 0,
+          getFontConfigVersion(),
+          run2.color ?? ""
         ].join(",");
       if (run2.kind === "fieldAnnotation") {
         const fieldRun = run2;
@@ -322264,7 +322382,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_C8mTdIvv_es = __esm(() => {
+var init_src_BAgFSihz_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_SuperConverter_CcHCWpfX_es();
   init_jszip_C49i9kUs_es();
@@ -356666,7 +356784,7 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_C8mTdIvv_es();
+  init_src_BAgFSihz_es();
   init_SuperConverter_CcHCWpfX_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();

package/package.json

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