@harbour-enterprises/superdoc 1.0.0-beta.82 → 1.0.0-beta.84

package/dist/chunks/{super-editor.es-44RL9-Ca.cjs → super-editor.es-C89GPNG4.cjs}

@@ -42391,7 +42391,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.82") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.84") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -59580,7 +59580,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.82";
+const summaryVersion = "1.0.0-beta.84";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -60369,7 +60369,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-GF5Urhpn-BNFw-VyP.cjs")),
+      Promise.resolve().then(() => require("./index-ByDo0rez-DTbakkgE.cjs")),
       Promise.resolve().then(() => require("./index-DRCvimau-H4Ck3S9a.cjs")),
       Promise.resolve().then(() => require("./index-C_x_N6Uh-Db3CUJMX.cjs")),
       Promise.resolve().then(() => require("./index-D_sWOSiG-BtDZzJ6I.cjs")),
@@ -60574,7 +60574,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.82");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.84");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -63618,32 +63618,76 @@ function hydrateImageBlocks(blocks, mediaFiles) {
     return hasChanges ? hydratedRuns : runs;
   };
   return blocks.map((block) => {
-    if (block.kind === "image") {
-      if (!block.src || block.src.startsWith("data:")) {
-        return block;
-      }
-      const attrs = block.attrs ?? {};
-      const relId = typeof attrs.rId === "string" ? attrs.rId : void 0;
-      const attrSrc = typeof attrs.src === "string" ? attrs.src : void 0;
-      const extension = typeof attrs.extension === "string" ? attrs.extension.toLowerCase() : void 0;
-      const resolvedSrc = resolveImageSrc(block.src, relId, attrSrc, extension);
-      if (resolvedSrc) {
-        return { ...block, src: resolvedSrc };
-      }
-      return block;
-    }
-    if (block.kind === "paragraph") {
-      const paragraphBlock = block;
-      if (!paragraphBlock.runs || paragraphBlock.runs.length === 0) {
-        return block;
-      }
-      const hydratedRuns = hydrateRuns(paragraphBlock.runs);
-      if (hydratedRuns !== paragraphBlock.runs) {
-        return { ...paragraphBlock, runs: hydratedRuns };
+    const hydrateBlock = (blk) => {
+      if (blk.kind === "image") {
+        if (!blk.src || blk.src.startsWith("data:")) {
+          return blk;
+        }
+        const attrs = blk.attrs ?? {};
+        const relId = typeof attrs.rId === "string" ? attrs.rId : void 0;
+        const attrSrc = typeof attrs.src === "string" ? attrs.src : void 0;
+        const extension = typeof attrs.extension === "string" ? attrs.extension.toLowerCase() : void 0;
+        const resolvedSrc = resolveImageSrc(blk.src, relId, attrSrc, extension);
+        if (resolvedSrc) {
+          return { ...blk, src: resolvedSrc };
+        }
+        return blk;
+      }
+      if (blk.kind === "paragraph") {
+        const paragraphBlock = blk;
+        if (!paragraphBlock.runs || paragraphBlock.runs.length === 0) {
+          return blk;
+        }
+        const hydratedRuns = hydrateRuns(paragraphBlock.runs);
+        if (hydratedRuns !== paragraphBlock.runs) {
+          return { ...paragraphBlock, runs: hydratedRuns };
+        }
+        return blk;
+      }
+      if (blk.kind === "table") {
+        let rowsChanged = false;
+        const newRows = blk.rows.map((row) => {
+          let cellsChanged = false;
+          const newCells = row.cells.map((cell) => {
+            let cellChanged = false;
+            const hydratedBlocks = (cell.blocks ?? (cell.paragraph ? [cell.paragraph] : [])).map((cb) => hydrateBlock(cb));
+            if (cell.blocks && hydratedBlocks !== cell.blocks) {
+              cellChanged = true;
+            }
+            let hydratedParagraph = cell.paragraph;
+            if (!cell.blocks && cell.paragraph && cell.paragraph.kind === "paragraph") {
+              const hydratedPara = hydrateBlock(cell.paragraph);
+              if (hydratedPara !== cell.paragraph) {
+                hydratedParagraph = hydratedPara;
+                cellChanged = true;
+              }
+            }
+            if (cellChanged) {
+              return {
+                ...cell,
+                blocks: hydratedBlocks.length > 0 ? hydratedBlocks : cell.blocks,
+                paragraph: hydratedParagraph
+              };
+            }
+            return cell;
+          });
+          if (newCells.some((c2, idx) => c2 !== row.cells[idx])) {
+            cellsChanged = true;
+          }
+          if (cellsChanged) {
+            rowsChanged = true;
+            return { ...row, cells: newCells };
+          }
+          return row;
+        });
+        if (rowsChanged) {
+          return { ...blk, rows: newRows };
+        }
+        return blk;
       }
-      return block;
-    }
-    return block;
+      return blk;
+    };
+    return hydrateBlock(block);
   });
 }
 function isGradientFill(value) {
@@ -65358,7 +65402,7 @@ function buildSdtCacheKey(nodeType, attrs, explicitKey) {
   return void 0;
 }
 const DEFAULT_LIST_HANGING_PX$1 = 18;
-const LIST_MARKER_GAP$2 = 8;
+const LIST_MARKER_GAP$3 = 8;
 const DEFAULT_BULLET_GLYPH = "•";
 const DEFAULT_DECIMAL_PATTERN = "%1.";
 const ASCII_UPPERCASE_A = 65;
@@ -65769,7 +65813,7 @@ function computeWordParagraphLayout(input) {
   let markerBoxWidthPx;
   let markerX;
   if (hasFirstLineIndent) {
-    markerBoxWidthPx = glyphWidthPx != null && glyphWidthPx > 0 ? glyphWidthPx + LIST_MARKER_GAP$2 : DEFAULT_LIST_HANGING_PX$1;
+    markerBoxWidthPx = glyphWidthPx != null && glyphWidthPx > 0 ? glyphWidthPx + LIST_MARKER_GAP$3 : DEFAULT_LIST_HANGING_PX$1;
     markerX = indentLeftPx + (firstLinePx ?? 0);
     layout.textStartPx = markerX + markerBoxWidthPx;
     layout.hangingPx = 0;
@@ -65869,12 +65913,12 @@ const resolveMarkerBoxWidth = (hangingPxRaw, glyphWidthPx) => {
   let markerBox = Math.max(hangingPxRaw || 0, 0);
   if (markerBox <= 0) {
     if (glyphWidthPx != null && glyphWidthPx > 0) {
-      markerBox = glyphWidthPx + LIST_MARKER_GAP$2;
+      markerBox = glyphWidthPx + LIST_MARKER_GAP$3;
     } else {
       markerBox = DEFAULT_LIST_HANGING_PX$1;
     }
-  } else if (glyphWidthPx != null && glyphWidthPx + LIST_MARKER_GAP$2 > markerBox) {
-    markerBox = glyphWidthPx + LIST_MARKER_GAP$2;
+  } else if (glyphWidthPx != null && glyphWidthPx + LIST_MARKER_GAP$3 > markerBox) {
+    markerBox = glyphWidthPx + LIST_MARKER_GAP$3;
   }
   return markerBox;
 };
@@ -66496,13 +66540,21 @@ const findNumFmtElement = (lvl) => {
 const resolveNumberingFromContext = (numId, ilvl, numbering) => {
   const definitions = numbering?.definitions;
   const abstracts = numbering?.abstracts;
-  if (!definitions || !abstracts) return void 0;
+  if (!definitions || !abstracts) {
+    return void 0;
+  }
   const numDef = asOoxmlElement(definitions[String(numId)]);
-  if (!numDef) return void 0;
+  if (!numDef) {
+    return void 0;
+  }
   const abstractId = getAttribute(findChild(numDef, "w:abstractNumId"), "w:val");
-  if (abstractId == null) return void 0;
+  if (abstractId == null) {
+    return void 0;
+  }
   const abstract = asOoxmlElement(abstracts[String(abstractId)]);
-  if (!abstract) return void 0;
+  if (!abstract) {
+    return void 0;
+  }
   let levelDef = abstract.elements?.find(
     (el) => el?.name === "w:lvl" && parseNumberAttr(el.attributes?.["w:ilvl"]) === ilvl
   );
@@ -66514,7 +66566,9 @@ const resolveNumberingFromContext = (numId, ilvl, numbering) => {
     levelDef = overrideLvl;
   }
   const startOverride = parseNumberAttr(getAttribute(findChild(override, "w:startOverride"), "w:val"));
-  if (!levelDef) return void 0;
+  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"));
@@ -67160,14 +67214,29 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.frame = frame;
     }
   }
+  const listRendering = normalizeListRenderingAttrs(attrs.listRendering);
   const numberingSource = attrs.numberingProperties ?? paragraphProps.numberingProperties ?? hydrated?.numberingProperties;
-  const rawNumberingProps = toAdapterNumberingProps(numberingSource);
+  let rawNumberingProps = toAdapterNumberingProps(numberingSource);
+  if (!rawNumberingProps && listRendering) {
+    const path = listRendering.path;
+    const counterFromPath = path && path.length ? path[path.length - 1] : void 0;
+    const ilvl = path && path.length > 1 ? path.length - 1 : 0;
+    rawNumberingProps = {
+      numId: -1,
+      ilvl,
+      path,
+      counterValue: Number.isFinite(counterFromPath) ? Number(counterFromPath) : void 0,
+      markerText: listRendering.markerText,
+      format: listRendering.numberingType,
+      lvlJc: listRendering.justification,
+      suffix: listRendering.suffix
+    };
+  }
   const hasValidNumbering = rawNumberingProps && isValidNumberingId(rawNumberingProps.numId);
   if (hasValidNumbering) {
     const numberingProps = rawNumberingProps;
     const numId = numberingProps.numId;
     const ilvl = Number.isFinite(numberingProps.ilvl) ? Math.max(0, Math.floor(Number(numberingProps.ilvl))) : 0;
-    const listRendering = normalizeListRenderingAttrs(attrs.listRendering);
     const numericNumId = typeof numId === "number" ? numId : void 0;
     const resolvedLevel = resolveNumberingFromContext(numId, ilvl, converterContext?.numbering);
     if (resolvedLevel) {
@@ -67242,13 +67311,18 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
         }
       }
       paragraphAttrs.wordLayout = wordLayout;
-      if (enrichedNumberingProps.resolvedLevelIndent) {
-        const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
-        const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
-        paragraphAttrs.indent = {
-          ...baseIndent,
-          ...normalizedIndent ?? {}
-        };
+    }
+    if (enrichedNumberingProps.resolvedLevelIndent) {
+      const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
+      const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
+      paragraphAttrs.indent = {
+        ...baseIndent,
+        ...normalizedIndent ?? {}
+      };
+      if (normalizedIndent?.firstLine !== void 0) {
+        delete paragraphAttrs.indent.hanging;
+      } else if (normalizedIndent?.hanging !== void 0) {
+        delete paragraphAttrs.indent.firstLine;
       }
     }
     paragraphAttrs.numberingProperties = enrichedNumberingProps;
@@ -69218,29 +69292,129 @@ const parseTableCell = (args) => {
     ...context.converterContext,
     tableStyleParagraphProps
   } : context.converterContext;
+  const paragraphToFlowBlocks2 = context.converters?.paragraphToFlowBlocks ?? context.paragraphToFlowBlocks;
+  const listCounterContext = context.listCounterContext;
   for (const childNode of cellNode.content) {
     if (childNode.type === "paragraph") {
-      const paragraphBlocks = context.paragraphToFlowBlocks(
+      if (!paragraphToFlowBlocks2) continue;
+      const paragraphBlocks = paragraphToFlowBlocks2(
         childNode,
         context.nextBlockId,
         context.positions,
         context.defaultFont,
         context.defaultSize,
         context.styleContext,
-        void 0,
-        // listCounterContext
+        listCounterContext,
         context.trackedChanges,
         context.bookmarks,
         context.hyperlinkConfig,
         context.themeColors,
         cellConverterContext
-        // converterContext at position 12
       );
-      const paragraph = paragraphBlocks.find((b2) => b2.kind === "paragraph");
-      if (paragraph) {
-        blocks.push(paragraph);
+      paragraphBlocks.forEach((block) => {
+        if (block.kind === "paragraph" || block.kind === "image" || block.kind === "drawing") {
+          blocks.push(block);
+        }
+      });
+      continue;
+    }
+    if (childNode.type === "image" && context.converters?.imageNodeToBlock) {
+      const mergedMarks = [...childNode.marks ?? []];
+      const trackedMeta = context.trackedChanges ? collectTrackedChangeFromMarks(mergedMarks) : void 0;
+      if (shouldHideTrackedNode(trackedMeta, context.trackedChanges)) {
+        continue;
+      }
+      const imageBlock = context.converters.imageNodeToBlock(
+        childNode,
+        context.nextBlockId,
+        context.positions,
+        trackedMeta,
+        context.trackedChanges
+      );
+      if (imageBlock && imageBlock.kind === "image") {
+        annotateBlockWithTrackedChange(imageBlock, trackedMeta, context.trackedChanges);
+        blocks.push(imageBlock);
+      }
+      continue;
+    }
+    if (childNode.type === "vectorShape" && context.converters?.vectorShapeNodeToDrawingBlock) {
+      const drawingBlock = context.converters.vectorShapeNodeToDrawingBlock(
+        childNode,
+        context.nextBlockId,
+        context.positions
+      );
+      if (drawingBlock) {
+        blocks.push(drawingBlock);
+      }
+      continue;
+    }
+    if (childNode.type === "shapeGroup" && context.converters?.shapeGroupNodeToDrawingBlock) {
+      const drawingBlock = context.converters.shapeGroupNodeToDrawingBlock(
+        childNode,
+        context.nextBlockId,
+        context.positions
+      );
+      if (drawingBlock) {
+        blocks.push(drawingBlock);
       }
+      continue;
     }
+    if (childNode.type === "shapeContainer" && context.converters?.shapeContainerNodeToDrawingBlock) {
+      const drawingBlock = context.converters.shapeContainerNodeToDrawingBlock(
+        childNode,
+        context.nextBlockId,
+        context.positions
+      );
+      if (drawingBlock) {
+        blocks.push(drawingBlock);
+      }
+      continue;
+    }
+    if (childNode.type === "shapeTextbox" && context.converters?.shapeTextboxNodeToDrawingBlock) {
+      const drawingBlock = context.converters.shapeTextboxNodeToDrawingBlock(
+        childNode,
+        context.nextBlockId,
+        context.positions
+      );
+      if (drawingBlock) {
+        blocks.push(drawingBlock);
+      }
+    }
+  }
+  try {
+    const blockSummaries = blocks.map((b2) => {
+      if (b2.kind === "paragraph") {
+        const runs = b2.runs ?? [];
+        const attrs = b2.attrs ?? {};
+        return {
+          kind: "paragraph",
+          runKinds: runs.map((r2) => r2.kind ?? "text"),
+          runCount: runs.length,
+          runPreview: runs.map((r2) => {
+            const kind = r2.kind ?? "text";
+            if (kind === "image") {
+              const img = r2;
+              return { kind, src: img.src, width: img.width, height: img.height };
+            }
+            return { kind };
+          }),
+          hasNumbering: Boolean(attrs.numberingProperties),
+          markerText: attrs.wordLayout?.marker?.markerText
+        };
+      }
+      return { kind: b2.kind };
+    });
+    console.log(
+      "[tableNodeToBlock.parseTableCell] cell contents",
+      JSON.stringify({
+        cellIndex,
+        rowIndex,
+        cellIdPreview: `cell-${rowIndex}-${cellIndex}`,
+        childTypes: cellNode.content.map((c2) => c2?.type),
+        blocks: blockSummaries
+      })
+    );
+  } catch {
   }
   if (blocks.length === 0) {
     return null;
@@ -69380,9 +69554,10 @@ function extractFloatingTableAnchorWrap(node) {
   }
   return { anchor, wrap: wrap2 };
 }
-function tableNodeToBlock$1(node, nextBlockId, positions, defaultFont, defaultSize, _styleContext, trackedChanges, bookmarks, hyperlinkConfig, themeColors, paragraphToFlowBlocks2, converterContext) {
+function tableNodeToBlock$1(node, nextBlockId, positions, defaultFont, defaultSize, _styleContext, trackedChanges, bookmarks, hyperlinkConfig, themeColors, paragraphToFlowBlocks2, converterContext, options) {
   if (!Array.isArray(node.content) || node.content.length === 0) return null;
-  if (!paragraphToFlowBlocks2) return null;
+  const paragraphConverter = paragraphToFlowBlocks2 ?? options?.converters?.paragraphToFlowBlocks;
+  if (!paragraphConverter) return null;
   const parserDeps = {
     nextBlockId,
     positions,
@@ -69393,8 +69568,10 @@ function tableNodeToBlock$1(node, nextBlockId, positions, defaultFont, defaultSi
     bookmarks,
     hyperlinkConfig,
     themeColors,
-    paragraphToFlowBlocks: paragraphToFlowBlocks2,
-    converterContext
+    listCounterContext: options?.listCounterContext,
+    paragraphToFlowBlocks: paragraphConverter,
+    converterContext,
+    converters: options?.converters
   };
   const hydratedTableStyle = hydrateTableStyleAttrs(node, converterContext);
   const defaultCellPadding = hydratedTableStyle?.cellPadding;
@@ -69514,6 +69691,7 @@ function handleTableNode(node, context) {
     defaultFont,
     defaultSize,
     styleContext,
+    listCounterContext,
     trackedChangesConfig,
     bookmarks,
     hyperlinkConfig,
@@ -69533,7 +69711,8 @@ function handleTableNode(node, context) {
     void 0,
     // themeColors
     converters?.paragraphToFlowBlocks,
-    converterContext
+    converterContext,
+    { listCounterContext, converters }
   );
   if (tableBlock) {
     blocks.push(tableBlock);
@@ -69687,7 +69866,7 @@ function toFlowBlocks(pmDoc, options) {
     bookmarks2,
     hyperlinkConfig2,
     themeColorsParam ?? themeColors,
-    converterCtx ?? converterContext
+    paragraphConverter
   );
   const handlerContext = {
     blocks,
@@ -69710,7 +69889,11 @@ function toFlowBlocks(pmDoc, options) {
     converters: {
       paragraphToFlowBlocks: paragraphConverter,
       tableNodeToBlock: tableConverter,
-      imageNodeToBlock
+      imageNodeToBlock,
+      vectorShapeNodeToDrawingBlock,
+      shapeGroupNodeToDrawingBlock,
+      shapeContainerNodeToDrawingBlock,
+      shapeTextboxNodeToDrawingBlock
     }
   };
   doc2.content.forEach((node) => {
@@ -69795,7 +69978,18 @@ function paragraphToFlowBlocks(para, nextBlockId, positions, defaultFont, defaul
         hyperlinkConfig2,
         themeColors2,
         paragraphToFlowBlocks,
-        converterCtx ?? converterContext
+        converterCtx ?? converterContext,
+        {
+          listCounterContext,
+          converters: {
+            paragraphToFlowBlocks: paragraphToFlowBlocks$1,
+            imageNodeToBlock,
+            vectorShapeNodeToDrawingBlock,
+            shapeGroupNodeToDrawingBlock,
+            shapeContainerNodeToDrawingBlock,
+            shapeTextboxNodeToDrawingBlock
+          }
+        }
       )
     },
     converterContext
@@ -69814,7 +70008,17 @@ function tableNodeToBlock(node, nextBlockId, positions, defaultFont, defaultSize
     hyperlinkConfig,
     themeColors,
     paragraphToFlowBlocks,
-    converterContext
+    converterContext,
+    {
+      converters: {
+        paragraphToFlowBlocks: paragraphToFlowBlocks$1,
+        imageNodeToBlock,
+        vectorShapeNodeToDrawingBlock,
+        shapeGroupNodeToDrawingBlock,
+        shapeContainerNodeToDrawingBlock,
+        shapeTextboxNodeToDrawingBlock
+      }
+    }
   );
 }
 let measurementCanvas = null;
@@ -72997,6 +73201,43 @@ const resolveTableCellBorders = (tableBorders, rowIndex, colIndex, totalRows, to
     right: borderValueToSpec(isLastCol ? tableBorders?.right : null)
   };
 };
+const LIST_MARKER_GAP$2 = 8;
+function renderListMarker(params2) {
+  const { doc: doc2, lineEl, markerLayout, markerMeasure, indentLeftPx } = params2;
+  const markerJustification = markerLayout?.justification ?? "left";
+  const markerBoxWidth = (typeof markerLayout?.markerBoxWidthPx === "number" ? markerLayout.markerBoxWidthPx : void 0) ?? markerMeasure?.markerWidth ?? 0;
+  const gutter = (typeof markerLayout?.gutterWidthPx === "number" ? markerLayout.gutterWidthPx : void 0) ?? markerMeasure?.gutterWidth ?? LIST_MARKER_GAP$2;
+  const markerStartPos = markerJustification === "left" ? indentLeftPx : (typeof markerLayout?.markerX === "number" ? markerLayout.markerX : void 0) ?? indentLeftPx;
+  const markerLeftPos = markerStartPos - markerBoxWidth;
+  const lineContainer = doc2.createElement("div");
+  lineContainer.style.position = "relative";
+  lineContainer.style.width = "100%";
+  const markerEl = doc2.createElement("span");
+  markerEl.classList.add("superdoc-paragraph-marker");
+  markerEl.textContent = markerLayout?.markerText ?? "";
+  markerEl.style.display = "inline-block";
+  markerEl.style.fontFamily = markerLayout?.run?.fontFamily ?? "";
+  if (markerLayout?.run?.fontSize != null) {
+    markerEl.style.fontSize = `${markerLayout.run.fontSize}px`;
+  }
+  markerEl.style.fontWeight = markerLayout?.run?.bold ? "bold" : "";
+  markerEl.style.fontStyle = markerLayout?.run?.italic ? "italic" : "";
+  if (markerLayout?.run?.color) {
+    markerEl.style.color = markerLayout.run.color;
+  }
+  if (markerLayout?.run?.letterSpacing != null) {
+    markerEl.style.letterSpacing = `${markerLayout.run.letterSpacing}px`;
+  }
+  markerEl.style.position = "absolute";
+  markerEl.style.left = `${markerLeftPos}px`;
+  markerEl.style.width = `${markerBoxWidth}px`;
+  markerEl.style.textAlign = markerJustification;
+  markerEl.style.paddingRight = `${gutter}px`;
+  lineEl.style.paddingLeft = `${markerStartPos}px`;
+  lineContainer.appendChild(markerEl);
+  lineContainer.appendChild(lineEl);
+  return lineContainer;
+}
 const renderTableCell = (deps) => {
   const {
     doc: doc2,
@@ -73038,6 +73279,20 @@ const renderTableCell = (deps) => {
   }
   const cellBlocks = cell?.blocks ?? (cell?.paragraph ? [cell.paragraph] : []);
   const blockMeasures = cellMeasure?.blocks ?? (cellMeasure?.paragraph ? [cellMeasure.paragraph] : []);
+  try {
+    console.log(
+      "[DomPainter.renderTableCell] cell render input",
+      JSON.stringify({
+        cellId: cell?.id,
+        blockKinds: cellBlocks.map((b2) => b2.kind),
+        measureKinds: blockMeasures.map((m2) => m2.kind),
+        width: cellMeasure?.width,
+        height: cellMeasure?.height,
+        rowHeight
+      })
+    );
+  } catch {
+  }
   if (cellBlocks.length > 0 && blockMeasures.length > 0) {
     const content = doc2.createElement("div");
     content.style.position = "relative";
@@ -73069,9 +73324,106 @@ const renderTableCell = (deps) => {
     for (let i = 0; i < Math.min(blockMeasures.length, cellBlocks.length); i++) {
       const blockMeasure = blockMeasures[i];
       const block = cellBlocks[i];
+      if (blockMeasure.kind === "image" && block?.kind === "image") {
+        console.log(
+          "[DomPainter.renderTableCell] rendering image block in cell",
+          JSON.stringify({
+            cellId: cell?.id,
+            blockId: block.id,
+            width: blockMeasure.width,
+            height: blockMeasure.height
+          })
+        );
+        const imageWrapper = doc2.createElement("div");
+        imageWrapper.style.position = "relative";
+        imageWrapper.style.width = `${blockMeasure.width}px`;
+        imageWrapper.style.height = `${blockMeasure.height}px`;
+        imageWrapper.style.maxWidth = "100%";
+        imageWrapper.style.boxSizing = "border-box";
+        applySdtDataset(imageWrapper, block.attrs?.sdt);
+        const imgEl = doc2.createElement("img");
+        imgEl.classList.add("superdoc-table-image");
+        if (block.src) {
+          imgEl.src = block.src;
+        }
+        imgEl.alt = block.alt ?? "";
+        imgEl.style.width = "100%";
+        imgEl.style.height = "100%";
+        imgEl.style.objectFit = block.objectFit ?? "contain";
+        imgEl.style.display = "block";
+        imageWrapper.appendChild(imgEl);
+        content.appendChild(imageWrapper);
+        continue;
+      }
+      if (blockMeasure.kind === "drawing" && block?.kind === "drawing") {
+        console.log(
+          "[DomPainter.renderTableCell] rendering drawing block in cell",
+          JSON.stringify({
+            cellId: cell?.id,
+            blockId: block.id,
+            drawingKind: block.drawingKind,
+            width: blockMeasure.width,
+            height: blockMeasure.height
+          })
+        );
+        const drawingWrapper = doc2.createElement("div");
+        drawingWrapper.style.position = "relative";
+        drawingWrapper.style.width = `${blockMeasure.width}px`;
+        drawingWrapper.style.height = `${blockMeasure.height}px`;
+        drawingWrapper.style.maxWidth = "100%";
+        drawingWrapper.style.boxSizing = "border-box";
+        applySdtDataset(drawingWrapper, block.attrs);
+        const drawingInner = doc2.createElement("div");
+        drawingInner.classList.add("superdoc-table-drawing");
+        drawingInner.style.width = "100%";
+        drawingInner.style.height = "100%";
+        drawingInner.style.display = "flex";
+        drawingInner.style.alignItems = "center";
+        drawingInner.style.justifyContent = "center";
+        drawingInner.style.overflow = "hidden";
+        if (block.drawingKind === "image" && "src" in block && block.src) {
+          const img = doc2.createElement("img");
+          img.classList.add("superdoc-drawing-image");
+          img.src = block.src;
+          img.alt = block.alt ?? "";
+          img.style.width = "100%";
+          img.style.height = "100%";
+          img.style.objectFit = block.objectFit ?? "contain";
+          drawingInner.appendChild(img);
+        } else {
+          const placeholder = doc2.createElement("div");
+          placeholder.style.width = "100%";
+          placeholder.style.height = "100%";
+          placeholder.style.background = "repeating-linear-gradient(45deg, rgba(15,23,42,0.1), rgba(15,23,42,0.1) 6px, rgba(15,23,42,0.2) 6px, rgba(15,23,42,0.2) 12px)";
+          placeholder.style.border = "1px dashed rgba(15, 23, 42, 0.3)";
+          drawingInner.appendChild(placeholder);
+        }
+        drawingWrapper.appendChild(drawingInner);
+        content.appendChild(drawingWrapper);
+        continue;
+      }
       if (blockMeasure.kind === "paragraph" && block?.kind === "paragraph") {
-        const lines = blockMeasure.lines;
+        try {
+          const runKinds = (block.runs ?? []).map((r2) => r2.kind ?? "text");
+          const imageRuns = (block.runs ?? []).filter((r2) => r2.kind === "image").map((r2) => ({ src: r2.src }));
+          console.log(
+            "[DomPainter.renderTableCell] rendering paragraph block in cell",
+            JSON.stringify({
+              cellId: cell?.id,
+              blockId: block.id,
+              runKinds,
+              imageRuns
+            })
+          );
+        } catch {
+        }
+        const paragraphMeasure = blockMeasure;
+        const lines = paragraphMeasure.lines;
         const blockLineCount = lines?.length || 0;
+        const wordLayout = block.attrs?.wordLayout ?? null;
+        const markerLayout = wordLayout?.marker;
+        const markerMeasure = paragraphMeasure.marker;
+        const indentLeftPx = markerMeasure?.indentLeft ?? wordLayout?.indentLeftPx ?? (block.attrs?.indent && typeof block.attrs.indent.left === "number" ? block.attrs.indent.left : 0);
         const blockStartGlobal = cumulativeLineCount;
         const blockEndGlobal = cumulativeLineCount + blockLineCount;
         if (blockEndGlobal <= globalFromLine) {
@@ -73093,7 +73445,38 @@ const renderTableCell = (deps) => {
         for (let lineIdx = localStartLine; lineIdx < localEndLine && lineIdx < lines.length; lineIdx++) {
           const line = lines[lineIdx];
           const lineEl = renderLine(block, line, { ...context, section: "body" });
-          paraWrapper.appendChild(lineEl);
+          lineEl.style.paddingLeft = "";
+          lineEl.style.paddingRight = "";
+          lineEl.style.textIndent = "";
+          const shouldRenderMarker = markerLayout && markerMeasure && lineIdx === 0 && localStartLine === 0 && markerMeasure.markerWidth > 0;
+          if (shouldRenderMarker) {
+            const lineContainer = renderListMarker({
+              doc: doc2,
+              lineEl,
+              markerLayout,
+              markerMeasure,
+              indentLeftPx
+            });
+            paraWrapper.appendChild(lineContainer);
+          } else {
+            if (markerLayout && indentLeftPx) {
+              lineEl.style.paddingLeft = `${indentLeftPx}px`;
+            } else {
+              const indent = block.attrs?.indent;
+              if (indent) {
+                if (typeof indent.left === "number" && indent.left > 0) {
+                  lineEl.style.paddingLeft = `${indent.left}px`;
+                }
+                if (typeof indent.right === "number" && indent.right > 0) {
+                  lineEl.style.paddingRight = `${indent.right}px`;
+                }
+                if (lineIdx === 0 && typeof indent.firstLine === "number" && indent.firstLine !== 0) {
+                  lineEl.style.textIndent = `${indent.firstLine}px`;
+                }
+              }
+            }
+            paraWrapper.appendChild(lineEl);
+          }
           renderedHeight += line.lineHeight;
         }
         const renderedEntireBlock = localStartLine === 0 && localEndLine >= blockLineCount;
@@ -74903,10 +75286,10 @@ const _DomPainter = class _DomPainter2 {
           let markerStartPos;
           if (isFirstLineIndentMode && wordLayout.marker.markerX !== void 0 && Number.isFinite(wordLayout.marker.markerX)) {
             markerStartPos = wordLayout.marker.markerX;
-          } else if (isFirstLineIndentMode) {
-            markerStartPos = paraIndentLeft + (paraIndent?.firstLine ?? 0);
           } else {
-            markerStartPos = paraIndentLeft - (paraIndent?.hanging ?? 0);
+            const hanging = paraIndent?.hanging ?? 0;
+            const firstLine = paraIndent?.firstLine ?? 0;
+            markerStartPos = paraIndentLeft - hanging + firstLine;
           }
           const validMarkerStartPos = Number.isFinite(markerStartPos) ? markerStartPos : 0;
           lineEl.style.paddingLeft = `${validMarkerStartPos}px`;
@@ -74974,15 +75357,27 @@ const _DomPainter = class _DomPainter2 {
                   tabWidth = LIST_MARKER_GAP$1;
                 }
               } else {
-                const implicitTabStop = paraIndentLeft;
-                tabWidth = implicitTabStop - currentPos;
-                if (tabWidth < 1) {
+                const firstLine = paraIndent?.firstLine ?? 0;
+                const textStart = paraIndentLeft + firstLine;
+                tabWidth = textStart - currentPos;
+                if (tabWidth <= 0) {
                   tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
-                  if (tabWidth === 0) tabWidth = DEFAULT_TAB_INTERVAL_PX$1;
+                } else if (tabWidth < LIST_MARKER_GAP$1) {
+                  tabWidth = LIST_MARKER_GAP$1;
                 }
               }
             } else {
-              tabWidth = fragment.markerGutter != null && isFinite(fragment.markerGutter) ? fragment.markerGutter : typeof wordLayout.marker.gutterWidthPx === "number" && isFinite(wordLayout.marker.gutterWidthPx) && wordLayout.marker.gutterWidthPx > 0 ? wordLayout.marker.gutterWidthPx : LIST_MARKER_GAP$1;
+              const gutterWidth = fragment.markerGutter ?? wordLayout.marker.gutterWidthPx;
+              if (gutterWidth !== void 0 && Number.isFinite(gutterWidth) && gutterWidth > 0) {
+                tabWidth = gutterWidth;
+              } else {
+                const firstLine = paraIndent?.firstLine ?? 0;
+                const textStart = paraIndentLeft + firstLine;
+                tabWidth = textStart - validMarkerStartPos;
+              }
+              if (tabWidth < LIST_MARKER_GAP$1) {
+                tabWidth = LIST_MARKER_GAP$1;
+              }
             }
             tabEl.style.display = "inline-block";
             tabEl.style.width = `${tabWidth}px`;