@superdoc-dev/cli 0.17.0-next.41 → 0.17.0-next.43

package/dist/index.js

@@ -68164,7 +68164,7 @@ var init_remark_gfm_BUJjZJLy_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter--x_mSI6o.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-DIgF4xk_.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -90006,6 +90006,7 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
   const context = getParagraphRunContext($pos, editor);
   const currentRunProperties = context?.runProperties || null;
   const cursorMarks = $pos.marks();
+  const directMarkRunProperties = decodeRPrFromMarks(cursorMarks);
   const hasStoredMarks = storedMarks !== null;
   const hasExplicitEmptyStoredMarks = hasStoredMarks && storedMarks.length === 0;
   const resolvedMarks = [];
@@ -90033,7 +90034,9 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
       inlineMarks: [],
       resolvedRunProperties: {},
       inlineRunProperties: {},
-      styleRunProperties: {}
+      styleRunProperties: {},
+      directMarkRunProperties: {},
+      mixedRunProperties: null
     };
   const resolvedFromSelection = getInheritedRunProperties($pos, editor, preferParagraphRunProperties || !hasStoredMarks && context?.isEmpty ? context?.paragraphAttrs?.paragraphProperties?.runProperties || null : inlineRunProperties);
   const resolvedRunProperties = resolvedFromSelection?.resolvedRunProperties ?? inlineRunProperties;
@@ -90047,7 +90050,9 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
     inlineMarks,
     resolvedRunProperties,
     inlineRunProperties,
-    styleRunProperties
+    styleRunProperties,
+    directMarkRunProperties,
+    mixedRunProperties: null
   };
 }
 function getFormattingStateForRange(state, from4, to, editor) {
@@ -90067,9 +90072,14 @@ function getFormattingStateForRange(state, from4, to, editor) {
   return aggregateFormattingSegments(state, editor, segments);
 }
 function aggregateFormattingSegments(state, editor, segments) {
-  const resolvedRunProperties = intersectRunProperties(segments.map((segment) => segment.resolvedRunProperties));
-  const inlineRunProperties = intersectRunProperties(segments.map((segment) => segment.inlineRunProperties));
-  const styleRunProperties = intersectRunProperties(segments.map((segment) => segment.styleRunProperties));
+  const resolvedRunPropertiesList = segments.map((segment) => segment.resolvedRunProperties);
+  const inlineRunPropertiesList = segments.map((segment) => segment.inlineRunProperties);
+  const styleRunPropertiesList = segments.map((segment) => segment.styleRunProperties);
+  const directMarkRunPropertiesList = segments.map((segment) => segment.directMarkRunProperties);
+  const resolvedRunProperties = intersectRunProperties(resolvedRunPropertiesList);
+  const inlineRunProperties = intersectRunProperties(inlineRunPropertiesList);
+  const styleRunProperties = intersectRunProperties(styleRunPropertiesList);
+  const directMarkRunProperties = intersectRunProperties(directMarkRunPropertiesList);
   const resolvedMarks = createMarksFromRunProperties(state, resolvedRunProperties, editor);
   const inlineMarks = createMarksFromRunProperties(state, inlineRunProperties, editor);
   return {
@@ -90077,7 +90087,9 @@ function aggregateFormattingSegments(state, editor, segments) {
     inlineMarks,
     resolvedRunProperties,
     inlineRunProperties,
-    styleRunProperties
+    styleRunProperties,
+    directMarkRunProperties,
+    mixedRunProperties: getMixedRunProperties(resolvedRunPropertiesList, directMarkRunPropertiesList)
   };
 }
 function mergeResolvedMarksWithInlineFallback(resolvedMarks, inlineMarks) {
@@ -90102,6 +90114,41 @@ function intersectRunProperties(runPropertiesList) {
   });
   return Object.keys(intersection).length ? intersection : null;
 }
+function getMixedRunProperties(runPropertiesList, directRunPropertiesList = []) {
+  const filtered = runPropertiesList.filter((props) => props && typeof props === "object");
+  if (filtered.length <= 1)
+    return null;
+  const keys$1 = new Set(filtered.flatMap((props) => Object.keys(props)));
+  const mixed = {};
+  keys$1.forEach((key) => {
+    if (key === "fontFamily" && hasUniformDirectFontFamily(directRunPropertiesList))
+      return;
+    const values = filtered.map((props) => Object.prototype.hasOwnProperty.call(props, key) ? props[key] : undefined);
+    const first = JSON.stringify(values[0]);
+    if (values.some((value) => JSON.stringify(value) !== first))
+      mixed[key] = true;
+  });
+  return Object.keys(mixed).length ? mixed : null;
+}
+function hasUniformDirectFontFamily(runPropertiesList) {
+  if (runPropertiesList.length <= 1)
+    return false;
+  let firstValue;
+  let hasFirstValue = false;
+  for (const props of runPropertiesList) {
+    if (!props || typeof props !== "object" || !Object.prototype.hasOwnProperty.call(props, "fontFamily"))
+      return false;
+    const value = props.fontFamily;
+    if (!hasFirstValue) {
+      firstValue = value;
+      hasFirstValue = true;
+      continue;
+    }
+    if (JSON.stringify(value) !== JSON.stringify(firstValue))
+      return false;
+  }
+  return hasFirstValue;
+}
 function getInheritedRunProperties($pos, editor, inlineRunProperties) {
   if (!editor)
     return {
@@ -104688,34 +104735,62 @@ function hydrateImageBlocks(blocks, mediaFiles) {
       if (blk.kind === "drawing") {
         const drawingBlock = blk;
         if (drawingBlock.drawingKind === "vectorShape" || drawingBlock.drawingKind === "textboxShape") {
-          const parts = drawingBlock.textContent?.parts;
-          if (!parts || parts.length === 0)
-            return blk;
-          let partsChanged = false;
-          const hydratedParts = parts.map((part) => {
-            if (part?.kind !== "image" || !part.src || part.src.startsWith("data:"))
+          let blockChanged = false;
+          let nextBlock = drawingBlock;
+          if (drawingBlock.drawingKind === "textboxShape") {
+            const contentBlocks = drawingBlock.contentBlocks;
+            if (Array.isArray(contentBlocks) && contentBlocks.length > 0) {
+              let contentBlocksChanged = false;
+              const hydratedContentBlocks = contentBlocks.map((paragraphBlock) => {
+                if (paragraphBlock.kind !== "paragraph" || !paragraphBlock.runs?.length)
+                  return paragraphBlock;
+                const hydratedRuns = hydrateRuns(paragraphBlock.runs);
+                if (hydratedRuns !== paragraphBlock.runs) {
+                  contentBlocksChanged = true;
+                  return {
+                    ...paragraphBlock,
+                    runs: hydratedRuns
+                  };
+                }
+                return paragraphBlock;
+              });
+              if (contentBlocksChanged) {
+                blockChanged = true;
+                nextBlock = {
+                  ...drawingBlock,
+                  contentBlocks: hydratedContentBlocks
+                };
+              }
+            }
+          }
+          const parts = nextBlock.textContent?.parts;
+          if (parts && parts.length > 0) {
+            let partsChanged = false;
+            const hydratedParts = parts.map((part) => {
+              if (part?.kind !== "image" || !part.src || part.src.startsWith("data:"))
+                return part;
+              const resolvedSrc = resolveImageSrc(part.src, part.rId, undefined, part.extension);
+              if (resolvedSrc) {
+                partsChanged = true;
+                return {
+                  ...part,
+                  src: resolvedSrc
+                };
+              }
               return part;
-            const resolvedSrc = resolveImageSrc(part.src, part.rId, undefined, part.extension);
-            if (resolvedSrc) {
-              partsChanged = true;
-              return {
-                ...part,
-                src: resolvedSrc
+            });
+            if (partsChanged) {
+              blockChanged = true;
+              nextBlock = {
+                ...nextBlock,
+                textContent: {
+                  ...nextBlock.textContent,
+                  parts: hydratedParts
+                }
               };
             }
-            return part;
-          });
-          if (partsChanged) {
-            const vectorShapeBlock = drawingBlock;
-            return {
-              ...vectorShapeBlock,
-              textContent: {
-                ...vectorShapeBlock.textContent,
-                parts: hydratedParts
-              }
-            };
           }
-          return blk;
+          return blockChanged ? nextBlock : blk;
         }
         if (drawingBlock.drawingKind !== "shapeGroup")
           return blk;
@@ -106880,6 +106955,7 @@ function shapeContainerNodeToDrawingBlock(node3, nextBlockId, positions) {
   const textContent = shapeTextboxNode ? extractTextboxTextContent(shapeTextboxNode) : undefined;
   return buildDrawingBlock({
     ...rawAttrs,
+    ...resolveInlineAlignmentFromWrapper(rawAttrs),
     ...textContent ? { textContent } : {},
     ...rawAttrs.textAlign == null && textContent?.horizontalAlign ? { textAlign: textContent.horizontalAlign } : {},
     ...rawAttrs.textInsets == null ? { textInsets: resolveTextboxInsetsFromAttrs(textboxAttrs) } : {},
@@ -135099,6 +135175,37 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
     required.bottom = Math.max(required.bottom, Math.max(0, childY + childHeight + paintExtent.bottom - height));
   }
   return hasEffectExtent(required) ? required : undefined;
+}, resolveWrapperAlignment = (justification) => {
+  switch (justification) {
+    case "center":
+    case "distribute":
+      return "center";
+    case "right":
+    case "end":
+      return "right";
+    default:
+      return;
+  }
+}, resolveInlineAlignmentFromWrapper = (rawAttrs) => {
+  if (rawAttrs.wrap?.type !== "Inline" || !isPlainObject3(rawAttrs.wrapperParagraph))
+    return {};
+  const wrapper = rawAttrs.wrapperParagraph;
+  const justification = (isPlainObject3(wrapper.paragraphProperties) ? wrapper.paragraphProperties : undefined)?.justification;
+  const textAlign = typeof wrapper.textAlign === "string" ? wrapper.textAlign : undefined;
+  const effectiveAlignment = resolveWrapperAlignment(justification) ?? textAlign;
+  if (effectiveAlignment !== "center" && effectiveAlignment !== "right")
+    return {};
+  const metadata = { inlineParagraphAlignment: effectiveAlignment };
+  const { paragraphAttrs } = computeParagraphAttrs({
+    type: "paragraph",
+    attrs: wrapper
+  });
+  const indent2 = paragraphAttrs.indent;
+  if (typeof indent2?.left === "number")
+    metadata.paragraphIndentLeft = indent2.left;
+  if (typeof indent2?.right === "number")
+    metadata.paragraphIndentRight = indent2.right;
+  return metadata;
 }, getAttrs$1 = (node3) => {
   return isPlainObject3(node3.attrs) ? { ...node3.attrs } : {};
 }, parseFullWidth = (value) => {
@@ -136401,7 +136508,7 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_x_mSI6o_es = __esm(() => {
+var init_SuperConverter_DIgF4xk__es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -165327,7 +165434,7 @@ var init_SuperConverter_x_mSI6o_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-D1KbRv5B.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BT4yIoZ-.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -175292,6 +175399,14 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN2, P
   if (!rawActiveMark || !hasFormattingAttrs(rawActiveMark))
     return false;
   return isNegatedMark(rawActiveMark.name, rawActiveMark.attrs);
+}, getPrimaryFontFamily = (value) => {
+  if (typeof value === "string")
+    return value.split(",")[0].trim();
+  if (!value || typeof value !== "object")
+    return null;
+  const fontFamily = value;
+  const primary = fontFamily.ascii ?? fontFamily.hAnsi ?? fontFamily.eastAsia ?? fontFamily.cs;
+  return typeof primary === "string" ? primary.split(",")[0].trim() : null;
 }, isFormatCommandsStorage = (value) => {
   return typeof value === "object" && value !== null && "storedStyle" in value;
 }, hasStoredCopyFormat = (context) => {
@@ -175384,15 +175499,20 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN2, P
       disabled: true,
       value: null
     };
-  const normalizedValues = getFormattingAttr(formatting, "fontFamily", "fontFamily").map((value$1) => normalizeFontFamilyValue(value$1));
+  const values = getFormattingAttr(formatting, "fontFamily", "fontFamily");
+  const selectionFormattingState = stateEditor?.state?.selection?.empty === false ? getSelectionFormattingState(stateEditor.state, stateEditor) : null;
+  const normalizedValues = values.map((value$1) => normalizeFontFamilyValue(value$1));
   const uniqueValues = [...new Set(normalizedValues)];
-  const canUseLinkedStyle = !(uniqueValues.length > 0) && isFormattingActivatedFromLinkedStyle(context, "font-family");
+  const hasDirectValue = uniqueValues.length > 0;
+  const hasMixedFontFamily = Boolean(selectionFormattingState?.mixedRunProperties?.fontFamily);
+  const directSelectionValue = normalizeFontFamilyValue(getPrimaryFontFamily(selectionFormattingState?.directMarkRunProperties?.fontFamily));
+  const canUseLinkedStyle = !hasDirectValue && !hasMixedFontFamily && isFormattingActivatedFromLinkedStyle(context, "font-family");
   const paragraphProps = canUseLinkedStyle ? getCurrentResolvedParagraphProperties(context) : null;
   const documentEditor = context?.presentationEditor?.editor ?? context?.editor ?? null;
   const linkedStyleValue = normalizeFontFamilyValue((canUseLinkedStyle ? documentEditor?.converter?.linkedStyles?.find((style) => style.id === paragraphProps?.styleId) : null)?.definition?.styles?.["font-family"]) ?? null;
-  const value = uniqueValues.length === 1 ? uniqueValues[0] : linkedStyleValue;
+  const value = hasMixedFontFamily ? null : directSelectionValue || (uniqueValues.length === 1 ? uniqueValues[0] : linkedStyleValue);
   return {
-    active: uniqueValues.length > 0 || linkedStyleValue != null,
+    active: hasMixedFontFamily || uniqueValues.length > 0 || directSelectionValue != null || linkedStyleValue != null,
     disabled: false,
     value
   };
@@ -176117,9 +176237,9 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN2, P
     }
   };
 };
-var init_create_headless_toolbar_D1KbRv5B_es = __esm(() => {
+var init_create_headless_toolbar_BT4yIoZ_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_x_mSI6o_es();
+  init_SuperConverter_DIgF4xk__es();
   init_jszip_C49i9kUs_es();
   init_uuid_B2wVPhPi_es();
   init_constants_D9qj59G2_es();
@@ -226212,7 +226332,7 @@ var init_remark_gfm_DCND_V_3_es = __esm(() => {
   init_remark_gfm_BUJjZJLy_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-Fy-l94Cn.es.js
+// ../../packages/superdoc/dist/chunks/src-BrcexyXf.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -271516,7 +271636,7 @@ function layoutDrawingBlock({ block, measure, columns, ensurePage, advanceColumn
   const indentRight = typeof attrs?.hrIndentRight === "number" ? attrs.hrIndentRight : 0;
   const maxWidthForBlock = attrs?.isFullWidth === true && maxWidth > 0 ? Math.max(1, maxWidth - indentLeft - indentRight) : maxWidth;
   const rawWrap = attrs?.wrap;
-  const isInlineShapeGroup = block.drawingKind === "shapeGroup" && rawWrap?.type === "Inline";
+  const isInlineAlignableDrawing = (block.drawingKind === "shapeGroup" || block.drawingKind === "textboxShape") && rawWrap?.type === "Inline";
   const inlineParagraphAlignment = attrs?.inlineParagraphAlignment === "center" || attrs?.inlineParagraphAlignment === "right" ? attrs.inlineParagraphAlignment : undefined;
   if (width > maxWidthForBlock && maxWidthForBlock > 0) {
     const scale = maxWidthForBlock / width;
@@ -271535,7 +271655,7 @@ function layoutDrawingBlock({ block, measure, columns, ensurePage, advanceColumn
     state = advanceColumn(state);
   const pmRange = extractBlockPmRange(block);
   let x = columnX(state) + marginLeft + indentLeft;
-  if (isInlineShapeGroup && inlineParagraphAlignment) {
+  if (isInlineAlignableDrawing && inlineParagraphAlignment) {
     const pIndentLeft = typeof attrs?.paragraphIndentLeft === "number" ? attrs.paragraphIndentLeft : 0;
     const pIndentRight = typeof attrs?.paragraphIndentRight === "number" ? attrs.paragraphIndentRight : 0;
     const alignBox = Math.max(0, maxWidthForBlock - pIndentLeft - pIndentRight);
@@ -275860,6 +275980,17 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
         endChar = text5.length > 0 ? text5.length : start$1 + 1;
         continue;
       }
+      if (text5.length === 0 && isAtomicLayoutRun(run2)) {
+        const atomicWidth = getAtomicRunLayoutWidth(run2);
+        if (width > 0 && width + atomicWidth > effectiveMaxWidth - WIDTH_FUDGE_PX) {
+          didBreakInThisLine = true;
+          break;
+        }
+        width += atomicWidth;
+        endRun = r$1;
+        endChar = 1;
+        continue;
+      }
       for (let c = start$1;c < text5.length; c += 1) {
         const ch = text5[c];
         if (ch === "\t") {
@@ -275948,6 +276079,7 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
       endRun = startRun;
       endChar = startChar + 1;
     }
+    const lineMaxAtomicHeight = getLineMaxAtomicHeight(runs2, startRun, startChar, endRun, endChar);
     const line = {
       fromRun: startRun,
       fromChar: startChar,
@@ -275956,8 +276088,9 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
       width,
       ascent: 0,
       descent: 0,
-      lineHeight: lineHeightForRuns(runs2, startRun, endRun, lastMeasuredFontSize),
-      maxWidth: effectiveMaxWidth
+      lineHeight: Math.max(lineHeightForRuns(runs2, startRun, endRun, lastMeasuredFontSize), lineMaxAtomicHeight),
+      maxWidth: effectiveMaxWidth,
+      ...lineMaxAtomicHeight > 0 ? { maxImageHeight: lineMaxAtomicHeight } : {}
     };
     lines.push(line);
     if (lineMaxTextFontSize > 0)
@@ -284669,14 +284802,14 @@ function capitalizeText$1(text5, fullText, startOffset) {
   return result;
 }
 function measureFieldAnnotationWidth(run2, fontContext) {
-  const fontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1 : DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1;
+  const fontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE : DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
   const font = buildFontString$1({
     fontFamily: normalizeFontFamily$1(run2.fontFamily ?? "Arial"),
     fontSize,
     bold: run2.bold,
     italic: run2.italic
   }, fontContext);
-  return getMeasuredTextWidth(applyTextTransform$1(run2.displayLabel || "", { text: run2.displayLabel || "" }), font, 0, getCanvasContext$1()) + (run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING$1);
+  return getMeasuredTextWidth(applyTextTransform$1(run2.displayLabel || "", { text: run2.displayLabel || "" }), font, 0, getCanvasContext$1()) + (run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING);
 }
 function isExplicitLineBreakRun(run2) {
   return run2.kind === "lineBreak" || run2.kind === "break" && run2.breakType === "line";
@@ -284862,6 +284995,15 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
     endRunIndex: runs2.length
   };
   let foundDecimal = false;
+  const measureAtomicText$1 = (text5, atomicRun, fontSize) => {
+    const { font } = buildFontString({
+      fontFamily: atomicRun.fontFamily ?? "Arial",
+      fontSize,
+      bold: atomicRun.bold,
+      italic: atomicRun.italic
+    }, fontContext);
+    return measureRunWidth(text5, font, ctx$1, atomicRun, 0);
+  };
   for (let i3 = startRunIndex;i3 < runs2.length; i3++) {
     const run2 = runs2[i3];
     if (isTabRun(run2)) {
@@ -284903,40 +285045,13 @@ function measureTabAlignmentGroup(startRunIndex, runs2, ctx$1, decimalSeparator
         });
       continue;
     }
-    if (isImageRun(run2)) {
-      const leftSpace = run2.distLeft ?? 0;
-      const rightSpace = run2.distRight ?? 0;
-      const imageWidth = run2.width + leftSpace + rightSpace;
+    if (isImageRun(run2) || run2.kind === "math" || isFieldAnnotationRun(run2)) {
+      const { width } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       result.runs.push({
         runIndex: i3,
-        width: imageWidth
-      });
-      result.totalWidth += imageWidth;
-      continue;
-    }
-    if (run2.kind === "math") {
-      const mathWidth = run2.width ?? 20;
-      result.runs.push({
-        runIndex: i3,
-        width: mathWidth
-      });
-      result.totalWidth += mathWidth;
-      continue;
-    }
-    if (isFieldAnnotationRun(run2)) {
-      const fontSize = run2.fontSize ?? DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
-      const { font } = buildFontString({
-        fontFamily: run2.fontFamily ?? "Arial",
-        fontSize,
-        bold: run2.bold,
-        italic: run2.italic
-      }, fontContext);
-      const pillWidth = (run2.displayLabel ? measureRunWidth(run2.displayLabel, font, ctx$1, run2, 0) : 0) + FIELD_ANNOTATION_PILL_PADDING;
-      result.runs.push({
-        runIndex: i3,
-        width: pillWidth
+        width
       });
-      result.totalWidth += pillWidth;
+      result.totalWidth += width;
       continue;
     }
     result.runs.push({
@@ -284966,6 +285081,13 @@ async function measureBlock(block, constraints, fontContext = DEFAULT_FONT_MEASU
 }
 async function measureParagraphBlock(block, maxWidth, fontContext) {
   const ctx$1 = getCanvasContext();
+  const measureAtomicText$1 = (text5, run2, fontSize) => {
+    const family2 = fontContext.resolvePhysical(run2.fontFamily || "Arial, sans-serif", faceOf(run2));
+    const weight = run2.bold ? "bold" : "normal";
+    ctx$1.font = `${run2.italic ? "italic" : "normal"} ${weight} ${fontSize}px ${family2}`;
+    const displayText = applyTextTransform(text5, run2);
+    return displayText ? ctx$1.measureText(displayText).width : 0;
+  };
   const wordLayout = block.attrs?.wordLayout;
   const firstTextRunWithSize = block.runs.find((run2) => isTextRun$22(run2) && ("fontSize" in run2) && run2.fontSize != null);
   const fallbackFontSize = normalizeFontSize2((firstTextRunWithSize ?? block.runs.find((run2) => typeof run2.fontSize === "number" && run2.fontSize > 0))?.fontSize, DEFAULT_PARAGRAPH_FONT_SIZE);
@@ -285495,12 +285617,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
       continue;
     }
     if (isImageRun(run2)) {
-      const leftSpace = run2.distLeft ?? 0;
-      const rightSpace = run2.distRight ?? 0;
-      const imageWidth = run2.width + leftSpace + rightSpace;
-      const topSpace = run2.distTop ?? 0;
-      const bottomSpace = run2.distBottom ?? 0;
-      const imageHeight = run2.height + topSpace + bottomSpace;
+      const { width: imageWidth, height: imageHeight } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       let imageStartX;
       if (activeTabGroup && currentLine) {
         imageStartX = activeTabGroup.currentX;
@@ -285591,9 +285708,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
       continue;
     }
     if (run2.kind === "math") {
-      const mathRun = run2;
-      const mathWidth = mathRun.width ?? 20;
-      const mathHeight = mathRun.height ?? 24;
+      const { width: mathWidth, height: mathHeight } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       if (!currentLine)
         currentLine = {
           fromRun: runIndex,
@@ -285630,26 +285745,7 @@ async function measureParagraphBlock(block, maxWidth, fontContext) {
       continue;
     }
     if (isFieldAnnotationRun(run2)) {
-      const displayText = applyTextTransform(run2.displayLabel || "", run2);
-      const annotationFontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE : DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
-      const annotationFontFamily = fontContext.resolvePhysical(run2.fontFamily || "Arial, sans-serif", faceOf(run2));
-      const fontWeight = run2.bold ? "bold" : "normal";
-      ctx$1.font = `${run2.italic ? "italic" : "normal"} ${fontWeight} ${annotationFontSize}px ${annotationFontFamily}`;
-      const textWidth = displayText ? ctx$1.measureText(displayText).width : 0;
-      const annotationHorizontalPadding = run2.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING;
-      const annotationVerticalPadding = run2.highlighted === false ? 0 : FIELD_ANNOTATION_VERTICAL_PADDING;
-      const annotationWidth = textWidth + annotationHorizontalPadding;
-      let annotationHeight = annotationFontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + annotationVerticalPadding;
-      if (run2.variant === "signature" && run2.imageSrc) {
-        const signatureHeight = 28 + annotationVerticalPadding;
-        annotationHeight = Math.max(annotationHeight, signatureHeight);
-      }
-      if (run2.variant === "image" && run2.imageSrc && run2.size?.height) {
-        const imageHeight = run2.size.height + annotationVerticalPadding;
-        annotationHeight = Math.max(annotationHeight, imageHeight);
-      }
-      if (run2.variant === "html" && run2.size?.height)
-        annotationHeight = Math.max(annotationHeight, run2.size.height);
+      const { width: annotationWidth, height: annotationHeight } = getAtomicRunLayoutSize(run2, measureAtomicText$1);
       let annotationStartX;
       if (pendingTabAlignment && currentLine)
         annotationStartX = alignPendingTabForWidth(annotationWidth);
@@ -303010,7 +303106,12 @@ var Node$13 = class Node$14 {
     suppressActiveHighlight: true,
     attributes: { ariaLabel: "Font family" },
     options: fontOptions,
-    onActivate: ({ fontFamily }) => {
+    onActivate: ({ fontFamily } = {}, isMultiple = false) => {
+      if (isMultiple) {
+        fontButton.label.value = "";
+        fontButton.selectedValue.value = "";
+        return;
+      }
       if (!fontFamily)
         return;
       fontFamily = fontFamily.split(",")[0];
@@ -309558,7 +309659,7 @@ menclose::after {
     left: borders.right,
     right: borders.left
   };
-}, getFiniteNumber = (value) => {
+}, FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER = 1.2, getFiniteNumber = (value) => {
   if (typeof value !== "number" || !Number.isFinite(value))
     return;
   return value;
@@ -318066,7 +318167,51 @@ menclose::after {
   getStats() {
     return this.cache.getStats();
   }
-}, sharedHeaderFooterCache, HEADER_FOOTER_VARIANTS$12, canvas = null, ctx = null, isWordChar$1 = (char) => {
+}, sharedHeaderFooterCache, HEADER_FOOTER_VARIANTS$12, isAtomicLayoutRun = (run2) => typeof run2.src === "string" || run2.kind === "math" || run2.kind === "fieldAnnotation", resolveFieldAnnotationFontSize = (value) => {
+  if (typeof value === "number" && Number.isFinite(value))
+    return value;
+  if (typeof value === "string") {
+    const parsed = parseFloat(value);
+    if (Number.isFinite(parsed) && parsed > 0)
+      return parsed;
+  }
+  return 16;
+}, getImageRunSize = (run2) => {
+  const distLeft = run2.distLeft ?? 0;
+  const distRight = run2.distRight ?? 0;
+  const distTop = run2.distTop ?? 0;
+  const distBottom = run2.distBottom ?? 0;
+  return {
+    width: (run2.width ?? 0) + distLeft + distRight,
+    height: (run2.height ?? 0) + distTop + distBottom
+  };
+}, getMathRunSize = (run2) => ({
+  width: run2.width ?? 20,
+  height: run2.height ?? 24
+}), getFieldAnnotationRunSize = (run2, measureText$1) => {
+  const fontSize = resolveFieldAnnotationFontSize(run2.fontSize);
+  const horizontalPadding = run2.highlighted === false ? 0 : 8;
+  const verticalPadding = run2.highlighted === false ? 0 : 6;
+  const label = run2.displayLabel ?? "";
+  const width = (label ? measureText$1(label, run2, fontSize) : 0) + horizontalPadding;
+  let height = fontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + verticalPadding;
+  if (run2.variant === "signature" && run2.imageSrc)
+    height = Math.max(height, 28 + verticalPadding);
+  if (run2.variant === "image" && run2.imageSrc && run2.size?.height)
+    height = Math.max(height, run2.size.height + verticalPadding);
+  if (run2.variant === "html" && run2.size?.height)
+    height = Math.max(height, run2.size.height);
+  return {
+    width,
+    height
+  };
+}, getAtomicRunLayoutSize = (run2, measureText$1) => {
+  if (typeof run2.src === "string")
+    return getImageRunSize(run2);
+  if (run2.kind === "math")
+    return getMathRunSize(run2);
+  return getFieldAnnotationRunSize(run2, measureText$1);
+}, canvas = null, ctx = null, isWordChar$1 = (char) => {
   if (!char)
     return false;
   const code6 = char.charCodeAt(0);
@@ -318095,6 +318240,26 @@ menclose::after {
 }, DEFAULT_TAB_INTERVAL_TWIPS$12 = 720, TWIPS_PER_PX$2, TAB_EPSILON$1 = 0.1, WIDTH_FUDGE_PX = 0.5, twipsToPx$1 = (twips) => twips / TWIPS_PER_PX$2, pxToTwips$1 = (px) => Math.round(px * TWIPS_PER_PX$2), sanitizeIndent$1 = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : 0, sanitizeRawIndent = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0, sanitizeDecimalSeparator$1 = (value) => value === "," ? "," : ".", getRunWidth = (run2) => {
   const width = run2.width;
   return typeof width === "number" ? width : 0;
+}, measureAtomicText = (text5, run2, fontSize) => {
+  const family2 = run2.fontFamily || "Arial";
+  const context = getCtx();
+  if (!context)
+    return Math.max(0, text5.length * (fontSize * 0.6));
+  context.font = `${run2.italic ? "italic " : ""}${run2.bold ? "bold " : ""}${fontSize}px ${family2}`.trim();
+  return context.measureText(text5).width;
+}, getAtomicRunLayoutWidth = (run2) => getAtomicRunLayoutSize(run2, measureAtomicText).width, getAtomicRunLayoutHeight = (run2) => getAtomicRunLayoutSize(run2, measureAtomicText).height, getLineMaxAtomicHeight = (runs2, fromRun, fromChar, toRun, toChar) => {
+  let max$2 = 0;
+  for (let r$1 = fromRun;r$1 <= toRun; r$1 += 1) {
+    const run2 = runs2[r$1];
+    if (!isAtomicLayoutRun(run2))
+      continue;
+    if (r$1 === toRun && toChar === 0)
+      continue;
+    if (r$1 === fromRun && r$1 === toRun && toChar <= fromChar)
+      continue;
+    max$2 = Math.max(max$2, getAtomicRunLayoutHeight(run2));
+  }
+  return max$2;
 }, isLineBreakRun$1 = (run2) => run2.kind === "lineBreak" || run2.kind === "break" && run2.breakType === "line", markerFontString = (run2) => {
   const size$1 = run2?.fontSize ?? 16;
   const family2 = run2?.fontFamily ?? "Arial";
@@ -318167,7 +318332,7 @@ menclose::after {
       };
     const text5 = runText(run2);
     if (!text5) {
-      const runWidth = getRunWidth(run2);
+      const runWidth = isAtomicLayoutRun(run2) ? getAtomicRunLayoutWidth(run2) : getRunWidth(run2);
       if (runWidth > 0) {
         totalWidth += runWidth;
         endRun = r$1;
@@ -318226,7 +318391,7 @@ menclose::after {
       break;
     const text5 = runText(run2);
     if (!text5) {
-      totalWidth += getRunWidth(run2);
+      totalWidth += isAtomicLayoutRun(run2) ? getAtomicRunLayoutWidth(run2) : getRunWidth(run2);
       continue;
     }
     const sliceStart = r$1 === startRunIndex ? startChar : 0;
@@ -318404,7 +318569,21 @@ menclose::after {
       }
       const text5 = runText(run2);
       if (!text5) {
-        cursorX += getRunWidth(run2);
+        const atomicWidth = isAtomicLayoutRun(run2) ? getAtomicRunLayoutWidth(run2) : getRunWidth(run2);
+        const pendingTabAlign = consumePendingTabAlignStart();
+        if (pendingTabAlign != null) {
+          const segment = {
+            runIndex,
+            fromChar: 0,
+            toChar: 1,
+            width: atomicWidth,
+            x: pendingTabAlign.paintX,
+            ...pendingTabAlign.precedingTabEndX !== undefined ? { precedingTabEndX: pendingTabAlign.precedingTabEndX } : {}
+          };
+          cursorX = pendingTabAlign.layoutX + atomicWidth;
+          segments.push(segment);
+        } else
+          cursorX += atomicWidth;
         lineWidth = Math.max(lineWidth, cursorX);
         continue;
       }
@@ -323822,7 +324001,7 @@ menclose::after {
   }
 }, EMUS_PER_INCH = 914400, maxSize = 5000, cache, makeKey = (text5, font, letterSpacing) => {
   return `${text5}|${font}|${letterSpacing || 0}`;
-}, fontMetricsCache, MAX_CACHE_SIZE = 1000, METRICS_TEST_STRING = "MHgypbdlÁÉÍ", DEFAULT_MIN_COLUMN_WIDTH = 8, TWIPS_PER_PX$1 = 15, PLACEHOLDER_COLUMN_MAX_WIDTH = 1, DEFAULT_CELL_PADDING$1, DEFAULT_FIELD_ANNOTATION_FONT_SIZE$1 = 16, FIELD_ANNOTATION_PILL_PADDING$1 = 8, TABLE_CELL_METRICS_CACHE_SIZE = 2000, TABLE_AUTOFIT_RESULT_CACHE_SIZE = 500, NO_WRAP_MAX_WIDTH, TOKEN_BOUNDARY_PATTERN, LruCache = class {
+}, fontMetricsCache, MAX_CACHE_SIZE = 1000, METRICS_TEST_STRING = "MHgypbdlÁÉÍ", DEFAULT_MIN_COLUMN_WIDTH = 8, TWIPS_PER_PX$1 = 15, PLACEHOLDER_COLUMN_MAX_WIDTH = 1, DEFAULT_CELL_PADDING$1, DEFAULT_FIELD_ANNOTATION_FONT_SIZE = 16, FIELD_ANNOTATION_PILL_PADDING = 8, TABLE_CELL_METRICS_CACHE_SIZE = 2000, TABLE_AUTOFIT_RESULT_CACHE_SIZE = 500, NO_WRAP_MAX_WIDTH, TOKEN_BOUNDARY_PATTERN, LruCache = class {
   constructor(maxSize$1) {
     this.cache = /* @__PURE__ */ new Map;
     this.maxSize = maxSize$1;
@@ -323856,7 +324035,7 @@ menclose::after {
       this.cache.delete(oldestKey);
     }
   }
-}, tableCellMetricsCache, autoFitTableResultCache, canvasContext$1 = null, computeTabStops2, measurementConfig, canvasContext = null, DEFAULT_TAB_INTERVAL_TWIPS2 = 720, TWIPS_PER_PX2, twipsToPx2 = (twips) => twips / TWIPS_PER_PX2, pxToTwips = (px) => Math.round(px * TWIPS_PER_PX2), DEFAULT_TAB_INTERVAL_PX, TAB_EPSILON = 0.1, DEFAULT_CELL_PADDING, DEFAULT_DECIMAL_SEPARATOR2 = ".", ALLOWED_TAB_VALS, FIELD_ANNOTATION_PILL_PADDING = 8, FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER = 1.2, FIELD_ANNOTATION_VERTICAL_PADDING = 6, DEFAULT_FIELD_ANNOTATION_FONT_SIZE = 16, DEFAULT_PARAGRAPH_FONT_SIZE = 12, DEFAULT_PARAGRAPH_FONT_FAMILY = "Arial", isValidFontSize = (value) => typeof value === "number" && Number.isFinite(value) && value > 0, normalizeFontSize2 = (value, fallback = DEFAULT_PARAGRAPH_FONT_SIZE) => {
+}, tableCellMetricsCache, autoFitTableResultCache, canvasContext$1 = null, computeTabStops2, measurementConfig, canvasContext = null, DEFAULT_TAB_INTERVAL_TWIPS2 = 720, TWIPS_PER_PX2, twipsToPx2 = (twips) => twips / TWIPS_PER_PX2, pxToTwips = (px) => Math.round(px * TWIPS_PER_PX2), DEFAULT_TAB_INTERVAL_PX, TAB_EPSILON = 0.1, DEFAULT_CELL_PADDING, DEFAULT_DECIMAL_SEPARATOR2 = ".", ALLOWED_TAB_VALS, DEFAULT_PARAGRAPH_FONT_SIZE = 12, DEFAULT_PARAGRAPH_FONT_FAMILY = "Arial", isValidFontSize = (value) => typeof value === "number" && Number.isFinite(value) && value > 0, normalizeFontSize2 = (value, fallback = DEFAULT_PARAGRAPH_FONT_SIZE) => {
   if (isValidFontSize(value))
     return value;
   if (typeof value === "string") {
@@ -326428,13 +326607,13 @@ 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_Fy_l94Cn_es = __esm(() => {
+var init_src_BrcexyXf_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_x_mSI6o_es();
+  init_SuperConverter_DIgF4xk__es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_B2wVPhPi_es();
-  init_create_headless_toolbar_D1KbRv5B_es();
+  init_create_headless_toolbar_BT4yIoZ_es();
   init_constants_D9qj59G2_es();
   init_unified_BDuVPlMu_es();
   init_remark_gfm_BUJjZJLy_es();
@@ -333196,10 +333375,18 @@ ${err.toString()}`);
     addCommands() {
       return {
         setFontFamily: (fontFamily) => ({ chain }) => {
-          return chain().setMark("textStyle", { fontFamily }).run();
+          return chain().setMark("textStyle", {
+            fontFamily,
+            eastAsiaFontFamily: null,
+            csFontFamily: null
+          }).run();
         },
         unsetFontFamily: () => ({ chain }) => {
-          return chain().setMark("textStyle", { fontFamily: null }).removeEmptyTextStyle().run();
+          return chain().setMark("textStyle", {
+            fontFamily: null,
+            eastAsiaFontFamily: null,
+            csFontFamily: null
+          }).removeEmptyTextStyle().run();
         }
       };
     }
@@ -339636,6 +339823,10 @@ ${err.toString()}`);
           return { style: attrs.style };
         } },
         wrapAttributes: { rendered: false },
+        wrapperParagraph: {
+          default: null,
+          rendered: false
+        },
         anchorData: { rendered: false },
         marginOffset: { rendered: false },
         attributes: { rendered: false },
@@ -356364,7 +356555,7 @@ function print() { __p += __j.call(arguments, '') }
         return null;
       return getParagraphFontFamilyFromProperties(calculateResolvedParagraphProperties(this.activeEditor, paragraphParent.node, state.doc.resolve(paragraphParent.pos)), this.activeEditor?.converter?.convertedXml ?? {}) || null;
     }
-    #isFontSizeMixedState(commandState) {
+    #isMixedState(commandState) {
       return Boolean(commandState?.active) && commandState?.value == null;
     }
     #applyHeadlessState(item) {
@@ -356408,6 +356599,10 @@ function print() { __p += __j.call(arguments, '') }
             item.activate({ fontFamily: commandState.value });
             return;
           }
+          if (this.#isMixedState(commandState)) {
+            item.activate({}, true);
+            return;
+          }
           const fallbackFontFamily = this.#getFontFamilyFallbackValue();
           if (fallbackFontFamily) {
             item.activate({ fontFamily: fallbackFontFamily });
@@ -356420,7 +356615,7 @@ function print() { __p += __j.call(arguments, '') }
             item.activate({ fontSize: commandState.value });
             return;
           }
-          if (this.#isFontSizeMixedState(commandState)) {
+          if (this.#isMixedState(commandState)) {
             item.activate({}, true);
             return;
           }
@@ -369677,11 +369872,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-Du-2OQ-7.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-B-QEvuPe.es.js
 var DEFAULT_TEXT_ALIGN_OPTIONS, DEFAULT_LINE_HEIGHT_OPTIONS, DEFAULT_ZOOM_OPTIONS, DEFAULT_DOCUMENT_MODE_OPTIONS, DEFAULT_FONT_SIZE_OPTIONS, headlessToolbarConstants, MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS, FONT_SIZE_OPTIONS;
-var init_create_super_doc_ui_Du_2OQ_7_es = __esm(() => {
-  init_SuperConverter_x_mSI6o_es();
-  init_create_headless_toolbar_D1KbRv5B_es();
+var init_create_super_doc_ui_B_QEvuPe_es = __esm(() => {
+  init_SuperConverter_DIgF4xk__es();
+  init_create_headless_toolbar_BT4yIoZ_es();
   DEFAULT_TEXT_ALIGN_OPTIONS = [
     {
       label: "Left",
@@ -369972,15 +370167,15 @@ var init_zipper_BxRAi0_5_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_Fy_l94Cn_es();
-  init_SuperConverter_x_mSI6o_es();
+  init_src_BrcexyXf_es();
+  init_SuperConverter_DIgF4xk__es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_D1KbRv5B_es();
+  init_create_headless_toolbar_BT4yIoZ_es();
   init_constants_D9qj59G2_es();
   init_unified_BDuVPlMu_es();
   init_DocxZipper_BzS208BW_es();
-  init_create_super_doc_ui_Du_2OQ_7_es();
+  init_create_super_doc_ui_B_QEvuPe_es();
   init_ui_CGB3qmy3_es();
   init_eventemitter3_UwU_CLPU_es();
   init_errors_C_DoKMoN_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.17.0-next.41",
+  "version": "0.17.0-next.43",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -26,20 +26,20 @@
     "lib0": "^0.2.114",
     "typescript": "^5.9.2",
     "y-protocols": "^1.0.6",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/document-api": "0.1.0-alpha.0",
-    "superdoc": "1.43.1"
+    "superdoc": "1.43.1",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.17.0-next.41",
-    "@superdoc-dev/cli-darwin-arm64": "0.17.0-next.41",
-    "@superdoc-dev/cli-linux-x64": "0.17.0-next.41",
-    "@superdoc-dev/cli-linux-arm64": "0.17.0-next.41",
-    "@superdoc-dev/cli-windows-x64": "0.17.0-next.41"
+    "@superdoc-dev/cli-darwin-arm64": "0.17.0-next.43",
+    "@superdoc-dev/cli-linux-x64": "0.17.0-next.43",
+    "@superdoc-dev/cli-darwin-x64": "0.17.0-next.43",
+    "@superdoc-dev/cli-linux-arm64": "0.17.0-next.43",
+    "@superdoc-dev/cli-windows-x64": "0.17.0-next.43"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",