@harbour-enterprises/superdoc 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/chunks/{super-editor.es-BKljkYUU.cjs → super-editor.es-C06-V-Iy.cjs}

@@ -35580,7 +35580,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.2") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.4") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -38780,7 +38780,7 @@ var __privateGet$1 = (obj, member, getter) => (__accessCheck$1(obj, member, "rea
 var __privateAdd$1 = (obj, member, value) => member.has(obj) ? __typeError$1("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck$1(obj, member, "write to private field"), member.set(obj, value), value);
 var __privateMethod$1 = (obj, member, method) => (__accessCheck$1(obj, member, "access private method"), method);
-var _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, dispatchWithFallback_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, getPluginKeyName_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _map, _editor2, _descriptors, _collections, _editorEntries, _maxCachedEditors, _editorAccessOrder, _pendingCreations, _cacheHits, _cacheMisses, _evictions, _HeaderFooterEditorManager_instances, hasConverter_fn, extractCollections_fn, collectDescriptors_fn, teardownMissingEditors_fn, teardownEditors_fn, createEditor_fn, createEditorContainer_fn, registerConverterEditor_fn, unregisterConverterEditor_fn, updateAccessOrder_fn, enforceCacheSizeLimit_fn, _manager, _mediaFiles, _blockCache, _HeaderFooterLayoutAdapter_instances, getBlocks_fn, getConverterContext_fn, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay, _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, _headerLayoutResults, _footerLayoutResults, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _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, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, updateDecorationProviders_fn, createDecorationProvider_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, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderSelectionRects_fn, renderHoverRegion_fn, clearHoverRegion_fn, renderCaretOverlay_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, computeHeaderFooterCaretRect_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, findLineContainingPos_fn, lineHeightBeforeIndex_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, createHiddenHost_fn, _windowRoot, _visibleHost2, _getTargetDom, _onTargetChanged, _listeners, _currentTarget, _PresentationInputBridge_instances, addListener_fn, dispatchToTarget_fn, forwardKeyboardEvent_fn, forwardTextEvent_fn, forwardCompositionEvent_fn, forwardContextMenu_fn, isEventOnActiveTarget_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ParagraphNodeView_instances, updateHTMLAttributes_fn, updateDOMStyles_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;
+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, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay, _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, _headerLayoutResults, _footerLayoutResults, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _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, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, updateDecorationProviders_fn, createDecorationProvider_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, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderSelectionRects_fn, renderHoverRegion_fn, clearHoverRegion_fn, renderCaretOverlay_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, computeHeaderFooterCaretRect_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, findLineContainingPos_fn, lineHeightBeforeIndex_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, createHiddenHost_fn, _windowRoot, _visibleHost2, _getTargetDom, _onTargetChanged, _listeners, _currentTarget, _destroyed, _PresentationInputBridge_instances, addListener_fn, dispatchToTarget_fn, forwardKeyboardEvent_fn, forwardTextEvent_fn, forwardCompositionEvent_fn, forwardContextMenu_fn, isEventOnActiveTarget_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ParagraphNodeView_instances, updateHTMLAttributes_fn, updateDOMStyles_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;
 var GOOD_LEAF_SIZE = 200;
 var RopeSequence = function RopeSequence2() {
 };
@@ -52287,7 +52287,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.2";
+const summaryVersion = "1.0.0-beta.4";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -53066,7 +53066,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-Sn-JVHIg-BxOp3gSx.cjs")),
+      Promise.resolve().then(() => require("./index-BNGaD3Up-D2cRHMMk.cjs")),
       Promise.resolve().then(() => require("./index-DRCvimau-H4Ck3S9a.cjs")),
       Promise.resolve().then(() => require("./index-C_x_N6Uh-Db3CUJMX.cjs")),
       Promise.resolve().then(() => require("./index-D_sWOSiG-BtDZzJ6I.cjs")),
@@ -53271,7 +53271,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.2");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.4");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -54890,6 +54890,50 @@ const resolveColorFromAttributes = (attrs, themeColors) => {
   }
   return void 0;
 };
+const MAX_DATA_ATTR_COUNT = 50;
+const MAX_DATA_ATTR_VALUE_LENGTH = 1e3;
+const MAX_DATA_ATTR_NAME_LENGTH = 100;
+const extractDataAttributes = (attrs) => {
+  if (!attrs) return void 0;
+  const result = {};
+  let attrCount = 0;
+  for (const [key2, value] of Object.entries(attrs)) {
+    if (typeof key2 !== "string" || !key2.toLowerCase().startsWith("data-")) {
+      continue;
+    }
+    if (attrCount >= MAX_DATA_ATTR_COUNT) {
+      if (process$1$1.env.NODE_ENV === "development") {
+        console.warn(`[PM-Adapter] Rejecting data attributes exceeding ${MAX_DATA_ATTR_COUNT} limit`);
+      }
+      break;
+    }
+    if (key2.length > MAX_DATA_ATTR_NAME_LENGTH) {
+      if (process$1$1.env.NODE_ENV === "development") {
+        console.warn(
+          `[PM-Adapter] Rejecting data attribute name exceeding ${MAX_DATA_ATTR_NAME_LENGTH} chars: ${key2.substring(0, 50)}...`
+        );
+      }
+      continue;
+    }
+    if (value == null) {
+      continue;
+    }
+    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+      const stringValue = String(value);
+      if (stringValue.length > MAX_DATA_ATTR_VALUE_LENGTH) {
+        if (process$1$1.env.NODE_ENV === "development") {
+          console.warn(
+            `[PM-Adapter] Rejecting data attribute value exceeding ${MAX_DATA_ATTR_VALUE_LENGTH} chars for key: ${key2}`
+          );
+        }
+        continue;
+      }
+      result[key2] = stringValue;
+      attrCount++;
+    }
+  }
+  return Object.keys(result).length > 0 ? result : void 0;
+};
 const normalizeRunMarkList = (value) => {
   if (!value) return void 0;
   let entries = value;
@@ -55058,6 +55102,19 @@ const sanitizeFontFamily = (fontFamily2) => {
   }
   return sanitized;
 };
+const normalizeFontSizePx = (value) => {
+  if (isFiniteNumber(value)) return value;
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  const numeric = Number.parseFloat(trimmed);
+  if (!Number.isFinite(numeric)) return void 0;
+  const unit = trimmed.match(/[a-zA-Z%]+$/)?.[0]?.toLowerCase();
+  if (unit === "pt") {
+    return ptToPx(numeric);
+  }
+  return numeric;
+};
 const applyTextStyleMark = (run2, attrs, themeColors) => {
   const resolvedColor = resolveColorFromAttributes(attrs, themeColors);
   if (resolvedColor) {
@@ -55069,11 +55126,9 @@ const applyTextStyleMark = (run2, attrs, themeColors) => {
       run2.fontFamily = sanitized;
     }
   }
-  if (isFiniteNumber(attrs.fontSize)) {
-    const size2 = Number(attrs.fontSize);
-    if (size2 >= 1 && size2 <= 1e3) {
-      run2.fontSize = size2;
-    }
+  const fontSizePx = normalizeFontSizePx(attrs.fontSize);
+  if (fontSizePx !== void 0 && fontSizePx >= 1 && fontSizePx <= 1e3) {
+    run2.fontSize = fontSizePx;
   }
   if (isFiniteNumber(attrs.letterSpacing)) {
     const spacing = Number(attrs.letterSpacing);
@@ -55087,6 +55142,7 @@ const DEFAULT_HYPERLINK_CONFIG = {
 };
 const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors) => {
   marks.forEach((mark) => {
+    const forwardedDataAttrs = extractDataAttributes(mark.attrs);
     try {
       switch (mark.type) {
         case TRACK_INSERT_MARK:
@@ -55181,6 +55237,9 @@ const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG
         console.warn(`[PM-Adapter] Failed to apply mark ${mark.type}:`, error);
       }
     }
+    if (forwardedDataAttrs) {
+      run2.dataAttrs = { ...run2.dataAttrs ?? {}, ...forwardedDataAttrs };
+    }
   });
 };
 function textNodeToRun(textNode, positions, defaultFont, defaultSize, inheritedMarks = [], sdtMetadata, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors) {
@@ -55204,8 +55263,9 @@ function tabNodeToRun(node, positions, tabIndex, paragraph) {
   const pos = positions.get(node);
   if (!pos) return null;
   const paragraphAttrs = paragraph.attrs ?? {};
-  const tabStops = Array.isArray(paragraphAttrs.tabStops) ? paragraphAttrs.tabStops : void 0;
-  const indent = paragraphAttrs.indent;
+  const paragraphProps = typeof paragraphAttrs.paragraphProperties === "object" && paragraphAttrs.paragraphProperties !== null ? paragraphAttrs.paragraphProperties : {};
+  const tabStops = Array.isArray(paragraphAttrs.tabStops) && paragraphAttrs.tabStops.length ? paragraphAttrs.tabStops : Array.isArray(paragraphProps.tabStops) ? paragraphProps.tabStops : void 0;
+  const indent = paragraphAttrs.indent ?? paragraphProps.indent ?? void 0;
   return {
     kind: "tab",
     text: "	",
@@ -55519,6 +55579,9 @@ const normalizeParagraphSpacing = (value) => {
   const afterRaw = pickNumber(source.after);
   const lineRaw = pickNumber(source.line);
   const lineRule = normalizeLineRule(source.lineRule);
+  const beforeAutospacing = toBooleanFlag(source.beforeAutospacing ?? source.beforeAutoSpacing);
+  const afterAutospacing = toBooleanFlag(source.afterAutospacing ?? source.afterAutoSpacing);
+  const contextualSpacing = toBooleanFlag(source.contextualSpacing);
   const before = beforeRaw != null ? twipsToPx$1(beforeRaw) : pickNumber(source.lineSpaceBefore);
   const after = afterRaw != null ? twipsToPx$1(afterRaw) : pickNumber(source.lineSpaceAfter);
   const line = normalizeLineValue(lineRaw, lineRule);
@@ -55526,8 +55589,24 @@ const normalizeParagraphSpacing = (value) => {
   if (after != null) spacing.after = after;
   if (line != null) spacing.line = line;
   if (lineRule) spacing.lineRule = lineRule;
+  if (beforeAutospacing != null) spacing.beforeAutospacing = beforeAutospacing;
+  if (afterAutospacing != null) spacing.afterAutospacing = afterAutospacing;
+  if (contextualSpacing != null) spacing.contextualSpacing = contextualSpacing;
   return Object.keys(spacing).length > 0 ? spacing : void 0;
 };
+const toBooleanFlag = (value) => {
+  if (value === true || value === false) return value;
+  if (typeof value === "string") {
+    const normalized = value.trim().toLowerCase();
+    if (["true", "1", "on", "yes"].includes(normalized)) return true;
+    if (["false", "0", "off", "no"].includes(normalized)) return false;
+  }
+  if (typeof value === "number") {
+    if (value === 1) return true;
+    if (value === 0) return false;
+  }
+  return void 0;
+};
 const normalizeLineValue = (value, lineRule) => {
   if (value == null) return void 0;
   if (lineRule === "auto") {
@@ -56900,15 +56979,17 @@ const hydrateParagraphStyleAttrs = (para, context, preResolved) => {
     return null;
   }
   const attrs = para.attrs ?? {};
-  const styleId = typeof attrs.styleId === "string" && attrs.styleId.trim() ? attrs.styleId : null;
+  const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
+  const styleIdSource = attrs.styleId ?? paragraphProps.styleId;
+  const styleId = typeof styleIdSource === "string" && styleIdSource.trim() ? styleIdSource : null;
   if (!styleId) {
     return null;
   }
   const inlineProps = {
     styleId,
-    numberingProperties: cloneIfObject(attrs.numberingProperties),
-    indent: cloneIfObject(attrs.indent),
-    spacing: cloneIfObject(attrs.spacing)
+    numberingProperties: cloneIfObject(attrs.numberingProperties ?? paragraphProps.numberingProperties),
+    indent: cloneIfObject(attrs.indent ?? paragraphProps.indent),
+    spacing: cloneIfObject(attrs.spacing ?? paragraphProps.spacing)
   };
   const resolverParams = {
     docx: context.docx,
@@ -57186,13 +57267,17 @@ const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleCont
 };
 const computeParagraphAttrs = (para, styleContext, listCounterContext, converterContext, hydrationOverride) => {
   const attrs = para.attrs ?? {};
+  const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
   const hydrated = hydrationOverride ?? hydrateParagraphStyleAttrs(para, converterContext);
-  const spacingSource = attrs.spacing !== void 0 ? attrs.spacing : hydrated?.spacing;
+  const spacingSource = attrs.spacing !== void 0 ? attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : hydrated?.spacing;
   const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
-  const indentSource = attrs.indent ?? hydrated?.indent;
+  const indentSource = attrs.indent ?? paragraphProps.indent ?? hydrated?.indent;
   const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? attrs.textIndent);
-  const styleNodeAttrs = hydrated?.tabStops && !attrs.tabStops && !attrs.tabs ? { ...attrs, tabStops: hydrated.tabStops } : attrs;
+  const styleNodeAttrs = hydrated?.tabStops && !attrs.tabStops && !attrs.tabs ? { ...attrs, tabStops: hydrated.tabStops } : !attrs.tabStops && paragraphProps.tabStops ? { ...attrs, tabStops: paragraphProps.tabStops } : attrs;
   const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
+  if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
+    styleNode.styleId = paragraphProps.styleId;
+  }
   const computed2 = resolveStyle(styleNode, styleContext);
   const { spacing, indent } = resolveSpacingIndent(computed2.paragraph, computed2.numbering);
   const paragraphAttrs = {};
@@ -57217,6 +57302,18 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   }
   const spacingPx = spacingPtToPx(spacing, normalizedSpacing);
   if (spacingPx) paragraphAttrs.spacing = spacingPx;
+  if (normalizedSpacing?.beforeAutospacing != null || normalizedSpacing?.afterAutospacing != null) {
+    paragraphAttrs.spacing = paragraphAttrs.spacing ?? {};
+    if (normalizedSpacing?.beforeAutospacing != null) {
+      paragraphAttrs.spacing.beforeAutospacing = normalizedSpacing.beforeAutospacing;
+    }
+    if (normalizedSpacing?.afterAutospacing != null) {
+      paragraphAttrs.spacing.afterAutospacing = normalizedSpacing.afterAutospacing;
+    }
+  }
+  if (normalizedSpacing?.contextualSpacing != null) {
+    paragraphAttrs.contextualSpacing = normalizedSpacing.contextualSpacing;
+  }
   const hasExplicitIndent = Boolean(normalizedIndent);
   const hasNumberingIndent = Boolean(computed2.numbering?.indent?.left || computed2.numbering?.indent?.hanging);
   if (hasExplicitIndent || hasNumberingIndent || bidi && adjustRightInd) {
@@ -57235,10 +57332,20 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   if (borders) paragraphAttrs.borders = borders;
   const shading = normalizeParagraphShading(attrs.shading ?? hydrated?.shading);
   if (shading) paragraphAttrs.shading = shading;
+  const keepNext = paragraphProps.keepNext ?? hydrated?.keepNext ?? attrs.keepNext;
+  if (keepNext === true) paragraphAttrs.keepNext = true;
+  const keepLines = paragraphProps.keepLines ?? hydrated?.keepLines ?? attrs.keepLines;
+  if (keepLines === true) paragraphAttrs.keepLines = true;
   const paragraphDecimalSeparator = styleContext.defaults?.decimalSeparator ?? DEFAULT_DECIMAL_SEPARATOR$2;
   if (paragraphDecimalSeparator !== DEFAULT_DECIMAL_SEPARATOR$2) {
     paragraphAttrs.decimalSeparator = paragraphDecimalSeparator;
   }
+  const styleIdAttr = typeof attrs.styleId === "string" ? attrs.styleId : void 0;
+  if (styleIdAttr) {
+    paragraphAttrs.styleId = styleIdAttr;
+  } else if (paragraphProps.styleId) {
+    paragraphAttrs.styleId = paragraphProps.styleId;
+  }
   const paraIntervalTwips = pickNumber(attrs.tabIntervalTwips) ?? (() => {
     const px = pickNumber(attrs.tabIntervalPx);
     return px != null ? Math.round(px * 15) : void 0;
@@ -57275,7 +57382,7 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.floatAlignment = xAlign;
     }
   }
-  const numberingSource = attrs.numberingProperties ?? hydrated?.numberingProperties;
+  const numberingSource = attrs.numberingProperties ?? paragraphProps.numberingProperties ?? hydrated?.numberingProperties;
   const rawNumberingProps = toAdapterNumberingProps(numberingSource);
   if (rawNumberingProps) {
     const numberingProps = rawNumberingProps;
@@ -57928,13 +58035,29 @@ const extractRunStyleId = (runProperties) => {
   return null;
 };
 const isTextRun$1 = (run2) => run2.kind !== "tab";
+const dataAttrsCompatible = (a, b2) => {
+  const aAttrs = a.dataAttrs;
+  const bAttrs = b2.dataAttrs;
+  if (!aAttrs && !bAttrs) return true;
+  if (!aAttrs || !bAttrs) return false;
+  const aKeys = Object.keys(aAttrs).sort();
+  const bKeys = Object.keys(bAttrs).sort();
+  if (aKeys.length !== bKeys.length) return false;
+  for (let i = 0; i < aKeys.length; i++) {
+    const key2 = aKeys[i];
+    if (key2 !== bKeys[i] || aAttrs[key2] !== bAttrs[key2]) {
+      return false;
+    }
+  }
+  return true;
+};
 function mergeAdjacentRuns(runs) {
   if (runs.length <= 1) return runs;
   const merged = [];
   let current = runs[0];
   for (let i = 1; i < runs.length; i++) {
     const next = runs[i];
-    const canMerge = isTextRun$1(current) && isTextRun$1(next) && !current.token && !next.token && current.pmStart != null && current.pmEnd != null && next.pmStart != null && next.pmEnd != null && current.pmEnd === next.pmStart && current.fontFamily === next.fontFamily && current.fontSize === next.fontSize && current.bold === next.bold && current.italic === next.italic && current.underline === next.underline && current.strike === next.strike && current.color === next.color && current.highlight === next.highlight && (current.letterSpacing ?? 0) === (next.letterSpacing ?? 0) && trackedChangesCompatible(current, next);
+    const canMerge = isTextRun$1(current) && isTextRun$1(next) && !current.token && !next.token && current.pmStart != null && current.pmEnd != null && next.pmStart != null && next.pmEnd != null && current.pmEnd === next.pmStart && current.fontFamily === next.fontFamily && current.fontSize === next.fontSize && current.bold === next.bold && current.italic === next.italic && current.underline === next.underline && current.strike === next.strike && current.color === next.color && current.highlight === next.highlight && (current.letterSpacing ?? 0) === (next.letterSpacing ?? 0) && trackedChangesCompatible(current, next) && dataAttrsCompatible(current, next);
     if (canMerge) {
       const currText = current.text ?? "";
       const nextText = next.text ?? "";
@@ -57951,10 +58074,62 @@ function mergeAdjacentRuns(runs) {
   merged.push(current);
   return merged;
 }
+const applyBaseRunDefaults = (run2, defaults, fallbackFont, fallbackSize) => {
+  if (!run2) return;
+  if (defaults.fontFamily && run2.fontFamily === fallbackFont) {
+    run2.fontFamily = defaults.fontFamily;
+  }
+  if (defaults.fontSizePx != null && run2.fontSize === fallbackSize) {
+    run2.fontSize = defaults.fontSizePx;
+  }
+  if (defaults.color && !run2.color) {
+    run2.color = defaults.color;
+  }
+  if (defaults.letterSpacing != null && run2.letterSpacing == null) {
+    run2.letterSpacing = defaults.letterSpacing;
+  }
+  if (defaults.bold && run2.bold === void 0) {
+    run2.bold = true;
+  }
+  if (defaults.italic && run2.italic === void 0) {
+    run2.italic = true;
+  }
+  if (defaults.underline && !run2.underline) {
+    run2.underline = defaults.underline;
+  }
+};
 function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext) {
   const baseBlockId = nextBlockId("paragraph");
-  const paragraphStyleId = typeof para.attrs?.styleId === "string" ? para.attrs.styleId : null;
+  const paragraphProps = typeof para.attrs?.paragraphProperties === "object" && para.attrs.paragraphProperties !== null ? para.attrs.paragraphProperties : {};
+  const paragraphStyleId = typeof para.attrs?.styleId === "string" && para.attrs.styleId.trim() ? para.attrs.styleId : typeof paragraphProps.styleId === "string" && paragraphProps.styleId.trim() ? paragraphProps.styleId : null;
   const paragraphHydration = converterContext ? hydrateParagraphStyleAttrs(para, converterContext) : null;
+  let baseRunDefaults = {};
+  try {
+    const spacingSource = para.attrs?.spacing !== void 0 ? para.attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : paragraphHydration?.spacing;
+    const indentSource = para.attrs?.indent ?? paragraphProps.indent ?? paragraphHydration?.indent;
+    const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
+    const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? para.attrs?.textIndent);
+    const styleNodeAttrs = paragraphHydration?.tabStops && !para.attrs?.tabStops && !para.attrs?.tabs ? { ...para.attrs ?? {}, tabStops: paragraphHydration.tabStops } : para.attrs ?? {};
+    const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
+    if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
+      styleNode.styleId = paragraphProps.styleId;
+    }
+    const resolved = resolveStyle(styleNode, styleContext);
+    baseRunDefaults = {
+      fontFamily: resolved.character.font?.family,
+      fontSizePx: ptToPx(resolved.character.font?.size),
+      color: resolved.character.color,
+      bold: resolved.character.font?.weight != null ? resolved.character.font.weight >= 600 : void 0,
+      italic: resolved.character.font?.italic,
+      underline: resolved.character.underline ? {
+        style: resolved.character.underline.style,
+        color: resolved.character.underline.color
+      } : void 0,
+      letterSpacing: ptToPx(resolved.character.letterSpacing)
+    };
+  } catch {
+    baseRunDefaults = {};
+  }
   const paragraphAttrs = computeParagraphAttrs(
     para,
     styleContext,
@@ -57962,6 +58137,18 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
     converterContext,
     paragraphHydration
   );
+  if (paragraphAttrs?.spacing) {
+    const spacing = { ...paragraphAttrs.spacing };
+    const effectiveFontSize = baseRunDefaults.fontSizePx ?? defaultSize;
+    const isList2 = Boolean(paragraphAttrs.numberingProperties);
+    if (spacing.beforeAutospacing) {
+      spacing.before = isList2 ? 0 : Math.max(0, Number(spacing.before ?? 0) + effectiveFontSize * 0.5);
+    }
+    if (spacing.afterAutospacing) {
+      spacing.after = isList2 ? 0 : Math.max(0, Number(spacing.after ?? 0) + effectiveFontSize * 0.5);
+    }
+    paragraphAttrs.spacing = spacing;
+  }
   const linkedStyleResolver = createLinkedStyleResolver(converterContext?.linkedStyles);
   const blocks = [];
   if (hasPageBreakBefore(para)) {
@@ -58039,6 +58226,7 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
       );
       const inlineStyleId = getInlineStyleId(inheritedMarks);
       applyRunStyles2(run2, inlineStyleId, activeRunStyleId);
+      applyBaseRunDefaults(run2, baseRunDefaults, defaultFont, defaultSize);
       currentRuns.push(run2);
       return;
     }
@@ -58074,6 +58262,7 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
           );
           const inlineStyleId = getInlineStyleId(inheritedMarks);
           applyRunStyles2(run2, inlineStyleId, activeRunStyleId);
+          applyBaseRunDefaults(run2, baseRunDefaults, defaultFont, defaultSize);
           currentRuns.push(run2);
         }
       }
@@ -58111,6 +58300,7 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
         );
         const inlineStyleId = getInlineStyleId(mergedMarks);
         applyRunStyles2(tokenRun, inlineStyleId, activeRunStyleId);
+        applyBaseRunDefaults(tokenRun, baseRunDefaults, defaultFont, defaultSize);
         if (pageRefPos) {
           tokenRun.pmStart = pageRefPos.start;
           tokenRun.pmEnd = pageRefPos.end;
@@ -58169,6 +58359,7 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
         }
         const inlineStyleId = getInlineStyleId(inheritedMarks);
         applyRunStyles2(tokenRun, inlineStyleId, activeRunStyleId);
+        applyBaseRunDefaults(tokenRun, baseRunDefaults, defaultFont, defaultSize);
         currentRuns.push(tokenRun);
       }
       return;
@@ -60197,7 +60388,9 @@ function layoutParagraphBlock(ctx2, anchors) {
   let lines = normalizeLines(measure);
   let fromLine = 0;
   const spacing = block.attrs?.spacing ?? {};
-  const spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
+  const styleId = block.attrs?.styleId;
+  const contextualSpacing = Boolean(block.attrs?.contextualSpacing);
+  let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
   const spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
   let appliedSpacingBefore = spacingBefore === 0;
   let lastState = null;
@@ -60213,6 +60406,15 @@ function layoutParagraphBlock(ctx2, anchors) {
   while (fromLine < lines.length) {
     let state2 = ensurePage();
     if (state2.trailingSpacing == null) state2.trailingSpacing = 0;
+    if (contextualSpacing) {
+      const prevStyle = state2.lastParagraphStyleId;
+      if (styleId && prevStyle && prevStyle === styleId) {
+        spacingBefore = 0;
+      }
+    }
+    if (contextualSpacing && state2.lastParagraphStyleId && styleId && state2.lastParagraphStyleId === styleId) {
+      spacingBefore = 0;
+    }
     if (!appliedSpacingBefore && spacingBefore > 0) {
       while (!appliedSpacingBefore) {
         const prevTrailing = state2.trailingSpacing ?? 0;
@@ -60381,6 +60583,7 @@ function layoutParagraphBlock(ctx2, anchors) {
     } else {
       lastState.trailingSpacing = 0;
     }
+    lastState.lastParagraphStyleId = styleId;
   }
 }
 function layoutImageBlock({
@@ -60619,7 +60822,8 @@ function createPaginator(opts) {
       contentBottom,
       constraintBoundaries: [],
       activeConstraintIndex: -1,
-      trailingSpacing: 0
+      trailingSpacing: 0,
+      lastParagraphStyleId: void 0
     };
     states.push(state2);
     pages.push(state2.page);
@@ -60641,6 +60845,7 @@ function createPaginator(opts) {
         state2.cursorY = state2.topMargin;
       }
       state2.trailingSpacing = 0;
+      state2.lastParagraphStyleId = void 0;
       return state2;
     }
     return startNewPage();
@@ -65183,8 +65388,59 @@ const _DomPainter = class _DomPainter2 {
     this.headerProvider = header;
     this.footerProvider = footer;
   }
-  setData(blocks, measures) {
+  /**
+   * Updates the painter's block and measure data.
+   *
+   * @param blocks - Main document blocks
+   * @param measures - Measures corresponding to main document blocks
+   * @param headerBlocks - Optional header blocks from header/footer layout results
+   * @param headerMeasures - Optional measures corresponding to header blocks
+   * @param footerBlocks - Optional footer blocks from header/footer layout results
+   * @param footerMeasures - Optional measures corresponding to footer blocks
+   */
+  setData(blocks, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
+    if (blocks.length !== measures.length) {
+      throw new Error(
+        `setData: blocks and measures arrays must have the same length. Got blocks.length=${blocks.length}, measures.length=${measures.length}`
+      );
+    }
+    const hasHeaderBlocks = headerBlocks !== void 0;
+    const hasHeaderMeasures = headerMeasures !== void 0;
+    if (hasHeaderBlocks !== hasHeaderMeasures) {
+      throw new Error(
+        `setData: headerBlocks and headerMeasures must both be provided or both be omitted. Got headerBlocks=${hasHeaderBlocks ? "provided" : "omitted"}, headerMeasures=${hasHeaderMeasures ? "provided" : "omitted"}`
+      );
+    }
+    if (hasHeaderBlocks && hasHeaderMeasures && headerBlocks.length !== headerMeasures.length) {
+      throw new Error(
+        `setData: headerBlocks and headerMeasures arrays must have the same length. Got headerBlocks.length=${headerBlocks.length}, headerMeasures.length=${headerMeasures.length}`
+      );
+    }
+    const hasFooterBlocks = footerBlocks !== void 0;
+    const hasFooterMeasures = footerMeasures !== void 0;
+    if (hasFooterBlocks !== hasFooterMeasures) {
+      throw new Error(
+        `setData: footerBlocks and footerMeasures must both be provided or both be omitted. Got footerBlocks=${hasFooterBlocks ? "provided" : "omitted"}, footerMeasures=${hasFooterMeasures ? "provided" : "omitted"}`
+      );
+    }
+    if (hasFooterBlocks && hasFooterMeasures && footerBlocks.length !== footerMeasures.length) {
+      throw new Error(
+        `setData: footerBlocks and footerMeasures arrays must have the same length. Got footerBlocks.length=${footerBlocks.length}, footerMeasures.length=${footerMeasures.length}`
+      );
+    }
     const nextLookup = this.buildBlockLookup(blocks, measures);
+    if (headerBlocks && headerMeasures) {
+      const headerLookup = this.buildBlockLookup(headerBlocks, headerMeasures);
+      headerLookup.forEach((entry, id) => {
+        nextLookup.set(id, entry);
+      });
+    }
+    if (footerBlocks && footerMeasures) {
+      const footerLookup = this.buildBlockLookup(footerBlocks, footerMeasures);
+      footerLookup.forEach((entry, id) => {
+        nextLookup.set(id, entry);
+      });
+    }
     const changed = /* @__PURE__ */ new Set();
     nextLookup.forEach((entry, id) => {
       const previous = this.blockLookup.get(id);
@@ -65507,6 +65763,14 @@ const _DomPainter = class _DomPainter2 {
     container.style.height = `${data.height}px`;
     container.style.top = `${Math.max(0, offset2)}px`;
     container.style.zIndex = "1";
+    let footerYOffset = 0;
+    if (kind === "footer" && data.fragments.length > 0) {
+      const contentHeight = typeof data.contentHeight === "number" ? data.contentHeight : data.fragments.reduce((max2, f2) => {
+        const fragHeight = "height" in f2 && typeof f2.height === "number" ? f2.height : this.estimateFragmentHeight(f2);
+        return Math.max(max2, f2.y + Math.max(0, fragHeight));
+      }, 0);
+      footerYOffset = Math.max(0, data.height - contentHeight);
+    }
     const context = {
       pageNumber: page.number,
       totalPages: this.totalPages,
@@ -65515,6 +65779,10 @@ const _DomPainter = class _DomPainter2 {
     };
     data.fragments.forEach((fragment) => {
       const fragEl = this.renderFragment(fragment, context);
+      if (footerYOffset > 0) {
+        const currentTop = parseFloat(fragEl.style.top) || fragment.y;
+        fragEl.style.top = `${currentTop + footerYOffset}px`;
+      }
       container.appendChild(fragEl);
     });
     if (!existing) {
@@ -65792,147 +66060,162 @@ const _DomPainter = class _DomPainter2 {
     return el;
   }
   renderListItemFragment(fragment, context) {
-    const lookup2 = this.blockLookup.get(fragment.blockId);
-    if (!lookup2 || lookup2.block.kind !== "list" || lookup2.measure.kind !== "list") {
-      throw new Error(`DomPainter: missing list data for fragment ${fragment.blockId}`);
-    }
-    if (!this.doc) {
-      throw new Error("DomPainter: document is not available");
+    try {
+      const lookup2 = this.blockLookup.get(fragment.blockId);
+      if (!lookup2 || lookup2.block.kind !== "list" || lookup2.measure.kind !== "list") {
+        throw new Error(`DomPainter: missing list data for fragment ${fragment.blockId}`);
+      }
+      if (!this.doc) {
+        throw new Error("DomPainter: document is not available");
+      }
+      const block = lookup2.block;
+      const measure = lookup2.measure;
+      const item = block.items.find((entry) => entry.id === fragment.itemId);
+      const itemMeasure = measure.items.find((entry) => entry.itemId === fragment.itemId);
+      if (!item || !itemMeasure) {
+        throw new Error(`DomPainter: missing list item ${fragment.itemId}`);
+      }
+      const fragmentEl = this.doc.createElement("div");
+      fragmentEl.classList.add(CLASS_NAMES.fragment, `${CLASS_NAMES.fragment}-list-item`);
+      applyStyles$2(fragmentEl, fragmentStyles);
+      fragmentEl.style.left = `${fragment.x - fragment.markerWidth}px`;
+      fragmentEl.style.top = `${fragment.y}px`;
+      fragmentEl.style.width = `${fragment.markerWidth + fragment.width}px`;
+      fragmentEl.dataset.blockId = fragment.blockId;
+      fragmentEl.dataset.itemId = fragment.itemId;
+      const paragraphMetadata = item.paragraph.attrs?.sdt;
+      this.applySdtDataset(fragmentEl, paragraphMetadata);
+      if (fragment.continuesFromPrev) {
+        fragmentEl.dataset.continuesFromPrev = "true";
+      }
+      if (fragment.continuesOnNext) {
+        fragmentEl.dataset.continuesOnNext = "true";
+      }
+      const markerEl = this.doc.createElement("span");
+      markerEl.classList.add("superdoc-list-marker");
+      const wordLayout = item.paragraph.attrs?.wordLayout;
+      const marker = wordLayout?.marker;
+      if (marker) {
+        markerEl.textContent = marker.markerText ?? null;
+        markerEl.style.display = "inline-block";
+        markerEl.style.width = `${Math.max(0, fragment.markerWidth - LIST_MARKER_GAP$1)}px`;
+        markerEl.style.paddingRight = `${LIST_MARKER_GAP$1}px`;
+        markerEl.style.textAlign = marker.justification ?? "";
+        markerEl.style.fontFamily = marker.run.fontFamily;
+        markerEl.style.fontSize = `${marker.run.fontSize}px`;
+        if (marker.run.bold) markerEl.style.fontWeight = "bold";
+        if (marker.run.italic) markerEl.style.fontStyle = "italic";
+        if (marker.run.color) markerEl.style.color = marker.run.color;
+        if (marker.run.letterSpacing) markerEl.style.letterSpacing = `${marker.run.letterSpacing}px`;
+      } else {
+        markerEl.textContent = item.marker.text;
+        markerEl.style.display = "inline-block";
+        markerEl.style.width = `${Math.max(0, fragment.markerWidth - LIST_MARKER_GAP$1)}px`;
+        markerEl.style.paddingRight = `${LIST_MARKER_GAP$1}px`;
+        if (item.marker.align) {
+          markerEl.style.textAlign = item.marker.align;
+        }
+      }
+      fragmentEl.appendChild(markerEl);
+      const contentEl = this.doc.createElement("div");
+      contentEl.classList.add("superdoc-list-content");
+      this.applySdtDataset(contentEl, paragraphMetadata);
+      contentEl.style.display = "inline-block";
+      contentEl.style.width = `${fragment.width}px`;
+      const lines = itemMeasure.paragraph.lines.slice(fragment.fromLine, fragment.toLine);
+      const contentAttrs = wordLayout ? item.paragraph.attrs : stripListIndent(item.paragraph.attrs);
+      applyParagraphBlockStyles(contentEl, contentAttrs);
+      lines.forEach((line) => {
+        const lineEl = this.renderLine(item.paragraph, line, context);
+        contentEl.appendChild(lineEl);
+      });
+      fragmentEl.appendChild(contentEl);
+      return fragmentEl;
+    } catch (error) {
+      console.error("[DomPainter] List item fragment rendering failed:", { fragment, error });
+      return this.createErrorPlaceholder(fragment.blockId, error);
     }
-    const block = lookup2.block;
-    const measure = lookup2.measure;
-    const item = block.items.find((entry) => entry.id === fragment.itemId);
-    const itemMeasure = measure.items.find((entry) => entry.itemId === fragment.itemId);
-    if (!item || !itemMeasure) {
-      throw new Error(`DomPainter: missing list item ${fragment.itemId}`);
-    }
-    const fragmentEl = this.doc.createElement("div");
-    fragmentEl.classList.add(CLASS_NAMES.fragment, `${CLASS_NAMES.fragment}-list-item`);
-    applyStyles$2(fragmentEl, fragmentStyles);
-    fragmentEl.style.left = `${fragment.x - fragment.markerWidth}px`;
-    fragmentEl.style.top = `${fragment.y}px`;
-    fragmentEl.style.width = `${fragment.markerWidth + fragment.width}px`;
-    fragmentEl.dataset.blockId = fragment.blockId;
-    fragmentEl.dataset.itemId = fragment.itemId;
-    const paragraphMetadata = item.paragraph.attrs?.sdt;
-    this.applySdtDataset(fragmentEl, paragraphMetadata);
-    if (fragment.continuesFromPrev) {
-      fragmentEl.dataset.continuesFromPrev = "true";
-    }
-    if (fragment.continuesOnNext) {
-      fragmentEl.dataset.continuesOnNext = "true";
-    }
-    const markerEl = this.doc.createElement("span");
-    markerEl.classList.add("superdoc-list-marker");
-    const wordLayout = item.paragraph.attrs?.wordLayout;
-    if (wordLayout?.marker) {
-      const marker = wordLayout.marker;
-      markerEl.textContent = marker.markerText;
-      markerEl.style.display = "inline-block";
-      markerEl.style.width = `${Math.max(0, fragment.markerWidth - LIST_MARKER_GAP$1)}px`;
-      markerEl.style.paddingRight = `${LIST_MARKER_GAP$1}px`;
-      markerEl.style.textAlign = marker.justification;
-      markerEl.style.fontFamily = marker.run.fontFamily;
-      markerEl.style.fontSize = `${marker.run.fontSize}px`;
-      if (marker.run.bold) markerEl.style.fontWeight = "bold";
-      if (marker.run.italic) markerEl.style.fontStyle = "italic";
-      if (marker.run.color) markerEl.style.color = marker.run.color;
-      if (marker.run.letterSpacing) markerEl.style.letterSpacing = `${marker.run.letterSpacing}px`;
-    } else {
-      markerEl.textContent = item.marker.text;
-      markerEl.style.display = "inline-block";
-      markerEl.style.width = `${Math.max(0, fragment.markerWidth - LIST_MARKER_GAP$1)}px`;
-      markerEl.style.paddingRight = `${LIST_MARKER_GAP$1}px`;
-      if (item.marker.align) {
-        markerEl.style.textAlign = item.marker.align;
-      }
-    }
-    fragmentEl.appendChild(markerEl);
-    const contentEl = this.doc.createElement("div");
-    contentEl.classList.add("superdoc-list-content");
-    this.applySdtDataset(contentEl, paragraphMetadata);
-    contentEl.style.display = "inline-block";
-    contentEl.style.width = `${fragment.width}px`;
-    const lines = itemMeasure.paragraph.lines.slice(fragment.fromLine, fragment.toLine);
-    const contentAttrs = wordLayout ? item.paragraph.attrs : stripListIndent(item.paragraph.attrs);
-    applyParagraphBlockStyles(contentEl, contentAttrs);
-    lines.forEach((line) => {
-      const lineEl = this.renderLine(item.paragraph, line, context);
-      contentEl.appendChild(lineEl);
-    });
-    fragmentEl.appendChild(contentEl);
-    return fragmentEl;
   }
   renderImageFragment(fragment) {
-    const lookup2 = this.blockLookup.get(fragment.blockId);
-    if (!lookup2 || lookup2.block.kind !== "image" || lookup2.measure.kind !== "image") {
-      throw new Error(`DomPainter: missing image block for fragment ${fragment.blockId}`);
-    }
-    if (!this.doc) {
-      throw new Error("DomPainter: document is not available");
-    }
-    const block = lookup2.block;
-    const fragmentEl = this.doc.createElement("div");
-    fragmentEl.classList.add(CLASS_NAMES.fragment);
-    applyStyles$2(fragmentEl, fragmentStyles);
-    this.applyFragmentFrame(fragmentEl, fragment);
-    fragmentEl.style.height = `${fragment.height}px`;
-    this.applySdtDataset(fragmentEl, block.attrs?.sdt);
-    this.applyContainerSdtDataset(fragmentEl, block.attrs?.containerSdt);
-    if (fragment.isAnchored && fragment.zIndex != null) {
-      fragmentEl.style.zIndex = String(fragment.zIndex);
-    }
-    const img = this.doc.createElement("img");
-    if (block.src) {
-      img.src = block.src;
+    try {
+      const lookup2 = this.blockLookup.get(fragment.blockId);
+      if (!lookup2 || lookup2.block.kind !== "image" || lookup2.measure.kind !== "image") {
+        throw new Error(`DomPainter: missing image block for fragment ${fragment.blockId}`);
+      }
+      if (!this.doc) {
+        throw new Error("DomPainter: document is not available");
+      }
+      const block = lookup2.block;
+      const fragmentEl = this.doc.createElement("div");
+      fragmentEl.classList.add(CLASS_NAMES.fragment);
+      applyStyles$2(fragmentEl, fragmentStyles);
+      this.applyFragmentFrame(fragmentEl, fragment);
+      fragmentEl.style.height = `${fragment.height}px`;
+      this.applySdtDataset(fragmentEl, block.attrs?.sdt);
+      this.applyContainerSdtDataset(fragmentEl, block.attrs?.containerSdt);
+      if (fragment.isAnchored && fragment.zIndex != null) {
+        fragmentEl.style.zIndex = String(fragment.zIndex);
+      }
+      const img = this.doc.createElement("img");
+      if (block.src) {
+        img.src = block.src;
+      }
+      img.alt = block.alt ?? "";
+      img.style.width = "100%";
+      img.style.height = "100%";
+      img.style.objectFit = block.objectFit ?? "contain";
+      img.style.display = block.display === "inline" ? "inline-block" : "block";
+      fragmentEl.appendChild(img);
+      return fragmentEl;
+    } catch (error) {
+      console.error("[DomPainter] Image fragment rendering failed:", { fragment, error });
+      return this.createErrorPlaceholder(fragment.blockId, error);
     }
-    img.alt = block.alt ?? "";
-    img.style.width = "100%";
-    img.style.height = "100%";
-    img.style.objectFit = block.objectFit ?? "contain";
-    img.style.display = block.display === "inline" ? "inline-block" : "block";
-    fragmentEl.appendChild(img);
-    return fragmentEl;
   }
   renderDrawingFragment(fragment) {
-    const lookup2 = this.blockLookup.get(fragment.blockId);
-    if (!lookup2 || lookup2.block.kind !== "drawing" || lookup2.measure.kind !== "drawing") {
-      throw new Error(`DomPainter: missing drawing block for fragment ${fragment.blockId}`);
-    }
-    if (!this.doc) {
-      throw new Error("DomPainter: document is not available");
+    try {
+      const lookup2 = this.blockLookup.get(fragment.blockId);
+      if (!lookup2 || lookup2.block.kind !== "drawing" || lookup2.measure.kind !== "drawing") {
+        throw new Error(`DomPainter: missing drawing block for fragment ${fragment.blockId}`);
+      }
+      if (!this.doc) {
+        throw new Error("DomPainter: document is not available");
+      }
+      const block = lookup2.block;
+      const isVectorShapeBlock = block.kind === "drawing" && block.drawingKind === "vectorShape";
+      const fragmentEl = this.doc.createElement("div");
+      fragmentEl.classList.add(CLASS_NAMES.fragment, "superdoc-drawing-fragment");
+      applyStyles$2(fragmentEl, fragmentStyles);
+      this.applyFragmentFrame(fragmentEl, fragment);
+      fragmentEl.style.height = `${fragment.height}px`;
+      fragmentEl.style.position = "absolute";
+      if (fragment.isAnchored && fragment.zIndex != null) {
+        fragmentEl.style.zIndex = String(fragment.zIndex);
+      }
+      const innerWrapper = this.doc.createElement("div");
+      innerWrapper.classList.add("superdoc-drawing-inner");
+      innerWrapper.style.position = "absolute";
+      innerWrapper.style.left = "50%";
+      innerWrapper.style.top = "50%";
+      innerWrapper.style.width = `${fragment.geometry.width}px`;
+      innerWrapper.style.height = `${fragment.geometry.height}px`;
+      innerWrapper.style.transformOrigin = "center";
+      const scale = fragment.scale ?? 1;
+      const transforms = ["translate(-50%, -50%)"];
+      if (!isVectorShapeBlock) {
+        transforms.push(`rotate(${fragment.geometry.rotation ?? 0}deg)`);
+        transforms.push(`scaleX(${fragment.geometry.flipH ? -1 : 1})`);
+        transforms.push(`scaleY(${fragment.geometry.flipV ? -1 : 1})`);
+      }
+      transforms.push(`scale(${scale})`);
+      innerWrapper.style.transform = transforms.join(" ");
+      innerWrapper.appendChild(this.renderDrawingContent(block, fragment));
+      fragmentEl.appendChild(innerWrapper);
+      return fragmentEl;
+    } catch (error) {
+      console.error("[DomPainter] Drawing fragment rendering failed:", { fragment, error });
+      return this.createErrorPlaceholder(fragment.blockId, error);
     }
-    const block = lookup2.block;
-    const isVectorShapeBlock = block.kind === "drawing" && block.drawingKind === "vectorShape";
-    const fragmentEl = this.doc.createElement("div");
-    fragmentEl.classList.add(CLASS_NAMES.fragment, "superdoc-drawing-fragment");
-    applyStyles$2(fragmentEl, fragmentStyles);
-    this.applyFragmentFrame(fragmentEl, fragment);
-    fragmentEl.style.height = `${fragment.height}px`;
-    fragmentEl.style.position = "absolute";
-    if (fragment.isAnchored && fragment.zIndex != null) {
-      fragmentEl.style.zIndex = String(fragment.zIndex);
-    }
-    const innerWrapper = this.doc.createElement("div");
-    innerWrapper.classList.add("superdoc-drawing-inner");
-    innerWrapper.style.position = "absolute";
-    innerWrapper.style.left = "50%";
-    innerWrapper.style.top = "50%";
-    innerWrapper.style.width = `${fragment.geometry.width}px`;
-    innerWrapper.style.height = `${fragment.geometry.height}px`;
-    innerWrapper.style.transformOrigin = "center";
-    const scale = fragment.scale ?? 1;
-    const transforms = ["translate(-50%, -50%)"];
-    if (!isVectorShapeBlock) {
-      transforms.push(`rotate(${fragment.geometry.rotation ?? 0}deg)`);
-      transforms.push(`scaleX(${fragment.geometry.flipH ? -1 : 1})`);
-      transforms.push(`scaleY(${fragment.geometry.flipV ? -1 : 1})`);
-    }
-    transforms.push(`scale(${scale})`);
-    innerWrapper.style.transform = transforms.join(" ");
-    innerWrapper.appendChild(this.renderDrawingContent(block, fragment));
-    fragmentEl.appendChild(innerWrapper);
-    return fragmentEl;
   }
   renderDrawingContent(block, fragment) {
     if (!this.doc) {
@@ -66367,6 +66650,7 @@ const _DomPainter = class _DomPainter2 {
     }
     applyRunStyles(elem, run2, isActiveLink);
     elem.style.zIndex = "1";
+    applyRunDataAttributes(elem, run2.dataAttrs);
     if (run2.pmStart != null) elem.dataset.pmStart = String(run2.pmStart);
     if (run2.pmEnd != null) elem.dataset.pmEnd = String(run2.pmEnd);
     if (trackedConfig) {
@@ -66565,6 +66849,33 @@ const _DomPainter = class _DomPainter2 {
       }
     }
   }
+  /**
+   * Estimates the height of a fragment when explicit height is not available.
+   *
+   * This method provides fallback height calculations for footer bottom-alignment
+   * by consulting measure data for paragraphs and list items, or using the
+   * fragment's height property for tables, images, and drawings.
+   *
+   * @param fragment - The fragment to estimate height for
+   * @returns Estimated height in pixels, or 0 if height cannot be determined
+   */
+  estimateFragmentHeight(fragment) {
+    const lookup2 = this.blockLookup.get(fragment.blockId);
+    const measure = lookup2?.measure;
+    if (fragment.kind === "para" && measure?.kind === "paragraph") {
+      return measure.totalHeight;
+    }
+    if (fragment.kind === "list-item" && measure?.kind === "list") {
+      return measure.totalHeight;
+    }
+    if (fragment.kind === "table") {
+      return fragment.height;
+    }
+    if (fragment.kind === "image" || fragment.kind === "drawing") {
+      return fragment.height;
+    }
+    return 0;
+  }
   buildBlockLookup(blocks, measures) {
     if (blocks.length !== measures.length) {
       throw new Error("DomPainter requires the same number of blocks and measures");
@@ -66747,6 +67058,12 @@ const deriveBlockVersion = (block) => {
         run2.kind !== "tab" && run2.bold ? 1 : 0,
         run2.kind !== "tab" && run2.italic ? 1 : 0,
         run2.kind !== "tab" ? run2.color ?? "" : "",
+        // Text decorations - ensures DOM updates when decoration properties change.
+        run2.kind !== "tab" ? run2.underline?.style ?? "" : "",
+        run2.kind !== "tab" ? run2.underline?.color ?? "" : "",
+        run2.kind !== "tab" && run2.strike ? 1 : 0,
+        run2.kind !== "tab" ? run2.highlight ?? "" : "",
+        run2.kind !== "tab" && run2.letterSpacing != null ? run2.letterSpacing : "",
         run2.pmStart ?? "",
         run2.pmEnd ?? "",
         run2.kind !== "tab" ? run2.token ?? "" : ""
@@ -66841,6 +67158,20 @@ const applyRunStyles = (element, run2, isLink = false) => {
     element.style.textDecorationLine = decorations.join(" ");
   }
 };
+const applyRunDataAttributes = (element, dataAttrs) => {
+  if (!dataAttrs) return;
+  Object.entries(dataAttrs).forEach(([key2, value]) => {
+    if (typeof key2 !== "string" || !key2.toLowerCase().startsWith("data-")) return;
+    if (typeof value !== "string") return;
+    try {
+      element.setAttribute(key2, value);
+    } catch (error) {
+      if (process$1$1.env.NODE_ENV === "development") {
+        console.warn(`[DomPainter] Failed to set data attribute "${key2}":`, error);
+      }
+    }
+  });
+};
 const applyParagraphBlockStyles = (element, attrs) => {
   if (!attrs) return;
   if (attrs.alignment) {
@@ -67013,8 +67344,8 @@ const createDomPainter = (options) => {
     paint(layout, mount2) {
       painter.paint(layout, mount2);
     },
-    setData(blocks, measures) {
-      painter.setData(blocks, measures);
+    setData(blocks, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
+      painter.setData(blocks, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures);
     },
     // Non-standard extension for demo app to avoid re-instantiating on provider changes
     setProviders(header, footer) {
@@ -70403,7 +70734,30 @@ rerender_fn = async function() {
   if (typeof painter.setProviders === "function") {
     painter.setProviders(__privateGet$1(this, _headerDecorationProvider), __privateGet$1(this, _footerDecorationProvider));
   }
-  painter.setData?.(blocks, measures);
+  const headerBlocks = [];
+  const headerMeasures = [];
+  if (headerLayouts) {
+    for (const headerResult of headerLayouts) {
+      headerBlocks.push(...headerResult.blocks);
+      headerMeasures.push(...headerResult.measures);
+    }
+  }
+  const footerBlocks = [];
+  const footerMeasures = [];
+  if (footerLayouts) {
+    for (const footerResult of footerLayouts) {
+      footerBlocks.push(...footerResult.blocks);
+      footerMeasures.push(...footerResult.measures);
+    }
+  }
+  painter.setData?.(
+    blocks,
+    measures,
+    headerBlocks.length > 0 ? headerBlocks : void 0,
+    headerMeasures.length > 0 ? headerMeasures : void 0,
+    footerBlocks.length > 0 ? footerBlocks : void 0,
+    footerMeasures.length > 0 ? footerMeasures : void 0
+  );
   painter.paint(layout, __privateGet$1(this, _painterHost));
   __privateSet(this, _layoutError, null);
   __privateSet(this, _layoutErrorState, "healthy");
@@ -70573,7 +70927,8 @@ createDecorationProvider_fn = function(kind, layout) {
     const finalHeaderId = headerId ?? fallbackId ?? void 0;
     return {
       fragments: slotPage.fragments,
-      height: variant.layout.height ?? box.height,
+      height: box.height,
+      contentHeight: variant.layout.height ?? box.height,
       offset: box.offset,
       marginLeft: box.x,
       contentWidth: box.width,
@@ -70600,18 +70955,19 @@ computeDecorationBox_fn = function(kind, pageMargins, pageHeight) {
   const left2 = margins.left ?? DEFAULT_MARGINS.left;
   const right2 = margins.right ?? DEFAULT_MARGINS.right;
   const width = Math.max(pageSize.w - (left2 + right2), 1);
-  const defaultHeight = kind === "header" ? margins.top ?? DEFAULT_MARGINS.top : margins.bottom ?? DEFAULT_MARGINS.bottom;
-  const { headerSpace, footerSpace } = extractHeaderFooterSpace(margins);
-  const target = kind === "header" ? headerSpace : footerSpace;
-  const height = Math.max(target || defaultHeight || 1, 1);
   const totalHeight = pageHeight ?? pageSize.h;
-  const offset2 = kind === "header" ? 0 : Math.max(0, totalHeight - height);
-  return {
-    x: left2,
-    width,
-    height,
-    offset: offset2
-  };
+  if (kind === "header") {
+    const headerMargin = margins.header ?? 0;
+    const topMargin = margins.top ?? DEFAULT_MARGINS.top ?? 0;
+    const height = Math.max(topMargin - headerMargin, 1);
+    return { x: left2, width, height, offset: headerMargin };
+  } else {
+    const footerMargin = margins.footer ?? 0;
+    const bottomMargin = margins.bottom ?? DEFAULT_MARGINS.bottom ?? 0;
+    const height = Math.max(bottomMargin - footerMargin, 1);
+    const offset2 = Math.max(0, totalHeight - footerMargin - height);
+    return { x: left2, width, height, offset: offset2 };
+  }
 };
 rebuildHeaderFooterRegions_fn = function(layout) {
   __privateGet$1(this, _headerRegions).clear();
@@ -70828,7 +71184,8 @@ getHeaderFooterPageHeight_fn = function() {
   return context.layout.pageSize?.h ?? context.region.height ?? 1;
 };
 renderSelectionRects_fn = function(rects) {
-  if (!__privateGet$1(this, _selectionOverlay)) {
+  const localSelectionLayer = __privateGet$1(this, _localSelectionLayer);
+  if (!localSelectionLayer) {
     return;
   }
   const pageHeight = __privateMethod$1(this, _PresentationEditor_instances, getBodyPageHeight_fn).call(this);
@@ -70839,7 +71196,7 @@ renderSelectionRects_fn = function(rects) {
     if (!coords) {
       return;
     }
-    const highlight = __privateGet$1(this, _selectionOverlay).ownerDocument?.createElement("div");
+    const highlight = localSelectionLayer.ownerDocument?.createElement("div");
     if (!highlight) {
       return;
     }
@@ -70852,7 +71209,7 @@ renderSelectionRects_fn = function(rects) {
     highlight.style.backgroundColor = "rgba(51, 132, 255, 0.35)";
     highlight.style.borderRadius = "2px";
     highlight.style.pointerEvents = "none";
-    __privateGet$1(this, _selectionOverlay).appendChild(highlight);
+    localSelectionLayer.appendChild(highlight);
   });
 };
 renderHoverRegion_fn = function(region) {
@@ -71302,6 +71659,7 @@ class PresentationInputBridge {
     __privateAdd$1(this, _onTargetChanged);
     __privateAdd$1(this, _listeners);
     __privateAdd$1(this, _currentTarget, null);
+    __privateAdd$1(this, _destroyed, false);
     __privateSet(this, _windowRoot, windowRoot);
     __privateSet(this, _visibleHost2, visibleHost);
     __privateSet(this, _getTargetDom, getTargetDom);
@@ -71329,9 +71687,13 @@ class PresentationInputBridge {
     });
     __privateSet(this, _listeners, []);
     __privateSet(this, _currentTarget, null);
+    __privateSet(this, _destroyed, true);
   }
   notifyTargetChanged() {
     var _a2;
+    if (__privateGet$1(this, _destroyed)) {
+      return;
+    }
     const nextTarget = __privateGet$1(this, _getTargetDom).call(this);
     if (nextTarget === __privateGet$1(this, _currentTarget)) {
       return;
@@ -71361,6 +71723,7 @@ _getTargetDom = /* @__PURE__ */ new WeakMap();
 _onTargetChanged = /* @__PURE__ */ new WeakMap();
 _listeners = /* @__PURE__ */ new WeakMap();
 _currentTarget = /* @__PURE__ */ new WeakMap();
+_destroyed = /* @__PURE__ */ new WeakMap();
 _PresentationInputBridge_instances = /* @__PURE__ */ new WeakSet();
 addListener_fn = function(type2, handler2, target) {
   const bound = handler2.bind(this);
@@ -71368,12 +71731,21 @@ addListener_fn = function(type2, handler2, target) {
   target.addEventListener(type2, bound, true);
 };
 dispatchToTarget_fn = function(originalEvent, synthetic) {
+  if (__privateGet$1(this, _destroyed)) return;
   const target = __privateGet$1(this, _getTargetDom).call(this);
   __privateSet(this, _currentTarget, target);
   if (!target) return;
-  const canceled = !target.dispatchEvent(synthetic) || synthetic.defaultPrevented;
-  if (canceled) {
-    originalEvent.preventDefault();
+  const isConnected = target.isConnected;
+  if (isConnected === false) return;
+  try {
+    const canceled = !target.dispatchEvent(synthetic) || synthetic.defaultPrevented;
+    if (canceled) {
+      originalEvent.preventDefault();
+    }
+  } catch (error) {
+    if (process$1$1.env.NODE_ENV === "development") {
+      console.warn("[PresentationEditor] Failed to dispatch event to target:", error);
+    }
   }
 };
 forwardKeyboardEvent_fn = function(event) {
@@ -100263,7 +100635,7 @@ var __accessCheck = (obj, member, msg2) => member.has(obj) || __typeError("Canno
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var _SuperToolbar_instances, initToolbarGroups_fn, _interceptedCommands, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, enrichTrackedChanges_fn, runCommandWithArgumentOnly_fn;
+var _MARK_TOGGLE_NAMES, _SuperToolbar_instances, initToolbarGroups_fn, _interceptedCommands, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, enrichTrackedChanges_fn, runCommandWithArgumentOnly_fn, syncStickyMarksFromState_fn, restoreStickyMarksIfNeeded_fn, ensureStoredMarksForMarkToggle_fn;
 var eventemitter3 = { exports: {} };
 var hasRequiredEventemitter3;
 function requireEventemitter3() {
@@ -100482,7 +100854,7 @@ const useToolbarItem = (options) => {
     if (!Array.isArray(options.options)) throw new Error("Invalid toolbar item options - " + options.options);
     nestedOptions.value?.push(...options.options);
   }
-  const activate = (attrs, ...args) => {
+  const activate = (attrs = {}, ...args) => {
     onActivate(attrs, ...args);
     if (suppressActiveHighlight.value) return;
     active.value = true;
@@ -102754,7 +103126,7 @@ const isNegatedMark = (name, attrs = {}) => {
   if (typeof checker !== "function") return false;
   return Boolean(checker(attrs));
 };
-class SuperToolbar extends EventEmitter2 {
+const _SuperToolbar = class _SuperToolbar2 extends EventEmitter2 {
   /**
    * Creates a new SuperToolbar instance
    * @param {ToolbarConfig} config - The configuration for the toolbar
@@ -102798,11 +103170,11 @@ class SuperToolbar extends EventEmitter2 {
         const isSmallScreen = window.matchMedia("(max-width: 834px)").matches;
         if (isMobileDevice && isSmallScreen) {
           layers.style.transformOrigin = "0 0";
-          layers.style.transform = `scale(${parseInt(argument) / 100})`;
+          layers.style.transform = `scale(${parseInt(argument, 10) / 100})`;
         } else {
-          layers.style.zoom = parseInt(argument) / 100;
+          layers.style.zoom = parseInt(argument, 10) / 100;
         }
-        this.superdoc.superdocStore.activeZoom = parseInt(argument);
+        this.superdoc.superdocStore.activeZoom = parseInt(argument, 10);
       },
       /**
        * Sets the document mode
@@ -102884,31 +103256,37 @@ class SuperToolbar extends EventEmitter2 {
        * @returns {Promise<void>}
        */
       startImageUpload: async () => {
-        let open = getFileOpener();
-        let result = await open();
-        if (!result?.file) {
-          return;
-        }
-        const { size: size2, file } = await checkAndProcessImage({
-          file: result.file,
-          getMaxContentSize: () => this.activeEditor.getMaxContentSize()
-        });
-        if (!file) {
-          return;
+        try {
+          let open = getFileOpener();
+          let result = await open();
+          if (!result?.file) {
+            return;
+          }
+          const { size: size2, file } = await checkAndProcessImage({
+            file: result.file,
+            getMaxContentSize: () => this.activeEditor.getMaxContentSize()
+          });
+          if (!file) {
+            return;
+          }
+          const id = {};
+          replaceSelectionWithImagePlaceholder({
+            view: this.activeEditor.view,
+            editorOptions: this.activeEditor.options,
+            id
+          });
+          await uploadAndInsertImage({
+            editor: this.activeEditor,
+            view: this.activeEditor.view,
+            file,
+            size: size2,
+            id
+          });
+        } catch (error) {
+          const err = new Error("[super-toolbar 🎨] Image upload failed");
+          this.emit("exception", { error: err, editor: this.activeEditor, originalError: error });
+          console.error(err, error);
         }
-        const id = {};
-        replaceSelectionWithImagePlaceholder({
-          view: this.activeEditor.view,
-          editorOptions: this.activeEditor.options,
-          id
-        });
-        await uploadAndInsertImage({
-          editor: this.activeEditor,
-          view: this.activeEditor.view,
-          file,
-          size: size2,
-          id
-        });
       },
       /**
        * Increases text indentation or list level
@@ -103077,6 +103455,13 @@ class SuperToolbar extends EventEmitter2 {
     };
     this.config.hideButtons = config2.hideButtons ?? true;
     this.config.responsiveToContainer = config2.responsiveToContainer ?? false;
+    this.pendingMarkCommands = [];
+    this.stickyStoredMarks = null;
+    this._boundEditorHandlers = {
+      transaction: null,
+      selectionUpdate: null,
+      focus: null
+    };
     if (!this.config.selector && this.config.element) {
       this.config.selector = this.config.element;
     }
@@ -103136,12 +103521,28 @@ class SuperToolbar extends EventEmitter2 {
   }
   /**
    * The toolbar expects an active Super Editor instance.
-   * @param {Object} editor - The editor instance to attach to the toolbar
+   * Removes listeners from the previous editor (if any) before attaching to the new one.
+   * @param {Object|null} editor - The editor instance to attach to the toolbar, or null to detach
    * @returns {void}
    */
   setActiveEditor(editor) {
+    if (this.activeEditor && this._boundEditorHandlers.transaction) {
+      this.activeEditor.off("transaction", this._boundEditorHandlers.transaction);
+      this.activeEditor.off("selectionUpdate", this._boundEditorHandlers.selectionUpdate);
+      this.activeEditor.off("focus", this._boundEditorHandlers.focus);
+      this._boundEditorHandlers.transaction = null;
+      this._boundEditorHandlers.selectionUpdate = null;
+      this._boundEditorHandlers.focus = null;
+    }
     this.activeEditor = editor;
-    this.activeEditor.on("transaction", this.onEditorTransaction.bind(this));
+    if (editor) {
+      this._boundEditorHandlers.transaction = this.onEditorTransaction.bind(this);
+      this._boundEditorHandlers.selectionUpdate = this.onEditorSelectionUpdate.bind(this);
+      this._boundEditorHandlers.focus = this.onEditorFocus.bind(this);
+      this.activeEditor.on("transaction", this._boundEditorHandlers.transaction);
+      this.activeEditor.on("selectionUpdate", this._boundEditorHandlers.selectionUpdate);
+      this.activeEditor.on("focus", this._boundEditorHandlers.focus);
+    }
   }
   /**
    * Get toolbar items by group name
@@ -103289,15 +103690,28 @@ class SuperToolbar extends EventEmitter2 {
    * @returns {*} The result of the executed command, undefined if no result is returned
    */
   emitCommand({ item, argument, option }) {
+    const hasFocusFn = this.activeEditor?.view?.hasFocus;
+    const wasFocused = Boolean(typeof hasFocusFn === "function" && hasFocusFn.call(this.activeEditor.view));
+    const { command: command2 } = item;
+    const isMarkToggle = this.isMarkToggle(item);
+    if (!wasFocused && isMarkToggle) {
+      this.pendingMarkCommands.push({ command: command2, argument, item });
+      item?.activate?.();
+      if (this.activeEditor && !this.activeEditor.options.isHeaderOrFooter) {
+        this.activeEditor.focus();
+      }
+      return;
+    }
     if (this.activeEditor && !this.activeEditor.options.isHeaderOrFooter) {
       this.activeEditor.focus();
     }
-    const { command: command2 } = item;
     if (!command2) {
       return;
     }
     if (command2 in __privateGet(this, _interceptedCommands)) {
-      return __privateGet(this, _interceptedCommands)[command2]({ item, argument });
+      const result = __privateGet(this, _interceptedCommands)[command2]({ item, argument });
+      if (isMarkToggle) __privateMethod(this, _SuperToolbar_instances, syncStickyMarksFromState_fn).call(this);
+      return result;
     }
     if (this.activeEditor && this.activeEditor.commands && command2 in this.activeEditor.commands) {
       this.activeEditor.commands[command2](argument);
@@ -103308,9 +103722,67 @@ class SuperToolbar extends EventEmitter2 {
       this.emit("exception", { error, editor: this.activeEditor });
       throw error;
     }
+    if (isMarkToggle) __privateMethod(this, _SuperToolbar_instances, syncStickyMarksFromState_fn).call(this);
     this.updateToolbarState();
   }
-}
+  /**
+   * Processes and executes pending mark commands when editor selection updates.
+   * This is triggered by the editor's 'selectionUpdate' event after focus is restored.
+   * Clears the pending queue after execution.
+   * @returns {void}
+   */
+  onEditorSelectionUpdate() {
+    if (!this.activeEditor) return;
+    if (this.pendingMarkCommands.length) {
+      const pending = this.pendingMarkCommands;
+      this.pendingMarkCommands = [];
+      pending.forEach(({ command: command2, argument, item }) => {
+        if (!command2) return;
+        try {
+          if (command2 in __privateGet(this, _interceptedCommands)) {
+            __privateGet(this, _interceptedCommands)[command2]({ item, argument });
+          } else if (this.activeEditor.commands && command2 in this.activeEditor.commands) {
+            this.activeEditor.commands[command2](argument);
+          }
+          __privateMethod(this, _SuperToolbar_instances, ensureStoredMarksForMarkToggle_fn).call(this, { command: command2, argument });
+        } catch (error) {
+          const err = new Error(`[super-toolbar 🎨] Failed to execute pending command: ${command2}`);
+          this.emit("exception", { error: err, editor: this.activeEditor, originalError: error });
+          console.error(err, error);
+        }
+      });
+      __privateMethod(this, _SuperToolbar_instances, syncStickyMarksFromState_fn).call(this);
+      this.updateToolbarState();
+      return;
+    }
+    const restored = __privateMethod(this, _SuperToolbar_instances, restoreStickyMarksIfNeeded_fn).call(this);
+    if (restored) this.updateToolbarState();
+  }
+  /**
+   * Handles editor focus events by flushing any pending mark commands.
+   * This is triggered by the editor's 'focus' event.
+   * @returns {void}
+   */
+  onEditorFocus() {
+    if (this.pendingMarkCommands.length) {
+      this.onEditorSelectionUpdate();
+      return;
+    }
+    const restored = __privateMethod(this, _SuperToolbar_instances, restoreStickyMarksIfNeeded_fn).call(this);
+    if (restored) this.updateToolbarState();
+  }
+  /**
+   * Determines if a toolbar item represents a mark toggle command.
+   * Mark toggles include text formatting commands like bold, italic, underline, etc.
+   * @param {ToolbarItem} item - The toolbar item to check
+   * @returns {boolean} True if the item is a mark toggle, false otherwise
+   */
+  isMarkToggle(item) {
+    const name = item?.name?.value;
+    return __privateGet(_SuperToolbar2, _MARK_TOGGLE_NAMES).has(name);
+  }
+};
+_MARK_TOGGLE_NAMES = /* @__PURE__ */ new WeakMap();
 _SuperToolbar_instances = /* @__PURE__ */ new WeakSet();
 initToolbarGroups_fn = function() {
   if (this.config.groups && !Array.isArray(this.config.groups) && Object.keys(this.config.groups).length) {
@@ -103423,6 +103895,55 @@ runCommandWithArgumentOnly_fn = function({ item, argument, noArgumentCallback =
     this.updateToolbarState();
   }
 };
+syncStickyMarksFromState_fn = function() {
+  if (!this.activeEditor) return;
+  const { selection, storedMarks } = this.activeEditor.state || {};
+  if (!selection?.empty) return;
+  this.stickyStoredMarks = storedMarks?.length ? [...storedMarks] : null;
+};
+restoreStickyMarksIfNeeded_fn = function() {
+  if (!this.activeEditor) return false;
+  if (!this.stickyStoredMarks?.length) return false;
+  const { state: state2, view } = this.activeEditor;
+  const { selection, storedMarks } = state2 || {};
+  if (!selection?.empty) return false;
+  if (storedMarks?.length) return false;
+  if (!view?.dispatch || !state2?.tr) return false;
+  const hasActiveMarkToggle = getActiveFormatting(this.activeEditor).some(
+    (mark) => __privateGet(_SuperToolbar, _MARK_TOGGLE_NAMES).has(mark.name)
+  );
+  if (hasActiveMarkToggle) return false;
+  const tr = state2.tr.setStoredMarks(this.stickyStoredMarks);
+  view.dispatch(tr);
+  return true;
+};
+ensureStoredMarksForMarkToggle_fn = function({ command: command2, argument }) {
+  if (!this.activeEditor) return;
+  if (!this.activeEditor.state?.selection?.empty) return;
+  if (this.activeEditor.state?.storedMarks?.length) return;
+  if (command2 !== "setFontSize") return;
+  const { state: state2, view } = this.activeEditor;
+  const textStyleMark = state2.schema?.marks?.textStyle;
+  if (!textStyleMark || !view?.dispatch || !state2?.tr) return;
+  const [value, unit] = parseSizeUnit(argument ?? "");
+  if (Number.isNaN(value)) return;
+  const clamped = Math.min(96, Math.max(8, Number(value)));
+  const resolvedUnit = unit || "pt";
+  const mark = textStyleMark.create({ fontSize: `${clamped}${resolvedUnit}` });
+  const tr = state2.tr.setStoredMarks([mark]);
+  view.dispatch(tr);
+};
+__privateAdd(_SuperToolbar, _MARK_TOGGLE_NAMES, /* @__PURE__ */ new Set([
+  "bold",
+  "italic",
+  "underline",
+  "strike",
+  "highlight",
+  "color",
+  "fontSize",
+  "fontFamily"
+]));
+let SuperToolbar = _SuperToolbar;
 const onMarginClickCursorChange = (event, editor) => {
   const y2 = event.clientY;
   const x2 = event.clientX;