superdoc 1.7.0-next.5 → 1.7.0-next.7

package/dist/superdoc.umd.js

@@ -24496,6 +24496,26 @@
       }
       const fldCharEl = node2.elements?.find((el) => el.name === "w:fldChar");
       const fldType = fldCharEl?.attributes?.["w:fldCharType"];
+      if (node2.name === "w:fldSimple") {
+        const instrAttr = node2.attributes?.["w:instr"] || "";
+        const fieldType = instrAttr.trim().split(/\s+/)[0];
+        if (fieldType === "PAGE" || fieldType === "NUMPAGES") {
+          const preprocessor = fieldType === "PAGE" ? preProcessPageInstruction : preProcessNumPagesInstruction;
+          const contentNodes = node2.elements || [];
+          let fieldRunRPr = null;
+          for (const child of contentNodes) {
+            const rPr = child.elements?.find((el) => el.name === "w:rPr");
+            if (rPr) {
+              fieldRunRPr = rPr;
+              break;
+            }
+          }
+          const processedField = preprocessor(contentNodes, instrAttr.trim(), fieldRunRPr);
+          processedNodes.push(...processedField);
+          i2++;
+          continue;
+        }
+      }
       if (fldType === "begin") {
         const fieldInfo = scanFieldSequence(nodes, i2);
         if (fieldInfo && (fieldInfo.fieldType === "PAGE" || fieldInfo.fieldType === "NUMPAGES")) {
@@ -38197,7 +38217,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.7.0-next.5") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.7.0-next.7") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -55474,8 +55494,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       arr.splice(i2, 1);
     }
   };
-  const hasOwnProperty$e = Object.prototype.hasOwnProperty;
-  const hasOwn = (val, key2) => hasOwnProperty$e.call(val, key2);
+  const hasOwnProperty$f = Object.prototype.hasOwnProperty;
+  const hasOwn = (val, key2) => hasOwnProperty$f.call(val, key2);
   const isArray$1 = Array.isArray;
   const isMap = (val) => toTypeString(val) === "[object Map]";
   const isSet = (val) => toTypeString(val) === "[object Set]";
@@ -56450,7 +56470,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const builtInSymbols = new Set(
     /* @__PURE__ */ Object.getOwnPropertyNames(Symbol).filter((key2) => key2 !== "arguments" && key2 !== "caller").map((key2) => Symbol[key2]).filter(isSymbol$1)
   );
-  function hasOwnProperty$d(key2) {
+  function hasOwnProperty$e(key2) {
     if (!isSymbol$1(key2)) key2 = String(key2);
     const obj = toRaw(this);
     track$1(obj, "has", key2);
@@ -56485,7 +56505,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           return fn;
         }
         if (key2 === "hasOwnProperty") {
-          return hasOwnProperty$d;
+          return hasOwnProperty$e;
         }
       }
       const res = Reflect.get(
@@ -64367,7 +64387,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.7.0-next.5";
+  const summaryVersion = "1.7.0-next.7";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -67035,7 +67055,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.5");
+      console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.7");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -81637,6 +81657,28 @@ ${o}
     next2.pendingOrientation = null;
     return next2;
   }
+  const isTextRun$3 = (run2) => {
+    const runWithKind = run2;
+    return !runWithKind.kind || runWithKind.kind === "text";
+  };
+  const isEmptyTextParagraph = (block) => {
+    const runs2 = block.runs;
+    if (!runs2 || runs2.length === 0) return true;
+    if (runs2.length !== 1) return false;
+    const run2 = runs2[0];
+    if (!isTextRun$3(run2)) return false;
+    return typeof run2.text === "string" && run2.text.length === 0;
+  };
+  const shouldSuppressSpacingForEmpty = (block, side) => {
+    if (!isEmptyTextParagraph(block)) return false;
+    const attrs = block.attrs;
+    const spacingExplicit = attrs?.spacingExplicit;
+    if (!spacingExplicit) return false;
+    if (side === "before") {
+      return !spacingExplicit.before;
+    }
+    return !spacingExplicit.after;
+  };
   function normalizeLines(measure) {
     if (measure.lines.length > 0) {
       return measure.lines;
@@ -81876,11 +81918,17 @@ ${o}
     let fromLine = 0;
     const attrs = getParagraphAttrs(block);
     const spacing = attrs?.spacing ?? {};
+    const spacingExplicit = attrs?.spacingExplicit;
     const styleId = asString(attrs?.styleId);
     const contextualSpacing = asBoolean$1(attrs?.contextualSpacing);
     let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
+    let spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
+    const emptyTextParagraph = isEmptyTextParagraph(block);
+    if (emptyTextParagraph && spacingExplicit) {
+      if (!spacingExplicit.before) spacingBefore = 0;
+      if (!spacingExplicit.after) spacingAfter = 0;
+    }
     const baseSpacingBefore = spacingBefore;
-    const spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
     let appliedSpacingBefore = spacingBefore === 0;
     let lastState = null;
     const isPositionedFrame = frame?.wrap === "none";
@@ -83203,11 +83251,13 @@ ${o}
   function getParagraphSpacingBefore(block) {
     const spacing = block.attrs?.spacing;
     const value = spacing?.before ?? spacing?.lineSpaceBefore;
+    if (shouldSuppressSpacingForEmpty(block, "before")) return 0;
     return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
   }
   function getParagraphSpacingAfter$1(block) {
     const spacing = block.attrs?.spacing;
     const value = spacing?.after ?? spacing?.lineSpaceAfter;
+    if (shouldSuppressSpacingForEmpty(block, "after")) return 0;
     return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
   }
   function getMeasureHeight(block, measure) {
@@ -90913,18 +90963,29 @@ ${o}
         const fieldId = event.data.fieldId;
         if (fieldId) {
           const targetPos = event.pmPosition;
+          const pmStart = event.data.pmStart;
           let sourceStart = null;
           let sourceEnd = null;
           let sourceNode = null;
-          state.doc.descendants((node2, pos) => {
-            if (node2.type.name === "fieldAnnotation" && node2.attrs.fieldId === fieldId) {
-              sourceStart = pos;
-              sourceEnd = pos + node2.nodeSize;
-              sourceNode = node2;
-              return false;
-            }
-            return true;
-          });
+          if (pmStart != null) {
+            const nodeAt = state.doc.nodeAt(pmStart);
+            if (nodeAt?.type?.name === "fieldAnnotation") {
+              sourceStart = pmStart;
+              sourceEnd = pmStart + nodeAt.nodeSize;
+              sourceNode = nodeAt;
+            }
+          }
+          if (sourceStart == null || sourceEnd == null || !sourceNode) {
+            state.doc.descendants((node2, pos) => {
+              if (node2.type.name === "fieldAnnotation" && node2.attrs.fieldId === fieldId) {
+                sourceStart = pos;
+                sourceEnd = pos + node2.nodeSize;
+                sourceNode = node2;
+                return false;
+              }
+              return true;
+            });
+          }
           if (sourceStart === null || sourceEnd === null || !sourceNode) {
             return;
           }
@@ -92052,6 +92113,26 @@ ${o}
     return { top: top2, right: right2, bottom: bottom2, left: left2 };
   }
   const OOXML_Z_INDEX_BASE = 251658240;
+  const asOoxmlElement = (value) => {
+    if (!value || typeof value !== "object") return void 0;
+    const element2 = value;
+    if (element2.name == null && element2.attributes == null && element2.elements == null) return void 0;
+    return element2;
+  };
+  const findOoxmlChild = (parent, name) => {
+    return parent?.elements?.find((child) => child?.name === name);
+  };
+  const getOoxmlAttribute = (element2, key2) => {
+    if (!element2?.attributes) return void 0;
+    const attrs = element2.attributes;
+    return attrs[key2] ?? attrs[key2.startsWith("w:") ? key2.slice(2) : `w:${key2}`];
+  };
+  const parseOoxmlNumber = (value) => {
+    if (value == null) return void 0;
+    const num = typeof value === "number" ? value : Number.parseInt(String(value), 10);
+    return Number.isFinite(num) ? num : void 0;
+  };
+  const hasOwnProperty$d = (obj, key2) => Object.prototype.hasOwnProperty.call(obj, key2);
   function normalizeZIndex(originalAttributes) {
     if (!isPlainObject$4(originalAttributes)) return void 0;
     const relativeHeight = originalAttributes.relativeHeight;
@@ -94012,24 +94093,47 @@ ${o}
   const isValidNumberingId = (numId) => {
     return numId != null && numId !== 0 && numId !== "0";
   };
-  const asOoxmlElement = (value) => {
-    if (!value || typeof value !== "object") return void 0;
-    const element2 = value;
-    if (element2.name == null && element2.attributes == null && element2.elements == null) return void 0;
-    return element2;
-  };
-  const findChild = (parent, name) => {
-    return parent?.elements?.find((child) => child?.name === name);
+  const extractSpacingExplicitFromObject = (value) => {
+    if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+    const obj = value;
+    const explicit = {};
+    if (hasOwnProperty$d(obj, "before") || hasOwnProperty$d(obj, "lineSpaceBefore") || hasOwnProperty$d(obj, "beforeAutospacing") || hasOwnProperty$d(obj, "beforeAutoSpacing")) {
+      explicit.before = true;
+    }
+    if (hasOwnProperty$d(obj, "after") || hasOwnProperty$d(obj, "lineSpaceAfter") || hasOwnProperty$d(obj, "afterAutospacing") || hasOwnProperty$d(obj, "afterAutoSpacing")) {
+      explicit.after = true;
+    }
+    if (hasOwnProperty$d(obj, "line") || hasOwnProperty$d(obj, "lineRule")) {
+      explicit.line = true;
+    }
+    return explicit;
   };
-  const getAttribute = (element2, key2) => {
-    if (!element2?.attributes) return void 0;
-    const attrs = element2.attributes;
-    return attrs[key2] ?? attrs[key2.startsWith("w:") ? key2.slice(2) : `w:${key2}`];
+  const extractSpacingExplicitFromOoxml = (value) => {
+    const element2 = asOoxmlElement(value);
+    if (!element2) return {};
+    const pPr = element2.name === "w:pPr" ? element2 : findOoxmlChild(element2, "w:pPr");
+    const spacingEl = findOoxmlChild(pPr, "w:spacing");
+    if (!spacingEl) return {};
+    const explicit = {};
+    if (getOoxmlAttribute(spacingEl, "w:before") != null || getOoxmlAttribute(spacingEl, "w:beforeAutospacing") != null || getOoxmlAttribute(spacingEl, "w:beforeAutoSpacing") != null) {
+      explicit.before = true;
+    }
+    if (getOoxmlAttribute(spacingEl, "w:after") != null || getOoxmlAttribute(spacingEl, "w:afterAutospacing") != null || getOoxmlAttribute(spacingEl, "w:afterAutoSpacing") != null) {
+      explicit.after = true;
+    }
+    if (getOoxmlAttribute(spacingEl, "w:line") != null || getOoxmlAttribute(spacingEl, "w:lineRule") != null) {
+      explicit.line = true;
+    }
+    return explicit;
   };
-  const parseNumberAttr = (value) => {
-    if (value == null) return void 0;
-    const num = typeof value === "number" ? value : Number.parseInt(String(value), 10);
-    return Number.isFinite(num) ? num : void 0;
+  const mergeSpacingExplicit = (...sources) => {
+    const merged = {};
+    for (const source of sources) {
+      if (source.before) merged.before = true;
+      if (source.after) merged.after = true;
+      if (source.line) merged.line = true;
+    }
+    return merged;
   };
   const mergeSpacingSources = (base2, paragraphProps, attrs) => {
     const isObject2 = (v2) => v2 !== null && typeof v2 === "object";
@@ -94075,13 +94179,13 @@ ${o}
     return void 0;
   };
   const extractIndentFromLevel = (lvl) => {
-    const pPr = findChild(lvl, "w:pPr");
-    const ind = findChild(pPr, "w:ind");
+    const pPr = findOoxmlChild(lvl, "w:pPr");
+    const ind = findOoxmlChild(pPr, "w:ind");
     if (!ind) return void 0;
-    const left2 = parseNumberAttr(getAttribute(ind, "w:left"));
-    const right2 = parseNumberAttr(getAttribute(ind, "w:right"));
-    const firstLine = parseNumberAttr(getAttribute(ind, "w:firstLine"));
-    const hanging = parseNumberAttr(getAttribute(ind, "w:hanging"));
+    const left2 = parseOoxmlNumber(getOoxmlAttribute(ind, "w:left"));
+    const right2 = parseOoxmlNumber(getOoxmlAttribute(ind, "w:right"));
+    const firstLine = parseOoxmlNumber(getOoxmlAttribute(ind, "w:firstLine"));
+    const hanging = parseOoxmlNumber(getOoxmlAttribute(ind, "w:hanging"));
     const indent2 = {};
     if (left2 != null) indent2.left = left2;
     if (right2 != null) indent2.right = right2;
@@ -94097,31 +94201,31 @@ ${o}
     return `#${upper.toUpperCase()}`;
   };
   const extractMarkerRun = (lvl) => {
-    const rPr = findChild(lvl, "w:rPr");
+    const rPr = findOoxmlChild(lvl, "w:rPr");
     if (!rPr) return void 0;
     const run2 = {};
-    const rFonts = findChild(rPr, "w:rFonts");
-    const font = getAttribute(rFonts, "w:ascii") ?? getAttribute(rFonts, "w:hAnsi") ?? getAttribute(rFonts, "w:eastAsia");
+    const rFonts = findOoxmlChild(rPr, "w:rFonts");
+    const font = getOoxmlAttribute(rFonts, "w:ascii") ?? getOoxmlAttribute(rFonts, "w:hAnsi") ?? getOoxmlAttribute(rFonts, "w:eastAsia");
     if (typeof font === "string" && font.trim()) {
       run2.fontFamily = font;
     }
-    const sz = parseNumberAttr(getAttribute(findChild(rPr, "w:sz"), "w:val")) ?? parseNumberAttr(getAttribute(findChild(rPr, "w:szCs"), "w:val"));
+    const sz = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:sz"), "w:val")) ?? parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:szCs"), "w:val"));
     if (sz != null) {
       run2.fontSize = sz / 2;
     }
-    const color2 = normalizeColor(getAttribute(findChild(rPr, "w:color"), "w:val"));
+    const color2 = normalizeColor(getOoxmlAttribute(findOoxmlChild(rPr, "w:color"), "w:val"));
     if (color2) run2.color = color2;
-    const boldEl = findChild(rPr, "w:b");
+    const boldEl = findOoxmlChild(rPr, "w:b");
     if (boldEl) {
-      const boldVal = getAttribute(boldEl, "w:val");
+      const boldVal = getOoxmlAttribute(boldEl, "w:val");
       if (boldVal == null || isTruthy(boldVal)) run2.bold = true;
     }
-    const italicEl = findChild(rPr, "w:i");
+    const italicEl = findOoxmlChild(rPr, "w:i");
     if (italicEl) {
-      const italicVal = getAttribute(italicEl, "w:val");
+      const italicVal = getOoxmlAttribute(italicEl, "w:val");
       if (italicVal == null || isTruthy(italicVal)) run2.italic = true;
     }
-    const spacingTwips = parseNumberAttr(getAttribute(findChild(rPr, "w:spacing"), "w:val"));
+    const spacingTwips = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:spacing"), "w:val"));
     if (spacingTwips != null && Number.isFinite(spacingTwips)) {
       run2.letterSpacing = twipsToPx$1(spacingTwips);
     }
@@ -94129,12 +94233,12 @@ ${o}
   };
   const findNumFmtElement = (lvl) => {
     if (!lvl) return void 0;
-    const direct = findChild(lvl, "w:numFmt");
+    const direct = findOoxmlChild(lvl, "w:numFmt");
     if (direct) return direct;
-    const alternate = findChild(lvl, "mc:AlternateContent");
-    const choice = findChild(alternate, "mc:Choice");
+    const alternate = findOoxmlChild(lvl, "mc:AlternateContent");
+    const choice = findOoxmlChild(alternate, "mc:Choice");
     if (choice) {
-      return findChild(choice, "w:numFmt");
+      return findOoxmlChild(choice, "w:numFmt");
     }
     return void 0;
   };
@@ -94148,7 +94252,7 @@ ${o}
     if (!numDef) {
       return void 0;
     }
-    const abstractId = getAttribute(findChild(numDef, "w:abstractNumId"), "w:val");
+    const abstractId = getOoxmlAttribute(findOoxmlChild(numDef, "w:abstractNumId"), "w:val");
     if (abstractId == null) {
       return void 0;
     }
@@ -94157,27 +94261,27 @@ ${o}
       return void 0;
     }
     let levelDef = abstract.elements?.find(
-      (el) => el?.name === "w:lvl" && parseNumberAttr(el.attributes?.["w:ilvl"]) === ilvl
+      (el) => el?.name === "w:lvl" && parseOoxmlNumber(el.attributes?.["w:ilvl"]) === ilvl
     );
     const override = numDef.elements?.find(
-      (el) => el?.name === "w:lvlOverride" && parseNumberAttr(el.attributes?.["w:ilvl"]) === ilvl
+      (el) => el?.name === "w:lvlOverride" && parseOoxmlNumber(el.attributes?.["w:ilvl"]) === ilvl
     );
-    const overrideLvl = findChild(override, "w:lvl");
+    const overrideLvl = findOoxmlChild(override, "w:lvl");
     if (overrideLvl) {
       levelDef = overrideLvl;
     }
-    const startOverride = parseNumberAttr(getAttribute(findChild(override, "w:startOverride"), "w:val"));
+    const startOverride = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(override, "w:startOverride"), "w:val"));
     if (!levelDef) {
       return void 0;
     }
     const numFmtEl = findNumFmtElement(levelDef);
-    const lvlText = getAttribute(findChild(levelDef, "w:lvlText"), "w:val");
-    const start2 = startOverride ?? parseNumberAttr(getAttribute(findChild(levelDef, "w:start"), "w:val"));
-    const suffix2 = normalizeSuffix(getAttribute(findChild(levelDef, "w:suff"), "w:val"));
-    const lvlJc = normalizeJustification(getAttribute(findChild(levelDef, "w:lvlJc"), "w:val"));
+    const lvlText = getOoxmlAttribute(findOoxmlChild(levelDef, "w:lvlText"), "w:val");
+    const start2 = startOverride ?? parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(levelDef, "w:start"), "w:val"));
+    const suffix2 = normalizeSuffix(getOoxmlAttribute(findOoxmlChild(levelDef, "w:suff"), "w:val"));
+    const lvlJc = normalizeJustification(getOoxmlAttribute(findOoxmlChild(levelDef, "w:lvlJc"), "w:val"));
     const indent2 = extractIndentFromLevel(levelDef);
     const markerRun = extractMarkerRun(levelDef);
-    const numFmt = normalizeNumFmt(getAttribute(numFmtEl, "w:val"));
+    const numFmt = normalizeNumFmt(getOoxmlAttribute(numFmtEl, "w:val"));
     return {
       format: numFmt,
       lvlText,
@@ -94270,6 +94374,7 @@ ${o}
     if (!attrs) return void 0;
     const clone = { ...attrs };
     if (attrs.spacing) clone.spacing = { ...attrs.spacing };
+    if (attrs.spacingExplicit) clone.spacingExplicit = { ...attrs.spacingExplicit };
     if (attrs.indent) clone.indent = { ...attrs.indent };
     if (attrs.borders) {
       const borderClone = {};
@@ -94645,6 +94750,11 @@ ${o}
     const hydrated = hydrationOverride ?? hydrateParagraphStyleAttrs(para, converterContext);
     const mergedSpacing = mergeSpacingSources(hydrated?.spacing, paragraphProps.spacing, attrs.spacing);
     const normalizedSpacing = normalizeParagraphSpacing(mergedSpacing);
+    const spacingExplicit = mergeSpacingExplicit(
+      extractSpacingExplicitFromObject(paragraphProps.spacing),
+      extractSpacingExplicitFromObject(attrs.spacing),
+      extractSpacingExplicitFromOoxml(paragraphProps)
+    );
     const normalizeIndentObject = (value) => {
       if (!value || typeof value !== "object") return;
       return normalizePxIndent(value) ?? convertIndentTwipsToPx(value);
@@ -94779,6 +94889,7 @@ ${o}
         paragraphAttrs.spacing.afterAutospacing = normalizedSpacing.afterAutospacing;
       }
     }
+    paragraphAttrs.spacingExplicit = spacingExplicit;
     const contextualSpacingValue = normalizedSpacing?.contextualSpacing ?? safeGetProperty(paragraphProps, "contextualSpacing") ?? safeGetProperty(attrs, "contextualSpacing") ?? hydrated?.contextualSpacing;
     if (contextualSpacingValue != null) {
       paragraphAttrs.contextualSpacing = isTruthy(contextualSpacingValue);
@@ -96148,7 +96259,10 @@ ${o}
     }
     return run2;
   }
-  const isTextRun = (run2) => run2.kind !== "tab";
+  const isTextRun = (run2) => {
+    const kind = run2.kind;
+    return (kind === void 0 || kind === "text") && "text" in run2;
+  };
   const dataAttrsCompatible = (a2, b2) => {
     const aAttrs = a2.dataAttrs;
     const bAttrs = b2.dataAttrs;
@@ -96257,6 +96371,75 @@ ${o}
     const font = findFirstTextFont(para.content);
     return font;
   };
+  const resolveRunFontFamily = (fontFamily2, docx) => {
+    if (typeof fontFamily2 === "string" && fontFamily2.trim().length > 0) {
+      return fontFamily2;
+    }
+    if (!fontFamily2 || typeof fontFamily2 !== "object") return void 0;
+    const toCssFontFamily2 = SuperConverter.toCssFontFamily;
+    const resolved = resolveDocxFontFamily(fontFamily2, docx ?? null, toCssFontFamily2);
+    return resolved ?? void 0;
+  };
+  const parseRunFontSizePx = (fontSize2) => {
+    if (typeof fontSize2 === "number" && Number.isFinite(fontSize2)) {
+      return ptToPx(fontSize2 / HALF_POINTS_PER_POINT) ?? void 0;
+    }
+    if (typeof fontSize2 === "string") {
+      const numeric = Number.parseFloat(fontSize2);
+      if (!Number.isFinite(numeric)) return void 0;
+      if (fontSize2.endsWith("pt")) {
+        return ptToPx(numeric);
+      }
+      if (fontSize2.endsWith("px")) {
+        return numeric;
+      }
+      return ptToPx(numeric / HALF_POINTS_PER_POINT) ?? void 0;
+    }
+    return void 0;
+  };
+  const extractParagraphMarkRunProps = (paragraphProps) => {
+    const directRunProps = paragraphProps.runProperties;
+    const directRunPropsElement = asOoxmlElement(directRunProps);
+    if (directRunProps && isPlainObject$4(directRunProps) && !directRunPropsElement) {
+      return directRunProps;
+    }
+    const element2 = asOoxmlElement(paragraphProps);
+    const pPr = element2 ? element2.name === "w:pPr" ? element2 : findOoxmlChild(element2, "w:pPr") : void 0;
+    const rPr = directRunPropsElement?.name === "w:rPr" ? directRunPropsElement : findOoxmlChild(pPr, "w:rPr");
+    if (!rPr) return void 0;
+    const runProps = {};
+    const sz = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:sz"), "w:val")) ?? parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:szCs"), "w:val"));
+    if (sz != null) {
+      runProps.fontSize = sz;
+    }
+    const rFonts = findOoxmlChild(rPr, "w:rFonts");
+    if (rFonts) {
+      const fontFamily2 = {};
+      const keys2 = ["ascii", "hAnsi", "eastAsia", "cs", "val", "asciiTheme", "hAnsiTheme", "eastAsiaTheme", "cstheme"];
+      for (const key2 of keys2) {
+        const value = getOoxmlAttribute(rFonts, `w:${key2}`);
+        if (value != null) {
+          fontFamily2[key2] = value;
+        }
+      }
+      if (Object.keys(fontFamily2).length > 0) {
+        runProps.fontFamily = fontFamily2;
+      }
+    }
+    return Object.keys(runProps).length > 0 ? runProps : void 0;
+  };
+  const applyParagraphMarkRunProps = (run2, paragraphProps, converterContext) => {
+    const runProps = extractParagraphMarkRunProps(paragraphProps);
+    if (!runProps) return;
+    const fontSizePx = parseRunFontSizePx(runProps.fontSize);
+    if (fontSizePx != null) {
+      run2.fontSize = fontSizePx;
+    }
+    const fontFamily2 = resolveRunFontFamily(runProps.fontFamily, converterContext?.docx);
+    if (fontFamily2) {
+      run2.fontFamily = fontFamily2;
+    }
+  };
   const applyBaseRunDefaults = (run2, defaults2, uiDisplayFallbackFont, fallbackSize) => {
     if (!run2) return;
     if (defaults2.fontFamily && run2.fontFamily === uiDisplayFallbackFont) {
@@ -96406,6 +96589,8 @@ ${o}
         emptyRun.pmStart = paraPos.start + 1;
         emptyRun.pmEnd = paraPos.start + 1;
       }
+      applyBaseRunDefaults(emptyRun, baseRunDefaults, defaultFont, defaultSize);
+      applyParagraphMarkRunProps(emptyRun, paragraphProps, converterContext);
       let emptyParagraphAttrs = cloneParagraphAttrs(paragraphAttrs);
       if (isSectPrMarker) {
         if (emptyParagraphAttrs) {
@@ -99793,7 +99978,6 @@ ${o}
     const paintedWidth = (metrics.actualBoundingBoxLeft || 0) + (metrics.actualBoundingBoxRight || 0);
     return Math.max(advanceWidth, paintedWidth);
   }
-  const MIN_SINGLE_LINE_PX = 12 * 96 / 72;
   const WORD_SINGLE_LINE_SPACING_MULTIPLIER = 1.15;
   function calculateTypographyMetrics(fontSize2, spacing, fontInfo) {
     let ascent;
@@ -99807,7 +99991,27 @@ ${o}
       ascent = roundValue(fontSize2 * 0.8);
       descent = roundValue(fontSize2 * 0.2);
     }
-    const baseLineHeight = Math.max(fontSize2 * WORD_SINGLE_LINE_SPACING_MULTIPLIER, ascent + descent, MIN_SINGLE_LINE_PX);
+    const baseLineHeight = Math.max(fontSize2 * WORD_SINGLE_LINE_SPACING_MULTIPLIER, ascent + descent);
+    const lineHeight2 = roundValue(resolveLineHeight(spacing, baseLineHeight));
+    return {
+      ascent,
+      descent,
+      lineHeight: lineHeight2
+    };
+  }
+  function calculateEmptyParagraphMetrics(fontSize2, spacing, fontInfo) {
+    let ascent;
+    let descent;
+    if (fontInfo) {
+      const ctx2 = getCanvasContext();
+      const metrics = getFontMetrics(ctx2, fontInfo);
+      ascent = roundValue(metrics.ascent);
+      descent = roundValue(metrics.descent);
+    } else {
+      ascent = roundValue(fontSize2 * 0.8);
+      descent = roundValue(fontSize2 * 0.2);
+    }
+    const baseLineHeight = Math.max(fontSize2, ascent + descent);
     const lineHeight2 = roundValue(resolveLineHeight(spacing, baseLineHeight));
     return {
       ascent,
@@ -99838,6 +100042,10 @@ ${o}
   function isLineBreakRun(run2) {
     return run2.kind === "lineBreak";
   }
+  const isEmptyTextRun = (run2) => {
+    if (run2.kind && run2.kind !== "text") return false;
+    return typeof run2.text === "string" && run2.text.length === 0;
+  };
   function isFieldAnnotationRun(run2) {
     return run2.kind === "fieldAnnotation";
   }
@@ -100007,8 +100215,28 @@ ${o}
         dropCapDescriptor.measuredHeight = dropCapMeasured.height;
       }
     }
+    const emptyParagraphRun = block.runs.length === 1 && isEmptyTextRun(block.runs[0]) ? block.runs[0] : null;
+    if (emptyParagraphRun) {
+      const fontSize2 = emptyParagraphRun.fontSize ?? 12;
+      const metrics = calculateEmptyParagraphMetrics(fontSize2, spacing, getFontInfoFromRun(emptyParagraphRun));
+      const emptyLine = {
+        fromRun: 0,
+        fromChar: 0,
+        toRun: 0,
+        toChar: 0,
+        width: 0,
+        ...metrics
+      };
+      addBarTabsToLine(emptyLine);
+      lines.push(emptyLine);
+      return {
+        kind: "paragraph",
+        lines,
+        totalHeight: metrics.lineHeight
+      };
+    }
     if (block.runs.length === 0) {
-      const metrics = calculateTypographyMetrics(12, spacing);
+      const metrics = calculateEmptyParagraphMetrics(12, spacing);
       const emptyLine = {
         fromRun: 0,
         fromChar: 0,
@@ -150967,7 +151195,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.7.0-next.5";
+      this.version = "1.7.0-next.7";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;