superdoc 1.0.0-beta.65 → 1.0.0-beta.66

package/dist/chunks/{super-editor.es-BHjskxiY.cjs → super-editor.es-CLrhh2DY.cjs}

@@ -42326,7 +42326,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.65") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.66") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -45638,7 +45638,7 @@ var __privateGet$1 = (obj, member, getter) => (__accessCheck$1(obj, member, "rea
 var __privateAdd$1 = (obj, member, value) => member.has(obj) ? __typeError$1("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck$1(obj, member, "write to private field"), member.set(obj, value), value);
 var __privateMethod$1 = (obj, member, method) => (__accessCheck$1(obj, member, "access private method"), method);
-var _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, dispatchWithFallback_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, getPluginKeyName_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _map, _editor2, _descriptors, _collections, _editorEntries, _maxCachedEditors, _editorAccessOrder, _pendingCreations, _cacheHits, _cacheMisses, _evictions, _HeaderFooterEditorManager_instances, hasConverter_fn, extractCollections_fn, collectDescriptors_fn, teardownMissingEditors_fn, teardownEditors_fn, createEditor_fn, createEditorContainer_fn, registerConverterEditor_fn, unregisterConverterEditor_fn, updateAccessOrder_fn, enforceCacheSizeLimit_fn, _manager, _mediaFiles, _blockCache, _HeaderFooterLayoutAdapter_instances, getBlocks_fn, getConverterContext_fn, _selectionOverlay, _activeEditorHost, _activeDecorationContainer, _activeRegion, _borderLine, _dimmingOverlay, _EditorOverlayManager_instances, findDecorationContainer_fn, ensureEditorHost_fn, positionEditorHost_fn, showHeaderFooterBorder_fn, hideHeaderFooterBorder_fn, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay2, _hiddenHost, _layoutOptions, _layoutState, _domPainter, _dragHandlerCleanup, _layoutError, _layoutErrorState, _errorBanner, _errorBannerMessage, _telemetryEmitter, _renderScheduled, _pendingDocChange, _isRerendering, _selectionUpdateScheduled, _remoteCursorUpdateScheduled, _rafHandle, _editorListeners, _sectionMetadata, _documentMode, _inputBridge, _trackedChangesMode, _trackedChangesEnabled, _trackedChangesOverrides, _headerFooterManager, _headerFooterAdapter, _headerFooterIdentifier, _multiSectionIdentifier, _headerLayoutResults, _footerLayoutResults, _headerLayoutsByRId, _footerLayoutsByRId, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _overlayManager, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _lastSelectedImageBlockId, _dragAnchor, _isDragging, _dragExtensionMode, _remoteCursorState, _remoteCursorElements, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _scrollTimeout, _lastRemoteCursorRenderTime, _remoteCursorThrottleTimeout, _PresentationEditor_instances, collectCommentPositions_fn, aggregateLayoutBounds_fn, safeCleanup_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, updateLocalAwarenessCursor_fn, normalizeAwarenessStates_fn, getFallbackColor_fn, getValidatedColor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, renderRemoteCaret_fn, renderRemoteCursorLabel_fn, renderRemoteSelection_fn, setupPointerHandlers_fn, setupDragHandlers_fn, focusEditorAfterImageSelection_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, selectWordAt_fn, selectParagraphAt_fn, calculateExtendedSelection_fn, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handlePointerUp, _handleDragOver, _handleDrop, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, layoutPerRIdHeaderFooters_fn, updateDecorationProviders_fn, createDecorationProvider_fn, findHeaderFooterPageForPageNumber_fn, computeDecorationBox_fn, computeExpectedSectionType_fn, rebuildHeaderFooterRegions_fn, hitTestHeaderFooterRegion_fn, pointInRegion_fn, activateHeaderFooterRegion_fn, enterHeaderFooterMode_fn, exitHeaderFooterMode_fn, getActiveDomTarget_fn, emitHeaderFooterModeChanged_fn, emitHeaderFooterEditingContext_fn, updateAwarenessSession_fn, updateModeBanner_fn, announce_fn, validateHeaderFooterEditPermission_fn, emitHeaderFooterEditBlocked_fn, resolveDescriptorForRegion_fn, createDefaultHeaderFooter_fn, getPageElement_fn, scrollPageIntoView_fn, computeAnchorMap_fn, waitForPageMount_fn, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderSelectionRects_fn, renderHoverRegion_fn, clearHoverRegion_fn, renderCaretOverlay_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, syncTrackedChangesPreferences_fn, deriveTrackedChangesMode_fn, deriveTrackedChangesEnabled_fn, getTrackChangesPluginState_fn, computeDefaultLayoutDefaults_fn, parseColumns_fn, inchesToPx_fn, applyZoom_fn, createLayoutMetrics_fn, convertPageLocalToOverlayCoords_fn, normalizeClientPoint_fn, computeCaretLayoutRect_fn, computeCaretLayoutRectFromDOM_fn, computeTableCaretLayoutRect_fn, findLineContainingPos_fn, lineHeightBeforeIndex_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, createHiddenHost_fn, _windowRoot, _layoutSurfaces, _getTargetDom, _isEditable, _onTargetChanged, _listeners, _currentTarget, _destroyed, _useWindowFallback, _PresentationInputBridge_instances, addListener_fn, dispatchToTarget_fn, forwardKeyboardEvent_fn, forwardTextEvent_fn, forwardCompositionEvent_fn, forwardContextMenu_fn, isEventOnActiveTarget_fn, shouldSkipSurface_fn, isInLayoutSurface_fn, getListenerTargets_fn, isPlainCharacterKey_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ParagraphNodeView_instances, checkShouldUpdate_fn, updateHTMLAttributes_fn, updateDOMStyles_fn, resolveNeighborParagraphProperties_fn, updateListStyles_fn, initList_fn, checkIsList_fn, createMarker_fn, createSeparator_fn, calculateTabSeparatorStyle_fn, calculateMarkerStyle_fn, removeList_fn, getParagraphContext_fn, scheduleAnimation_fn, cancelScheduledAnimation_fn, _FieldAnnotationView_instances, createAnnotation_fn, _AutoPageNumberNodeView_instances, renderDom_fn, scheduleUpdateNodeStyle_fn, _VectorShapeView_instances, ensureParentPositioned_fn, _ShapeGroupView_instances, ensureParentPositioned_fn2;
+var _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, dispatchWithFallback_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, getPluginKeyName_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _map, _editor2, _descriptors, _collections, _editorEntries, _maxCachedEditors, _editorAccessOrder, _pendingCreations, _cacheHits, _cacheMisses, _evictions, _HeaderFooterEditorManager_instances, hasConverter_fn, extractCollections_fn, collectDescriptors_fn, teardownMissingEditors_fn, teardownEditors_fn, createEditor_fn, createEditorContainer_fn, registerConverterEditor_fn, unregisterConverterEditor_fn, updateAccessOrder_fn, enforceCacheSizeLimit_fn, _manager, _mediaFiles, _blockCache, _HeaderFooterLayoutAdapter_instances, getBlocks_fn, getConverterContext_fn, _selectionOverlay, _activeEditorHost, _activeDecorationContainer, _activeRegion, _borderLine, _dimmingOverlay, _EditorOverlayManager_instances, findDecorationContainer_fn, ensureEditorHost_fn, positionEditorHost_fn, showHeaderFooterBorder_fn, hideHeaderFooterBorder_fn, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay2, _hiddenHost, _layoutOptions, _layoutState, _domPainter, _dragHandlerCleanup, _layoutError, _layoutErrorState, _errorBanner, _errorBannerMessage, _telemetryEmitter, _renderScheduled, _pendingDocChange, _isRerendering, _selectionUpdateScheduled, _remoteCursorUpdateScheduled, _rafHandle, _editorListeners, _sectionMetadata, _documentMode, _inputBridge, _trackedChangesMode, _trackedChangesEnabled, _trackedChangesOverrides, _headerFooterManager, _headerFooterAdapter, _headerFooterIdentifier, _multiSectionIdentifier, _headerLayoutResults, _footerLayoutResults, _headerLayoutsByRId, _footerLayoutsByRId, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _overlayManager, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _lastSelectedImageBlockId, _dragAnchor, _isDragging, _dragExtensionMode, _remoteCursorState, _remoteCursorElements, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _scrollTimeout, _lastRemoteCursorRenderTime, _remoteCursorThrottleTimeout, _PresentationEditor_instances, collectCommentPositions_fn, aggregateLayoutBounds_fn, safeCleanup_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, updateLocalAwarenessCursor_fn, normalizeAwarenessStates_fn, getFallbackColor_fn, getValidatedColor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, renderRemoteCaret_fn, renderRemoteCursorLabel_fn, renderRemoteSelection_fn, setupPointerHandlers_fn, setupDragHandlers_fn, focusEditorAfterImageSelection_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, selectWordAt_fn, selectParagraphAt_fn, calculateExtendedSelection_fn, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handlePointerUp, _handleDragOver, _handleDrop, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, layoutPerRIdHeaderFooters_fn, updateDecorationProviders_fn, createDecorationProvider_fn, findHeaderFooterPageForPageNumber_fn, computeDecorationBox_fn, computeExpectedSectionType_fn, rebuildHeaderFooterRegions_fn, hitTestHeaderFooterRegion_fn, pointInRegion_fn, activateHeaderFooterRegion_fn, enterHeaderFooterMode_fn, exitHeaderFooterMode_fn, getActiveDomTarget_fn, emitHeaderFooterModeChanged_fn, emitHeaderFooterEditingContext_fn, updateAwarenessSession_fn, updateModeBanner_fn, announce_fn, validateHeaderFooterEditPermission_fn, emitHeaderFooterEditBlocked_fn, resolveDescriptorForRegion_fn, createDefaultHeaderFooter_fn, getPageElement_fn, scrollPageIntoView_fn, computeAnchorMap_fn, waitForPageMount_fn, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, applyDomCorrectionToRects_fn, renderSelectionRects_fn, renderHoverRegion_fn, clearHoverRegion_fn, renderCaretOverlay_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, syncTrackedChangesPreferences_fn, deriveTrackedChangesMode_fn, deriveTrackedChangesEnabled_fn, getTrackChangesPluginState_fn, computeDefaultLayoutDefaults_fn, parseColumns_fn, inchesToPx_fn, applyZoom_fn, createLayoutMetrics_fn, convertPageLocalToOverlayCoords_fn, computeDomCaretPageLocal_fn, normalizeClientPoint_fn, computeCaretLayoutRectGeometry_fn, computeCaretLayoutRect_fn, computeTableCaretLayoutRect_fn, findLineContainingPos_fn, lineHeightBeforeIndex_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, createHiddenHost_fn, _windowRoot, _layoutSurfaces, _getTargetDom, _isEditable, _onTargetChanged, _listeners, _currentTarget, _destroyed, _useWindowFallback, _PresentationInputBridge_instances, addListener_fn, dispatchToTarget_fn, forwardKeyboardEvent_fn, forwardTextEvent_fn, forwardCompositionEvent_fn, forwardContextMenu_fn, isEventOnActiveTarget_fn, shouldSkipSurface_fn, isInLayoutSurface_fn, getListenerTargets_fn, isPlainCharacterKey_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ParagraphNodeView_instances, checkShouldUpdate_fn, updateHTMLAttributes_fn, updateDOMStyles_fn, resolveNeighborParagraphProperties_fn, updateListStyles_fn, initList_fn, checkIsList_fn, createMarker_fn, createSeparator_fn, calculateTabSeparatorStyle_fn, calculateMarkerStyle_fn, removeList_fn, getParagraphContext_fn, scheduleAnimation_fn, cancelScheduledAnimation_fn, _FieldAnnotationView_instances, createAnnotation_fn, _AutoPageNumberNodeView_instances, renderDom_fn, scheduleUpdateNodeStyle_fn, _VectorShapeView_instances, ensureParentPositioned_fn, _ShapeGroupView_instances, ensureParentPositioned_fn2;
 var GOOD_LEAF_SIZE = 200;
 var RopeSequence = function RopeSequence2() {
 };
@@ -59515,7 +59515,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.65";
+const summaryVersion = "1.0.0-beta.66";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -60304,7 +60304,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-YSWS94Jr-C7xFStTB.cjs")),
+      Promise.resolve().then(() => require("./index-Bjv0_slj-CIZ6x5_a.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")),
@@ -60509,7 +60509,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.65");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.66");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -68014,6 +68014,7 @@ function tableNodeToBlock(node, nextBlockId, positions, defaultFont, defaultSize
 let measurementCanvas = null;
 let measurementCtx = null;
 const TAB_CHAR_LENGTH = 1;
+const SPACE_CHARS = /* @__PURE__ */ new Set([" ", " "]);
 const isTabRun$1 = (run2) => run2?.kind === "tab";
 function getMeasurementContext() {
   if (measurementCtx) return measurementCtx;
@@ -68030,6 +68031,41 @@ function getMeasurementContext() {
   }
   return measurementCtx;
 }
+const countSpaces = (text) => {
+  let spaces = 0;
+  for (let i = 0; i < text.length; i += 1) {
+    if (SPACE_CHARS.has(text[i])) {
+      spaces += 1;
+    }
+  }
+  return spaces;
+};
+const getJustifyAdjustment = (block, line, availableWidthOverride) => {
+  if (block.kind !== "paragraph") {
+    return { extraPerSpace: 0, totalSpaces: 0 };
+  }
+  const alignment2 = block.attrs?.alignment;
+  const hasExplicitPositioning = line.segments?.some((seg) => seg.x !== void 0);
+  const availableWidth = availableWidthOverride ?? line.maxWidth ?? line.width;
+  const slack = Math.max(0, availableWidth - line.width);
+  if (alignment2 !== "justify" || hasExplicitPositioning || slack <= 0) {
+    return { extraPerSpace: 0, totalSpaces: 0 };
+  }
+  const runs = sliceRunsForLine$1(block, line);
+  const totalSpaces = runs.reduce((sum, run2) => {
+    if (isTabRun$1(run2) || "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation") {
+      return sum;
+    }
+    return sum + countSpaces(run2.text ?? "");
+  }, 0);
+  if (totalSpaces <= 0) {
+    return { extraPerSpace: 0, totalSpaces: 0 };
+  }
+  return {
+    extraPerSpace: slack / totalSpaces,
+    totalSpaces
+  };
+};
 function getRunFontString(run2) {
   if (run2.kind === "tab" || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" || "src" in run2) {
     return "normal normal 16px Arial";
@@ -68087,9 +68123,15 @@ function sliceRunsForLine$1(block, line) {
   }
   return result;
 }
-function measureCharacterX(block, line, charOffset) {
+function measureCharacterX(block, line, charOffset, availableWidthOverride) {
   const ctx2 = getMeasurementContext();
+  const availableWidth = availableWidthOverride ?? line.maxWidth ?? // Fallback: if no maxWidth, approximate available width as line width (no slack)
+  line.width;
+  const justify = getJustifyAdjustment(block, line, availableWidth);
+  const renderedLineWidth = line.width + Math.max(0, availableWidth - line.width);
+  const alignment2 = block.kind === "paragraph" ? block.attrs?.alignment : void 0;
   const hasExplicitPositioning = line.segments?.some((seg) => seg.x !== void 0);
+  const alignmentOffset = !hasExplicitPositioning && alignment2 === "center" ? Math.max(0, (availableWidth - renderedLineWidth) / 2) : !hasExplicitPositioning && alignment2 === "right" ? Math.max(0, availableWidth - renderedLineWidth) : 0;
   if (hasExplicitPositioning && line.segments && ctx2) {
     return measureCharacterXSegmentBased(block, line, charOffset, ctx2);
   }
@@ -68104,11 +68146,12 @@ function measureCharacterX(block, line, charOffset) {
         return sum + (run2.text ?? "").length;
       }, 0)
     );
-    return charOffset / charsInLine * line.width;
+    return charOffset / charsInLine * renderedLineWidth;
   }
   const runs = sliceRunsForLine$1(block, line);
   let currentX = 0;
   let currentCharOffset = 0;
+  let spaceTally = 0;
   for (const run2 of runs) {
     if (isTabRun$1(run2)) {
       const runLength2 = TAB_CHAR_LENGTH;
@@ -68129,14 +68172,18 @@ function measureCharacterX(block, line, charOffset) {
       const textUpToTarget = text.slice(0, offsetInRun);
       const measured2 = ctx2.measureText(textUpToTarget);
       const spacingWidth = computeLetterSpacingWidth(run2, offsetInRun, runLength);
-      return currentX + measured2.width + spacingWidth;
+      const spacesInPortion = justify.extraPerSpace > 0 ? countSpaces(textUpToTarget) : 0;
+      return alignmentOffset + currentX + measured2.width + spacingWidth + justify.extraPerSpace * (spaceTally + spacesInPortion);
     }
     ctx2.font = getRunFontString(run2);
     const measured = ctx2.measureText(text);
-    currentX += measured.width + computeLetterSpacingWidth(run2, runLength, runLength);
+    const runLetterSpacing = computeLetterSpacingWidth(run2, runLength, runLength);
+    const spacesInRun = justify.extraPerSpace > 0 ? countSpaces(text) : 0;
+    currentX += measured.width + runLetterSpacing + justify.extraPerSpace * spacesInRun;
+    spaceTally += spacesInRun;
     currentCharOffset += runLength;
   }
-  return currentX;
+  return alignmentOffset + currentX;
 }
 function measureCharacterXSegmentBased(block, line, charOffset, ctx2) {
   if (block.kind !== "paragraph" || !line.segments) return 0;
@@ -68211,8 +68258,15 @@ function charOffsetToPm(block, line, charOffset, fallbackPmStart) {
   }
   return lastPm;
 }
-function findCharacterAtX(block, line, x2, pmStart) {
+function findCharacterAtX(block, line, x2, pmStart, availableWidthOverride) {
   const ctx2 = getMeasurementContext();
+  const availableWidth = availableWidthOverride ?? line.maxWidth ?? // Fallback: approximate with line width when no maxWidth is present
+  line.width;
+  const justify = getJustifyAdjustment(block, line, availableWidth);
+  const renderedLineWidth = line.width + Math.max(0, availableWidth - line.width);
+  const alignment2 = block.kind === "paragraph" ? block.attrs?.alignment : void 0;
+  const hasExplicitPositioning = line.segments?.some((seg) => seg.x !== void 0);
+  const alignmentOffset = !hasExplicitPositioning && alignment2 === "center" ? Math.max(0, (availableWidth - renderedLineWidth) / 2) : !hasExplicitPositioning && alignment2 === "right" ? Math.max(0, availableWidth - renderedLineWidth) : 0;
   if (!ctx2) {
     const runs2 = sliceRunsForLine$1(block, line);
     const charsInLine = Math.max(
@@ -68224,7 +68278,7 @@ function findCharacterAtX(block, line, x2, pmStart) {
         return sum + (run2.text ?? "").length;
       }, 0)
     );
-    const ratio = Math.max(0, Math.min(1, x2 / line.width));
+    const ratio = Math.max(0, Math.min(1, (x2 - alignmentOffset) / renderedLineWidth));
     const charOffset = Math.round(ratio * charsInLine);
     const pmPosition2 = charOffsetToPm(block, line, charOffset, pmStart);
     return {
@@ -68233,9 +68287,10 @@ function findCharacterAtX(block, line, x2, pmStart) {
     };
   }
   const runs = sliceRunsForLine$1(block, line);
-  const safeX = Math.max(0, Math.min(line.width, x2));
+  const safeX = Math.max(0, Math.min(renderedLineWidth, x2 - alignmentOffset));
   let currentX = 0;
   let currentCharOffset = 0;
+  let spaceTally = 0;
   for (const run2 of runs) {
     if (isTabRun$1(run2)) {
       const tabWidth = run2.width ?? 0;
@@ -68262,7 +68317,8 @@ function findCharacterAtX(block, line, x2, pmStart) {
     for (let i = 0; i <= runLength; i++) {
       const textUpToChar = text.slice(0, i);
       const measured2 = ctx2.measureText(textUpToChar);
-      const charX = currentX + measured2.width + computeLetterSpacingWidth(run2, i, runLength);
+      const spacesInPortion = justify.extraPerSpace > 0 ? countSpaces(textUpToChar) : 0;
+      const charX = currentX + measured2.width + computeLetterSpacingWidth(run2, i, runLength) + justify.extraPerSpace * (spaceTally + spacesInPortion);
       if (charX >= safeX) {
         if (i === 0) {
           const pmPosition3 = charOffsetToPm(block, line, currentCharOffset, pmStart);
@@ -68285,7 +68341,10 @@ function findCharacterAtX(block, line, x2, pmStart) {
       }
     }
     const measured = ctx2.measureText(text);
-    currentX += measured.width + computeLetterSpacingWidth(run2, runLength, runLength);
+    const runLetterSpacing = computeLetterSpacingWidth(run2, runLength, runLength);
+    const spacesInRun = justify.extraPerSpace > 0 ? countSpaces(text) : 0;
+    currentX += measured.width + runLetterSpacing + justify.extraPerSpace * spacesInRun;
+    spaceTally += spacesInRun;
     currentCharOffset += runLength;
   }
   const pmPosition = charOffsetToPm(block, line, currentCharOffset, pmStart);
@@ -80902,7 +80961,10 @@ function clickToPosition(layout, blocks, measures, containerPoint, domContainer,
     }
     const line = measure.lines[lineIndex];
     const isRTL = isRtlBlock(block);
-    const pos = mapPointToPm(block, line, pageRelativePoint.x - fragment.x, isRTL);
+    const paraIndentLeft = block.attrs?.indent?.left ?? 0;
+    const paraIndentRight = block.attrs?.indent?.right ?? 0;
+    const availableWidth = Math.max(0, fragment.width - (paraIndentLeft + paraIndentRight));
+    const pos = mapPointToPm(block, line, pageRelativePoint.x - fragment.x, isRTL, availableWidth);
     if (pos == null) {
       logClickStage("warn", "no-position", {
         blockId: fragment.blockId
@@ -80933,7 +80995,10 @@ function clickToPosition(layout, blocks, measures, containerPoint, domContainer,
     if (lineIndex != null) {
       const line = cellMeasure.lines[lineIndex];
       const isRTL = isRtlBlock(cellBlock);
-      const pos = mapPointToPm(cellBlock, line, localX, isRTL);
+      const paraIndentLeft = cellBlock.attrs?.indent?.left ?? 0;
+      const paraIndentRight = cellBlock.attrs?.indent?.right ?? 0;
+      const availableWidth = Math.max(0, tableHit.fragment.width - (paraIndentLeft + paraIndentRight));
+      const pos = mapPointToPm(cellBlock, line, localX, isRTL, availableWidth);
       if (pos != null) {
         logClickStage("log", "success", {
           blockId: tableHit.fragment.blockId,
@@ -81092,7 +81157,15 @@ function selectionToRects(layout, blocks, measures, from2, to) {
           const startX = mapPmToX(block, line, charOffsetFrom, fragment.width);
           const endX = mapPmToX(block, line, charOffsetTo, fragment.width);
           const markerWidth = fragment.markerWidth ?? measure.marker?.markerWidth ?? 0;
-          const rectX = fragment.x + markerWidth + Math.min(startX, endX);
+          const paraIndentLeft = block.attrs?.indent?.left ?? 0;
+          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 rectX = fragment.x + markerWidth + indentAdjust + Math.min(startX, endX);
           const rectWidth = Math.max(1, Math.abs(endX - startX));
           const lineOffset = lineHeightBeforeIndex(measure, index2) - lineHeightBeforeIndex(measure, fragment.fromLine);
           const rectY = fragment.y + lineOffset;
@@ -81468,11 +81541,11 @@ const lineHeightBeforeIndex = (measure, absoluteLineIndex) => {
   }
   return height;
 };
-const mapPointToPm = (block, line, x2, isRTL) => {
+const mapPointToPm = (block, line, x2, isRTL, availableWidthOverride) => {
   if (block.kind !== "paragraph") return null;
   const range2 = computeLinePmRange(block, line);
   if (range2.pmStart == null || range2.pmEnd == null) return null;
-  const result = findCharacterAtX(block, line, x2, range2.pmStart);
+  const result = findCharacterAtX(block, line, x2, range2.pmStart, availableWidthOverride);
   if (isRTL) {
     const charOffset = result.charOffset;
     const charsInLine = Math.max(1, line.toChar - line.fromChar);
@@ -81483,7 +81556,10 @@ const mapPointToPm = (block, line, x2, isRTL) => {
 };
 const mapPmToX = (block, line, offset2, fragmentWidth) => {
   if (fragmentWidth <= 0 || line.width <= 0) return 0;
-  return measureCharacterX(block, line, offset2);
+  const paraIndentLeft = block.kind === "paragraph" ? block.attrs?.indent?.left ?? 0 : 0;
+  const paraIndentRight = block.kind === "paragraph" ? block.attrs?.indent?.right ?? 0 : 0;
+  const availableWidth = Math.max(0, fragmentWidth - (paraIndentLeft + paraIndentRight));
+  return measureCharacterX(block, line, offset2, availableWidth);
 };
 const isRtlBlock = (block) => {
   if (block.kind !== "paragraph") return false;
@@ -84148,29 +84224,16 @@ ensureEditorHost_fn = function(pageElement, kind, decorationContainer) {
   }
   return editorHost;
 };
-positionEditorHost_fn = function(editorHost, region, decorationContainer, zoom) {
+positionEditorHost_fn = function(editorHost, region, decorationContainer, _zoom) {
   const pageElement = editorHost.parentElement;
   if (!pageElement) {
     console.error("[EditorOverlayManager] Editor host has no parent element");
     return;
   }
-  let top2;
-  let left2;
-  let width;
-  let height;
-  if (decorationContainer) {
-    const decorationRect = decorationContainer.getBoundingClientRect();
-    const pageRect = pageElement.getBoundingClientRect();
-    top2 = decorationRect.top - pageRect.top;
-    left2 = decorationRect.left - pageRect.left;
-    width = decorationRect.width;
-    height = decorationRect.height;
-  } else {
-    top2 = region.localY * zoom;
-    left2 = region.localX * zoom;
-    width = region.width * zoom;
-    height = region.height * zoom;
-  }
+  const top2 = decorationContainer?.offsetTop ?? region.localY;
+  const left2 = decorationContainer?.offsetLeft ?? region.localX;
+  const width = decorationContainer?.offsetWidth ?? region.width;
+  const height = decorationContainer?.offsetHeight ?? region.height;
   Object.assign(editorHost.style, {
     top: `${top2}px`,
     left: `${left2}px`,
@@ -84185,19 +84248,14 @@ positionEditorHost_fn = function(editorHost, region, decorationContainer, zoom)
     }
   }
 };
-showHeaderFooterBorder_fn = function(pageElement, region, decorationContainer, zoom) {
+showHeaderFooterBorder_fn = function(pageElement, region, decorationContainer, _zoom) {
   __privateMethod$1(this, _EditorOverlayManager_instances, hideHeaderFooterBorder_fn).call(this);
   __privateSet(this, _borderLine, document.createElement("div"));
   __privateGet$1(this, _borderLine).className = "superdoc-header-footer-border";
-  let topPosition;
   const isHeader = region.kind === "header";
-  if (decorationContainer) {
-    const decorationRect = decorationContainer.getBoundingClientRect();
-    const pageRect = pageElement.getBoundingClientRect();
-    topPosition = isHeader ? decorationRect.bottom - pageRect.top : decorationRect.top - pageRect.top;
-  } else {
-    topPosition = isHeader ? (region.localY + region.height) * zoom : region.localY * zoom;
-  }
+  const decorationTop = decorationContainer?.offsetTop;
+  const decorationHeight = decorationContainer?.offsetHeight;
+  const topPosition = isHeader ? decorationTop != null && decorationHeight != null ? decorationTop + decorationHeight : region.localY + region.height : decorationTop ?? region.localY;
   Object.assign(__privateGet$1(this, _borderLine).style, {
     position: "absolute",
     left: "0",
@@ -85310,8 +85368,10 @@ const _PresentationEditor = class _PresentationEditor2 extends EventEmitter$1 {
     const start2 = Math.min(from2, to);
     const end2 = Math.max(from2, to);
     const zoom = __privateGet$1(this, _layoutOptions).zoom ?? 1;
-    const overlayRect = __privateGet$1(this, _selectionOverlay2).getBoundingClientRect();
     const relativeRect = relativeTo?.getBoundingClientRect() ?? null;
+    const containerRect = __privateGet$1(this, _visibleHost).getBoundingClientRect();
+    const scrollLeft = __privateGet$1(this, _visibleHost).scrollLeft ?? 0;
+    const scrollTop = __privateGet$1(this, _visibleHost).scrollTop ?? 0;
     const layoutRectSource = () => {
       if (__privateGet$1(this, _session).mode !== "body") {
         return __privateMethod$1(this, _PresentationEditor_instances, computeHeaderFooterSelectionRects_fn).call(this, start2, end2);
@@ -85322,14 +85382,38 @@ const _PresentationEditor = class _PresentationEditor2 extends EventEmitter$1 {
     };
     const rawRects = layoutRectSource();
     if (!rawRects.length) return [];
+    const domCaretStart = __privateMethod$1(this, _PresentationEditor_instances, computeDomCaretPageLocal_fn).call(this, start2);
+    const domCaretEnd = __privateMethod$1(this, _PresentationEditor_instances, computeDomCaretPageLocal_fn).call(this, end2);
+    const layoutCaretStart = __privateMethod$1(this, _PresentationEditor_instances, computeCaretLayoutRectGeometry_fn).call(this, start2, false);
+    __privateMethod$1(this, _PresentationEditor_instances, computeCaretLayoutRectGeometry_fn).call(this, end2, false);
+    const pageDelta = {};
+    if (domCaretStart && layoutCaretStart && domCaretStart.pageIndex === layoutCaretStart.pageIndex) {
+      pageDelta[domCaretStart.pageIndex] = {
+        dx: domCaretStart.x - layoutCaretStart.x,
+        dy: domCaretStart.y - layoutCaretStart.y
+      };
+    }
     const pageHeight = __privateGet$1(this, _session).mode === "body" ? __privateMethod$1(this, _PresentationEditor_instances, getBodyPageHeight_fn).call(this) : __privateMethod$1(this, _PresentationEditor_instances, getHeaderFooterPageHeight_fn).call(this);
     const pageGap = __privateGet$1(this, _layoutState).layout?.pageGap ?? 0;
-    return rawRects.map((rect) => {
-      const pageLocalY = rect.y - rect.pageIndex * (pageHeight + pageGap);
-      const coords = __privateMethod$1(this, _PresentationEditor_instances, convertPageLocalToOverlayCoords_fn).call(this, rect.pageIndex, rect.x, pageLocalY);
+    const finalRects = rawRects.map((rect, idx, allRects) => {
+      const delta = pageDelta[rect.pageIndex];
+      let adjustedX = delta ? rect.x + delta.dx : rect.x;
+      const adjustedY = delta ? rect.y + delta.dy : rect.y;
+      const isFirstRect = idx === 0;
+      const isLastRect = idx === allRects.length - 1;
+      if (isFirstRect && domCaretStart && rect.pageIndex === domCaretStart.pageIndex) {
+        adjustedX = domCaretStart.x;
+      }
+      if (isLastRect && domCaretEnd && rect.pageIndex === domCaretEnd.pageIndex) {
+        const endX = domCaretEnd.x;
+        const newWidth = Math.max(1, endX - adjustedX);
+        rect = { ...rect, width: newWidth };
+      }
+      const pageLocalY = adjustedY - rect.pageIndex * (pageHeight + pageGap);
+      const coords = __privateMethod$1(this, _PresentationEditor_instances, convertPageLocalToOverlayCoords_fn).call(this, rect.pageIndex, adjustedX, pageLocalY);
       if (!coords) return null;
-      const absLeft = coords.x * zoom + overlayRect.left;
-      const absTop = coords.y * zoom + overlayRect.top;
+      const absLeft = coords.x * zoom - scrollLeft + containerRect.left;
+      const absTop = coords.y * zoom - scrollTop + containerRect.top;
       const left2 = relativeRect ? absLeft - relativeRect.left : absLeft;
       const top2 = relativeRect ? absTop - relativeRect.top : absTop;
       const width = Math.max(1, rect.width * zoom);
@@ -85344,6 +85428,7 @@ const _PresentationEditor = class _PresentationEditor2 extends EventEmitter$1 {
         height
       };
     }).filter((rect) => Boolean(rect));
+    return finalRects;
   }
   /**
    * Get selection bounds for a document range with aggregated bounding box.
@@ -85572,24 +85657,22 @@ const _PresentationEditor = class _PresentationEditor2 extends EventEmitter$1 {
         return null;
       }
       const rect2 = rects2[0];
-      const overlayRect = __privateGet$1(this, _selectionOverlay2)?.getBoundingClientRect();
-      if (!overlayRect) {
-        return null;
-      }
+      const zoom = __privateGet$1(this, _layoutOptions).zoom ?? 1;
+      const containerRect = __privateGet$1(this, _visibleHost).getBoundingClientRect();
+      const scrollLeft = __privateGet$1(this, _visibleHost).scrollLeft ?? 0;
+      const scrollTop = __privateGet$1(this, _visibleHost).scrollTop ?? 0;
       const pageHeight = __privateMethod$1(this, _PresentationEditor_instances, getBodyPageHeight_fn).call(this);
       const pageGap = __privateGet$1(this, _layoutState).layout?.pageGap ?? 0;
       const pageLocalY = rect2.y - rect2.pageIndex * (pageHeight + pageGap);
       const coords = __privateMethod$1(this, _PresentationEditor_instances, convertPageLocalToOverlayCoords_fn).call(this, rect2.pageIndex, rect2.x, pageLocalY);
-      if (!coords) {
-        return null;
-      }
+      if (!coords) return null;
       return {
-        top: coords.y + overlayRect.top,
-        bottom: coords.y + overlayRect.top + rect2.height,
-        left: coords.x + overlayRect.left,
-        right: coords.x + overlayRect.left + rect2.width,
-        width: rect2.width,
-        height: rect2.height
+        top: coords.y * zoom - scrollTop + containerRect.top,
+        bottom: coords.y * zoom - scrollTop + containerRect.top + rect2.height * zoom,
+        left: coords.x * zoom - scrollLeft + containerRect.left,
+        right: coords.x * zoom - scrollLeft + containerRect.left + rect2.width * zoom,
+        width: rect2.width * zoom,
+        height: rect2.height * zoom
       };
     }
     const rects = this.getRangeRects(pos, pos);
@@ -86955,7 +87038,7 @@ updateSelection_fn = function() {
     }
     try {
       __privateGet$1(this, _localSelectionLayer).innerHTML = "";
-      __privateMethod$1(this, _PresentationEditor_instances, renderCaretOverlay_fn).call(this, caretLayout);
+      __privateMethod$1(this, _PresentationEditor_instances, renderCaretOverlay_fn).call(this, caretLayout, from2);
     } catch (error) {
       if (process$1$1.env.NODE_ENV === "development") {
         console.warn("[PresentationEditor] Failed to render caret overlay:", error);
@@ -86964,9 +87047,12 @@ updateSelection_fn = function() {
     return;
   }
   const rects = selectionToRects(layout, __privateGet$1(this, _layoutState).blocks, __privateGet$1(this, _layoutState).measures, from2, to) ?? [];
+  const domStart = __privateMethod$1(this, _PresentationEditor_instances, computeDomCaretPageLocal_fn).call(this, from2);
+  const domEnd = __privateMethod$1(this, _PresentationEditor_instances, computeDomCaretPageLocal_fn).call(this, to);
+  const correctedRects = __privateMethod$1(this, _PresentationEditor_instances, applyDomCorrectionToRects_fn).call(this, rects, domStart, domEnd);
   try {
     __privateGet$1(this, _localSelectionLayer).innerHTML = "";
-    __privateMethod$1(this, _PresentationEditor_instances, renderSelectionRects_fn).call(this, rects);
+    __privateMethod$1(this, _PresentationEditor_instances, renderSelectionRects_fn).call(this, correctedRects);
   } catch (error) {
     if (process$1$1.env.NODE_ENV === "development") {
       console.warn("[PresentationEditor] Failed to render selection rects:", error);
@@ -87741,6 +87827,43 @@ getHeaderFooterPageHeight_fn = function() {
   }
   return context.layout.pageSize?.h ?? context.region.height ?? 1;
 };
+applyDomCorrectionToRects_fn = function(rects, domStart, domEnd) {
+  if (rects.length === 0) return rects;
+  const pageDelta = {};
+  if (domStart && rects[0] && domStart.pageIndex === rects[0].pageIndex) {
+    const pageHeight = __privateMethod$1(this, _PresentationEditor_instances, getBodyPageHeight_fn).call(this);
+    const pageGap = __privateGet$1(this, _layoutState).layout?.pageGap ?? 0;
+    const layoutY = rects[0].y - rects[0].pageIndex * (pageHeight + pageGap);
+    pageDelta[domStart.pageIndex] = {
+      dx: domStart.x - rects[0].x,
+      dy: domStart.y - layoutY
+    };
+  }
+  return rects.map((rect, idx) => {
+    const delta = pageDelta[rect.pageIndex];
+    let adjustedX = delta ? rect.x + delta.dx : rect.x;
+    let adjustedY = delta ? rect.y + delta.dy : rect.y;
+    let adjustedWidth = rect.width;
+    const isFirstRect = idx === 0;
+    const isLastRect = idx === rects.length - 1;
+    if (isFirstRect && domStart && rect.pageIndex === domStart.pageIndex) {
+      const pageHeight = __privateMethod$1(this, _PresentationEditor_instances, getBodyPageHeight_fn).call(this);
+      const pageGap = __privateGet$1(this, _layoutState).layout?.pageGap ?? 0;
+      adjustedX = domStart.x;
+      adjustedY = domStart.y + rect.pageIndex * (pageHeight + pageGap);
+    }
+    if (isLastRect && domEnd && rect.pageIndex === domEnd.pageIndex) {
+      const endX = domEnd.x;
+      adjustedWidth = Math.max(1, endX - adjustedX);
+    }
+    return {
+      ...rect,
+      x: adjustedX,
+      y: adjustedY,
+      width: adjustedWidth
+    };
+  });
+};
 renderSelectionRects_fn = function(rects) {
   const localSelectionLayer = __privateGet$1(this, _localSelectionLayer);
   if (!localSelectionLayer) {
@@ -87748,7 +87871,7 @@ renderSelectionRects_fn = function(rects) {
   }
   const pageHeight = __privateMethod$1(this, _PresentationEditor_instances, getBodyPageHeight_fn).call(this);
   const pageGap = __privateGet$1(this, _layoutState).layout?.pageGap ?? 0;
-  rects.forEach((rect, _index) => {
+  rects.forEach((rect) => {
     const pageLocalY = rect.y - rect.pageIndex * (pageHeight + pageGap);
     const coords = __privateMethod$1(this, _PresentationEditor_instances, convertPageLocalToOverlayCoords_fn).call(this, rect.pageIndex, rect.x, pageLocalY);
     if (!coords) {
@@ -87801,7 +87924,7 @@ clearHoverRegion_fn = function() {
     __privateGet$1(this, _hoverTooltip).style.display = "none";
   }
 };
-renderCaretOverlay_fn = function(caretLayout) {
+renderCaretOverlay_fn = function(caretLayout, pos) {
   if (!__privateGet$1(this, _localSelectionLayer)) {
     return;
   }
@@ -88013,6 +88136,46 @@ convertPageLocalToOverlayCoords_fn = function(pageIndex, pageLocalX, pageLocalY)
     y: pageIndex * (pageHeight + pageGap) + pageLocalY
   };
 };
+computeDomCaretPageLocal_fn = function(pos) {
+  __privateGet$1(this, _viewportHost).querySelector(`.superdoc-page span[data-pm-start][data-pm-end]`) ? __privateGet$1(this, _viewportHost).querySelector(`.superdoc-page`) : null;
+  const spans = Array.from(__privateGet$1(this, _viewportHost).querySelectorAll("span[data-pm-start][data-pm-end]"));
+  let targetSpan = null;
+  for (const span of spans) {
+    const pmStart2 = Number(span.dataset.pmStart ?? "NaN");
+    const pmEnd = Number(span.dataset.pmEnd ?? "NaN");
+    if (!Number.isFinite(pmStart2) || !Number.isFinite(pmEnd)) continue;
+    if (pos < pmStart2 || pos > pmEnd) continue;
+    targetSpan = span;
+    break;
+  }
+  if (!targetSpan) return null;
+  const page = targetSpan.closest(".superdoc-page");
+  if (!page) return null;
+  const pageRect = page.getBoundingClientRect();
+  const zoom = __privateGet$1(this, _layoutOptions).zoom ?? 1;
+  const textNode = targetSpan.firstChild;
+  if (!textNode || textNode.nodeType !== Node.TEXT_NODE) {
+    const spanRect = targetSpan.getBoundingClientRect();
+    return {
+      pageIndex: Number(page.dataset.pageIndex ?? "0"),
+      x: (spanRect.left - pageRect.left) / zoom,
+      y: (spanRect.top - pageRect.top) / zoom
+    };
+  }
+  const pmStart = Number(targetSpan.dataset.pmStart ?? "NaN");
+  const charIndex = Math.min(pos - pmStart, textNode.length);
+  const range2 = document.createRange();
+  range2.setStart(textNode, Math.max(0, charIndex));
+  range2.setEnd(textNode, Math.max(0, charIndex));
+  const rangeRect = range2.getBoundingClientRect();
+  const lineEl = targetSpan.closest(".superdoc-line");
+  const lineRect = lineEl?.getBoundingClientRect() ?? rangeRect;
+  return {
+    pageIndex: Number(page.dataset.pageIndex ?? "0"),
+    x: (rangeRect.left - pageRect.left) / zoom,
+    y: (lineRect.top - pageRect.top) / zoom
+  };
+};
 normalizeClientPoint_fn = function(clientX, clientY) {
   if (!Number.isFinite(clientX) || !Number.isFinite(clientY)) {
     return null;
@@ -88026,13 +88189,9 @@ normalizeClientPoint_fn = function(clientX, clientY) {
     y: (clientY - rect.top + scrollTop) / zoom
   };
 };
-computeCaretLayoutRect_fn = function(pos) {
+computeCaretLayoutRectGeometry_fn = function(pos, includeDomFallback = true) {
   const layout = __privateGet$1(this, _layoutState).layout;
   if (!layout) return null;
-  const domResult = __privateMethod$1(this, _PresentationEditor_instances, computeCaretLayoutRectFromDOM_fn).call(this, pos);
-  if (domResult) {
-    return domResult;
-  }
   const hit = getFragmentAtPosition(layout, __privateGet$1(this, _layoutState).blocks, __privateGet$1(this, _layoutState).measures, pos);
   if (!hit) {
     return null;
@@ -88054,101 +88213,75 @@ computeCaretLayoutRect_fn = function(pos) {
   const { line, index: index2 } = lineInfo;
   const range2 = computeLinePmRange(block, line);
   if (range2.pmStart == null || range2.pmEnd == null) return null;
-  const pmCharsInLine = Math.max(1, range2.pmEnd - range2.pmStart);
-  const pmOffset = Math.max(0, Math.min(pmCharsInLine, pos - range2.pmStart));
-  const localX = fragment.x + measureCharacterX(block, line, pmOffset);
+  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 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 localX = fragment.x + markerWidth + indentAdjust + charX;
   const lineOffset = __privateMethod$1(this, _PresentationEditor_instances, lineHeightBeforeIndex_fn).call(this, measure.lines, fragment.fromLine, index2);
   const localY = fragment.y + lineOffset;
-  return {
+  const result = {
     pageIndex: hit.pageIndex,
     x: localX,
     y: localY,
     height: line.lineHeight
   };
-};
-computeCaretLayoutRectFromDOM_fn = function(pos) {
-  const zoom = __privateGet$1(this, _layoutOptions).zoom ?? 1;
-  let targetPageEl = null;
-  if (__privateGet$1(this, _layoutState).layout && __privateGet$1(this, _layoutState).blocks && __privateGet$1(this, _layoutState).measures) {
-    const fragmentHit = getFragmentAtPosition(
-      __privateGet$1(this, _layoutState).layout,
-      __privateGet$1(this, _layoutState).blocks,
-      __privateGet$1(this, _layoutState).measures,
-      pos
-    );
-    if (fragmentHit) {
-      const pageEl = __privateGet$1(this, _viewportHost).querySelector(
-        `.superdoc-page[data-page-index="${fragmentHit.pageIndex}"]`
-      );
-      if (pageEl) {
-        targetPageEl = pageEl;
-      }
-    }
-  }
-  const spanEls = Array.from(
-    targetPageEl ? targetPageEl.querySelectorAll(`span[data-pm-start][data-pm-end]:not(.${DOM_CLASS_NAMES.INLINE_SDT_WRAPPER})`) : __privateGet$1(this, _viewportHost).querySelectorAll(
-      `span[data-pm-start][data-pm-end]:not(.${DOM_CLASS_NAMES.INLINE_SDT_WRAPPER})`
-    )
+  const pageEl = __privateGet$1(this, _painterHost)?.querySelector(
+    `.superdoc-page[data-page-index="${hit.pageIndex}"]`
   );
+  const pageRect = pageEl?.getBoundingClientRect();
+  const zoom = __privateGet$1(this, _layoutOptions).zoom ?? 1;
+  let domCaretX = null;
+  let domCaretY = null;
+  const spanEls = pageEl?.querySelectorAll("span[data-pm-start][data-pm-end]") ?? [];
   for (const spanEl of spanEls) {
-    const pmStart = Number(spanEl.dataset.pmStart ?? "NaN");
-    const pmEnd = Number(spanEl.dataset.pmEnd ?? "NaN");
-    if (!Number.isFinite(pmStart) || !Number.isFinite(pmEnd)) continue;
-    if (pos < pmStart || pos > pmEnd) continue;
-    const pageEl = spanEl.closest(".superdoc-page");
-    if (!pageEl) continue;
-    const pageIndex = Number(pageEl.dataset.pageIndex ?? "0");
-    const pageRect = pageEl.getBoundingClientRect();
-    const textNode = spanEl.firstChild;
-    if (!textNode || textNode.nodeType !== Node.TEXT_NODE) {
-      const spanRect2 = spanEl.getBoundingClientRect();
-      return {
-        pageIndex,
-        x: (spanRect2.left - pageRect.left) / zoom,
-        y: (spanRect2.top - pageRect.top) / zoom,
-        height: spanRect2.height / zoom
-      };
-    }
-    const text = textNode.textContent ?? "";
-    const charOffset = Math.max(0, Math.min(text.length, pos - pmStart));
-    const range2 = document.createRange();
-    try {
-      range2.setStart(textNode, charOffset);
-      range2.setEnd(textNode, charOffset);
-    } catch (error) {
-      if (process$1$1.env.NODE_ENV === "development") {
-        console.warn("[PresentationEditor] Range.setStart/setEnd failed:", {
-          error: error instanceof Error ? error.message : String(error),
-          charOffset,
-          textLength: text.length,
-          pos,
-          pmStart,
-          pmEnd
-        });
+    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 (pageRect) {
+        domCaretX = (rangeRect.left - pageRect.left) / zoom;
+        domCaretY = (rangeRect.top - pageRect.top) / zoom;
       }
-      const spanRect2 = spanEl.getBoundingClientRect();
-      return {
-        pageIndex,
-        x: (spanRect2.left - pageRect.left) / zoom,
-        y: (spanRect2.top - pageRect.top) / zoom,
-        height: spanRect2.height / zoom
-      };
+      break;
     }
-    const rangeRect = range2.getBoundingClientRect();
-    const spanRect = spanEl.getBoundingClientRect();
-    const lineEl = spanEl.closest(".superdoc-line");
-    const lineRect = lineEl ? lineEl.getBoundingClientRect() : spanRect;
-    const caretHeight = spanRect.height;
-    const verticalOffset = (lineRect.height - caretHeight) / 2;
-    const caretY = lineRect.top + verticalOffset;
+  }
+  if (includeDomFallback && domCaretX != null && domCaretY != null) {
     return {
-      pageIndex,
-      x: (rangeRect.left - pageRect.left) / zoom,
-      y: (caretY - pageRect.top) / zoom,
-      height: caretHeight / zoom
+      pageIndex: hit.pageIndex,
+      x: domCaretX,
+      y: domCaretY,
+      height: line.lineHeight
     };
   }
-  return null;
+  return result;
+};
+computeCaretLayoutRect_fn = function(pos) {
+  const geometry = __privateMethod$1(this, _PresentationEditor_instances, computeCaretLayoutRectGeometry_fn).call(this, pos, true);
+  const dom = __privateMethod$1(this, _PresentationEditor_instances, computeDomCaretPageLocal_fn).call(this, pos);
+  if (dom && geometry) {
+    return {
+      pageIndex: dom.pageIndex,
+      x: dom.x,
+      y: dom.y,
+      height: geometry.height
+    };
+  }
+  return geometry;
 };
 computeTableCaretLayoutRect_fn = function(pos, _fragment, _tableBlock, _tableMeasure, pageIndex) {
   const lineEls = Array.from(__privateGet$1(this, _viewportHost).querySelectorAll(".superdoc-line"));