@harbour-enterprises/superdoc 1.3.0 → 1.3.1-next.1

package/dist/superdoc.umd.js

@@ -36435,7 +36435,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.1-next.1") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -62245,7 +62245,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.3.0";
+  const summaryVersion = "1.3.1-next.1";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -64878,7 +64878,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.3.0");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.1-next.1");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -71743,7 +71743,7 @@ ${l}
     return true;
   }
   const LIST_MARKER_GAP$2 = 8;
-  const DEFAULT_TAB_INTERVAL_PX$2 = 48;
+  const DEFAULT_TAB_INTERVAL_PX$1 = 48;
   const DEFAULT_PAGE_HEIGHT_PX = 1056;
   const DEFAULT_VIRTUALIZED_PAGE_GAP$1 = 72;
   const COMMENT_EXTERNAL_COLOR = "#B1124B";
@@ -72777,7 +72777,7 @@ ${l}
                 const textStart = paraIndentLeft + firstLine;
                 tabWidth = textStart - currentPos;
                 if (tabWidth <= 0) {
-                  tabWidth = DEFAULT_TAB_INTERVAL_PX$2 - currentPos % DEFAULT_TAB_INTERVAL_PX$2;
+                  tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
                 } else if (tabWidth < LIST_MARKER_GAP$2) {
                   tabWidth = LIST_MARKER_GAP$2;
                 }
@@ -72929,7 +72929,7 @@ ${l}
                   const textStart = paraIndentLeft + firstLine;
                   tabWidth = textStart - currentPos;
                   if (tabWidth <= 0) {
-                    tabWidth = DEFAULT_TAB_INTERVAL_PX$2 - currentPos % DEFAULT_TAB_INTERVAL_PX$2;
+                    tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
                   } else if (tabWidth < LIST_MARKER_GAP$2) {
                     tabWidth = LIST_MARKER_GAP$2;
                   }
@@ -74277,6 +74277,13 @@ ${l}
       const trackedConfig = this.resolveTrackedChangesConfig(block);
       if (runsForLine.length === 0) {
         const span = this.doc.createElement("span");
+        span.classList.add("superdoc-empty-run");
+        if (lineRange.pmStart != null) {
+          span.dataset.pmStart = String(lineRange.pmStart);
+        }
+        if (lineRange.pmEnd != null) {
+          span.dataset.pmEnd = String(lineRange.pmEnd);
+        }
         span.innerHTML = "&nbsp;";
         el.appendChild(span);
       }
@@ -77521,7 +77528,6 @@ ${l}
   const DEFAULT_LIST_INDENT_STEP_PX = 24;
   const DEFAULT_LIST_HANGING_PX$1 = 18;
   const SPACE_SUFFIX_GAP_PX = 4;
-  const DEFAULT_TAB_INTERVAL_PX$1 = 48;
   function resolveListTextStartPx(wordLayout, indentLeft, firstLine, hanging, measureMarkerText) {
     const marker = wordLayout?.marker;
     if (!marker) {
@@ -77555,9 +77561,13 @@ ${l}
       return markerStartPos + finalMarkerTextWidth;
     }
     const markerJustification = marker.justification ?? "left";
+    const markerWidthEffective = Math.max(
+      typeof marker.markerBoxWidthPx === "number" && Number.isFinite(marker.markerBoxWidthPx) ? marker.markerBoxWidthPx : 0,
+      finalMarkerTextWidth
+    );
     if (markerJustification !== "left") {
-      const gutterWidth = typeof marker.gutterWidthPx === "number" && Number.isFinite(marker.gutterWidthPx) && marker.gutterWidthPx > 0 ? marker.gutterWidthPx : LIST_MARKER_GAP$1;
-      return markerStartPos + finalMarkerTextWidth + Math.max(gutterWidth, LIST_MARKER_GAP$1);
+      const gutterWidth2 = typeof marker.gutterWidthPx === "number" && Number.isFinite(marker.gutterWidthPx) && marker.gutterWidthPx > 0 ? marker.gutterWidthPx : LIST_MARKER_GAP$1;
+      return markerStartPos + finalMarkerTextWidth + Math.max(gutterWidth2, LIST_MARKER_GAP$1);
     }
     if (wordLayout?.firstLineIndentMode === true) {
       let targetTabStop;
@@ -77569,12 +77579,12 @@ ${l}
           }
         }
       }
-      const textStartTarget = typeof marker.textStartX === "number" && Number.isFinite(marker.textStartX) ? marker.textStartX : wordLayout.textStartPx;
+      const textStartTarget2 = typeof marker.textStartX === "number" && Number.isFinite(marker.textStartX) ? marker.textStartX : wordLayout.textStartPx;
       let tabWidth2;
       if (targetTabStop !== void 0) {
         tabWidth2 = targetTabStop - currentPos;
-      } else if (textStartTarget !== void 0 && Number.isFinite(textStartTarget) && textStartTarget > currentPos) {
-        tabWidth2 = textStartTarget - currentPos;
+      } else if (textStartTarget2 !== void 0 && Number.isFinite(textStartTarget2) && textStartTarget2 > currentPos) {
+        tabWidth2 = textStartTarget2 - currentPos;
       } else {
         tabWidth2 = LIST_MARKER_GAP$1;
       }
@@ -77583,14 +77593,21 @@ ${l}
       }
       return markerStartPos + finalMarkerTextWidth + tabWidth2;
     }
+    const textStartTarget = typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
+    const gutterWidth = typeof marker.gutterWidthPx === "number" && Number.isFinite(marker.gutterWidthPx) && marker.gutterWidthPx > 0 ? marker.gutterWidthPx : LIST_MARKER_GAP$1;
+    const currentPosStandard = markerStartPos + markerWidthEffective;
+    if (textStartTarget !== void 0) {
+      const gap = Math.max(textStartTarget - currentPosStandard, gutterWidth);
+      return currentPosStandard + gap;
+    }
     const textStart = indentLeft + firstLine;
-    let tabWidth = textStart - currentPos;
+    let tabWidth = textStart - currentPosStandard;
     if (tabWidth <= 0) {
-      tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
+      tabWidth = gutterWidth;
     } else if (tabWidth < LIST_MARKER_GAP$1) {
-      tabWidth = LIST_MARKER_GAP$1;
+      tabWidth = Math.max(tabWidth, gutterWidth);
     }
-    return markerStartPos + finalMarkerTextWidth + tabWidth;
+    return currentPosStandard + tabWidth;
   }
   function getWordLayoutConfig(block) {
     if (!block || block.kind !== "paragraph") {
@@ -77619,21 +77636,45 @@ ${l}
     return hasHangingIndentPattern;
   }
   function calculateTextStartIndent(params2) {
-    const { isFirstLine, isListItem: isListItem2, markerWidth, paraIndentLeft, firstLineIndent, hangingIndent, wordLayout } = params2;
+    const {
+      isFirstLine,
+      isListItem: isListItem2,
+      markerWidth,
+      markerTextWidth,
+      paraIndentLeft,
+      firstLineIndent,
+      hangingIndent,
+      wordLayout
+    } = params2;
     const firstLineOffset = firstLineIndent - hangingIndent;
-    const isFirstLineIndentMode = wordLayout?.firstLineIndentMode === true;
+    const effectiveMarkerTextWidth = typeof markerTextWidth === "number" && Number.isFinite(markerTextWidth) && markerTextWidth > 0 ? markerTextWidth : markerWidth;
     let indentAdjust = paraIndentLeft;
-    if (isListItem2 && isFirstLine && isFirstLineIndentMode) {
+    if (isListItem2 && isFirstLine) {
       const resolvedTextStart = resolveListTextStartPx(
         wordLayout,
         paraIndentLeft,
         Math.max(firstLineIndent, 0),
         Math.max(hangingIndent, 0),
-        () => markerWidth
-        // Use provided markerWidth since we don't have canvas access here
+        () => effectiveMarkerTextWidth
+        // Use measured marker text width when available
       );
-      const textStartFallback = paraIndentLeft + Math.max(firstLineIndent, 0) + markerWidth;
-      indentAdjust = typeof resolvedTextStart === "number" && Number.isFinite(resolvedTextStart) ? resolvedTextStart : textStartFallback;
+      if (typeof resolvedTextStart === "number" && Number.isFinite(resolvedTextStart)) {
+        indentAdjust = resolvedTextStart;
+      } else {
+        const explicitTextStart = wordLayout?.marker?.textStartX ?? wordLayout?.textStartPx;
+        const isStandardHangingList = hangingIndent > 0 && wordLayout?.firstLineIndentMode !== true;
+        const textStartLooksValid = typeof explicitTextStart === "number" && Number.isFinite(explicitTextStart) && (!isStandardHangingList || explicitTextStart > paraIndentLeft);
+        if (textStartLooksValid) {
+          indentAdjust = explicitTextStart;
+        } else if (wordLayout?.firstLineIndentMode === true) {
+          indentAdjust = paraIndentLeft + Math.max(firstLineIndent, 0) + markerWidth;
+        } else if (isStandardHangingList && effectiveMarkerTextWidth > 0) {
+          const markerStartPos = Math.max(0, paraIndentLeft - hangingIndent + firstLineIndent);
+          const gutterWidthCandidate = wordLayout?.gutterWidthPx;
+          const gutterWidth = typeof gutterWidthCandidate === "number" && Number.isFinite(gutterWidthCandidate) ? gutterWidthCandidate : wordLayout?.marker?.gutterWidthPx ?? LIST_MARKER_GAP$1;
+          indentAdjust = markerStartPos + effectiveMarkerTextWidth + gutterWidth;
+        }
+      }
     } else if (isFirstLine && !isListItem2) {
       indentAdjust += firstLineOffset;
     }
@@ -78484,12 +78525,16 @@ ${l}
     const negativeRightIndent = indentRight < 0 ? indentRight : 0;
     const remeasureWidth = Math.max(1, columnWidth - indentLeft - indentRight);
     let didRemeasureForColumnWidth = false;
+    let remeasuredMarkerInfo;
     if (typeof remeasureParagraph2 === "function" && typeof measurementWidth === "number" && measurementWidth > remeasureWidth) {
       const firstLineIndent = calculateFirstLineIndent(block, measure);
       const newMeasure = remeasureParagraph2(block, columnWidth, firstLineIndent);
       const newLines = normalizeLines(newMeasure);
       lines = newLines;
       didRemeasureForColumnWidth = true;
+      if (newMeasure.marker) {
+        remeasuredMarkerInfo = newMeasure.marker;
+      }
     }
     let fromLine = 0;
     const attrs = getParagraphAttrs(block);
@@ -78528,10 +78573,12 @@ ${l}
         width: fragmentWidth,
         ...computeFragmentPmRange(block, lines, 0, lines.length)
       };
-      if (measure.marker) {
-        fragment.markerWidth = measure.marker.markerWidth;
-        if (measure.marker.markerTextWidth != null) {
-          fragment.markerTextWidth = measure.marker.markerTextWidth;
+      if (measure.marker || remeasuredMarkerInfo) {
+        const effectiveMarkerInfo = remeasuredMarkerInfo ?? measure.marker;
+        fragment.markerWidth = effectiveMarkerInfo?.markerWidth ?? measure.marker?.markerWidth ?? 0;
+        const markerTextWidth = remeasuredMarkerInfo?.markerTextWidth ?? measure.marker?.markerTextWidth;
+        if (markerTextWidth != null) {
+          fragment.markerTextWidth = markerTextWidth;
         }
       }
       state.page.fragments.push(fragment);
@@ -78573,6 +78620,9 @@ ${l}
         const newLines = normalizeLines(newMeasure);
         lines = newLines;
         didRemeasureForFloats = true;
+        if (newMeasure.marker) {
+          remeasuredMarkerInfo = newMeasure.marker;
+        }
       }
     }
     while (fromLine < lines.length) {
@@ -78644,13 +78694,16 @@ ${l}
       if (didRemeasureForColumnWidth) {
         fragment.lines = lines.slice(fromLine, slice.toLine);
       }
-      if (measure.marker && fromLine === 0) {
-        fragment.markerWidth = measure.marker.markerWidth;
-        if (measure.marker.markerTextWidth != null) {
-          fragment.markerTextWidth = measure.marker.markerTextWidth;
+      if ((measure.marker || remeasuredMarkerInfo) && fromLine === 0) {
+        const effectiveMarkerInfo = remeasuredMarkerInfo ?? measure.marker;
+        fragment.markerWidth = effectiveMarkerInfo?.markerWidth ?? measure.marker?.markerWidth ?? 0;
+        const markerTextWidth = remeasuredMarkerInfo?.markerTextWidth ?? measure.marker?.markerTextWidth;
+        if (markerTextWidth != null) {
+          fragment.markerTextWidth = markerTextWidth;
         }
-        if (measure.kind === "paragraph" && measure.marker?.gutterWidth != null) {
-          fragment.markerGutter = measure.marker.gutterWidth;
+        const gutterWidth = remeasuredMarkerInfo?.gutterWidth ?? measure.marker?.gutterWidth;
+        if (gutterWidth != null) {
+          fragment.markerGutter = gutterWidth;
         }
       }
       if (fromLine > 0) fragment.continuesFromPrev = true;
@@ -82093,16 +82146,19 @@ ${l}
     const contentWidth = Math.max(1, maxWidth - indentLeft - indentRight);
     const markerTextStartX = wordLayout?.marker?.textStartX;
     const textStartPx = typeof markerTextStartX === "number" && Number.isFinite(markerTextStartX) ? markerTextStartX : typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
+    let measuredMarkerTextWidth;
     const resolvedTextStartPx = resolveListTextStartPx(
       wordLayout,
       indentLeft,
       indentFirstLine,
       indentHanging,
-      (markerText, marker) => {
+      (markerText, marker2) => {
         const context = getCtx();
         if (!context) return 0;
-        context.font = markerFontString(marker.run);
-        return context.measureText(markerText).width;
+        context.font = markerFontString(marker2.run);
+        const width = context.measureText(markerText).width;
+        measuredMarkerTextWidth = width;
+        return width;
       }
     );
     const effectiveTextStartPx = resolvedTextStartPx ?? textStartPx;
@@ -82193,7 +82249,14 @@ ${l}
       }
     }
     const totalHeight = lines.reduce((s2, l) => s2 + l.lineHeight, 0);
-    return { kind: "paragraph", lines, totalHeight };
+    const marker = wordLayout?.marker;
+    const markerInfo = marker ? {
+      markerWidth: marker.markerBoxWidthPx ?? indentHanging ?? 0,
+      markerTextWidth: measuredMarkerTextWidth ?? 0,
+      indentLeft,
+      gutterWidth: marker.gutterWidthPx
+    } : void 0;
+    return { kind: "paragraph", lines, totalHeight, marker: markerInfo };
   }
   function hasComments(run2) {
     return "comments" in run2 && Array.isArray(run2.comments) && run2.comments.length > 0;
@@ -84245,6 +84308,7 @@ ${l}
               isFirstLine,
               isListItem: isListItemFlag,
               markerWidth,
+              markerTextWidth: fragment.markerTextWidth ?? measure.marker?.markerTextWidth ?? void 0,
               paraIndentLeft: indent2.left,
               firstLineIndent: indent2.firstLine,
               hangingIndent: indent2.hanging,
@@ -84382,6 +84446,7 @@ ${l}
                     isFirstLine,
                     isListItem: cellIsListItem,
                     markerWidth: paragraphMarkerWidth,
+                    markerTextWidth: info.measure?.marker?.markerTextWidth ?? void 0,
                     paraIndentLeft: cellIndent.left,
                     firstLineIndent: cellIndent.firstLine,
                     hangingIndent: cellIndent.hanging,
@@ -84633,25 +84698,36 @@ ${l}
     const range2 = computeLinePmRange(block, line);
     if (range2.pmStart == null || range2.pmEnd == null) return null;
     const result = findCharacterAtX(block, line, x2, range2.pmStart, availableWidthOverride, alignmentOverride);
+    let pmPosition = result.pmPosition;
     if (isRTL) {
       const charOffset = result.charOffset;
       const charsInLine = Math.max(1, line.toChar - line.fromChar);
       const reversedOffset = Math.max(0, Math.min(charsInLine, charsInLine - charOffset));
-      return charOffsetToPm(block, line, reversedOffset, range2.pmStart);
+      pmPosition = charOffsetToPm(block, line, reversedOffset, range2.pmStart);
     }
-    return result.pmPosition;
+    return pmPosition;
   };
   const mapPmToX = (block, line, offset2, fragmentWidth, alignmentOverride) => {
     if (fragmentWidth <= 0 || line.width <= 0) return 0;
     let paraIndentLeft = 0;
     let paraIndentRight = 0;
+    let effectiveLeft = 0;
     if (block.kind === "paragraph") {
       const indentLeft = typeof block.attrs?.indent?.left === "number" ? block.attrs.indent.left : 0;
       const indentRight = typeof block.attrs?.indent?.right === "number" ? block.attrs.indent.right : 0;
       paraIndentLeft = Number.isFinite(indentLeft) ? indentLeft : 0;
       paraIndentRight = Number.isFinite(indentRight) ? indentRight : 0;
+      effectiveLeft = paraIndentLeft;
+      const wl = getWordLayoutConfig(block);
+      const isListParagraph = Boolean(block.attrs?.numberingProperties) || Boolean(wl?.marker);
+      if (isListParagraph) {
+        const explicitTextStart = typeof wl?.marker?.textStartX === "number" && Number.isFinite(wl.marker.textStartX) ? wl.marker.textStartX : typeof wl?.textStartPx === "number" && Number.isFinite(wl.textStartPx) ? wl.textStartPx : void 0;
+        if (typeof explicitTextStart === "number" && explicitTextStart > paraIndentLeft) {
+          effectiveLeft = explicitTextStart;
+        }
+      }
     }
-    const totalIndent = paraIndentLeft + paraIndentRight;
+    const totalIndent = effectiveLeft + paraIndentRight;
     const availableWidth = Math.max(0, fragmentWidth - totalIndent);
     if (totalIndent > fragmentWidth) {
       console.warn(
@@ -85983,16 +86059,26 @@ ${l}
   }
   function computeCaretLayoutRectGeometry({ layout, blocks: blocks2, measures, painterHost, viewportHost, visibleHost, zoom }, pos, includeDomFallback = true) {
     if (!layout) return null;
-    const hit = getFragmentAtPosition(layout, blocks2, measures, pos);
+    let effectivePos = pos;
+    let hit = getFragmentAtPosition(layout, blocks2, measures, pos);
     if (!hit) {
-      return null;
+      const fallbackCandidates = [pos - 1, pos + 1, pos - 2, pos + 2].filter((candidate) => candidate >= 0);
+      for (const candidate of fallbackCandidates) {
+        const fallbackHit = getFragmentAtPosition(layout, blocks2, measures, candidate);
+        if (fallbackHit) {
+          hit = fallbackHit;
+          effectivePos = candidate;
+          break;
+        }
+      }
+      if (!hit) return null;
     }
     const block = hit.block;
     const measure = hit.measure;
     if (hit.fragment.kind === "table" && block?.kind === "table" && measure?.kind === "table") {
       return computeTableCaretLayoutRectFromDom(
         { viewportHost, visibleHost, zoom },
-        pos,
+        effectivePos,
         hit.fragment,
         block,
         measure,
@@ -86000,92 +86086,32 @@ ${l}
       );
     }
     if (!block || block.kind !== "paragraph" || measure?.kind !== "paragraph") return null;
-    if (hit.fragment.kind !== "para") {
-      return null;
-    }
+    if (hit.fragment.kind !== "para") return null;
     const fragment = hit.fragment;
-    const lineInfo = findLineContainingPos(block, measure, fragment.fromLine, fragment.toLine, pos);
-    if (!lineInfo) {
-      return null;
-    }
+    const lineInfo = findLineContainingPos(block, measure, fragment.fromLine, fragment.toLine, effectivePos);
+    if (!lineInfo) return null;
     const { line, index: index2 } = lineInfo;
     const range2 = computeLinePmRange(block, line);
     if (range2.pmStart == null || range2.pmEnd == null) return null;
-    const pmOffset = pmPosToCharOffset(block, line, pos);
+    const pmOffset = pmPosToCharOffset(block, line, effectivePos);
     const markerWidth = fragment.markerWidth ?? measure.marker?.markerWidth ?? 0;
-    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 markerTextWidth = fragment.markerTextWidth ?? measure.marker?.markerTextWidth ?? void 0;
     const isFirstLine = index2 === fragment.fromLine;
     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 = lineHeightBeforeIndex(measure.lines, fragment.fromLine, index2);
-      const localY2 = fragment.y + lineOffset2;
-      const result2 = {
-        pageIndex: hit.pageIndex,
-        x: localX2,
-        y: localY2,
-        height: line.lineHeight
-      };
-      const pageEl2 = painterHost?.querySelector(
-        `.superdoc-page[data-page-index="${hit.pageIndex}"]`
-      );
-      const pageRect2 = pageEl2?.getBoundingClientRect();
-      let domCaretX2 = null;
-      let domCaretY2 = null;
-      const spanEls2 = pageEl2?.querySelectorAll("span[data-pm-start][data-pm-end]");
-      for (const spanEl of Array.from(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);
-          if (typeof rangeObj.getBoundingClientRect !== "function") {
-            break;
-          }
-          const rangeRect = rangeObj.getBoundingClientRect();
-          if (pageRect2) {
-            domCaretX2 = (rangeRect.left - pageRect2.left) / zoom;
-            domCaretY2 = (rangeRect.top - pageRect2.top) / zoom;
-          }
-          break;
-        }
-      }
-      if (includeDomFallback && domCaretX2 != null && domCaretY2 != null) {
-        return {
-          pageIndex: hit.pageIndex,
-          x: domCaretX2,
-          y: domCaretY2,
-          height: line.lineHeight
-        };
-      }
-      return result2;
-    }
+    const indent2 = extractParagraphIndent(block.attrs?.indent);
     const indentAdjust = calculateTextStartIndent({
       isFirstLine,
       isListItem: isListItemFlag,
       markerWidth,
+      markerTextWidth,
       paraIndentLeft: indent2.left,
       firstLineIndent: indent2.firstLine,
       hangingIndent: indent2.hanging,
       wordLayout
     });
+    const availableWidth = Math.max(0, fragment.width - (indentAdjust + indent2.right));
+    const charX = measureCharacterX(block, line, pmOffset, availableWidth);
     const localX = fragment.x + indentAdjust + charX;
     const lineOffset = lineHeightBeforeIndex(measure.lines, fragment.fromLine, index2);
     const localY = fragment.y + lineOffset;
@@ -86103,9 +86129,9 @@ ${l}
     for (const spanEl of Array.from(spanEls ?? [])) {
       const pmStart = Number(spanEl.dataset.pmStart);
       const pmEnd = Number(spanEl.dataset.pmEnd);
-      if (pos >= pmStart && pos <= pmEnd && spanEl.firstChild?.nodeType === Node.TEXT_NODE) {
+      if (effectivePos >= pmStart && effectivePos <= pmEnd && spanEl.firstChild?.nodeType === Node.TEXT_NODE) {
         const textNode = spanEl.firstChild;
-        const charIndex = Math.min(pos - pmStart, textNode.length);
+        const charIndex = Math.min(effectivePos - pmStart, textNode.length);
         const rangeObj = document.createRange();
         rangeObj.setStart(textNode, charIndex);
         rangeObj.setEnd(textNode, charIndex);
@@ -99257,7 +99283,12 @@ ${l}
       }
       if (!handledByDepth) {
         try {
-          const tr = this.#editor.state.tr.setSelection(TextSelection$1.create(this.#editor.state.doc, hit.pos));
+          const doc22 = this.#editor.state.doc;
+          let nextSelection = TextSelection$1.create(doc22, hit.pos);
+          if (!nextSelection.$from.parent.inlineContent) {
+            nextSelection = Selection.near(doc22.resolve(hit.pos), 1);
+          }
+          const tr = this.#editor.state.tr.setSelection(nextSelection);
           this.#editor.view?.dispatch(tr);
         } catch {
         }
@@ -100235,6 +100266,7 @@ ${l}
       if (!layout) {
         return;
       }
+      const { from: from2, to } = selection;
       const docEpoch = this.#epochMapper.getCurrentEpoch();
       if (this.#layoutEpoch < docEpoch) {
         return;
@@ -100249,7 +100281,6 @@ ${l}
         }
         return;
       }
-      const { from: from2, to } = selection;
       if (from2 === to) {
         const caretLayout = this.#computeCaretLayoutRect(from2);
         if (!caretLayout) {
@@ -104836,6 +104867,28 @@ ${l}
     }
     return markDefs;
   };
+  const normalizeSelectionIntoRun = (tr, runType) => {
+    const selection = tr.selection;
+    if (!(selection instanceof TextSelection$1)) return;
+    if (selection.from !== selection.to) return;
+    const $pos = tr.doc.resolve(selection.from);
+    if ($pos.parent.type === runType) return;
+    const nodeAfter = $pos.nodeAfter;
+    if (nodeAfter?.type === runType && nodeAfter.content.size > 0) {
+      const nextPos = selection.from + 1;
+      if (nextPos <= tr.doc.content.size) {
+        tr.setSelection(TextSelection$1.create(tr.doc, nextPos));
+      }
+      return;
+    }
+    const nodeBefore = $pos.nodeBefore;
+    if (nodeBefore?.type === runType && nodeBefore.content.size > 0) {
+      const prevPos = selection.from - 1;
+      if (prevPos >= 0) {
+        tr.setSelection(TextSelection$1.create(tr.doc, prevPos));
+      }
+    }
+  };
   const buildWrapTransaction = (state, ranges, runType, editor, markDefsFromMeta = []) => {
     if (!ranges.length) return null;
     const replacements = [];
@@ -104869,6 +104922,7 @@ ${l}
     if (!replacements.length) return null;
     const tr = state.tr;
     replacements.sort((a2, b2) => b2.from - a2.from).forEach(({ from: from2, to, runNode }) => tr.replaceWith(from2, to, runNode));
+    normalizeSelectionIntoRun(tr, runType);
     return tr.docChanged ? tr : null;
   };
   const wrapTextInRunsPlugin = (editor) => {
@@ -119817,6 +119871,7 @@ ${l}
     const parentItem = ref(null);
     const iconColor = ref(options.iconColor);
     const hasCaret = ref(options.hasCaret);
+    const restoreEditorFocus = Boolean(options.restoreEditorFocus);
     const dropdownStyles = ref(options.dropdownStyles);
     const tooltip = ref(options.tooltip);
     const tooltipVisible = ref(options.tooltipVisible);
@@ -119892,6 +119947,7 @@ ${l}
       hideLabel,
       inlineTextInputVisible,
       hasInlineTextInput,
+      restoreEditorFocus,
       markName,
       labelAttr,
       childItem,
@@ -122205,6 +122261,7 @@ ${l}
       command: "toggleBulletList",
       icon: toolbarIcons2.bulletList,
       tooltip: toolbarTexts2.bulletList,
+      restoreEditorFocus: true,
       attributes: {
         ariaLabel: "Bullet list"
       }
@@ -122215,6 +122272,7 @@ ${l}
       command: "toggleOrderedList",
       icon: toolbarIcons2.numberedList,
       tooltip: toolbarTexts2.numberedList,
+      restoreEditorFocus: true,
       attributes: {
         ariaLabel: "Numbered list"
       }
@@ -135114,6 +135172,7 @@ ${style2}
         selectionUpdate: null,
         focus: null
       };
+      this._restoreFocusTimeoutId = null;
       if (!this.config.selector && this.config.element) {
         this.config.selector = this.config.element;
       }
@@ -135779,6 +135838,7 @@ ${style2}
       const wasFocused = Boolean(typeof hasFocusFn === "function" && hasFocusFn.call(this.activeEditor.view));
       const { command: command2 } = item;
       const isMarkToggle = this.isMarkToggle(item);
+      const shouldRestoreFocus = Boolean(item?.restoreEditorFocus);
       if (!wasFocused && isMarkToggle) {
         this.pendingMarkCommands.push({ command: command2, argument, item });
         item?.activate?.();
@@ -135809,6 +135869,13 @@ ${style2}
       }
       if (isMarkToggle) this.#syncStickyMarksFromState();
       this.updateToolbarState();
+      if (shouldRestoreFocus && this.activeEditor && !this.activeEditor.options.isHeaderOrFooter) {
+        this._restoreFocusTimeoutId = setTimeout(() => {
+          this._restoreFocusTimeoutId = null;
+          if (!this.activeEditor || this.activeEditor.options.isHeaderOrFooter) return;
+          this.activeEditor.focus();
+        }, 0);
+      }
     }
     /**
      * Processes and executes pending mark commands when editor selection updates.
@@ -135951,6 +136018,17 @@ ${style2}
       const tr = state.tr.setStoredMarks([mark2]);
       view.dispatch(tr);
     }
+    /**
+     * Cleans up resources when the toolbar is destroyed.
+     * Clears any pending timeouts to prevent callbacks firing after unmount.
+     * @returns {void}
+     */
+    destroy() {
+      if (this._restoreFocusTimeoutId !== null) {
+        clearTimeout(this._restoreFocusTimeoutId);
+        this._restoreFocusTimeoutId = null;
+      }
+    }
   }
   async function createZip(blobs, fileNames) {
     const zip = new JSZip();
@@ -144479,7 +144557,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.0";
+      this.version = "1.3.1-next.1";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;