superdoc 1.0.0-beta.31 → 1.0.0-beta.33

package/dist/superdoc.umd.js

@@ -18281,9 +18281,9 @@
   const areAttrsEqual = (attrsA = {}, attrsB = {}) => {
     return objectIncludes(attrsA, attrsB);
   };
-  const TrackInsertMarkName = "trackInsert";
-  const TrackDeleteMarkName = "trackDelete";
-  const TrackFormatMarkName = "trackFormat";
+  const TrackInsertMarkName$1 = "trackInsert";
+  const TrackDeleteMarkName$1 = "trackDelete";
+  const TrackFormatMarkName$1 = "trackFormat";
   const generateV2HandlerEntity = (handlerName, translator2) => ({
     handlerName,
     handler: (params2) => {
@@ -20049,7 +20049,7 @@
       const runProperties = translator$1N.encode({ ...params2, nodes: [rPr] });
       submarks = encodeMarksFromRPr(runProperties, params2?.docx);
     }
-    return [{ type: TrackFormatMarkName, attrs: { ...mappedAttributes, before: submarks, after: [...currentMarks] } }];
+    return [{ type: TrackFormatMarkName$1, attrs: { ...mappedAttributes, before: submarks, after: [...currentMarks] } }];
   }
   function handleStyleChangeMarks(rPr, currentMarks) {
     const styleChangeMark = rPr.elements?.find((el) => el.name === "w:rPrChange");
@@ -20064,7 +20064,7 @@
       authorEmail: attributes["w:authorEmail"]
     };
     const submarks = parseMarks(styleChangeMark);
-    return [{ type: TrackFormatMarkName, attrs: { ...mappedAttributes, before: submarks, after: [...currentMarks] } }];
+    return [{ type: TrackFormatMarkName$1, attrs: { ...mappedAttributes, before: submarks, after: [...currentMarks] } }];
   }
   function createImportMarks(marks) {
     const textStyleMarksToCombine = marks.filter((mark2) => mark2.type === "textStyle");
@@ -20502,7 +20502,7 @@
   const prepareRunTrackingContext = (node2 = {}) => {
     const marks = Array.isArray(node2.marks) ? node2.marks : [];
     const trackingMarks = marks.filter(
-      (mark2) => mark2?.type === TrackInsertMarkName || mark2?.type === TrackDeleteMarkName
+      (mark2) => mark2?.type === TrackInsertMarkName$1 || mark2?.type === TrackDeleteMarkName$1
     );
     if (!trackingMarks.length) {
       return { runNode: node2, trackingMarksByType: /* @__PURE__ */ new Map() };
@@ -20511,7 +20511,7 @@
     trackingMarks.forEach((mark2) => {
       if (mark2?.type) trackingMarksByType.set(mark2.type, cloneMark(mark2));
     });
-    const preservedMarks = marks.filter((mark2) => mark2?.type !== TrackInsertMarkName && mark2?.type !== TrackDeleteMarkName).map((mark2) => cloneMark(mark2));
+    const preservedMarks = marks.filter((mark2) => mark2?.type !== TrackInsertMarkName$1 && mark2?.type !== TrackDeleteMarkName$1).map((mark2) => cloneMark(mark2));
     const clonedContent = Array.isArray(node2.content) ? node2.content.map((child) => {
       const childClone = cloneNode(child);
       const childMarks = Array.isArray(childClone.marks) ? childClone.marks.slice() : [];
@@ -20550,8 +20550,8 @@
       return runs2;
     }
     if (!trackingMarksByType.size) return runs2;
-    if (trackingMarksByType.has(TrackInsertMarkName)) {
-      const mark2 = trackingMarksByType.get(TrackInsertMarkName);
+    if (trackingMarksByType.has(TrackInsertMarkName$1)) {
+      const mark2 = trackingMarksByType.get(TrackInsertMarkName$1);
       const clonedRuns = cloneRuns(runs2);
       const wrapper = {
         name: "w:ins",
@@ -20568,8 +20568,8 @@
       };
       return [wrapper];
     }
-    if (trackingMarksByType.has(TrackDeleteMarkName)) {
-      const mark2 = trackingMarksByType.get(TrackDeleteMarkName);
+    if (trackingMarksByType.has(TrackDeleteMarkName$1)) {
+      const mark2 = trackingMarksByType.get(TrackDeleteMarkName$1);
       const clonedRuns = cloneRuns(runs2);
       clonedRuns.forEach(renameTextElementsForDeletion);
       const wrapper = {
@@ -41859,7 +41859,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.31") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.33") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -53022,7 +53022,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   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, _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, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _remoteCursorRafHandle, _scrollTimeout, _PresentationEditor_instances, aggregateLayoutBounds_fn, safeCleanup_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, normalizeAwarenessStates_fn, getFallbackColor_fn, getValidatedColor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, renderRemoteCaret_fn, renderRemoteCursorLabel_fn, renderRemoteSelection_fn, setupPointerHandlers_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, selectWordAt_fn, selectParagraphAt_fn, calculateExtendedSelection_fn, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handlePointerUp, _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, 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, 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, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _remoteCursorRafHandle, _scrollTimeout, _PresentationEditor_instances, collectCommentPositions_fn, aggregateLayoutBounds_fn, safeCleanup_fn, setupEditorListeners_fn, setupCollaborationCursors_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, 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, 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, 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 GOOD_LEAF_SIZE = 200;
   var RopeSequence = function RopeSequence2() {
   };
@@ -63874,13 +63874,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return markFound;
   };
   const markInsertion = ({ tr, from: from2, to, user, date }) => {
-    tr.removeMark(from2, to, tr.doc.type.schema.marks[TrackDeleteMarkName]);
-    tr.removeMark(from2, to, tr.doc.type.schema.marks[TrackInsertMarkName]);
+    tr.removeMark(from2, to, tr.doc.type.schema.marks[TrackDeleteMarkName$1]);
+    tr.removeMark(from2, to, tr.doc.type.schema.marks[TrackInsertMarkName$1]);
     let trackedMark = findTrackedMarkBetween({
       tr,
       from: from2,
       to,
-      markName: TrackInsertMarkName,
+      markName: TrackInsertMarkName$1,
       attrs: { authorEmail: user.email }
     });
     let id;
@@ -63889,7 +63889,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     } else {
       id = v4$1();
     }
-    const insertionMark = tr.doc.type.schema.marks[TrackInsertMarkName].create({
+    const insertionMark = tr.doc.type.schema.marks[TrackInsertMarkName$1].create({
       id,
       author: user.name,
       authorEmail: user.email,
@@ -63915,7 +63915,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       tr,
       from: from2,
       to,
-      markName: TrackDeleteMarkName,
+      markName: TrackDeleteMarkName$1,
       attrs: { authorEmail: user.email }
     });
     let id;
@@ -63926,7 +63926,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     } else {
       id = v4$1();
     }
-    const deletionMark = tr.doc.type.schema.marks[TrackDeleteMarkName].create({
+    const deletionMark = tr.doc.type.schema.marks[TrackDeleteMarkName$1].create({
       id,
       author: user.name,
       authorEmail: user.email,
@@ -63939,7 +63939,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (node2.type.name.includes("table")) {
         return;
       }
-      if (node2.isInline && node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName && mark2.attrs.authorEmail === user.email)) {
+      if (node2.isInline && node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName$1 && mark2.attrs.authorEmail === user.email)) {
         const removeStep = new ReplaceStep(
           deletionMap.map(Math.max(from2, pos)),
           deletionMap.map(Math.min(to, pos + node2.nodeSize)),
@@ -63948,14 +63948,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (!tr.maybeStep(removeStep).failed) {
           deletionMap.appendMap(removeStep.getMap());
         }
-      } else if (node2.isInline && !node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName)) {
+      } else if (node2.isInline && !node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName$1)) {
         nodes.push(node2);
         tr.addMark(
           deletionMap.map(Math.max(from2, pos)),
           deletionMap.map(Math.min(to, pos + node2.nodeSize)),
           deletionMark
         );
-      } else if (node2.attrs.track && !node2.attrs.track.find((trackAttr) => trackAttr.type === TrackDeleteMarkName) && !["bulletList", "orderedList"].includes(node2.type.name)) ;
+      } else if (node2.attrs.track && !node2.attrs.track.find((trackAttr) => trackAttr.type === TrackDeleteMarkName$1) && !["bulletList", "orderedList"].includes(node2.type.name)) ;
     });
     return { deletionMark, deletionMap, nodes };
   };
@@ -64022,7 +64022,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     allInlineNodes.forEach(({ node: node2, pos }) => {
       const { marks } = node2;
-      const trackedMarks = [TrackInsertMarkName, TrackDeleteMarkName, TrackFormatMarkName];
+      const trackedMarks = [TrackInsertMarkName$1, TrackDeleteMarkName$1, TrackFormatMarkName$1];
       if (marks.length > 0) {
         marks.forEach((mark2) => {
           if (trackedMarks.includes(mark2.type.name)) {
@@ -64135,7 +64135,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return DecorationSet.empty;
     }
     trackedChanges.forEach(({ mark: mark2, from: from2, to }) => {
-      if (mark2.type.name === TrackInsertMarkName) {
+      if (mark2.type.name === TrackInsertMarkName$1) {
         if (onlyOriginalShown) {
           const decoration = Decoration.inline(from2, to, {
             class: "track-insert-dec hidden"
@@ -64153,7 +64153,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           decorations.push(decoration);
         }
       }
-      if (mark2.type.name === TrackDeleteMarkName) {
+      if (mark2.type.name === TrackDeleteMarkName$1) {
         if (onlyOriginalShown) {
           const decoration = Decoration.inline(from2, to, {
             class: "track-delete-dec normal"
@@ -64185,7 +64185,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           decorations.push(decorationWidget);
         }
       }
-      if (mark2.type.name === TrackFormatMarkName) {
+      if (mark2.type.name === TrackFormatMarkName$1) {
         if (onlyOriginalShown) {
           const decoration = Decoration.inline(from2, to, {
             class: "track-format-dec before"
@@ -64206,7 +64206,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     });
     return DecorationSet.create(state2.doc, decorations);
   };
-  const CommentMarkName = "commentMark";
+  const CommentMarkName$1 = "commentMark";
   const resolveCommentMeta = ({ converter, importedId }) => {
     const comments = converter?.comments || [];
     const matchingImportedComment = comments.find((c2) => c2.importedId == importedId);
@@ -64237,7 +64237,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const removeCommentsById = ({ commentId, state: state2, tr, dispatch }) => {
     const positions = getCommentPositionsById(commentId, state2.doc);
     positions.forEach(({ from: from2, to }) => {
-      tr.removeMark(from2, to, state2.schema.marks[CommentMarkName]);
+      tr.removeMark(from2, to, state2.schema.marks[CommentMarkName$1]);
     });
     dispatch(tr);
   };
@@ -64245,7 +64245,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const positions = [];
     doc2.descendants((node2, pos) => {
       const { marks } = node2;
-      const commentMark = marks.find((mark2) => mark2.type.name === CommentMarkName);
+      const commentMark = marks.find((mark2) => mark2.type.name === CommentMarkName$1);
       if (commentMark) {
         const { attrs } = commentMark;
         const { commentId: currentCommentId } = attrs;
@@ -64265,7 +64265,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const endNodes = [];
     const seen = /* @__PURE__ */ new Set();
     doc2.descendants((node2, pos) => {
-      const commentMarks = node2.marks?.filter((mark2) => mark2.type.name === CommentMarkName) || [];
+      const commentMarks = node2.marks?.filter((mark2) => mark2.type.name === CommentMarkName$1) || [];
       commentMarks.forEach((commentMark) => {
         const { attrs = {} } = commentMark;
         const { commentId } = attrs;
@@ -64393,7 +64393,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           importedId,
           internal: itemToMark.internal
         };
-        tr.addMark(start2, pos + 1, schema.marks[CommentMarkName].create(markAttrs));
+        tr.addMark(start2, pos + 1, schema.marks[CommentMarkName$1].create(markAttrs));
         toDelete.push({ start: pos, end: pos + 1 });
       } else if (type2.name === "commentReference") {
         toDelete.push({ start: pos, end: pos + 1 });
@@ -64511,7 +64511,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       existing.bounds.bottom = Math.max(existing.bounds.bottom, currentBounds.bottom);
     }
   };
-  const TRACK_CHANGE_MARKS = [TrackInsertMarkName, TrackDeleteMarkName, TrackFormatMarkName];
+  const TRACK_CHANGE_MARKS = [TrackInsertMarkName$1, TrackDeleteMarkName$1, TrackFormatMarkName$1];
   const CommentsPluginKey = new PluginKey("comments");
   const CommentsPlugin = Extension.create({
     name: "comments",
@@ -64527,7 +64527,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           tr.addMark(
             $from.pos,
             $to.pos,
-            this.editor.schema.marks[CommentMarkName].create({
+            this.editor.schema.marks[CommentMarkName$1].create({
               commentId: resolvedCommentId,
               internal: resolvedInternal
             })
@@ -64567,7 +64567,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           doc2.descendants((node2, pos) => {
             if (foundStartNode) return;
             const { marks = [] } = node2;
-            const commentMark = marks.find((mark2) => mark2.type.name === CommentMarkName);
+            const commentMark = marks.find((mark2) => mark2.type.name === CommentMarkName$1);
             if (commentMark) {
               const { attrs } = commentMark;
               const wid = attrs.commentId;
@@ -64581,7 +64581,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           tr.addMark(
             foundPos,
             foundPos + foundStartNode.nodeSize,
-            this.editor.schema.marks[CommentMarkName].create({
+            this.editor.schema.marks[CommentMarkName$1].create({
               commentId,
               internal: isInternal
             })
@@ -64710,10 +64710,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               prevDoc = doc2;
               shouldUpdate = false;
               const decorations = [];
-              const allCommentPositions = onlyActiveThreadChanged ? prevAllCommentPositions : {};
+              const allCommentPositions = {};
               doc2.descendants((node2, pos) => {
                 const { marks = [] } = node2;
-                const commentMarks = marks.filter((mark2) => mark2.type.name === CommentMarkName);
+                const commentMarks = marks.filter((mark2) => mark2.type.name === CommentMarkName$1);
                 let hasActive = false;
                 commentMarks.forEach((commentMark) => {
                   const { attrs } = commentMark;
@@ -64839,7 +64839,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         return;
       }
       const { marks = [] } = node2;
-      const commentMark = marks.find((mark2) => mark2.type.name === CommentMarkName);
+      const commentMark = marks.find((mark2) => mark2.type.name === CommentMarkName$1);
       if (commentMark) {
         overlaps.push({
           node: node2,
@@ -64862,7 +64862,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
     });
     const { marks: closestMarks = [] } = closestCommentRangeStart || {};
-    const closestCommentMark = closestMarks.find((mark2) => mark2.type.name === CommentMarkName);
+    const closestCommentMark = closestMarks.find((mark2) => mark2.type.name === CommentMarkName$1);
     return closestCommentMark?.attrs?.commentId || closestCommentMark?.attrs?.importedId;
   };
   const findTrackedMark = ({
@@ -64912,7 +64912,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     let nodes = step?.slice?.content?.content || [];
     if (!nodes.length) {
       newEditorState.doc.descendants((node2) => {
-        const hasFormatMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
+        const hasFormatMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1);
         if (hasFormatMark) {
           nodes = [node2];
           return false;
@@ -64937,19 +64937,19 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const getTrackedChangeText = ({ nodes, mark: mark2, trackedChangeType, isDeletionInsertion }) => {
     let trackedChangeText = "";
     let deletionText = "";
-    if (trackedChangeType === TrackInsertMarkName) {
+    if (trackedChangeType === TrackInsertMarkName$1) {
       trackedChangeText = nodes.reduce((acc, node2) => {
         if (!node2.marks.find((nodeMark) => nodeMark.type.name === mark2.type.name)) return acc;
         acc += node2?.text || node2?.textContent || "";
         return acc;
       }, "");
     }
-    if (trackedChangeType === TrackFormatMarkName) {
+    if (trackedChangeType === TrackFormatMarkName$1) {
       trackedChangeText = translateFormatChangesToEnglish(mark2.attrs);
     }
-    if (trackedChangeType === TrackDeleteMarkName || isDeletionInsertion) {
+    if (trackedChangeType === TrackDeleteMarkName$1 || isDeletionInsertion) {
       deletionText = nodes.reduce((acc, node2) => {
-        if (!node2.marks.find((nodeMark) => nodeMark.type.name === TrackDeleteMarkName)) return acc;
+        if (!node2.marks.find((nodeMark) => nodeMark.type.name === TrackDeleteMarkName$1)) return acc;
         acc += node2?.text || node2?.textContent || "";
         return acc;
       }, "");
@@ -65015,7 +65015,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (to === null || pos + node2.nodeSize > to) to = pos + node2.nodeSize;
       }
       const commentMark = node2.marks.find(
-        (m2) => m2.type.name === CommentMarkName && (m2.attrs.commentId === id || m2.attrs.importedId === id)
+        (m2) => m2.type.name === CommentMarkName$1 && (m2.attrs.commentId === id || m2.attrs.importedId === id)
       );
       if (commentMark) {
         if (from2 === null || pos < from2) from2 = pos;
@@ -65025,7 +65025,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return from2 !== null && to !== null ? { from: from2, to } : null;
   }
   const replaceStep = ({ state: state2, tr, step, newTr, map: map2, user, date, originalStep, originalStepIndex }) => {
-    const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName];
+    const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName$1];
     const deletionMark = findMark(state2, deletionMarkSchema, false);
     const positionTo = deletionMark ? deletionMark.to : step.to;
     const newStep = new ReplaceStep(
@@ -65089,17 +65089,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (!node2.isInline) {
         return;
       }
-      if (node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName)) {
+      if (node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName$1)) {
         return false;
       }
       const existingChangeMark = node2.marks.find(
-        (mark2) => [TrackDeleteMarkName, TrackFormatMarkName].includes(mark2.type.name)
+        (mark2) => [TrackDeleteMarkName$1, TrackFormatMarkName$1].includes(mark2.type.name)
       );
       const wid = existingChangeMark ? existingChangeMark.attrs.id : v4$1();
       newTr.addMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), step.mark);
       const allowedMarks = ["bold", "italic", "strike", "underline", "textStyle"];
       if (allowedMarks.includes(step.mark.type.name) && !node2.marks.find((mark2) => mark2.type === step.mark.type)) {
-        const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
+        const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1);
         let after = [];
         let before = [];
         if (formatChangeMark) {
@@ -65135,7 +65135,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           ];
         }
         if (after.length || before.length) {
-          const newFormatMark = state2.schema.marks[TrackFormatMarkName].create({
+          const newFormatMark = state2.schema.marks[TrackFormatMarkName$1].create({
             id: wid,
             author: user.name,
             authorEmail: user.email,
@@ -65167,13 +65167,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (!node2.isInline) {
         return true;
       }
-      if (node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName)) {
+      if (node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName$1)) {
         return false;
       }
       newTr.removeMark(Math.max(step.from, pos), Math.min(step.to, pos + node2.nodeSize), step.mark);
       const allowedMarks = ["bold", "italic", "strike", "underline", "textStyle"];
       if (allowedMarks.includes(step.mark.type.name) && node2.marks.find((mark2) => mark2.type === step.mark.type)) {
-        const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
+        const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1);
         let after = [];
         let before = [];
         if (formatChangeMark) {
@@ -65201,7 +65201,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           ];
         }
         if (after.length || before.length) {
-          const newFormatMark = state2.schema.marks[TrackFormatMarkName].create({
+          const newFormatMark = state2.schema.marks[TrackFormatMarkName$1].create({
             id: v4$1(),
             author: user.name,
             authorEmail: user.email,
@@ -65282,7 +65282,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       newTr.setMeta("addToHistory", tr.getMeta("addToHistory"));
     }
     if (tr.selectionSet) {
-      const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName];
+      const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName$1];
       const deletionMark = findMark(state2, deletionMarkSchema, false);
       if (tr.selection instanceof TextSelection$1 && (tr.selection.from < state2.selection.from || tr.getMeta("inputType") === "deleteContentBackward")) {
         const caretPos = map2.map(tr.selection.from, -1);
@@ -66889,7 +66889,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.31";
+  const summaryVersion = "1.0.0-beta.33";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -67678,7 +67678,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexEGVYUeN),
+        Promise.resolve().then(() => indexHX4H5xPH),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -67883,7 +67883,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.31");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.33");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -73025,7 +73025,27 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           blocks2.push(block);
           recordBlockKind(block.kind);
         });
-      } else if (child.type === "table") ;
+      } else if (child.type === "table") {
+        const tableNodeToBlock2 = converters?.tableNodeToBlock;
+        if (tableNodeToBlock2) {
+          const tableBlock = tableNodeToBlock2(
+            child,
+            nextBlockId,
+            positions,
+            defaultFont,
+            defaultSize,
+            styleContext,
+            trackedChangesConfig,
+            bookmarks,
+            hyperlinkConfig
+          );
+          if (tableBlock) {
+            applySdtMetadataToTableBlock(tableBlock, structuredContentMetadata);
+            blocks2.push(tableBlock);
+            recordBlockKind(tableBlock.kind);
+          }
+        }
+      }
     });
   }
   function processParagraphChild(child, sectionMetadata, context, output, converters) {
@@ -73495,6 +73515,65 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return run2;
   }
+  function fieldAnnotationNodeToRun(node2, positions, fieldMetadata) {
+    const attrs = node2.attrs ?? {};
+    const rawVariant = attrs.type ?? fieldMetadata?.variant ?? "text";
+    const validVariants = ["text", "image", "signature", "checkbox", "html", "link"];
+    const variant = validVariants.includes(rawVariant) ? rawVariant : "text";
+    const displayLabel = (typeof attrs.displayLabel === "string" ? attrs.displayLabel : void 0) || (typeof attrs.defaultDisplayLabel === "string" ? attrs.defaultDisplayLabel : void 0) || (typeof fieldMetadata?.displayLabel === "string" ? fieldMetadata.displayLabel : void 0) || (typeof fieldMetadata?.defaultDisplayLabel === "string" ? fieldMetadata.defaultDisplayLabel : void 0) || (typeof attrs.alias === "string" ? attrs.alias : void 0) || (typeof fieldMetadata?.alias === "string" ? fieldMetadata.alias : void 0) || "";
+    const run2 = {
+      kind: "fieldAnnotation",
+      variant,
+      displayLabel
+    };
+    const fieldId = typeof attrs.fieldId === "string" ? attrs.fieldId : fieldMetadata?.fieldId;
+    if (fieldId) run2.fieldId = fieldId;
+    const fieldType = typeof attrs.fieldType === "string" ? attrs.fieldType : fieldMetadata?.fieldType;
+    if (fieldType) run2.fieldType = fieldType;
+    const fieldColor = typeof attrs.fieldColor === "string" ? attrs.fieldColor : fieldMetadata?.fieldColor;
+    if (fieldColor) run2.fieldColor = fieldColor;
+    const borderColor = typeof attrs.borderColor === "string" ? attrs.borderColor : fieldMetadata?.borderColor;
+    if (borderColor) run2.borderColor = borderColor;
+    const highlighted = attrs.highlighted ?? fieldMetadata?.highlighted;
+    if (highlighted === false) run2.highlighted = false;
+    if (attrs.hidden === true || fieldMetadata?.hidden === true) run2.hidden = true;
+    const visibility = attrs.visibility ?? fieldMetadata?.visibility;
+    if (visibility === "hidden") run2.visibility = "hidden";
+    const imageSrc = typeof attrs.imageSrc === "string" ? attrs.imageSrc : fieldMetadata?.imageSrc;
+    if (imageSrc) run2.imageSrc = imageSrc;
+    const linkUrl = typeof attrs.linkUrl === "string" ? attrs.linkUrl : fieldMetadata?.linkUrl;
+    if (linkUrl) run2.linkUrl = linkUrl;
+    const rawHtml = attrs.rawHtml ?? fieldMetadata?.rawHtml;
+    if (typeof rawHtml === "string") run2.rawHtml = rawHtml;
+    const size2 = attrs.size ?? fieldMetadata?.size;
+    if (size2 && (typeof size2.width === "number" || typeof size2.height === "number")) {
+      run2.size = {
+        width: typeof size2.width === "number" ? size2.width : void 0,
+        height: typeof size2.height === "number" ? size2.height : void 0
+      };
+    }
+    const fontFamily2 = attrs.fontFamily ?? fieldMetadata?.fontFamily;
+    if (typeof fontFamily2 === "string") run2.fontFamily = fontFamily2;
+    const fontSize2 = attrs.fontSize ?? fieldMetadata?.fontSize;
+    if (typeof fontSize2 === "string" || typeof fontSize2 === "number") run2.fontSize = fontSize2;
+    const textColor = attrs.textColor ?? fieldMetadata?.textColor;
+    if (typeof textColor === "string") run2.textColor = textColor;
+    const textHighlight = attrs.textHighlight ?? fieldMetadata?.textHighlight;
+    if (typeof textHighlight === "string") run2.textHighlight = textHighlight;
+    const formatting = fieldMetadata?.formatting;
+    if (attrs.bold === true || formatting?.bold === true) run2.bold = true;
+    if (attrs.italic === true || formatting?.italic === true) run2.italic = true;
+    if (attrs.underline === true || formatting?.underline === true) run2.underline = true;
+    const pos = positions.get(node2);
+    if (pos) {
+      run2.pmStart = pos.start;
+      run2.pmEnd = pos.end;
+    }
+    if (fieldMetadata) {
+      run2.sdt = fieldMetadata;
+    }
+    return run2;
+  }
   const isTextRun$1 = (run2) => run2.kind !== "tab";
   const dataAttrsCompatible = (a2, b2) => {
     const aAttrs = a2.dataAttrs;
@@ -73790,28 +73869,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       if (node2.type === "fieldAnnotation") {
         const fieldMetadata = resolveNodeSdtMetadata(node2, "fieldAnnotation");
+        let contentText;
         if (Array.isArray(node2.content) && node2.content.length > 0) {
-          node2.content.forEach((child) => visitNode(child, inheritedMarks, fieldMetadata ?? activeSdt, activeRunStyleId));
-        } else {
-          const nodeAttrs = typeof node2.attrs === "object" && node2.attrs !== null ? node2.attrs : {};
-          const label = (typeof nodeAttrs.displayLabel === "string" ? nodeAttrs.displayLabel : void 0) || (typeof nodeAttrs.defaultDisplayLabel === "string" ? nodeAttrs.defaultDisplayLabel : void 0) || (typeof nodeAttrs.alias === "string" ? nodeAttrs.alias : void 0) || "";
-          if (label && typeof label === "string") {
-            const run2 = textNodeToRun(
-              { type: "text", text: label },
-              positions,
-              defaultFont,
-              defaultSize,
-              inheritedMarks,
-              fieldMetadata ?? activeSdt,
-              hyperlinkConfig,
-              themeColors
-            );
-            const inlineStyleId = getInlineStyleId(inheritedMarks);
-            applyRunStyles2(run2, inlineStyleId, activeRunStyleId);
-            applyBaseRunDefaults(run2, baseRunDefaults, defaultFont, defaultSize);
-            currentRuns.push(run2);
-          }
+          const extractText = (n) => {
+            if (n.type === "text" && typeof n.text === "string") return n.text;
+            if (Array.isArray(n.content)) {
+              return n.content.map(extractText).join("");
+            }
+            return "";
+          };
+          contentText = node2.content.map(extractText).join("");
         }
+        const nodeForRun = contentText && contentText.length > 0 ? { ...node2, attrs: { ...node2.attrs ?? {}, displayLabel: contentText } } : node2;
+        const run2 = fieldAnnotationNodeToRun(nodeForRun, positions, fieldMetadata);
+        currentRuns.push(run2);
         return;
       }
       if (node2.type === "pageReference") {
@@ -74648,9 +74719,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       const attrs = spacingEl.attributes;
       const spacing = {};
-      const before = parseIntSafe(attrs["w:before"]);
-      const after = parseIntSafe(attrs["w:after"]);
-      const line = parseIntSafe(attrs["w:line"]);
+      const before = parseIntSafe$1(attrs["w:before"]);
+      const after = parseIntSafe$1(attrs["w:after"]);
+      const line = parseIntSafe$1(attrs["w:line"]);
       const rawLineRule = attrs["w:lineRule"];
       const lineRule = rawLineRule === "auto" || rawLineRule === "exact" || rawLineRule === "atLeast" ? rawLineRule : void 0;
       if (before != null) spacing.before = twipsToPx$1(before);
@@ -74665,11 +74736,11 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (lineRule) spacing.lineRule = lineRule;
       const result = Object.keys(spacing).length > 0 ? { spacing } : void 0;
       return result;
-    } catch (err) {
+    } catch {
       return void 0;
     }
   };
-  const parseIntSafe = (value) => {
+  const parseIntSafe$1 = (value) => {
     if (value == null) return void 0;
     const num = typeof value === "number" ? value : parseInt(String(value), 10);
     return Number.isFinite(num) ? num : void 0;
@@ -75321,7 +75392,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return measurementCtx;
   }
   function getRunFontString(run2) {
-    if (run2.kind === "tab" || run2.kind === "lineBreak" || run2.kind === "break" || "src" in run2) {
+    if (run2.kind === "tab" || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" || "src" in run2) {
       return "normal normal 16px Arial";
     }
     const style2 = run2.italic ? "italic" : "normal";
@@ -75352,6 +75423,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         result.push(run2);
         continue;
       }
+      if (run2.kind === "fieldAnnotation") {
+        result.push(run2);
+        continue;
+      }
       const text2 = run2.text ?? "";
       const isFirstRun = runIndex === line.fromRun;
       const isLastRun = runIndex === line.toRun;
@@ -75385,7 +75460,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         1,
         runs22.reduce((sum, run2) => {
           if (isTabRun$1(run2)) return sum + TAB_CHAR_LENGTH;
-          if ("src" in run2 || run2.kind === "lineBreak" || run2.kind === "break") return sum;
+          if ("src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation")
+            return sum;
           return sum + (run2.text ?? "").length;
         }, 0)
       );
@@ -75406,7 +75482,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         currentCharOffset += runLength2;
         continue;
       }
-      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
+      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runLength = text2.length;
       if (currentCharOffset + runLength >= charOffset) {
         const offsetInRun = charOffset - currentCharOffset;
@@ -75449,7 +75525,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (isTabRun$1(run2)) {
           return segmentBaseX + (offsetInSegment > 0 ? segment.width ?? 0 : 0);
         }
-        if ("src" in run2 || run2.kind === "lineBreak" || run2.kind === "break") {
+        if ("src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation") {
           return segmentBaseX + (offsetInSegment >= segmentChars ? segment.width ?? 0 : 0);
         }
         const text2 = run2.text ?? "";
@@ -75478,7 +75554,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     let lastPm = fallbackPmStart;
     for (const run2 of runs2) {
       const isTab = isTabRun$1(run2);
-      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
+      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runLength = isTab ? TAB_CHAR_LENGTH : text2.length;
       const runPmStart = typeof run2.pmStart === "number" ? run2.pmStart : null;
       const runPmEnd = typeof run2.pmEnd === "number" ? run2.pmEnd : runPmStart != null ? runPmStart + runLength : null;
@@ -75504,7 +75580,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         1,
         runs22.reduce((sum, run2) => {
           if (isTabRun$1(run2)) return sum + TAB_CHAR_LENGTH;
-          if ("src" in run2 || run2.kind === "lineBreak" || run2.kind === "break") return sum;
+          if ("src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation")
+            return sum;
           return sum + (run2.text ?? "").length;
         }, 0)
       );
@@ -75539,7 +75616,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         currentCharOffset += TAB_CHAR_LENGTH;
         continue;
       }
-      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
+      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runLength = text2.length;
       if (runLength === 0) continue;
       ctx2.font = getRunFontString(run2);
@@ -75579,7 +75656,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     };
   }
   const computeLetterSpacingWidth = (run2, precedingChars, runLength) => {
-    if (isTabRun$1(run2) || "src" in run2 || !("letterSpacing" in run2) || !run2.letterSpacing) {
+    if (isTabRun$1(run2) || "src" in run2 || run2.kind === "fieldAnnotation" || !("letterSpacing" in run2) || !run2.letterSpacing) {
       return 0;
     }
     const maxGaps = Math.max(runLength - 1, 0);
@@ -75676,6 +75753,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       pmStart: fragmentEl.dataset.pmStart,
       pmEnd: fragmentEl.dataset.pmEnd
     });
+    const hitChainLine = hitChain.find(
+      (el) => el.classList?.contains?.(CLASS_NAMES$1.line) && el.dataset?.pmStart !== void 0 && el.dataset?.pmEnd !== void 0
+    );
+    if (hitChainLine) {
+      log("Using hit chain line directly:", {
+        pmStart: hitChainLine.dataset.pmStart,
+        pmEnd: hitChainLine.dataset.pmEnd
+      });
+      const result2 = processLineElement(hitChainLine, viewX);
+      return result2;
+    }
     const result = processFragment(fragmentEl, viewX, viewY);
     return result;
   }
@@ -75741,7 +75829,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (!Number.isFinite(lineStart) || !Number.isFinite(lineEnd)) {
       return null;
     }
-    const spanEls = Array.from(lineEl.querySelectorAll("span, a"));
+    const spanEls = Array.from(lineEl.querySelectorAll("span, a")).filter(
+      (el) => el.dataset.pmStart !== void 0 && el.dataset.pmEnd !== void 0
+    );
     log(
       "Spans/anchors in line:",
       spanEls.map((el, i2) => {
@@ -75800,6 +75890,77 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const pos = spanStart + charIndex;
     return pos;
   }
+  function processLineElement(lineEl, viewX) {
+    const lineStart = Number(lineEl.dataset.pmStart ?? "NaN");
+    const lineEnd = Number(lineEl.dataset.pmEnd ?? "NaN");
+    const lineRect = lineEl.getBoundingClientRect();
+    log("processLineElement:", {
+      pmStart: lineStart,
+      pmEnd: lineEnd,
+      rect: { top: lineRect.top, bottom: lineRect.bottom, left: lineRect.left, right: lineRect.right }
+    });
+    if (!Number.isFinite(lineStart) || !Number.isFinite(lineEnd)) {
+      return null;
+    }
+    const spanEls = Array.from(lineEl.querySelectorAll("span, a")).filter(
+      (el) => el.dataset.pmStart !== void 0 && el.dataset.pmEnd !== void 0
+    );
+    log(
+      "Spans/anchors in line:",
+      spanEls.map((el, i2) => {
+        const rect = el.getBoundingClientRect();
+        return {
+          index: i2,
+          tag: el.tagName,
+          pmStart: el.dataset.pmStart,
+          pmEnd: el.dataset.pmEnd,
+          text: el.textContent?.substring(0, 20) + (el.textContent && el.textContent.length > 20 ? "..." : ""),
+          visibility: el.style.visibility,
+          rect: { left: rect.left, right: rect.right, width: rect.width }
+        };
+      })
+    );
+    if (spanEls.length === 0) {
+      return lineStart;
+    }
+    const firstRect = spanEls[0].getBoundingClientRect();
+    if (viewX <= firstRect.left) {
+      return lineStart;
+    }
+    const lastRect = spanEls[spanEls.length - 1].getBoundingClientRect();
+    if (viewX >= lastRect.right) {
+      return lineEnd;
+    }
+    const targetEl = findSpanAtX(spanEls, viewX);
+    if (!targetEl) {
+      return lineStart;
+    }
+    const spanStart = Number(targetEl.dataset.pmStart ?? "NaN");
+    const spanEnd = Number(targetEl.dataset.pmEnd ?? "NaN");
+    const targetRect = targetEl.getBoundingClientRect();
+    log("Target element:", {
+      tag: targetEl.tagName,
+      pmStart: spanStart,
+      pmEnd: spanEnd,
+      text: targetEl.textContent?.substring(0, 30),
+      visibility: targetEl.style.visibility,
+      rect: { left: targetRect.left, right: targetRect.right, width: targetRect.width }
+    });
+    if (!Number.isFinite(spanStart) || !Number.isFinite(spanEnd)) {
+      return null;
+    }
+    const firstChild = targetEl.firstChild;
+    if (!firstChild || firstChild.nodeType !== Node.TEXT_NODE || !firstChild.textContent) {
+      const elRect = targetEl.getBoundingClientRect();
+      const closerToLeft = Math.abs(viewX - elRect.left) <= Math.abs(viewX - elRect.right);
+      const snapPos = closerToLeft ? spanStart : spanEnd;
+      return snapPos;
+    }
+    const textNode = firstChild;
+    const charIndex = findCharIndexAtX(textNode, targetEl, viewX);
+    const pos = spanStart + charIndex;
+    return pos;
+  }
   function findLineAtY(lineEls, viewY) {
     if (lineEls.length === 0) {
       return null;
@@ -78690,7 +78851,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         return `img:${srcHash}:${imgRun.width}x${imgRun.height}`;
       }
       const text2 = normalizeText(
-        "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? ""
+        "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? ""
       );
       const bold = "bold" in run2 ? run2.bold : false;
       const italic = "italic" in run2 ? run2.italic : false;
@@ -79402,7 +79563,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     let pmStart = Infinity;
     let pmEnd = 0;
     for (const run2 of block.runs) {
-      text2 += "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text;
+      text2 += "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text;
       if (run2.pmStart !== void 0) {
         pmStart = Math.min(pmStart, run2.pmStart);
       }
@@ -79452,7 +79613,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return `${italic}${bold}${size2}px ${family}`.trim();
   }
   function runText(run2) {
-    return "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
+    return "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
   }
   function measureRunSliceWidth(run2, fromChar, toChar) {
     const context = getCtx();
@@ -79614,7 +79775,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     for (let i2 = 0; i2 < a2.runs.length; i2 += 1) {
       const runA = a2.runs[i2];
       const runB = b2.runs[i2];
-      if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
+      if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
         return false;
       }
     }
@@ -79734,7 +79895,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       parts.push(block.id);
       if (block.kind === "paragraph") {
         for (const run2 of block.runs) {
-          if (!("src" in run2) && run2.kind !== "lineBreak" && run2.kind !== "break") {
+          if (!("src" in run2) && run2.kind !== "lineBreak" && run2.kind !== "break" && run2.kind !== "fieldAnnotation") {
             parts.push(run2.text ?? "");
           }
           if ("bold" in run2 && run2.bold) parts.push("b");
@@ -80219,6 +80380,255 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     /** P3: Heavy debounce for full document layout */
     [Priority.P3]: 150
   });
+  const DEFAULT_MIME_TYPE$1 = "application/x-field-annotation";
+  const LEGACY_MIME_TYPE = "fieldAnnotation";
+  function parseIntSafe(value) {
+    if (!value) return void 0;
+    const parsed = parseInt(value, 10);
+    return Number.isFinite(parsed) ? parsed : void 0;
+  }
+  function extractFieldAnnotationData(element2) {
+    const dataset = element2.dataset;
+    const attributes = {};
+    for (const key2 in dataset) {
+      const value = dataset[key2];
+      if (value !== void 0) {
+        attributes[key2] = value;
+      }
+    }
+    return {
+      fieldId: dataset.fieldId,
+      fieldType: dataset.fieldType,
+      variant: dataset.variant ?? dataset.type,
+      displayLabel: dataset.displayLabel,
+      pmStart: parseIntSafe(dataset.pmStart),
+      pmEnd: parseIntSafe(dataset.pmEnd),
+      attributes
+    };
+  }
+  class DragHandler {
+    /**
+     * Creates a new DragHandler instance.
+     *
+     * @param container - The DOM container element (typically .superdoc-layout)
+     * @param config - Configuration options and callbacks
+     */
+    constructor(container, config2 = {}) {
+      this.container = container;
+      this.config = config2;
+      this.mimeType = config2.mimeType ?? DEFAULT_MIME_TYPE$1;
+      this.boundHandlers = {
+        dragstart: this.handleDragStart.bind(this),
+        dragover: this.handleDragOver.bind(this),
+        drop: this.handleDrop.bind(this),
+        dragend: this.handleDragEnd.bind(this),
+        dragleave: this.handleDragLeave.bind(this)
+      };
+      this.windowDragoverHandler = this.handleWindowDragOver.bind(this);
+      this.windowDropHandler = this.handleWindowDrop.bind(this);
+      this.attachListeners();
+    }
+    /**
+     * Attaches event listeners to the container and window.
+     */
+    attachListeners() {
+      this.container.addEventListener("dragstart", this.boundHandlers.dragstart);
+      this.container.addEventListener("dragover", this.boundHandlers.dragover);
+      this.container.addEventListener("drop", this.boundHandlers.drop);
+      this.container.addEventListener("dragend", this.boundHandlers.dragend);
+      this.container.addEventListener("dragleave", this.boundHandlers.dragleave);
+      window.addEventListener("dragover", this.windowDragoverHandler, false);
+      window.addEventListener("drop", this.windowDropHandler, false);
+    }
+    /**
+     * Removes event listeners from the container and window.
+     */
+    removeListeners() {
+      this.container.removeEventListener("dragstart", this.boundHandlers.dragstart);
+      this.container.removeEventListener("dragover", this.boundHandlers.dragover);
+      this.container.removeEventListener("drop", this.boundHandlers.drop);
+      this.container.removeEventListener("dragend", this.boundHandlers.dragend);
+      this.container.removeEventListener("dragleave", this.boundHandlers.dragleave);
+      window.removeEventListener("dragover", this.windowDragoverHandler, false);
+      window.removeEventListener("drop", this.windowDropHandler, false);
+    }
+    /**
+     * Handles dragover at window level to allow drops on overlay elements.
+     * This ensures preventDefault is called even when dragging over selection
+     * highlights or other UI elements that sit on top of the layout content.
+     */
+    handleWindowDragOver(event) {
+      if (this.hasFieldAnnotationData(event)) {
+        event.preventDefault();
+        if (event.dataTransfer) {
+          event.dataTransfer.dropEffect = "move";
+        }
+        const target = event.target;
+        if (!this.container.contains(target)) {
+          this.config.onDragOver?.({
+            event,
+            clientX: event.clientX,
+            clientY: event.clientY,
+            hasFieldAnnotation: true
+          });
+        }
+      }
+    }
+    /**
+     * Handles drop at window level to catch drops on overlay elements.
+     * If the drop target is outside the container, we process it here.
+     */
+    handleWindowDrop(event) {
+      if (this.hasFieldAnnotationData(event)) {
+        const target = event.target;
+        if (!this.container.contains(target)) {
+          this.handleDrop(event);
+        }
+      }
+    }
+    /**
+     * Handles the dragstart event.
+     * Sets up dataTransfer with field annotation data and drag image.
+     */
+    handleDragStart(event) {
+      const target = event.target;
+      if (!target?.dataset?.draggable || target.dataset.draggable !== "true") {
+        return;
+      }
+      const data = extractFieldAnnotationData(target);
+      if (event.dataTransfer) {
+        const jsonData = JSON.stringify({
+          attributes: data.attributes,
+          sourceField: data
+        });
+        event.dataTransfer.setData(this.mimeType, jsonData);
+        event.dataTransfer.setData(LEGACY_MIME_TYPE, jsonData);
+        event.dataTransfer.setData("text/plain", data.displayLabel ?? "Field Annotation");
+        event.dataTransfer.setDragImage(target, 0, 0);
+        event.dataTransfer.effectAllowed = "move";
+      }
+      this.config.onDragStart?.({
+        event,
+        element: target,
+        data
+      });
+    }
+    /**
+     * Handles the dragover event.
+     * Provides visual feedback and determines if drop is allowed.
+     */
+    handleDragOver(event) {
+      const hasFieldAnnotation = this.hasFieldAnnotationData(event);
+      if (hasFieldAnnotation) {
+        event.preventDefault();
+        if (event.dataTransfer) {
+          event.dataTransfer.dropEffect = "move";
+        }
+        this.container.classList.add("drag-over");
+      }
+      this.config.onDragOver?.({
+        event,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        hasFieldAnnotation
+      });
+    }
+    /**
+     * Handles the dragleave event.
+     * Removes visual feedback when drag leaves the container.
+     */
+    handleDragLeave(event) {
+      const relatedTarget = event.relatedTarget;
+      if (!relatedTarget || !this.container.contains(relatedTarget)) {
+        this.container.classList.remove("drag-over");
+      }
+    }
+    /**
+     * Handles the drop event.
+     * Maps drop coordinates to ProseMirror position and emits drop event.
+     */
+    handleDrop(event) {
+      this.container.classList.remove("drag-over");
+      if (!this.hasFieldAnnotationData(event)) {
+        return;
+      }
+      event.preventDefault();
+      const data = this.extractDragData(event);
+      if (!data) {
+        return;
+      }
+      const pmPosition = clickToPositionDom(this.container, event.clientX, event.clientY);
+      this.config.onDrop?.({
+        event,
+        data,
+        pmPosition,
+        clientX: event.clientX,
+        clientY: event.clientY
+      });
+    }
+    /**
+     * Handles the dragend event.
+     * Cleans up drag state.
+     */
+    handleDragEnd(event) {
+      this.container.classList.remove("drag-over");
+      this.config.onDragEnd?.(event);
+    }
+    /**
+     * Checks if a drag event contains field annotation data.
+     */
+    hasFieldAnnotationData(event) {
+      if (!event.dataTransfer) {
+        return false;
+      }
+      const types2 = event.dataTransfer.types;
+      return types2.includes(this.mimeType) || types2.includes(LEGACY_MIME_TYPE);
+    }
+    /**
+     * Extracts field annotation data from a drag event's dataTransfer.
+     */
+    extractDragData(event) {
+      if (!event.dataTransfer) {
+        return null;
+      }
+      let jsonData = event.dataTransfer.getData(this.mimeType);
+      if (!jsonData) {
+        jsonData = event.dataTransfer.getData(LEGACY_MIME_TYPE);
+      }
+      if (!jsonData) {
+        return null;
+      }
+      try {
+        const parsed = JSON.parse(jsonData);
+        return parsed.sourceField ?? parsed.attributes ?? parsed;
+      } catch {
+        return null;
+      }
+    }
+    /**
+     * Updates the configuration options.
+     *
+     * @param config - New configuration options to merge
+     */
+    updateConfig(config2) {
+      this.config = { ...this.config, ...config2 };
+      if (config2.mimeType) {
+        this.mimeType = config2.mimeType;
+      }
+    }
+    /**
+     * Destroys the drag handler and removes all event listeners.
+     * Call this when the layout engine is unmounted or the container is removed.
+     */
+    destroy() {
+      this.removeListeners();
+      this.container.classList.remove("drag-over");
+    }
+  }
+  function createDragHandler(container, config2 = {}) {
+    const handler2 = new DragHandler(container, config2);
+    return () => handler2.destroy();
+  }
   const isAtomicFragment = (fragment) => {
     return fragment.kind === "drawing" || fragment.kind === "image";
   };
@@ -80270,7 +80680,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     });
     for (const fragment of fragments) {
       if (fragment.kind !== "para") continue;
-      const blockIndex = blocks2.findIndex((block2) => block2.id === fragment.blockId);
+      const blockIndex = findBlockIndexByFragmentId(blocks2, fragment.blockId);
       if (blockIndex === -1) continue;
       const block = blocks2[blockIndex];
       const measure = measures[blockIndex];
@@ -80297,7 +80707,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const withinX = point2.x >= fragment.x && point2.x <= fragment.x + fragment.width;
       const withinY = point2.y >= fragment.y && point2.y <= fragment.y + fragment.height;
       if (!withinX || !withinY) continue;
-      const blockIndex = blocks2.findIndex((block2) => block2.id === fragment.blockId);
+      const blockIndex = findBlockIndexByFragmentId(blocks2, fragment.blockId);
       if (blockIndex === -1) continue;
       const block = blocks2[blockIndex];
       const measure = measures[blockIndex];
@@ -80436,7 +80846,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
                 blockId = fragment.blockId;
                 pageIndex = pi;
                 column = determineColumn(layout, fragment.x);
-                const blockIndex = blocks2.findIndex((b2) => b2.id === fragment.blockId);
+                const blockIndex = findBlockIndexByFragmentId(blocks2, fragment.blockId);
                 if (blockIndex !== -1) {
                   const measure = measures[blockIndex];
                   if (measure && measure.kind === "paragraph") {
@@ -80586,6 +80996,44 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     });
     return null;
   }
+  function findBlockIndexByFragmentId(blocks2, fragmentBlockId, targetPmRange) {
+    const index2 = blocks2.findIndex(
+      (block) => block.id === fragmentBlockId && block.kind !== "pageBreak" && block.kind !== "sectionBreak"
+    );
+    if (index2 !== -1) {
+      return index2;
+    }
+    const baseBlockId = fragmentBlockId.replace(/-\d+$/, "");
+    if (baseBlockId === fragmentBlockId) {
+      return -1;
+    }
+    const matchingIndices = [];
+    blocks2.forEach((block, idx) => {
+      if (block.id === baseBlockId && block.kind === "paragraph") {
+        matchingIndices.push(idx);
+      }
+    });
+    if (matchingIndices.length === 0) {
+      return -1;
+    }
+    if (matchingIndices.length === 1) {
+      return matchingIndices[0];
+    }
+    if (targetPmRange) {
+      for (const idx of matchingIndices) {
+        const block = blocks2[idx];
+        if (block.kind !== "paragraph") continue;
+        const hasOverlap = block.runs.some((run2) => {
+          if (run2.pmStart == null || run2.pmEnd == null) return false;
+          return run2.pmEnd > targetPmRange.from && run2.pmStart < targetPmRange.to;
+        });
+        if (hasOverlap) {
+          return idx;
+        }
+      }
+    }
+    return matchingIndices[0];
+  }
   function selectionToRects(layout, blocks2, measures, from2, to) {
     if (from2 === to) {
       return [];
@@ -80594,8 +81042,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     layout.pages.forEach((page, pageIndex) => {
       page.fragments.forEach((fragment) => {
         if (fragment.kind === "para") {
-          const blockIndex = blocks2.findIndex((block2) => block2.id === fragment.blockId);
-          if (blockIndex === -1) return;
+          const blockIndex = findBlockIndexByFragmentId(blocks2, fragment.blockId, { from: from2, to });
+          if (blockIndex === -1) {
+            return;
+          }
           const block = blocks2[blockIndex];
           const measure = measures[blockIndex];
           if (!block || block.kind !== "paragraph" || measure?.kind !== "paragraph") {
@@ -80631,7 +81081,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           return;
         }
         if (isAtomicFragment(fragment)) {
-          const blockIndex = blocks2.findIndex((block2) => block2.id === fragment.blockId);
+          const blockIndex = findBlockIndexByFragmentId(blocks2, fragment.blockId, { from: from2, to });
           if (blockIndex === -1) return;
           const block = blocks2[blockIndex];
           const pmRange = getAtomicPmRange(fragment, block);
@@ -80652,7 +81102,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     for (let pageIndex = 0; pageIndex < layout.pages.length; pageIndex += 1) {
       const page = layout.pages[pageIndex];
       for (const fragment of page.fragments) {
-        const blockIndex = blocks2.findIndex((block2) => block2.id === fragment.blockId);
+        const blockIndex = findBlockIndexByFragmentId(blocks2, fragment.blockId);
         if (blockIndex === -1) {
           continue;
         }
@@ -80757,7 +81207,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
       const run2 = block.runs[runIndex];
       if (!run2) continue;
-      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
+      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runLength = text2.length;
       const runPmStart = run2.pmStart ?? null;
       const runPmEnd = run2.pmEnd ?? (runPmStart != null ? runPmStart + runLength : null);
@@ -80781,7 +81231,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
       const run2 = block.runs[runIndex];
       if (!run2) continue;
-      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" ? "" : run2.text ?? "";
+      const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runTextLength = text2.length;
       const runPmStart = run2.pmStart ?? null;
       const runPmEnd = run2.pmEnd ?? (runPmStart != null ? runPmStart + runTextLength : null);
@@ -83313,10 +83763,228 @@ ${l}
 .superdoc-layout .track-format-dec.highlighted {
   border-bottom: 2px solid gold;
 }
+`;
+  const SDT_CONTAINER_STYLES = `
+/* Document Section - Block-level container with gray border and hover tooltip */
+.superdoc-document-section {
+  background-color: #fafafa;
+  border: 1px solid #ababab;
+  border-radius: 4px;
+  position: relative;
+  box-sizing: border-box;
+}
+
+/* Document section tooltip - positioned above the fragment */
+.superdoc-document-section__tooltip {
+  position: absolute;
+  top: -19px;
+  left: -1px;
+  max-width: 100px;
+  min-width: 0;
+  height: 18px;
+  border: 1px solid #ababab;
+  border-bottom: none;
+  border-radius: 6px 6px 0 0;
+  padding: 0 8px;
+  align-items: center;
+  font-size: 10px;
+  display: none;
+  z-index: 100;
+  background-color: #fafafa;
+  pointer-events: none;
+}
+
+.superdoc-document-section__tooltip span {
+  max-width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+/* Show tooltip on hover - adjust border radius to connect with tooltip tab */
+.superdoc-document-section:hover {
+  border-radius: 0 4px 4px 4px;
+}
+
+.superdoc-document-section:hover .superdoc-document-section__tooltip {
+  display: flex;
+  align-items: center;
+}
+
+/* Continuation styling: first fragment has top corners, last has bottom corners */
+.superdoc-document-section[data-sdt-container-start="true"] {
+  border-radius: 4px 4px 0 0;
+}
+
+.superdoc-document-section[data-sdt-container-end="true"] {
+  border-radius: 0 0 4px 4px;
+}
+
+.superdoc-document-section[data-sdt-container-start="true"][data-sdt-container-end="true"] {
+  border-radius: 4px;
+}
+
+.superdoc-document-section[data-sdt-container-start="true"]:hover {
+  border-radius: 0 4px 0 0;
+}
+
+/* Middle fragments have no border radius */
+.superdoc-document-section:not([data-sdt-container-start="true"]):not([data-sdt-container-end="true"]) {
+  border-radius: 0;
+  border-top: none;
+}
+
+/* Structured Content Block - Blue border container */
+.superdoc-structured-content-block {
+  padding: 1px;
+  box-sizing: border-box;
+  border-radius: 4px;
+  border: 1px solid #629be7;
+  position: relative;
+}
+
+/* Structured content drag handle/label - positioned above */
+.superdoc-structured-content__label {
+  font-size: 10px;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  left: 2px;
+  top: -19px;
+  width: calc(100% - 4px);
+  max-width: 110px;
+  min-width: 0;
+  height: 18px;
+  padding: 0 4px;
+  border: 1px solid #629be7;
+  border-bottom: none;
+  border-radius: 6px 6px 0 0;
+  background-color: #629be7dd;
+  box-sizing: border-box;
+  z-index: 10;
+  display: none;
+  pointer-events: none;
+}
+
+.superdoc-structured-content__label span {
+  max-width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.superdoc-structured-content-block:hover .superdoc-structured-content__label {
+  display: inline-flex;
+}
+
+/* Continuation styling for structured content blocks */
+.superdoc-structured-content-block[data-sdt-container-start="true"] {
+  border-radius: 4px 4px 0 0;
+}
+
+.superdoc-structured-content-block[data-sdt-container-end="true"] {
+  border-radius: 0 0 4px 4px;
+}
+
+.superdoc-structured-content-block[data-sdt-container-start="true"][data-sdt-container-end="true"] {
+  border-radius: 4px;
+}
+
+.superdoc-structured-content-block:not([data-sdt-container-start="true"]):not([data-sdt-container-end="true"]) {
+  border-radius: 0;
+  border-top: none;
+}
+
+/* Structured Content Inline - Inline wrapper with blue border */
+.superdoc-structured-content-inline {
+  padding: 1px;
+  box-sizing: border-box;
+  border-radius: 4px;
+  border: 1px solid #629be7;
+  position: relative;
+  display: inline;
+}
+
+/* Hover effect for inline structured content */
+.superdoc-structured-content-inline:hover {
+  background-color: rgba(98, 155, 231, 0.15);
+  border-color: #4a8ad9;
+}
+
+/* Inline structured content label - shown on hover */
+.superdoc-structured-content-inline__label {
+  position: absolute;
+  bottom: calc(100% + 2px);
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 10px;
+  padding: 2px 6px;
+  background-color: #629be7dd;
+  color: white;
+  border-radius: 4px;
+  white-space: nowrap;
+  z-index: 100;
+  display: none;
+  pointer-events: none;
+}
+
+.superdoc-structured-content-inline:hover .superdoc-structured-content-inline__label {
+  display: block;
+}
+
+/* Print mode: hide visual styling for SDT containers */
+@media print {
+  .superdoc-document-section,
+  .superdoc-structured-content-block,
+  .superdoc-structured-content-inline {
+    background: none;
+    border: none;
+    padding: 0;
+  }
+
+  .superdoc-document-section__tooltip,
+  .superdoc-structured-content__label,
+  .superdoc-structured-content-inline__label {
+    display: none !important;
+  }
+}
+`;
+  const FIELD_ANNOTATION_STYLES = `
+/* Field annotation draggable styles */
+.superdoc-layout .annotation[data-draggable="true"] {
+  cursor: grab;
+  user-select: none;
+  -webkit-user-select: none;
+}
+
+.superdoc-layout .annotation[data-draggable="true"]:hover {
+  opacity: 0.9;
+}
+
+.superdoc-layout .annotation[data-draggable="true"]:active {
+  cursor: grabbing;
+}
+
+/* Drag over indicator for drop targets */
+.superdoc-layout.drag-over {
+  outline: 2px dashed #b015b3;
+  outline-offset: -2px;
+}
+
+/* Drop zone indicator */
+.superdoc-layout .superdoc-drop-indicator {
+  position: absolute;
+  width: 2px;
+  background-color: #b015b3;
+  pointer-events: none;
+  z-index: 1000;
+}
 `;
   let printStylesInjected = false;
   let linkStylesInjected = false;
   let trackChangeStylesInjected = false;
+  let sdtContainerStylesInjected = false;
+  let fieldAnnotationStylesInjected = false;
   const ensurePrintStyles = (doc2) => {
     if (printStylesInjected || !doc2) return;
     const styleEl = doc2.createElement("style");
@@ -83341,6 +84009,22 @@ ${l}
     doc2.head?.appendChild(styleEl);
     trackChangeStylesInjected = true;
   };
+  const ensureSdtContainerStyles = (doc2) => {
+    if (sdtContainerStylesInjected || !doc2) return;
+    const styleEl = doc2.createElement("style");
+    styleEl.setAttribute("data-superdoc-sdt-container-styles", "true");
+    styleEl.textContent = SDT_CONTAINER_STYLES;
+    doc2.head?.appendChild(styleEl);
+    sdtContainerStylesInjected = true;
+  };
+  const ensureFieldAnnotationStyles = (doc2) => {
+    if (fieldAnnotationStylesInjected || !doc2) return;
+    const styleEl = doc2.createElement("style");
+    styleEl.setAttribute("data-superdoc-field-annotation-styles", "true");
+    styleEl.textContent = FIELD_ANNOTATION_STYLES;
+    doc2.head?.appendChild(styleEl);
+    fieldAnnotationStylesInjected = true;
+  };
   const ALLOWED_BORDER_STYLES = /* @__PURE__ */ new Set([
     "none",
     "single",
@@ -83670,6 +84354,50 @@ ${l}
       container.appendChild(cellElement);
     }
   };
+  function isStructuredContentMetadata(sdt) {
+    return sdt !== null && sdt !== void 0 && typeof sdt === "object" && "type" in sdt && sdt.type === "structuredContent";
+  }
+  function isDocumentSectionMetadata(sdt) {
+    return sdt !== null && sdt !== void 0 && typeof sdt === "object" && "type" in sdt && sdt.type === "documentSection";
+  }
+  function getSdtContainerConfig(sdt) {
+    if (isDocumentSectionMetadata(sdt)) {
+      return {
+        className: "superdoc-document-section",
+        labelText: sdt.title ?? "Document section",
+        labelClassName: "superdoc-document-section__tooltip",
+        isStart: true,
+        isEnd: true
+      };
+    }
+    if (isStructuredContentMetadata(sdt) && sdt.scope === "block") {
+      return {
+        className: "superdoc-structured-content-block",
+        labelText: sdt.alias ?? "Structured content",
+        labelClassName: "superdoc-structured-content__label",
+        isStart: true,
+        isEnd: true
+      };
+    }
+    return null;
+  }
+  function applySdtContainerStyling(doc2, container, sdt, containerSdt) {
+    let config2 = getSdtContainerConfig(sdt);
+    if (!config2 && containerSdt) {
+      config2 = getSdtContainerConfig(containerSdt);
+    }
+    if (!config2) return;
+    container.classList.add(config2.className);
+    container.dataset.sdtContainerStart = String(config2.isStart);
+    container.dataset.sdtContainerEnd = String(config2.isEnd);
+    container.style.overflow = "visible";
+    const labelEl = doc2.createElement("div");
+    labelEl.className = config2.labelClassName;
+    const labelText = doc2.createElement("span");
+    labelText.textContent = config2.labelText;
+    labelEl.appendChild(labelText);
+    container.appendChild(labelEl);
+  }
   const renderTableFragment = (deps) => {
     const { doc: doc2, fragment, blockLookup, context, renderLine, applyFragmentFrame, applySdtDataset, applyStyles: applyStyles2 } = deps;
     if (!doc2) {
@@ -83706,6 +84434,7 @@ ${l}
     applyFragmentFrame(container, fragment);
     container.style.height = `${fragment.height}px`;
     applySdtDataset(container, block.attrs?.sdt);
+    applySdtContainerStyling(doc2, container, block.attrs?.sdt);
     container.classList.add("superdoc-table-fragment");
     if (fragment.metadata?.columnBoundaries) {
       const columnCount = measure.columnWidths.length;
@@ -84172,6 +84901,8 @@ ${l}
       ensurePrintStyles(doc2);
       ensureLinkStyles(doc2);
       ensureTrackChangeStyles(doc2);
+      ensureFieldAnnotationStyles(doc2);
+      ensureSdtContainerStyles(doc2);
       mount2.classList.add(CLASS_NAMES.container);
       if (this.mount && this.mount !== mount2) {
         this.resetState();
@@ -84694,7 +85425,8 @@ ${l}
         fragmentEl.classList.add(CLASS_NAMES.fragment);
         const isTocEntry = block.attrs?.isTocEntry;
         const hasMarker = !fragment.continuesFromPrev && fragment.markerWidth && wordLayout?.marker;
-        const styles = isTocEntry ? { ...fragmentStyles, whiteSpace: "nowrap" } : hasMarker ? { ...fragmentStyles, overflow: "visible" } : fragmentStyles;
+        const hasSdtContainer = block.attrs?.sdt?.type === "documentSection" || block.attrs?.sdt?.type === "structuredContent" || block.attrs?.containerSdt?.type === "documentSection" || block.attrs?.containerSdt?.type === "structuredContent";
+        const styles = isTocEntry ? { ...fragmentStyles, whiteSpace: "nowrap" } : hasMarker || hasSdtContainer ? { ...fragmentStyles, overflow: "visible" } : fragmentStyles;
         applyStyles$2(fragmentEl, styles);
         this.applyFragmentFrame(fragmentEl, fragment, context.section);
         if (isTocEntry) {
@@ -84714,6 +85446,7 @@ ${l}
         }
         this.applySdtDataset(fragmentEl, block.attrs?.sdt);
         this.applyContainerSdtDataset(fragmentEl, block.attrs?.containerSdt);
+        applySdtContainerStyling(this.doc, fragmentEl, block.attrs?.sdt, block.attrs?.containerSdt);
         const dropCapDescriptor = block.attrs?.dropCapDescriptor;
         const dropCapMeasure = measure.dropCap;
         if (dropCapDescriptor && dropCapMeasure && !fragment.continuesFromPrev) {
@@ -84932,6 +85665,7 @@ ${l}
         fragmentEl.dataset.itemId = fragment.itemId;
         const paragraphMetadata = item.paragraph.attrs?.sdt;
         this.applySdtDataset(fragmentEl, paragraphMetadata);
+        applySdtContainerStyling(this.doc, fragmentEl, paragraphMetadata, item.paragraph.attrs?.containerSdt);
         if (fragment.continuesFromPrev) {
           fragmentEl.dataset.continuesFromPrev = "true";
         }
@@ -85703,10 +86437,19 @@ ${l}
     isBreakRun(run2) {
       return run2.kind === "break";
     }
+    /**
+     * Type guard to check if a run is a field annotation run.
+     */
+    isFieldAnnotationRun(run2) {
+      return run2.kind === "fieldAnnotation";
+    }
     renderRun(run2, context, trackedConfig) {
       if (this.isImageRun(run2)) {
         return this.renderImageRun(run2);
       }
+      if (this.isFieldAnnotationRun(run2)) {
+        return this.renderFieldAnnotationRun(run2);
+      }
       if (this.isLineBreakRun(run2)) {
         return null;
       }
@@ -85843,6 +86586,200 @@ ${l}
       }
       return img2;
     }
+    /**
+     * Renders a FieldAnnotationRun as an inline "pill" element matching super-editor's visual appearance.
+     *
+     * Field annotations are styled inline elements that display form fields with:
+     * - Outer span with border, border-radius, padding, and background color
+     * - Inner span containing the displayLabel or type-specific content (image, link, etc.)
+     *
+     * @param run - The FieldAnnotationRun to render containing field configuration and styling
+     * @returns HTMLElement (span) or null if document is not available
+     *
+     * @example
+     * ```typescript
+     * // Text variant
+     * renderFieldAnnotationRun({ kind: 'fieldAnnotation', variant: 'text', displayLabel: 'Full Name', fieldColor: '#980043' })
+     * // Returns: <span class="annotation" style="border: 2px solid #b015b3; ..."><span class="annotation-content">Full Name</span></span>
+     *
+     * // Image variant with imageSrc
+     * renderFieldAnnotationRun({ kind: 'fieldAnnotation', variant: 'image', displayLabel: 'Photo', imageSrc: 'data:image/png;...' })
+     * // Returns: <span class="annotation"><span class="annotation-content"><img src="..." /></span></span>
+     *
+     * // Link variant
+     * renderFieldAnnotationRun({ kind: 'fieldAnnotation', variant: 'link', displayLabel: 'Website', linkUrl: 'https://example.com' })
+     * // Returns: <span class="annotation"><span class="annotation-content"><a href="...">https://example.com</a></span></span>
+     * ```
+     */
+    renderFieldAnnotationRun(run2) {
+      if (!this.doc) {
+        return null;
+      }
+      if (run2.hidden) {
+        const hidden2 = this.doc.createElement("span");
+        hidden2.style.display = "none";
+        if (run2.pmStart != null) hidden2.dataset.pmStart = String(run2.pmStart);
+        if (run2.pmEnd != null) hidden2.dataset.pmEnd = String(run2.pmEnd);
+        return hidden2;
+      }
+      const defaultBorderColor = "#b015b3";
+      const defaultFieldColor = "#980043";
+      const annotation = this.doc.createElement("span");
+      annotation.classList.add("annotation");
+      annotation.setAttribute("aria-label", "Field annotation");
+      const showHighlight = run2.highlighted !== false;
+      if (showHighlight) {
+        const borderColor = run2.borderColor || defaultBorderColor;
+        annotation.style.border = `2px solid ${borderColor}`;
+        annotation.style.borderRadius = "2px";
+        annotation.style.padding = "1px 2px";
+        annotation.style.boxSizing = "border-box";
+        const fieldColor = run2.fieldColor || defaultFieldColor;
+        const bgColor = fieldColor.length === 7 ? `${fieldColor}33` : fieldColor;
+        if (run2.textHighlight) {
+          annotation.style.backgroundColor = run2.textHighlight;
+        } else {
+          annotation.style.backgroundColor = bgColor;
+        }
+      }
+      if (run2.visibility === "hidden") {
+        annotation.style.visibility = "hidden";
+      }
+      if (run2.size) {
+        if (run2.size.width) {
+          annotation.style.width = `${run2.size.width}px`;
+          annotation.style.display = "inline-block";
+          annotation.style.overflow = "hidden";
+        }
+        if (run2.size.height) {
+          annotation.style.height = `${run2.size.height}px`;
+        }
+      }
+      if (run2.fontFamily) {
+        annotation.style.fontFamily = run2.fontFamily;
+      }
+      if (run2.fontSize) {
+        const fontSize2 = typeof run2.fontSize === "number" ? `${run2.fontSize}pt` : run2.fontSize;
+        annotation.style.fontSize = fontSize2;
+      }
+      if (run2.textColor) {
+        annotation.style.color = run2.textColor;
+      }
+      if (run2.bold) {
+        annotation.style.fontWeight = "bold";
+      }
+      if (run2.italic) {
+        annotation.style.fontStyle = "italic";
+      }
+      if (run2.underline) {
+        annotation.style.textDecoration = "underline";
+      }
+      annotation.style.zIndex = "1";
+      const content2 = this.doc.createElement("span");
+      content2.classList.add("annotation-content");
+      content2.style.pointerEvents = "none";
+      content2.setAttribute("contenteditable", "false");
+      switch (run2.variant) {
+        case "image":
+        case "signature": {
+          if (run2.imageSrc) {
+            const img2 = this.doc.createElement("img");
+            const isDataUrl = run2.imageSrc.startsWith("data:");
+            if (isDataUrl) {
+              if (run2.imageSrc.length <= MAX_DATA_URL_LENGTH && VALID_IMAGE_DATA_URL.test(run2.imageSrc)) {
+                img2.src = run2.imageSrc;
+              } else {
+                content2.textContent = run2.displayLabel;
+                break;
+              }
+            } else {
+              const sanitized = sanitizeHref(run2.imageSrc);
+              if (sanitized) {
+                img2.src = sanitized.href;
+              } else {
+                content2.textContent = run2.displayLabel;
+                break;
+              }
+            }
+            img2.alt = run2.displayLabel;
+            img2.style.height = "auto";
+            img2.style.maxWidth = "100%";
+            img2.style.pointerEvents = "none";
+            img2.style.verticalAlign = "middle";
+            if (run2.variant === "signature") {
+              img2.style.maxHeight = "28px";
+            }
+            content2.appendChild(img2);
+            annotation.style.display = "inline-block";
+            content2.style.display = "inline-block";
+          } else {
+            content2.textContent = run2.displayLabel || (run2.variant === "signature" ? "Signature" : "");
+          }
+          break;
+        }
+        case "link": {
+          if (run2.linkUrl) {
+            const link2 = this.doc.createElement("a");
+            const sanitized = sanitizeHref(run2.linkUrl);
+            if (sanitized) {
+              link2.href = sanitized.href;
+              link2.target = "_blank";
+              link2.rel = "noopener noreferrer";
+              link2.textContent = run2.linkUrl;
+              link2.style.textDecoration = "none";
+              content2.style.pointerEvents = "all";
+              content2.appendChild(link2);
+            } else {
+              content2.textContent = run2.displayLabel;
+            }
+          } else {
+            content2.textContent = run2.displayLabel;
+          }
+          break;
+        }
+        case "html": {
+          if (run2.rawHtml && typeof run2.rawHtml === "string") {
+            content2.textContent = run2.displayLabel;
+            annotation.style.display = "inline-block";
+            content2.style.display = "inline-block";
+          } else {
+            content2.textContent = run2.displayLabel;
+          }
+          break;
+        }
+        case "text":
+        case "checkbox":
+        default: {
+          content2.textContent = run2.displayLabel;
+          break;
+        }
+      }
+      annotation.appendChild(content2);
+      annotation.dataset.type = run2.variant;
+      if (run2.fieldId) {
+        annotation.dataset.fieldId = run2.fieldId;
+      }
+      if (run2.fieldType) {
+        annotation.dataset.fieldType = run2.fieldType;
+      }
+      annotation.draggable = true;
+      annotation.dataset.draggable = "true";
+      if (run2.displayLabel) {
+        annotation.dataset.displayLabel = run2.displayLabel;
+      }
+      if (run2.variant) {
+        annotation.dataset.variant = run2.variant;
+      }
+      assertPmPositions(run2, "field annotation run");
+      if (run2.pmStart != null) {
+        annotation.dataset.pmStart = String(run2.pmStart);
+      }
+      if (run2.pmEnd != null) {
+        annotation.dataset.pmEnd = String(run2.pmEnd);
+      }
+      this.applySdtDataset(annotation, run2.sdt);
+      return annotation;
+    }
     /**
      * Renders a single line of a paragraph block.
      *
@@ -86020,6 +86957,22 @@ ${l}
           if (this.isBreakRun(baseRun)) {
             continue;
           }
+          if (this.isFieldAnnotationRun(baseRun)) {
+            const elem = this.renderRun(baseRun, context, trackedConfig);
+            if (elem) {
+              if (styleId) {
+                elem.setAttribute("styleid", styleId);
+              }
+              const runSegments2 = segmentsByRun.get(runIndex);
+              const segX = runSegments2 && runSegments2[0]?.x !== void 0 ? runSegments2[0].x : cumulativeX;
+              const segWidth = (runSegments2 && runSegments2[0]?.width !== void 0 ? runSegments2[0].width : 0) ?? 0;
+              elem.style.position = "absolute";
+              elem.style.left = `${segX}px`;
+              el.appendChild(elem);
+              cumulativeX = segX + segWidth;
+            }
+            continue;
+          }
           const runSegments = segmentsByRun.get(runIndex);
           if (!runSegments || runSegments.length === 0) {
             continue;
@@ -86065,7 +87018,22 @@ ${l}
           });
         }
       } else {
+        let currentInlineSdtWrapper = null;
+        let currentInlineSdtId = null;
+        const closeCurrentWrapper = () => {
+          if (currentInlineSdtWrapper) {
+            el.appendChild(currentInlineSdtWrapper);
+            currentInlineSdtWrapper = null;
+            currentInlineSdtId = null;
+          }
+        };
         runsForLine.forEach((run2) => {
+          const runSdt = run2.sdt;
+          const isInlineSdt = runSdt?.type === "structuredContent" && runSdt?.scope === "inline";
+          const runSdtId = isInlineSdt && runSdt?.id ? String(runSdt.id) : null;
+          if (runSdtId !== currentInlineSdtId) {
+            closeCurrentWrapper();
+          }
           if (run2.kind === "tab") {
             const tabEl = this.doc.createElement("span");
             tabEl.classList.add("superdoc-tab");
@@ -86093,9 +87061,37 @@ ${l}
             if (styleId) {
               elem.setAttribute("styleid", styleId);
             }
-            el.appendChild(elem);
+            if (isInlineSdt && runSdtId && this.doc) {
+              if (!currentInlineSdtWrapper) {
+                currentInlineSdtWrapper = this.doc.createElement("span");
+                currentInlineSdtWrapper.className = "superdoc-structured-content-inline";
+                currentInlineSdtId = runSdtId;
+                this.applySdtDataset(currentInlineSdtWrapper, runSdt);
+                const alias = runSdt?.alias || "Inline content";
+                const labelEl = this.doc.createElement("span");
+                labelEl.className = "superdoc-structured-content-inline__label";
+                labelEl.textContent = alias;
+                currentInlineSdtWrapper.appendChild(labelEl);
+              }
+              const wrapperPmStart = currentInlineSdtWrapper.dataset.pmStart;
+              const wrapperPmEnd = currentInlineSdtWrapper.dataset.pmEnd;
+              if (run2.pmStart != null) {
+                if (!wrapperPmStart || run2.pmStart < parseInt(wrapperPmStart, 10)) {
+                  currentInlineSdtWrapper.dataset.pmStart = String(run2.pmStart);
+                }
+              }
+              if (run2.pmEnd != null) {
+                if (!wrapperPmEnd || run2.pmEnd > parseInt(wrapperPmEnd, 10)) {
+                  currentInlineSdtWrapper.dataset.pmEnd = String(run2.pmEnd);
+                }
+              }
+              currentInlineSdtWrapper.appendChild(elem);
+            } else {
+              el.appendChild(elem);
+            }
           }
         });
+        closeCurrentWrapper();
       }
       const anchors = el.querySelectorAll("a[href]");
       anchors.forEach((anchor) => {
@@ -86603,7 +87599,7 @@ ${l}
     return block.id;
   };
   const applyRunStyles = (element2, run2, _isLink = false) => {
-    if (run2.kind === "tab" || run2.kind === "image" || run2.kind === "lineBreak" || run2.kind === "break") {
+    if (run2.kind === "tab" || run2.kind === "image" || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation") {
       return;
     }
     element2.style.fontFamily = run2.fontFamily;
@@ -86763,6 +87759,10 @@ ${l}
         result.push(run2);
         continue;
       }
+      if (run2.kind === "fieldAnnotation") {
+        result.push(run2);
+        continue;
+      }
       if (!("text" in run2)) {
         continue;
       }
@@ -87078,6 +88078,10 @@ ${l}
   const TAB_EPSILON = 0.1;
   const DEFAULT_DECIMAL_SEPARATOR = ".";
   const ALLOWED_TAB_VALS = /* @__PURE__ */ new Set(["start", "center", "end", "decimal", "bar", "clear"]);
+  const FIELD_ANNOTATION_PILL_PADDING = 8;
+  const FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER = 1.2;
+  const FIELD_ANNOTATION_VERTICAL_PADDING = 6;
+  const DEFAULT_FIELD_ANNOTATION_FONT_SIZE = 16;
   const roundValue = (value) => value;
   function getCanvasContext() {
     if (!canvasContext) {
@@ -87157,6 +88161,9 @@ ${l}
   function isLineBreakRun(run2) {
     return run2.kind === "lineBreak";
   }
+  function isFieldAnnotationRun(run2) {
+    return run2.kind === "fieldAnnotation";
+  }
   async function measureBlock(block, constraints) {
     const normalized = normalizeConstraints(constraints);
     if (block.kind === "drawing") {
@@ -87523,6 +88530,92 @@ ${l}
         lastAppliedTabAlign = null;
         continue;
       }
+      if (isFieldAnnotationRun(run2)) {
+        const displayText = run2.displayLabel || "";
+        const annotationFontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE : DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
+        const annotationFontFamily = run2.fontFamily || "Arial, sans-serif";
+        const fontWeight = run2.bold ? "bold" : "normal";
+        const fontStyle = run2.italic ? "italic" : "normal";
+        const annotationFont = `${fontStyle} ${fontWeight} ${annotationFontSize}px ${annotationFontFamily}`;
+        ctx2.font = annotationFont;
+        const textWidth = displayText ? ctx2.measureText(displayText).width : 0;
+        const annotationWidth = textWidth + FIELD_ANNOTATION_PILL_PADDING;
+        const annotationHeight = annotationFontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + FIELD_ANNOTATION_VERTICAL_PADDING;
+        let annotationStartX;
+        if (pendingTabAlignment && currentLine) {
+          annotationStartX = alignPendingTabForWidth(annotationWidth);
+        }
+        if (!currentLine) {
+          currentLine = {
+            fromRun: runIndex,
+            fromChar: 0,
+            toRun: runIndex,
+            toChar: 1,
+            // Field annotations are atomic units
+            width: annotationWidth,
+            maxFontSize: annotationHeight,
+            maxWidth: getEffectiveWidth(initialAvailableWidth),
+            segments: [
+              {
+                runIndex,
+                fromChar: 0,
+                toChar: 1,
+                width: annotationWidth,
+                ...annotationStartX !== void 0 ? { x: annotationStartX } : {}
+              }
+            ]
+          };
+          continue;
+        }
+        if (currentLine.width + annotationWidth > currentLine.maxWidth && currentLine.width > 0) {
+          const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
+          const completedLine = {
+            ...currentLine,
+            ...metrics
+          };
+          addBarTabsToLine(completedLine);
+          lines.push(completedLine);
+          tabStopCursor = 0;
+          pendingTabAlignment = null;
+          lastAppliedTabAlign = null;
+          currentLine = {
+            fromRun: runIndex,
+            fromChar: 0,
+            toRun: runIndex,
+            toChar: 1,
+            width: annotationWidth,
+            maxFontSize: annotationHeight,
+            maxWidth: getEffectiveWidth(contentWidth),
+            segments: [
+              {
+                runIndex,
+                fromChar: 0,
+                toChar: 1,
+                width: annotationWidth
+              }
+            ]
+          };
+        } else {
+          currentLine.toRun = runIndex;
+          currentLine.toChar = 1;
+          currentLine.width = roundValue(currentLine.width + annotationWidth);
+          currentLine.maxFontSize = Math.max(currentLine.maxFontSize, annotationHeight);
+          if (!currentLine.segments) currentLine.segments = [];
+          currentLine.segments.push({
+            runIndex,
+            fromChar: 0,
+            toChar: 1,
+            width: annotationWidth,
+            ...annotationStartX !== void 0 ? { x: annotationStartX } : {}
+          });
+        }
+        const tabAlign = lastAppliedTabAlign;
+        if (tabAlign && currentLine && tabAlign.val === "end") {
+          currentLine.width = roundValue(tabAlign.target);
+        }
+        lastAppliedTabAlign = null;
+        continue;
+      }
       if (!("text" in run2) || !("fontSize" in run2)) {
         continue;
       }
@@ -89487,6 +90580,16 @@ ${l}
     }
     return false;
   }
+  const CommentMarkName = "commentMark";
+  const TrackInsertMarkName = "trackInsert";
+  const TrackDeleteMarkName = "trackDelete";
+  const TrackFormatMarkName = "trackFormat";
+  function isValidFieldAnnotationAttributes(attrs) {
+    if (!attrs || typeof attrs !== "object") return false;
+    const a2 = attrs;
+    return typeof a2.fieldId === "string" && typeof a2.fieldType === "string" && typeof a2.displayLabel === "string" && typeof a2.type === "string";
+  }
+  const FIELD_ANNOTATION_DATA_TYPE = "fieldAnnotation";
   const DEFAULT_PAGE_SIZE = { w: 612, h: 792 };
   const DEFAULT_MARGINS = { top: 72, right: 72, bottom: 72, left: 72 };
   const WORD_CHARACTER_REGEX = /[\p{L}\p{N}''_~-]/u;
@@ -89512,6 +90615,7 @@ ${l}
       __privateAdd$1(this, _layoutOptions);
       __privateAdd$1(this, _layoutState, { blocks: [], measures: [], layout: null });
       __privateAdd$1(this, _domPainter, null);
+      __privateAdd$1(this, _dragHandlerCleanup, null);
       __privateAdd$1(this, _layoutError, null);
       __privateAdd$1(this, _layoutErrorState, "healthy");
       __privateAdd$1(this, _errorBanner, null);
@@ -89570,8 +90674,12 @@ ${l}
         if (event.button !== 0) {
           return;
         }
+        const target = event.target;
+        const isDraggableAnnotation = target?.closest?.('[data-draggable="true"]') != null;
         if (!__privateGet$1(this, _layoutState).layout) {
-          event.preventDefault();
+          if (!isDraggableAnnotation) {
+            event.preventDefault();
+          }
           if (document.activeElement instanceof HTMLElement) {
             document.activeElement.blur();
           }
@@ -89580,10 +90688,10 @@ ${l}
             return;
           }
           const validPos = __privateMethod$1(this, _PresentationEditor_instances, getFirstTextPosition_fn).call(this);
-          const doc22 = __privateGet$1(this, _editor3)?.state?.doc;
-          if (doc22) {
+          const doc222 = __privateGet$1(this, _editor3)?.state?.doc;
+          if (doc222) {
             try {
-              const tr = __privateGet$1(this, _editor3).state.tr.setSelection(TextSelection$1.create(doc22, validPos));
+              const tr = __privateGet$1(this, _editor3).state.tr.setSelection(TextSelection$1.create(doc222, validPos));
               __privateGet$1(this, _editor3).view?.dispatch(tr);
             } catch (error) {
               if (process$1$1.env.NODE_ENV === "development") {
@@ -89619,7 +90727,7 @@ ${l}
         if (headerFooterRegion) {
           return;
         }
-        const hit = clickToPosition(
+        const rawHit = clickToPosition(
           __privateGet$1(this, _layoutState).layout,
           __privateGet$1(this, _layoutState).blocks,
           __privateGet$1(this, _layoutState).measures,
@@ -89628,7 +90736,11 @@ ${l}
           event.clientX,
           event.clientY
         );
-        event.preventDefault();
+        const doc22 = __privateGet$1(this, _editor3).state?.doc;
+        const hit = rawHit && doc22 ? { ...rawHit, pos: Math.max(0, Math.min(rawHit.pos, doc22.content.size)) } : rawHit;
+        if (!isDraggableAnnotation) {
+          event.preventDefault();
+        }
         if (!hit) {
           if (document.activeElement instanceof HTMLElement) {
             document.activeElement.blur();
@@ -89636,10 +90748,10 @@ ${l}
           const editorDom2 = __privateGet$1(this, _editor3).view?.dom;
           if (editorDom2) {
             const validPos = __privateMethod$1(this, _PresentationEditor_instances, getFirstTextPosition_fn).call(this);
-            const doc22 = __privateGet$1(this, _editor3)?.state?.doc;
-            if (doc22) {
+            const doc222 = __privateGet$1(this, _editor3)?.state?.doc;
+            if (doc222) {
               try {
-                const tr = __privateGet$1(this, _editor3).state.tr.setSelection(TextSelection$1.create(doc22, validPos));
+                const tr = __privateGet$1(this, _editor3).state.tr.setSelection(TextSelection$1.create(doc222, validPos));
                 __privateGet$1(this, _editor3).view?.dispatch(tr);
               } catch (error) {
                 if (process$1$1.env.NODE_ENV === "development") {
@@ -89660,9 +90772,9 @@ ${l}
           hit.pos
         );
         if (fragmentHit && (fragmentHit.fragment.kind === "image" || fragmentHit.fragment.kind === "drawing")) {
-          const doc22 = __privateGet$1(this, _editor3).state.doc;
+          const doc222 = __privateGet$1(this, _editor3).state.doc;
           try {
-            const tr = __privateGet$1(this, _editor3).state.tr.setSelection(NodeSelection.create(doc22, hit.pos));
+            const tr = __privateGet$1(this, _editor3).state.tr.setSelection(NodeSelection.create(doc222, hit.pos));
             __privateGet$1(this, _editor3).view?.dispatch(tr);
             if (__privateGet$1(this, _lastSelectedImageBlockId) && __privateGet$1(this, _lastSelectedImageBlockId) !== fragmentHit.fragment.blockId) {
               this.emit("imageDeselected", { blockId: __privateGet$1(this, _lastSelectedImageBlockId) });
@@ -89753,8 +90865,8 @@ ${l}
           }
         }
         if (!handledByDepth) {
-          const tr = __privateGet$1(this, _editor3).state.tr.setSelection(TextSelection$1.create(__privateGet$1(this, _editor3).state.doc, hit.pos));
           try {
+            const tr = __privateGet$1(this, _editor3).state.tr.setSelection(TextSelection$1.create(__privateGet$1(this, _editor3).state.doc, hit.pos));
             __privateGet$1(this, _editor3).view?.dispatch(tr);
           } catch {
           }
@@ -89829,6 +90941,90 @@ ${l}
         }
         __privateSet(this, _isDragging, false);
       });
+      __privateAdd$1(this, _handleDragOver, (event) => {
+        const activeEditor = this.getActiveEditor();
+        if (!activeEditor?.isEditable) {
+          return;
+        }
+        event.preventDefault();
+        if (event.dataTransfer) {
+          event.dataTransfer.dropEffect = "copy";
+        }
+        const dt = event.dataTransfer;
+        const hasFieldAnnotation = dt?.types?.includes(FIELD_ANNOTATION_DATA_TYPE) || Boolean(dt?.getData?.(FIELD_ANNOTATION_DATA_TYPE));
+        if (!hasFieldAnnotation) {
+          return;
+        }
+        const hit = this.hitTest(event.clientX, event.clientY);
+        const doc22 = activeEditor.state?.doc;
+        if (!hit || !doc22) {
+          return;
+        }
+        const pos = Math.min(Math.max(hit.pos, 1), doc22.content.size);
+        const currentSelection = activeEditor.state.selection;
+        const isSameCursor = currentSelection instanceof TextSelection$1 && currentSelection.from === pos && currentSelection.to === pos;
+        if (isSameCursor) {
+          return;
+        }
+        try {
+          const tr = activeEditor.state.tr.setSelection(TextSelection$1.create(doc22, pos)).setMeta("addToHistory", false);
+          activeEditor.view?.dispatch(tr);
+          __privateMethod$1(this, _PresentationEditor_instances, scheduleSelectionUpdate_fn).call(this);
+        } catch (error) {
+          if (process$1$1.env.NODE_ENV === "development") {
+            console.debug("[PresentationEditor] Drag position update skipped:", error);
+          }
+        }
+      });
+      __privateAdd$1(this, _handleDrop, (event) => {
+        const activeEditor = this.getActiveEditor();
+        if (!activeEditor?.isEditable) {
+          return;
+        }
+        if (event.dataTransfer?.types?.includes("application/x-field-annotation")) {
+          return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        const fieldAnnotationData = event.dataTransfer?.getData(FIELD_ANNOTATION_DATA_TYPE);
+        if (!fieldAnnotationData) {
+          return;
+        }
+        const hit = this.hitTest(event.clientX, event.clientY);
+        const selection = activeEditor.state?.selection;
+        const fallbackPos = selection?.from ?? activeEditor.state?.doc?.content.size ?? null;
+        const pos = hit?.pos ?? fallbackPos;
+        if (pos == null) {
+          return;
+        }
+        let parsedData = null;
+        try {
+          parsedData = JSON.parse(fieldAnnotationData);
+        } catch {
+          return;
+        }
+        const { attributes, sourceField } = parsedData ?? {};
+        activeEditor.emit?.("fieldAnnotationDropped", {
+          sourceField,
+          editor: activeEditor,
+          coordinates: hit,
+          pos
+        });
+        if (attributes && isValidFieldAnnotationAttributes(attributes)) {
+          activeEditor.commands?.addFieldAnnotation?.(pos, attributes, true);
+          const posAfter = Math.min(pos + 1, activeEditor.state?.doc?.content.size ?? pos + 1);
+          const tr = activeEditor.state?.tr.setSelection(TextSelection$1.create(activeEditor.state.doc, posAfter));
+          if (tr) {
+            activeEditor.view?.dispatch(tr);
+          }
+          __privateMethod$1(this, _PresentationEditor_instances, scheduleSelectionUpdate_fn).call(this);
+        }
+        const editorDom = activeEditor.view?.dom;
+        if (editorDom) {
+          editorDom.focus();
+          activeEditor.view?.focus();
+        }
+      });
       __privateAdd$1(this, _handleDoubleClick, (event) => {
         if (event.button !== 0) return;
         if (!__privateGet$1(this, _layoutState).layout) return;
@@ -90018,6 +91214,7 @@ ${l}
         __privateMethod$1(this, _PresentationEditor_instances, applyZoom_fn).call(this);
         __privateMethod$1(this, _PresentationEditor_instances, setupEditorListeners_fn).call(this);
         __privateMethod$1(this, _PresentationEditor_instances, setupPointerHandlers_fn).call(this);
+        __privateMethod$1(this, _PresentationEditor_instances, setupDragHandlers_fn).call(this);
         __privateMethod$1(this, _PresentationEditor_instances, setupInputBridge_fn).call(this);
         __privateMethod$1(this, _PresentationEditor_instances, syncTrackedChangesPreferences_fn).call(this);
         if (options.documentId) {
@@ -90729,6 +91926,7 @@ ${l}
      * Safe to call during partial initialization.
      */
     destroy() {
+      var _a2;
       if (__privateGet$1(this, _rafHandle) != null) {
         __privateMethod$1(this, _PresentationEditor_instances, safeCleanup_fn).call(this, () => {
           const win = __privateGet$1(this, _visibleHost)?.ownerDocument?.defaultView ?? window;
@@ -90750,6 +91948,8 @@ ${l}
       __privateGet$1(this, _viewportHost)?.removeEventListener("pointermove", __privateGet$1(this, _handlePointerMove));
       __privateGet$1(this, _viewportHost)?.removeEventListener("pointerup", __privateGet$1(this, _handlePointerUp));
       __privateGet$1(this, _viewportHost)?.removeEventListener("pointerleave", __privateGet$1(this, _handlePointerLeave));
+      __privateGet$1(this, _viewportHost)?.removeEventListener("dragover", __privateGet$1(this, _handleDragOver));
+      __privateGet$1(this, _viewportHost)?.removeEventListener("drop", __privateGet$1(this, _handleDrop));
       __privateGet$1(this, _visibleHost)?.removeEventListener("keydown", __privateGet$1(this, _handleKeyDown));
       __privateGet$1(this, _inputBridge)?.notifyTargetChanged();
       __privateGet$1(this, _inputBridge)?.destroy();
@@ -90788,6 +91988,8 @@ ${l}
       __privateSet(this, _session, { mode: "body" });
       __privateSet(this, _activeHeaderFooterEditor, null);
       __privateSet(this, _domPainter, null);
+      (_a2 = __privateGet$1(this, _dragHandlerCleanup)) == null ? void 0 : _a2.call(this);
+      __privateSet(this, _dragHandlerCleanup, null);
       __privateGet$1(this, _selectionOverlay2)?.remove();
       __privateGet$1(this, _painterHost)?.remove();
       __privateGet$1(this, _hiddenHost)?.remove();
@@ -90815,6 +92017,7 @@ ${l}
   _layoutOptions = /* @__PURE__ */ new WeakMap();
   _layoutState = /* @__PURE__ */ new WeakMap();
   _domPainter = /* @__PURE__ */ new WeakMap();
+  _dragHandlerCleanup = /* @__PURE__ */ new WeakMap();
   _layoutError = /* @__PURE__ */ new WeakMap();
   _layoutErrorState = /* @__PURE__ */ new WeakMap();
   _errorBanner = /* @__PURE__ */ new WeakMap();
@@ -90870,6 +92073,33 @@ ${l}
   _remoteCursorRafHandle = /* @__PURE__ */ new WeakMap();
   _scrollTimeout = /* @__PURE__ */ new WeakMap();
   _PresentationEditor_instances = /* @__PURE__ */ new WeakSet();
+  collectCommentPositions_fn = function() {
+    const editorState = __privateGet$1(this, _editor3)?.state;
+    if (!editorState) return {};
+    const doc2 = editorState.doc;
+    const trackChangeMarks = [TrackInsertMarkName, TrackDeleteMarkName, TrackFormatMarkName];
+    const pmPositions = {};
+    doc2.descendants((node2, pos) => {
+      const marks = node2.marks || [];
+      for (const mark2 of marks) {
+        let threadId;
+        if (mark2.type.name === CommentMarkName) {
+          threadId = mark2.attrs.commentId || mark2.attrs.importedId;
+        } else if (trackChangeMarks.includes(mark2.type.name)) {
+          threadId = mark2.attrs.id;
+        }
+        if (!threadId) continue;
+        const nodeEnd = pos + node2.nodeSize;
+        if (!pmPositions[threadId]) {
+          pmPositions[threadId] = { threadId, start: pos, end: nodeEnd };
+        } else {
+          pmPositions[threadId].start = Math.min(pmPositions[threadId].start, pos);
+          pmPositions[threadId].end = Math.max(pmPositions[threadId].end, nodeEnd);
+        }
+      }
+    });
+    return pmPositions;
+  };
   aggregateLayoutBounds_fn = function(rects) {
     if (!rects.length) return null;
     const top2 = Math.min(...rects.map((rect) => rect.top));
@@ -91198,8 +92428,99 @@ ${l}
     __privateGet$1(this, _viewportHost).addEventListener("pointermove", __privateGet$1(this, _handlePointerMove));
     __privateGet$1(this, _viewportHost).addEventListener("pointerup", __privateGet$1(this, _handlePointerUp));
     __privateGet$1(this, _viewportHost).addEventListener("pointerleave", __privateGet$1(this, _handlePointerLeave));
+    __privateGet$1(this, _viewportHost).addEventListener("dragover", __privateGet$1(this, _handleDragOver));
+    __privateGet$1(this, _viewportHost).addEventListener("drop", __privateGet$1(this, _handleDrop));
     __privateGet$1(this, _visibleHost).addEventListener("keydown", __privateGet$1(this, _handleKeyDown));
   };
+  setupDragHandlers_fn = function() {
+    var _a2;
+    (_a2 = __privateGet$1(this, _dragHandlerCleanup)) == null ? void 0 : _a2.call(this);
+    __privateSet(this, _dragHandlerCleanup, null);
+    __privateSet(this, _dragHandlerCleanup, createDragHandler(__privateGet$1(this, _painterHost), {
+      onDragOver: (event) => {
+        if (!event.hasFieldAnnotation || event.event.clientX === 0) {
+          return;
+        }
+        const activeEditor = this.getActiveEditor();
+        if (!activeEditor?.isEditable) {
+          return;
+        }
+        const hit = this.hitTest(event.clientX, event.clientY);
+        const doc2 = activeEditor.state?.doc;
+        if (!hit || !doc2) {
+          return;
+        }
+        const pos = Math.min(Math.max(hit.pos, 1), doc2.content.size);
+        const currentSelection = activeEditor.state.selection;
+        if (currentSelection instanceof TextSelection$1 && currentSelection.from === pos && currentSelection.to === pos) {
+          return;
+        }
+        try {
+          const tr = activeEditor.state.tr.setSelection(TextSelection$1.create(doc2, pos)).setMeta("addToHistory", false);
+          activeEditor.view?.dispatch(tr);
+          __privateMethod$1(this, _PresentationEditor_instances, scheduleSelectionUpdate_fn).call(this);
+        } catch {
+        }
+      },
+      onDrop: (event) => {
+        event.event.preventDefault();
+        event.event.stopPropagation();
+        if (event.pmPosition === null) {
+          return;
+        }
+        const activeEditor = this.getActiveEditor();
+        const { state: state2, view } = activeEditor;
+        if (!state2 || !view) {
+          return;
+        }
+        const fieldId = event.data.fieldId;
+        if (fieldId) {
+          const targetPos = event.pmPosition;
+          let sourceStart = null;
+          let sourceEnd = null;
+          let sourceNode = null;
+          state2.doc.descendants((node2, pos) => {
+            if (node2.type.name === "fieldAnnotation" && node2.attrs.fieldId === fieldId) {
+              sourceStart = pos;
+              sourceEnd = pos + node2.nodeSize;
+              sourceNode = node2;
+              return false;
+            }
+            return true;
+          });
+          if (sourceStart === null || sourceEnd === null || !sourceNode) {
+            return;
+          }
+          if (targetPos >= sourceStart && targetPos <= sourceEnd) {
+            return;
+          }
+          const tr = state2.tr;
+          tr.delete(sourceStart, sourceEnd);
+          const mappedTarget = tr.mapping.map(targetPos);
+          if (mappedTarget < 0 || mappedTarget > tr.doc.content.size) {
+            return;
+          }
+          tr.insert(mappedTarget, sourceNode);
+          tr.setMeta("uiEvent", "drop");
+          view.dispatch(tr);
+          return;
+        }
+        const attrs = event.data.attributes;
+        if (attrs && isValidFieldAnnotationAttributes(attrs)) {
+          const inserted = activeEditor.commands?.addFieldAnnotation?.(event.pmPosition, attrs, true);
+          if (inserted) {
+            __privateMethod$1(this, _PresentationEditor_instances, scheduleSelectionUpdate_fn).call(this);
+          }
+          return;
+        }
+        activeEditor.emit("fieldAnnotationDropped", {
+          sourceField: event.data,
+          editor: activeEditor,
+          coordinates: { pos: event.pmPosition }
+        });
+      }
+    }));
+  };
   setupInputBridge_fn = function() {
     __privateGet$1(this, _inputBridge)?.destroy();
     const win = __privateGet$1(this, _visibleHost).ownerDocument?.defaultView ?? window;
@@ -91417,6 +92738,8 @@ ${l}
   _handlePointerMove = /* @__PURE__ */ new WeakMap();
   _handlePointerLeave = /* @__PURE__ */ new WeakMap();
   _handlePointerUp = /* @__PURE__ */ new WeakMap();
+  _handleDragOver = /* @__PURE__ */ new WeakMap();
+  _handleDrop = /* @__PURE__ */ new WeakMap();
   _handleDoubleClick = /* @__PURE__ */ new WeakMap();
   _handleKeyDown = /* @__PURE__ */ new WeakMap();
   focusHeaderFooterShortcut_fn = function(kind) {
@@ -91587,6 +92910,11 @@ ${l}
     const payload = { layout, blocks: blocks2, measures, metrics };
     this.emit("layoutUpdated", payload);
     this.emit("paginationUpdate", payload);
+    const commentPositions = __privateMethod$1(this, _PresentationEditor_instances, collectCommentPositions_fn).call(this);
+    const positionKeys = Object.keys(commentPositions);
+    if (positionKeys.length > 0) {
+      this.emit("commentPositions", { positions: commentPositions });
+    }
     if (__privateGet$1(this, _telemetryEmitter) && metrics) {
       __privateGet$1(this, _telemetryEmitter).call(this, { type: "layout", data: { layout, blocks: blocks2, measures, metrics } });
     }
@@ -97053,6 +98381,7 @@ ${l}
       return ["p", Attribute.mergeAttributes(this.options.htmlAttributes, htmlAttributes), 0];
     },
     addNodeView() {
+      if (this.editor.options?.mode !== "docx" || !this.editor.converter) return null;
       if (shouldSkipNodeView(this.editor)) return null;
       return ({ node: node2, editor, getPos, decorations, extensionAttrs }) => {
         return new ParagraphNodeView(node2, editor, getPos, decorations, extensionAttrs);
@@ -97295,7 +98624,7 @@ ${l}
     }
   });
   const CommentsMark = Mark.create({
-    name: CommentMarkName,
+    name: CommentMarkName$1,
     group: "comments",
     excludes: "",
     addOptions() {
@@ -97314,10 +98643,10 @@ ${l}
       };
     },
     parseDOM() {
-      return [{ tag: CommentMarkName }];
+      return [{ tag: CommentMarkName$1 }];
     },
     renderDOM({ htmlAttributes }) {
-      return [CommentMarkName, Attribute.mergeAttributes(this.options.htmlAttributes, htmlAttributes)];
+      return [CommentMarkName$1, Attribute.mergeAttributes(this.options.htmlAttributes, htmlAttributes)];
     }
   });
   let cache$2 = /* @__PURE__ */ new WeakMap();
@@ -107501,7 +108830,7 @@ ${l}
   }
   const trackInsertClass = "track-insert";
   const TrackInsert = Mark.create({
-    name: TrackInsertMarkName,
+    name: TrackInsertMarkName$1,
     group: "track",
     inclusive: false,
     addOptions() {
@@ -107578,7 +108907,7 @@ ${l}
   });
   const trackDeleteClass = "track-delete";
   const TrackDelete = Mark.create({
-    name: TrackDeleteMarkName,
+    name: TrackDeleteMarkName$1,
     group: "track",
     inclusive: false,
     addOptions() {
@@ -107687,7 +109016,7 @@ ${l}
   }, Symbol.toStringTag, { value: "Module" }));
   const trackFormatClass = "track-format";
   const TrackFormat = Mark.create({
-    name: TrackFormatMarkName,
+    name: TrackFormatMarkName$1,
     group: "track",
     inclusive: false,
     addOptions() {
@@ -107901,7 +109230,7 @@ ${l}
           tr.setMeta("inputType", "acceptReject");
           const map2 = new Mapping();
           doc2.nodesBetween(from2, to, (node2, pos) => {
-            if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName)) {
+            if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName$1)) {
               const deletionStep = new ReplaceStep(
                 map2.map(Math.max(pos, from2)),
                 map2.map(Math.min(pos + node2.nodeSize, to)),
@@ -107909,8 +109238,8 @@ ${l}
               );
               tr.step(deletionStep);
               map2.appendMap(deletionStep.getMap());
-            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName)) {
-              const insertionMark = node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName);
+            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName$1)) {
+              const insertionMark = node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName$1);
               tr.step(
                 new RemoveMarkStep(
                   map2.map(Math.max(pos, from2)),
@@ -107918,8 +109247,8 @@ ${l}
                   insertionMark
                 )
               );
-            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName)) {
-              const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
+            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1)) {
+              const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1);
               tr.step(
                 new RemoveMarkStep(
                   map2.map(Math.max(pos, from2)),
@@ -107941,8 +109270,8 @@ ${l}
           tr.setMeta("inputType", "acceptReject");
           const map2 = new Mapping();
           doc2.nodesBetween(from2, to, (node2, pos) => {
-            if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName)) {
-              const deletionMark = node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName);
+            if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName$1)) {
+              const deletionMark = node2.marks.find((mark2) => mark2.type.name === TrackDeleteMarkName$1);
               tr.step(
                 new RemoveMarkStep(
                   map2.map(Math.max(pos, from2)),
@@ -107950,7 +109279,7 @@ ${l}
                   deletionMark
                 )
               );
-            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName)) {
+            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackInsertMarkName$1)) {
               const deletionStep = new ReplaceStep(
                 map2.map(Math.max(pos, from2)),
                 map2.map(Math.min(pos + node2.nodeSize, to)),
@@ -107958,8 +109287,8 @@ ${l}
               );
               tr.step(deletionStep);
               map2.appendMap(deletionStep.getMap());
-            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName)) {
-              const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName);
+            } else if (node2.marks && node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1)) {
+              const formatChangeMark = node2.marks.find((mark2) => mark2.type.name === TrackFormatMarkName$1);
               formatChangeMark.attrs.before.forEach((oldMark) => {
                 tr.step(
                   new AddMarkStep(
@@ -108135,7 +109464,7 @@ ${l}
       const hasContentBetween = state2.doc.textBetween(left2.from, right2.to, "\n").length > getSegmentSize(left2) + getSegmentSize(right2);
       return !hasContentBetween;
     };
-    const isComplementaryPair = (firstType, secondType) => firstType === TrackDeleteMarkName && secondType === TrackInsertMarkName || firstType === TrackInsertMarkName && secondType === TrackDeleteMarkName;
+    const isComplementaryPair = (firstType, secondType) => firstType === TrackDeleteMarkName$1 && secondType === TrackInsertMarkName$1 || firstType === TrackInsertMarkName$1 && secondType === TrackDeleteMarkName$1;
     const linkedBefore = [];
     const linkedAfter = [];
     const collectDirection = (direction, collection) => {
@@ -144530,26 +145859,14 @@ ${style2}
       const firstGroupRendered = ref(false);
       const verticalOffset = ref(0);
       const commentsRenderKey = ref(0);
+      const measurementTimeoutId = ref(null);
       const getCommentPosition = computed(() => (comment2) => {
         if (!floatingCommentsContainer.value) return { top: "0px" };
-        floatingCommentsContainer.value.getBoundingClientRect();
         if (typeof comment2.top !== "number" || isNaN(comment2.top)) {
           return { display: "none" };
         }
         return { top: `${comment2.top}px` };
       });
-      const findScrollParent = (element2) => {
-        if (!element2) return window;
-        let parent = element2.parentNode;
-        while (parent && parent !== document) {
-          const style2 = getComputedStyle(parent);
-          if (/(auto|scroll|overlay)/.test(style2.overflow + style2.overflowY + style2.overflowX)) {
-            return parent;
-          }
-          parent = parent.parentNode;
-        }
-        return window;
-      };
       const handleDialog = (dialog) => {
         if (!dialog) return;
         const { elementRef, commentId } = dialog;
@@ -144557,44 +145874,68 @@ ${style2}
         nextTick(() => {
           const id = commentId;
           if (renderedSizes.value.some((item) => item.id == id)) return;
-          const editorBounds = props.parent.getBoundingClientRect();
           const comment2 = getFloatingComments.value.find((c2) => c2.commentId === id || c2.importedId == id);
           const positionKey = id || comment2?.importedId;
-          let position2 = editorCommentPositions.value[positionKey]?.bounds || {};
+          const positionEntry = editorCommentPositions.value[positionKey];
+          const position2 = positionEntry?.bounds || {};
           if (props.currentDocument.type === "application/pdf") {
             Object.entries(comment2.selection?.selectionBounds).forEach(([key2, value]) => {
               position2[key2] = Number(value);
             });
-            position2.top += editorBounds.top;
           }
           if (!position2) return;
-          const scrollParent = findScrollParent(props.parent);
-          scrollParent === window ? window.scrollY : scrollParent.scrollTop;
           const bounds = elementRef.value?.getBoundingClientRect();
+          const top2 = Number(position2.top);
+          if (!Number.isFinite(top2)) return;
           const placement = {
             id,
-            top: position2.top - editorBounds.top,
+            top: top2,
             height: bounds.height,
             commentRef: comment2,
-            elementRef
+            elementRef,
+            pageIndex: positionEntry?.pageIndex ?? 0
           };
           renderedSizes.value.push(placement);
         });
       };
       const processLocations = async () => {
-        let currentBottom = 0;
-        renderedSizes.value.sort((a2, b2) => a2.top - b2.top).forEach((comment2) => {
-          if (comment2.top <= currentBottom + 15) {
-            comment2.top = currentBottom + 15;
-          }
-          currentBottom = comment2.top + comment2.height;
+        const groupedByPage = renderedSizes.value.reduce((acc, comment2) => {
+          const key2 = comment2.pageIndex ?? 0;
+          if (!acc[key2]) acc[key2] = [];
+          acc[key2].push(comment2);
+          return acc;
+        }, {});
+        Object.values(groupedByPage).forEach((comments) => {
+          comments.sort((a2, b2) => a2.top - b2.top).forEach((comment2, idx, arr) => {
+            if (idx === 0) return;
+            const prev = arr[idx - 1];
+            const minTop = prev.top + prev.height + 15;
+            if (comment2.top < minTop) {
+              comment2.top = minTop;
+            }
+          });
         });
         await nextTick();
         firstGroupRendered.value = true;
       };
       watchEffect(() => {
-        if (renderedSizes.value.length === getFloatingComments.value.length) {
+        if (measurementTimeoutId.value) {
+          clearTimeout(measurementTimeoutId.value);
+          measurementTimeoutId.value = null;
+        }
+        const totalComments = getFloatingComments.value.length;
+        const measuredComments = renderedSizes.value.length;
+        if (totalComments === 0) {
+          return;
+        }
+        if (measuredComments === totalComments) {
           nextTick(processLocations);
+        } else if (measuredComments > 0 && !firstGroupRendered.value) {
+          measurementTimeoutId.value = setTimeout(() => {
+            if (!firstGroupRendered.value && renderedSizes.value.length > 0) {
+              processLocations();
+            }
+          }, 100);
         }
       });
       watch(activeComment, (newVal, oldVal) => {
@@ -144617,6 +145958,12 @@ ${style2}
           }, 200);
         });
       });
+      onBeforeUnmount(() => {
+        if (measurementTimeoutId.value) {
+          clearTimeout(measurementTimeoutId.value);
+          measurementTimeoutId.value = null;
+        }
+      });
       return (_ctx, _cache) => {
         return openBlock(), createElementBlock("div", {
           class: "section-wrapper",
@@ -144667,7 +146014,7 @@ ${style2}
       };
     }
   };
-  const FloatingComments = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-91de2350"]]);
+  const FloatingComments = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-eab6fbfa"]]);
   const _sfc_main$9 = {
     __name: "TextField",
     props: {
@@ -145422,6 +146769,13 @@ ${style2}
         presentationEditor.onTelemetry((telemetryPayload) => {
           proxy.$superdoc.captureLayoutPipelineEvent(telemetryPayload);
         });
+        presentationEditor.on("commentPositions", ({ positions }) => {
+          const commentsConfig = proxy.$superdoc.config.modules?.comments;
+          if (!commentsConfig || commentsConfig === false) return;
+          if (!positions || Object.keys(positions).length === 0) return;
+          const mappedPositions = presentationEditor.getCommentBounds(positions, layers.value);
+          handleEditorLocationsUpdate(mappedPositions);
+        });
       };
       const onEditorDestroy = () => {
         proxy.$superdoc.broadcastEditorDestroy();
@@ -145968,7 +147322,7 @@ ${style2}
       };
     }
   };
-  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-3fafc837"]]);
+  const App = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-3c3356b6"]]);
   const createSuperdocVueApp = () => {
     const app = createApp(App);
     const pinia = createPinia();
@@ -146148,7 +147502,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.31";
+      this.version = "1.0.0-beta.33";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -148592,7 +149946,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexEGVYUeN = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexHX4H5xPH = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));