@harbour-enterprises/superdoc 1.0.0-beta.86 → 1.0.0-beta.88

package/dist/superdoc.umd.js

@@ -19632,9 +19632,9 @@
     const { spacing, indent: indent2, borders, justification } = paragraphProperties;
     const nextStyleId = nextParagraphProps?.styleId;
     if (spacing) {
-      const getEffectiveBefore = (nextSpacing, isListItem) => {
+      const getEffectiveBefore = (nextSpacing, isListItem2) => {
         if (!nextSpacing) return 0;
-        if (nextSpacing.beforeAutospacing && isListItem) {
+        if (nextSpacing.beforeAutospacing && isListItem2) {
           return 0;
         }
         return nextSpacing.before || 0;
@@ -20015,7 +20015,7 @@
     }
     String(value).split(/\s+/).map((entry) => entry.trim()).filter(Boolean).forEach((entry) => targetSet.add(entry));
   }
-  const getSpacingStyle = (spacing, isListItem) => {
+  const getSpacingStyle = (spacing, isListItem2) => {
     let { before, after, line, lineRule, beforeAutospacing, afterAutospacing } = spacing;
     line = twipsToLines(line);
     if (line != null && line < 1) {
@@ -20026,13 +20026,13 @@
     }
     before = twipsToPixels$2(before);
     if (beforeAutospacing) {
-      if (isListItem) {
+      if (isListItem2) {
         before = 0;
       }
     }
     after = twipsToPixels$2(after);
     if (afterAutospacing) {
-      if (isListItem) {
+      if (isListItem2) {
         after = 0;
       }
     }
@@ -42398,7 +42398,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.86") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.88") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -64421,6 +64421,23 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         };
       }
     });
+    const nodeAtEndPosition = doc2.nodeAt(endPos);
+    if (nodeAtEndPosition?.type?.name === "run") {
+      const node2 = nodeAtEndPosition.content?.content?.[0];
+      const isTextNode = node2?.type?.name === "text";
+      if (isTextNode) {
+        const mark2 = node2.marks.find(
+          (mark22) => mark22.type.name === markName && Object.keys(attrs).every((attr) => mark22.attrs[attr] === attrs[attr])
+        );
+        if (mark2 && !markFound) {
+          markFound = {
+            from: endPos,
+            to: endPos + node2.nodeSize,
+            mark: mark2
+          };
+        }
+      }
+    }
     return markFound;
   };
   const markInsertion = ({ tr, from: from2, to, user, date }) => {
@@ -67444,7 +67461,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.86";
+  const summaryVersion = "1.0.0-beta.88";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -68233,7 +68250,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexDeSyD44U),
+        Promise.resolve().then(() => indexBLlh97IN),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -68438,7 +68455,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.86");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.88");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -71514,7 +71531,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             let cellsChanged = false;
             const newCells = row2.cells.map((cell2) => {
               let cellChanged = false;
-              const hydratedBlocks = (cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : [])).map((cb) => hydrateBlock(cb));
+              const hydratedBlocks = (cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : [])).map(
+                (cb) => hydrateBlock(cb)
+              );
               if (cell2.blocks && hydratedBlocks !== cell2.blocks) {
                 cellChanged = true;
               }
@@ -71549,6 +71568,40 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
           return blk;
         }
+        if (blk.kind === "drawing") {
+          const drawingBlock = blk;
+          if (drawingBlock.drawingKind !== "shapeGroup") {
+            return blk;
+          }
+          const shapeGroupBlock = drawingBlock;
+          if (!shapeGroupBlock.shapes || shapeGroupBlock.shapes.length === 0) {
+            return blk;
+          }
+          let shapesChanged = false;
+          const hydratedShapes = shapeGroupBlock.shapes.map((shape) => {
+            if (shape.shapeType !== "image") {
+              return shape;
+            }
+            const imageChild = shape;
+            const src = imageChild.attrs?.src;
+            if (!src || src.startsWith("data:")) {
+              return shape;
+            }
+            const resolvedSrc = resolveImageSrc(src);
+            if (resolvedSrc) {
+              shapesChanged = true;
+              return {
+                ...imageChild,
+                attrs: { ...imageChild.attrs, src: resolvedSrc }
+              };
+            }
+            return shape;
+          });
+          if (shapesChanged) {
+            return { ...shapeGroupBlock, shapes: hydratedShapes };
+          }
+          return blk;
+        }
         return blk;
       };
       return hydrateBlock(block);
@@ -81112,6 +81165,7 @@ ${l}
       cell: cell2,
       borders,
       renderLine,
+      renderDrawingContent,
       context,
       applySdtDataset,
       fromLine,
@@ -81254,6 +81308,11 @@ ${l}
             img2.style.height = "100%";
             img2.style.objectFit = block.objectFit ?? "contain";
             drawingInner.appendChild(img2);
+          } else if (renderDrawingContent) {
+            const drawingContent = renderDrawingContent(block);
+            drawingContent.style.width = "100%";
+            drawingContent.style.height = "100%";
+            drawingInner.appendChild(drawingContent);
           } else {
             const placeholder = doc2.createElement("div");
             placeholder.style.width = "100%";
@@ -81379,6 +81438,7 @@ ${l}
       allRowHeights,
       context,
       renderLine,
+      renderDrawingContent,
       applySdtDataset,
       continuesFromPrev,
       continuesOnNext,
@@ -81475,6 +81535,7 @@ ${l}
         cell: cell2,
         borders: resolvedBorders,
         renderLine,
+        renderDrawingContent,
         context,
         applySdtDataset,
         fromLine,
@@ -81528,7 +81589,17 @@ ${l}
     container.appendChild(labelEl);
   }
   const renderTableFragment = (deps) => {
-    const { doc: doc2, fragment, blockLookup, context, renderLine, applyFragmentFrame, applySdtDataset, applyStyles: applyStyles2 } = deps;
+    const {
+      doc: doc2,
+      fragment,
+      blockLookup,
+      context,
+      renderLine,
+      renderDrawingContent,
+      applyFragmentFrame,
+      applySdtDataset,
+      applyStyles: applyStyles2
+    } = deps;
     if (!doc2) {
       console.error("DomPainter: document is not available");
       if (typeof document !== "undefined") {
@@ -81658,6 +81729,7 @@ ${l}
           allRowHeights,
           context,
           renderLine,
+          renderDrawingContent,
           applySdtDataset,
           // Headers are always rendered as-is (no border suppression)
           continuesFromPrev: false,
@@ -81687,6 +81759,7 @@ ${l}
         allRowHeights,
         context,
         renderLine,
+        renderDrawingContent,
         applySdtDataset,
         // Draw top border if table continues from previous fragment (MS Word behavior)
         continuesFromPrev: isFirstRenderedBodyRow && fragment.continuesFromPrev === true,
@@ -83929,12 +84002,25 @@ ${l}
       const renderLineForTableCell = (block, line, ctx2) => {
         return this.renderLine(block, line, ctx2, void 0, void 0, true);
       };
+      const renderDrawingContentForTableCell = (block) => {
+        if (block.drawingKind === "image") {
+          return this.createDrawingImageElement(block);
+        }
+        if (block.drawingKind === "shapeGroup") {
+          return this.createShapeGroupElement(block);
+        }
+        if (block.drawingKind === "vectorShape") {
+          return this.createVectorShapeElement(block, block.geometry, false);
+        }
+        return this.createDrawingPlaceholder();
+      };
       return renderTableFragment({
         doc: this.doc,
         fragment,
         context,
         blockLookup: this.blockLookup,
         renderLine: renderLineForTableCell,
+        renderDrawingContent: renderDrawingContentForTableCell,
         applyFragmentFrame: applyFragmentFrameWithSection,
         applySdtDataset: this.applySdtDataset.bind(this),
         applyStyles: applyStyles$2
@@ -86057,6 +86143,50 @@ ${l}
     }
     return index2;
   }
+  function getWordLayoutConfig(block) {
+    if (!block || block.kind !== "paragraph") {
+      return void 0;
+    }
+    return block.attrs?.wordLayout;
+  }
+  function isListItem(markerWidth, block) {
+    const hasMarkerWidth = markerWidth > 0;
+    if (hasMarkerWidth) {
+      return true;
+    }
+    if (!block || block.kind !== "paragraph") {
+      return false;
+    }
+    const wordLayout = getWordLayoutConfig(block);
+    const hasListAttrs = block.attrs?.listItem != null || wordLayout?.marker != null;
+    if (hasListAttrs) {
+      return true;
+    }
+    const hangingIndent = block.attrs?.indent?.hanging ?? 0;
+    const paraIndentLeft = block.attrs?.indent?.left ?? 0;
+    const hasHangingIndentPattern = hangingIndent > 0 && paraIndentLeft > 0;
+    return hasHangingIndentPattern;
+  }
+  function calculateTextStartIndent(params2) {
+    const { isFirstLine, isListItem: isListItem2, markerWidth, paraIndentLeft, firstLineIndent, hangingIndent, wordLayout } = params2;
+    const firstLineOffset = firstLineIndent - hangingIndent;
+    const isFirstLineIndentMode = wordLayout?.firstLineIndentMode === true;
+    let indentAdjust = paraIndentLeft;
+    if (isListItem2 && isFirstLine && isFirstLineIndentMode) {
+      const textStartFallback = paraIndentLeft + Math.max(firstLineIndent, 0) + markerWidth;
+      indentAdjust = typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : textStartFallback;
+    } else if (isFirstLine && !isListItem2) {
+      indentAdjust += firstLineOffset;
+    }
+    return indentAdjust;
+  }
+  function extractParagraphIndent(indent2) {
+    const left2 = typeof indent2?.left === "number" && Number.isFinite(indent2.left) ? indent2.left : 0;
+    const right2 = typeof indent2?.right === "number" && Number.isFinite(indent2.right) ? indent2.right : 0;
+    const firstLine = typeof indent2?.firstLine === "number" && Number.isFinite(indent2.firstLine) ? indent2.firstLine : 0;
+    const hanging = typeof indent2?.hanging === "number" && Number.isFinite(indent2.hanging) ? indent2.hanging : 0;
+    return { left: left2, right: right2, firstLine, hanging };
+  }
   const defaultHeaderFooterIdentifier = () => ({
     headerIds: { default: null, first: null, even: null, odd: null },
     footerIds: { default: null, first: null, even: null, odd: null },
@@ -91068,8 +91198,8 @@ ${l}
         );
       }
       const markerWidth = fragment.markerWidth ?? measure.marker?.markerWidth ?? 0;
-      const isListItem = markerWidth > 0;
-      const alignmentOverride = isListItem ? "left" : void 0;
+      const isListItem3 = markerWidth > 0;
+      const alignmentOverride = isListItem3 ? "left" : void 0;
       const pos = mapPointToPm(block, line, pageRelativePoint.x - fragment.x, isRTL, availableWidth, alignmentOverride);
       if (pos == null) {
         logClickStage("warn", "no-position", {
@@ -91113,8 +91243,8 @@ ${l}
           );
         }
         const cellMarkerWidth = cellMeasure.marker?.markerWidth ?? 0;
-        const isListItem = cellMarkerWidth > 0;
-        const alignmentOverride = isListItem ? "left" : void 0;
+        const isListItem3 = cellMarkerWidth > 0;
+        const alignmentOverride = isListItem3 ? "left" : void 0;
         const pos = mapPointToPm(cellBlock, line, localX, isRTL, availableWidth, alignmentOverride);
         if (pos != null) {
           logClickStage("log", "success", {
@@ -91272,17 +91402,22 @@ ${l}
             const charOffsetFrom = pmPosToCharOffset(block, line, sliceFrom);
             const charOffsetTo = pmPosToCharOffset(block, line, sliceTo);
             const markerWidth = fragment.markerWidth ?? measure.marker?.markerWidth ?? 0;
-            const isListItem = markerWidth > 0;
-            const alignmentOverride = isListItem ? "left" : void 0;
+            const isListItemFlag = isListItem(markerWidth, block);
+            const alignmentOverride = isListItemFlag ? "left" : void 0;
             const startX = mapPmToX(block, line, charOffsetFrom, fragment.width, alignmentOverride);
             const endX = mapPmToX(block, line, charOffsetTo, fragment.width, alignmentOverride);
-            const paraIndentLeft = block.attrs?.indent?.left ?? 0;
-            const firstLineOffset = (block.attrs?.indent?.firstLine ?? 0) - (block.attrs?.indent?.hanging ?? 0);
+            const indent2 = extractParagraphIndent(block.attrs?.indent);
+            const wordLayout = getWordLayoutConfig(block);
             const isFirstLine = index2 === fragment.fromLine;
-            let indentAdjust = paraIndentLeft;
-            if (isFirstLine && !isListItem) {
-              indentAdjust += firstLineOffset;
-            }
+            const indentAdjust = calculateTextStartIndent({
+              isFirstLine,
+              isListItem: isListItemFlag,
+              markerWidth,
+              paraIndentLeft: indent2.left,
+              firstLineIndent: indent2.firstLine,
+              hangingIndent: indent2.hanging,
+              wordLayout
+            });
             const rectX = fragment.x + indentAdjust + Math.min(startX, endX);
             const rectWidth = Math.max(1, Math.abs(endX - startX));
             const lineOffset = lineHeightBeforeIndex(measure, index2) - lineHeightBeforeIndex(measure, fragment.fromLine);
@@ -91385,9 +91520,12 @@ ${l}
               let blockTopCursor = padding.top + verticalOffset;
               renderedBlocks.forEach((info) => {
                 const paragraphMarkerWidth = info.measure.marker?.markerWidth ?? 0;
-                const isListItem = paragraphMarkerWidth > 0;
-                const alignmentOverride = isListItem ? "left" : void 0;
-                const paraIndentLeft = info.block.kind === "paragraph" ? info.block.attrs?.indent?.left ?? 0 : 0;
+                const cellIsListItem = isListItem(paragraphMarkerWidth, info.block);
+                const alignmentOverride = cellIsListItem ? "left" : void 0;
+                const cellIndent = extractParagraphIndent(
+                  info.block.kind === "paragraph" ? info.block.attrs?.indent : void 0
+                );
+                const cellWordLayout = getWordLayoutConfig(info.block);
                 const intersectingLines = findLinesIntersectingRange(info.block, info.measure, from2, to);
                 intersectingLines.forEach(({ line, index: index2 }) => {
                   if (index2 < info.startLine || index2 >= info.endLine) {
@@ -91403,7 +91541,17 @@ ${l}
                   const availableWidth = Math.max(1, cellMeasure.width - padding.left - padding.right);
                   const startX = mapPmToX(info.block, line, charOffsetFrom, availableWidth, alignmentOverride);
                   const endX = mapPmToX(info.block, line, charOffsetTo, availableWidth, alignmentOverride);
-                  const rectX = fragment.x + cellX + padding.left + paraIndentLeft + Math.min(startX, endX);
+                  const isFirstLine = index2 === info.startLine;
+                  const textIndentAdjust = calculateTextStartIndent({
+                    isFirstLine,
+                    isListItem: cellIsListItem,
+                    markerWidth: paragraphMarkerWidth,
+                    paraIndentLeft: cellIndent.left,
+                    firstLineIndent: cellIndent.firstLine,
+                    hangingIndent: cellIndent.hanging,
+                    wordLayout: cellWordLayout
+                  });
+                  const rectX = fragment.x + cellX + padding.left + textIndentAdjust + Math.min(startX, endX);
                   const rectWidth = Math.max(1, Math.abs(endX - startX));
                   const lineOffset = lineHeightBeforeIndex(info.measure, index2) - lineHeightBeforeIndex(info.measure, info.startLine);
                   const rectY = fragment.y + rowOffset + blockTopCursor + lineOffset;
@@ -98947,18 +99095,78 @@ ${l}
     if (range2.pmStart == null || range2.pmEnd == null) return null;
     const pmOffset = pmPosToCharOffset(block, line, pos);
     const markerWidth = fragment.markerWidth ?? measure.marker?.markerWidth ?? 0;
-    const paraIndentLeft = block.attrs?.indent?.left ?? 0;
-    const paraIndentRight = block.attrs?.indent?.right ?? 0;
-    const availableWidth = Math.max(0, fragment.width - (paraIndentLeft + paraIndentRight));
+    const indent2 = extractParagraphIndent(block.attrs?.indent);
+    const availableWidth = Math.max(0, fragment.width - (indent2.left + indent2.right));
     const charX = measureCharacterX(block, line, pmOffset, availableWidth);
-    const firstLineOffset = (block.attrs?.indent?.firstLine ?? 0) - (block.attrs?.indent?.hanging ?? 0);
     const isFirstLine = index2 === fragment.fromLine;
-    const isListFirstLine = isFirstLine && !fragment.continuesFromPrev && (fragment.markerWidth ?? 0) > 0;
-    let indentAdjust = 0;
-    if (!isListFirstLine) {
-      indentAdjust = paraIndentLeft + (isFirstLine ? firstLineOffset : 0);
+    const isListItemFlag = isListItem(markerWidth, block);
+    const isListFirstLine = isFirstLine && !fragment.continuesFromPrev && isListItemFlag;
+    const wordLayout = getWordLayoutConfig(block);
+    const isFirstLineIndentMode = wordLayout?.firstLineIndentMode === true;
+    if (isListFirstLine && isFirstLineIndentMode) {
+      const textStartPx = calculateTextStartIndent({
+        isFirstLine,
+        isListItem: isListItemFlag,
+        markerWidth,
+        paraIndentLeft: indent2.left,
+        firstLineIndent: indent2.firstLine,
+        hangingIndent: indent2.hanging,
+        wordLayout
+      });
+      const localX2 = fragment.x + textStartPx + charX;
+      const lineOffset2 = __privateMethod$1(this, _PresentationEditor_instances, lineHeightBeforeIndex_fn).call(this, measure.lines, fragment.fromLine, index2);
+      const localY2 = fragment.y + lineOffset2;
+      const result2 = {
+        pageIndex: hit.pageIndex,
+        x: localX2,
+        y: localY2,
+        height: line.lineHeight
+      };
+      const pageEl2 = __privateGet$1(this, _painterHost)?.querySelector(
+        `.superdoc-page[data-page-index="${hit.pageIndex}"]`
+      );
+      const pageRect2 = pageEl2?.getBoundingClientRect();
+      const zoom2 = __privateGet$1(this, _layoutOptions).zoom ?? 1;
+      let domCaretX2 = null;
+      let domCaretY2 = null;
+      const spanEls2 = pageEl2?.querySelectorAll("span[data-pm-start][data-pm-end]") ?? [];
+      for (const spanEl of spanEls2) {
+        const pmStart = Number(spanEl.dataset.pmStart);
+        const pmEnd = Number(spanEl.dataset.pmEnd);
+        if (pos >= pmStart && pos <= pmEnd && spanEl.firstChild?.nodeType === Node.TEXT_NODE) {
+          const textNode = spanEl.firstChild;
+          const charIndex = Math.min(pos - pmStart, textNode.length);
+          const rangeObj = document.createRange();
+          rangeObj.setStart(textNode, charIndex);
+          rangeObj.setEnd(textNode, charIndex);
+          const rangeRect = rangeObj.getBoundingClientRect();
+          if (pageRect2) {
+            domCaretX2 = (rangeRect.left - pageRect2.left) / zoom2;
+            domCaretY2 = (rangeRect.top - pageRect2.top) / zoom2;
+          }
+          break;
+        }
+      }
+      if (includeDomFallback && domCaretX2 != null && domCaretY2 != null) {
+        return {
+          pageIndex: hit.pageIndex,
+          x: domCaretX2,
+          y: domCaretY2,
+          height: line.lineHeight
+        };
+      }
+      return result2;
     }
-    const localX = fragment.x + markerWidth + indentAdjust + charX;
+    const indentAdjust = calculateTextStartIndent({
+      isFirstLine,
+      isListItem: isListItemFlag,
+      markerWidth,
+      paraIndentLeft: indent2.left,
+      firstLineIndent: indent2.firstLine,
+      hangingIndent: indent2.hanging,
+      wordLayout
+    });
+    const localX = fragment.x + indentAdjust + charX;
     const lineOffset = __privateMethod$1(this, _PresentationEditor_instances, lineHeightBeforeIndex_fn).call(this, measure.lines, fragment.fromLine, index2);
     const localY = fragment.y + lineOffset;
     const result = {
@@ -151307,7 +151515,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.86";
+      this.version = "1.0.0-beta.88";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -153779,7 +153987,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexDeSyD44U = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexBLlh97IN = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));