superdoc 1.0.0-beta.20 → 1.0.0-beta.21

package/dist/chunks/{super-editor.es-B6lsvAAY.cjs → super-editor.es-C2UuUFg3.cjs}

@@ -34680,7 +34680,7 @@ const _processCombinedNodesForFldChar = (nodesToCombine = [], instrText, docx) =
   }
   return { nodes: nodesToCombine, handled: false };
 };
-const preProcessPageFieldsOnly = (nodes = []) => {
+const preProcessPageFieldsOnly = (nodes = [], depth = 0) => {
   const processedNodes = [];
   let i = 0;
   while (i < nodes.length) {
@@ -34701,7 +34701,7 @@ const preProcessPageFieldsOnly = (nodes = []) => {
           for (let j2 = i; j2 <= fieldInfo.endIndex; j2++) {
             const passNode = nodes[j2];
             if (Array.isArray(passNode.elements)) {
-              const childResult = preProcessPageFieldsOnly(passNode.elements);
+              const childResult = preProcessPageFieldsOnly(passNode.elements, depth + 1);
               passNode.elements = childResult.processedNodes;
             }
             processedNodes.push(passNode);
@@ -34712,7 +34712,7 @@ const preProcessPageFieldsOnly = (nodes = []) => {
       }
     }
     if (Array.isArray(node.elements)) {
-      const childResult = preProcessPageFieldsOnly(node.elements);
+      const childResult = preProcessPageFieldsOnly(node.elements, depth + 1);
       node.elements = childResult.processedNodes;
     }
     processedNodes.push(node);
@@ -36388,7 +36388,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.20") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.21") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -39694,7 +39694,7 @@ var __privateGet$1 = (obj, member, getter) => (__accessCheck$1(obj, member, "rea
 var __privateAdd$1 = (obj, member, value) => member.has(obj) ? __typeError$1("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck$1(obj, member, "write to private field"), member.set(obj, value), value);
 var __privateMethod$1 = (obj, member, method) => (__accessCheck$1(obj, member, "access private method"), method);
-var _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, dispatchWithFallback_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, getPluginKeyName_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _map, _editor2, _descriptors, _collections, _editorEntries, _maxCachedEditors, _editorAccessOrder, _pendingCreations, _cacheHits, _cacheMisses, _evictions, _HeaderFooterEditorManager_instances, hasConverter_fn, extractCollections_fn, collectDescriptors_fn, teardownMissingEditors_fn, teardownEditors_fn, createEditor_fn, createEditorContainer_fn, registerConverterEditor_fn, unregisterConverterEditor_fn, updateAccessOrder_fn, enforceCacheSizeLimit_fn, _manager, _mediaFiles, _blockCache, _HeaderFooterLayoutAdapter_instances, getBlocks_fn, getConverterContext_fn, _selectionOverlay, _activeEditorHost, _activeDecorationContainer, _activeRegion, _borderLine, _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, _headerLayoutResults, _footerLayoutResults, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _overlayManager, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _lastSelectedImageBlockId, _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, 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, _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, _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, _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, 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, _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() {
 };
@@ -50884,7 +50884,6 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
   comments.forEach((c2) => {
     commentMap.set(c2.commentId, c2);
   });
-  new Set(comments.filter((c2) => c2.parentCommentId).map((c2) => c2.parentCommentId));
   const startNodes = [];
   const endNodes = [];
   const seen = /* @__PURE__ */ new Set();
@@ -53505,7 +53504,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.20";
+const summaryVersion = "1.0.0-beta.21";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -54281,7 +54280,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-DHhKY9FZ-DORT-UR6.cjs")),
+      Promise.resolve().then(() => require("./index-DSuc12CK-Dpg5Hd9W.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")),
@@ -54486,7 +54485,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.20");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.21");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -55173,8 +55172,9 @@ function extractPageNumbering(elements) {
   const fmt = validFormats.includes(fmtRaw) ? fmtRaw : void 0;
   const startRaw = pgNumType.attributes["w:start"];
   const startNum = startRaw != null ? Number(startRaw) : void 0;
+  const effectiveFormat = fmt ?? (Number.isFinite(startNum) ? "decimal" : void 0);
   return {
-    format: fmt,
+    format: effectiveFormat,
     ...Number.isFinite(startNum) ? { start: Number(startNum) } : {}
   };
 }
@@ -62396,6 +62396,84 @@ const getHeaderFooterType = (pageNumber, identifier, options) => {
   }
   return null;
 };
+const defaultMultiSectionIdentifier = () => ({
+  headerIds: { default: null, first: null, even: null, odd: null },
+  footerIds: { default: null, first: null, even: null, odd: null },
+  titlePg: false,
+  alternateHeaders: false,
+  sectionCount: 0,
+  sectionHeaderIds: /* @__PURE__ */ new Map(),
+  sectionFooterIds: /* @__PURE__ */ new Map(),
+  sectionTitlePg: /* @__PURE__ */ new Map()
+});
+function buildMultiSectionIdentifier(sectionMetadata, pageStyles2) {
+  const identifier = defaultMultiSectionIdentifier();
+  identifier.alternateHeaders = Boolean(pageStyles2?.alternateHeaders ?? false);
+  identifier.sectionCount = sectionMetadata.length;
+  for (const section of sectionMetadata) {
+    const idx = section.sectionIndex;
+    if (section.headerRefs) {
+      identifier.sectionHeaderIds.set(idx, {
+        default: section.headerRefs.default ?? null,
+        first: section.headerRefs.first ?? null,
+        even: section.headerRefs.even ?? null,
+        odd: section.headerRefs.odd ?? null
+      });
+    }
+    if (section.footerRefs) {
+      identifier.sectionFooterIds.set(idx, {
+        default: section.footerRefs.default ?? null,
+        first: section.footerRefs.first ?? null,
+        even: section.footerRefs.even ?? null,
+        odd: section.footerRefs.odd ?? null
+      });
+    }
+    const hasFirstHeader = Boolean(section.headerRefs?.first);
+    const hasFirstFooter = Boolean(section.footerRefs?.first);
+    if (hasFirstHeader || hasFirstFooter) {
+      identifier.sectionTitlePg.set(idx, true);
+    }
+  }
+  const section0Headers = identifier.sectionHeaderIds.get(0);
+  const section0Footers = identifier.sectionFooterIds.get(0);
+  if (section0Headers) {
+    identifier.headerIds = { ...section0Headers };
+  }
+  if (section0Footers) {
+    identifier.footerIds = { ...section0Footers };
+  }
+  identifier.titlePg = identifier.sectionTitlePg.get(0) ?? false;
+  return identifier;
+}
+function getHeaderFooterTypeForSection(pageNumber, sectionIndex, identifier, options) {
+  if (pageNumber <= 0) return null;
+  const kind = options?.kind ?? "header";
+  const sectionPageNumber = options?.sectionPageNumber ?? pageNumber;
+  const sectionIds = kind === "header" ? identifier.sectionHeaderIds.get(sectionIndex) : identifier.sectionFooterIds.get(sectionIndex);
+  const ids = sectionIds ?? (kind === "header" ? identifier.headerIds : identifier.footerIds);
+  const hasFirst = Boolean(ids.first);
+  const hasEven = Boolean(ids.even);
+  const hasOdd = Boolean(ids.odd);
+  const hasDefault = Boolean(ids.default);
+  const sectionTitlePg = identifier.sectionTitlePg.get(sectionIndex) ?? identifier.titlePg;
+  const titlePgEnabled = sectionTitlePg && hasFirst;
+  const isFirstPageOfSection = sectionPageNumber === 1;
+  if (isFirstPageOfSection && titlePgEnabled) {
+    return "first";
+  }
+  if (identifier.alternateHeaders) {
+    if (pageNumber % 2 === 0 && (hasEven || hasDefault)) {
+      return hasEven ? "even" : "default";
+    }
+    if (pageNumber % 2 === 1 && (hasOdd || hasDefault)) {
+      return hasOdd ? "odd" : "default";
+    }
+  }
+  if (hasDefault) {
+    return "default";
+  }
+  return null;
+}
 function createFloatingObjectManager(columns, margins, pageWidth) {
   const zones = [];
   const marginLeft = Math.max(0, margins?.left ?? 0);
@@ -63546,23 +63624,54 @@ function layoutTableBlock({
   const headerCount = countHeaderRows(block);
   const headerHeight = headerCount > 0 ? sumRowHeights(measure.rows, 0, headerCount) : 0;
   let state2 = ensurePage();
+  const availableHeight = state2.contentBottom - state2.cursorY;
+  let minRequiredHeight = 0;
+  if (measure.rows.length > 0) {
+    minRequiredHeight = sumRowHeights(measure.rows, 0, 1);
+  } else if (measure.totalHeight > 0) {
+    minRequiredHeight = measure.totalHeight;
+  }
+  if (minRequiredHeight > availableHeight && state2.page.fragments.length > 0) {
+    state2 = advanceColumn(state2);
+  }
   let currentRow = 0;
   let isTableContinuation = false;
   let pendingPartialRow = null;
+  if (block.rows.length === 0 && measure.totalHeight > 0) {
+    const height = Math.min(measure.totalHeight, state2.contentBottom - state2.cursorY);
+    const metadata = {
+      columnBoundaries: generateColumnBoundaries(measure),
+      coordinateSystem: "fragment"
+    };
+    const fragment = {
+      kind: "table",
+      blockId: block.id,
+      fromRow: 0,
+      toRow: 0,
+      x: columnX(state2.columnIndex),
+      y: state2.cursorY,
+      width: Math.min(columnWidth, measure.totalWidth || columnWidth),
+      height,
+      metadata
+    };
+    state2.page.fragments.push(fragment);
+    state2.cursorY += height;
+    return;
+  }
   while (currentRow < block.rows.length || pendingPartialRow !== null) {
     state2 = ensurePage();
-    const availableHeight = state2.contentBottom - state2.cursorY;
+    const availableHeight2 = state2.contentBottom - state2.cursorY;
     let repeatHeaderCount = 0;
     if (currentRow === 0 && !pendingPartialRow) {
       repeatHeaderCount = 0;
     } else {
-      if (headerCount > 0 && headerHeight <= availableHeight) {
+      if (headerCount > 0 && headerHeight <= availableHeight2) {
         repeatHeaderCount = headerCount;
-      } else if (headerCount > 0 && headerHeight > availableHeight) {
+      } else if (headerCount > 0 && headerHeight > availableHeight2) {
         repeatHeaderCount = 0;
       }
     }
-    const availableForBody = repeatHeaderCount > 0 ? availableHeight - headerHeight : availableHeight;
+    const availableForBody = repeatHeaderCount > 0 ? availableHeight2 - headerHeight : availableHeight2;
     const fullPageHeight = state2.contentBottom;
     if (pendingPartialRow !== null) {
       const rowIndex = pendingPartialRow.rowIndex;
@@ -63941,7 +64050,7 @@ function computeDisplayPageNumber(pages, sections) {
   let currentSectionIndex = -1;
   for (let i = 0; i < pages.length; i++) {
     const page = pages[i];
-    const pageSectionIndex = 0;
+    const pageSectionIndex = page.sectionIndex ?? 0;
     if (pageSectionIndex !== currentSectionIndex) {
       const sectionMetadata2 = sectionMap.get(pageSectionIndex);
       if (sectionMetadata2?.numbering?.start !== void 0) {
@@ -64190,6 +64299,18 @@ function layoutDocument(blocks, measures, options = {}) {
         };
         layoutLog(`[Layout] First section: Scheduled pendingSectionRefs:`, pendingSectionRefs);
       }
+      const firstSectionIndexRaw = block.attrs?.sectionIndex;
+      const firstMetadataIndex = typeof firstSectionIndexRaw === "number" ? firstSectionIndexRaw : Number(firstSectionIndexRaw ?? NaN);
+      if (Number.isFinite(firstMetadataIndex)) {
+        activeSectionIndex = firstMetadataIndex;
+      }
+      const firstSectionMetadata = Number.isFinite(firstMetadataIndex) ? sectionMetadataList[firstMetadataIndex] : void 0;
+      if (firstSectionMetadata?.numbering) {
+        if (firstSectionMetadata.numbering.format) activeNumberFormat = firstSectionMetadata.numbering.format;
+        if (typeof firstSectionMetadata.numbering.start === "number") {
+          activePageCounter = firstSectionMetadata.numbering.start;
+        }
+      }
       return { decision: { forcePageBreak: false, forceMidPageRegion: false }, state: next };
     }
     const headerPx = block.margins?.header;
@@ -64206,7 +64327,15 @@ function layoutDocument(blocks, measures, options = {}) {
     if (block.orientation) next.pendingOrientation = block.orientation;
     const sectionType = block.type ?? "continuous";
     const isColumnsChanging = !!block.columns && (block.columns.count !== next.activeColumns.count || block.columns.gap !== next.activeColumns.gap);
-    if (block.numbering) {
+    const sectionIndexRaw = block.attrs?.sectionIndex;
+    const metadataIndex = typeof sectionIndexRaw === "number" ? sectionIndexRaw : Number(sectionIndexRaw ?? NaN);
+    if (Number.isFinite(metadataIndex)) {
+      pendingSectionIndex = metadataIndex;
+    }
+    const sectionMetadata = Number.isFinite(metadataIndex) ? sectionMetadataList[metadataIndex] : void 0;
+    if (sectionMetadata?.numbering) {
+      pendingNumbering = { ...sectionMetadata.numbering };
+    } else if (block.numbering) {
       pendingNumbering = { ...block.numbering };
     }
     if (block.headerRefs || block.footerRefs) {
@@ -64275,6 +64404,8 @@ function layoutDocument(blocks, measures, options = {}) {
       ...initialSectionMetadata.footerRefs && { footerRefs: initialSectionMetadata.footerRefs }
     };
   }
+  let activeSectionIndex = initialSectionMetadata?.sectionIndex ?? 0;
+  let pendingSectionIndex = null;
   const paginator = createPaginator({
     margins: { left: margins.left, right: margins.right },
     getActiveTopMargin: () => activeTopMargin,
@@ -64331,6 +64462,10 @@ function layoutDocument(blocks, measures, options = {}) {
           activeSectionRefs = pendingSectionRefs;
           pendingSectionRefs = null;
         }
+        if (pendingSectionIndex !== null) {
+          activeSectionIndex = pendingSectionIndex;
+          pendingSectionIndex = null;
+        }
         if (pendingVAlign !== null) {
           activeVAlign = pendingVAlign;
           pendingVAlign = null;
@@ -64340,6 +64475,8 @@ function layoutDocument(blocks, measures, options = {}) {
       }
       if (state2?.page) {
         state2.page.numberText = formatPageNumber(activePageCounter, activeNumberFormat);
+        state2.page.sectionIndex = activeSectionIndex;
+        layoutLog(`[Layout] Page ${state2.page.number}: Stamped sectionIndex:`, activeSectionIndex);
         if (activeSectionRefs) {
           state2.page.sectionRefs = {
             ...activeSectionRefs.headerRefs && { headerRefs: activeSectionRefs.headerRefs },
@@ -64526,8 +64663,8 @@ function layoutDocument(blocks, measures, options = {}) {
       activeOrientation = updatedState.activeOrientation;
       pendingOrientation = updatedState.pendingOrientation;
       if (effectiveBlock.vAlign) {
-        const isFirstSection = effectiveBlock.attrs?.isFirstSection && states.length === 0;
-        if (isFirstSection) {
+        const isFirstSection2 = effectiveBlock.attrs?.isFirstSection && states.length === 0;
+        if (isFirstSection2) {
           activeVAlign = effectiveBlock.vAlign;
           pendingVAlign = null;
         } else {
@@ -64541,6 +64678,36 @@ function layoutDocument(blocks, measures, options = {}) {
         };
         layoutLog(`[Layout] After scheduleSectionBreakCompat: Scheduled pendingSectionRefs:`, pendingSectionRefs);
       }
+      const sectionIndexRaw = effectiveBlock.attrs?.sectionIndex;
+      const metadataIndex = typeof sectionIndexRaw === "number" ? sectionIndexRaw : Number(sectionIndexRaw ?? NaN);
+      const isFirstSection = effectiveBlock.attrs?.isFirstSection && states.length === 0;
+      if (Number.isFinite(metadataIndex)) {
+        if (isFirstSection) {
+          activeSectionIndex = metadataIndex;
+        } else {
+          pendingSectionIndex = metadataIndex;
+        }
+      }
+      const sectionMetadata = Number.isFinite(metadataIndex) ? sectionMetadataList[metadataIndex] : void 0;
+      if (sectionMetadata?.numbering) {
+        if (isFirstSection) {
+          if (sectionMetadata.numbering.format) activeNumberFormat = sectionMetadata.numbering.format;
+          if (typeof sectionMetadata.numbering.start === "number") {
+            activePageCounter = sectionMetadata.numbering.start;
+          }
+        } else {
+          pendingNumbering = { ...sectionMetadata.numbering };
+        }
+      } else if (effectiveBlock.numbering) {
+        if (isFirstSection) {
+          if (effectiveBlock.numbering.format) activeNumberFormat = effectiveBlock.numbering.format;
+          if (typeof effectiveBlock.numbering.start === "number") {
+            activePageCounter = effectiveBlock.numbering.start;
+          }
+        } else {
+          pendingNumbering = { ...effectiveBlock.numbering };
+        }
+      }
       if (breakInfo.forceMidPageRegion && block.columns) {
         let state2 = paginator.ensurePage();
         const columnIndexBefore = state2.columnIndex;
@@ -65520,8 +65687,11 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock2,
   const { totalPages: docTotalPages } = pageResolver(1);
   const useBucketing = FeatureFlags.HF_DIGIT_BUCKETING && docTotalPages >= MIN_PAGES_FOR_BUCKETING;
   for (const [type2, blocks] of Object.entries(sections)) {
-    if (!blocks || blocks.length === 0) continue;
-    if (!hasPageTokens(blocks)) {
+    if (!blocks || blocks.length === 0) {
+      continue;
+    }
+    const hasTokens = hasPageTokens(blocks);
+    if (!hasTokens) {
       const measures = await cache2.measureBlocks(blocks, constraints, measureBlock2);
       const layout = layoutHeaderFooter(blocks, measures, constraints);
       result[type2] = { blocks, measures, layout };
@@ -65543,7 +65713,8 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock2,
     for (const pageNum of pagesToLayout) {
       const clonedBlocks = cloneHeaderFooterBlocks(blocks);
       const { displayText, totalPages: totalPagesForPage } = pageResolver(pageNum);
-      resolveHeaderFooterTokens(clonedBlocks, parseInt(displayText, 10) || pageNum, totalPagesForPage);
+      const resolvedPageNum = parseInt(displayText, 10) || pageNum;
+      resolveHeaderFooterTokens(clonedBlocks, resolvedPageNum, totalPagesForPage);
       const measures = await cache2.measureBlocks(clonedBlocks, constraints, measureBlock2);
       const pageLayout = layoutHeaderFooter(clonedBlocks, measures, constraints);
       pages.push({
@@ -74848,6 +75019,49 @@ class HeaderFooterLayoutAdapter {
     });
     return hasBlocks ? batch : void 0;
   }
+  /**
+   * Retrieves FlowBlocks for ALL header/footer content, keyed by relationship ID.
+   *
+   * Unlike getBatch() which only returns content for variant-associated IDs,
+   * this method returns content for ALL registered header/footer IDs. This is
+   * essential for multi-section documents where different sections may use
+   * different content for the same variant type.
+   *
+   * @param kind - The type of section to retrieve: 'header' or 'footer'
+   * @returns A Map of rId to FlowBlock arrays, or undefined if no content exists
+   *
+   * @example
+   * ```typescript
+   * const footersByRId = adapter.getBlocksByRId('footer');
+   * if (footersByRId) {
+   *   // footersByRId.get('rId14') - blocks for footer with rId14
+   *   // footersByRId.get('rId18') - blocks for footer with rId18 (different section)
+   * }
+   * ```
+   */
+  getBlocksByRId(kind) {
+    const descriptors = __privateGet$1(this, _manager).getDescriptors(kind);
+    if (!descriptors.length) return void 0;
+    const blocksMap = /* @__PURE__ */ new Map();
+    descriptors.forEach((descriptor) => {
+      const blocks = __privateMethod$1(this, _HeaderFooterLayoutAdapter_instances, getBlocks_fn).call(this, descriptor);
+      if (blocks && blocks.length > 0) {
+        blocksMap.set(descriptor.id, blocks);
+      }
+    });
+    return blocksMap.size > 0 ? blocksMap : void 0;
+  }
+  /**
+   * Retrieves FlowBlocks for a specific header/footer by its relationship ID.
+   *
+   * @param rId - The relationship ID (e.g., 'rId14')
+   * @returns FlowBlock array for the specified rId, or undefined if not found
+   */
+  getBlocksForRId(rId) {
+    const descriptor = __privateGet$1(this, _manager).getDescriptorById(rId);
+    if (!descriptor) return void 0;
+    return __privateMethod$1(this, _HeaderFooterLayoutAdapter_instances, getBlocks_fn).call(this, descriptor);
+  }
   /**
    * Invalidates the cached FlowBlocks for a specific header/footer section.
    *
@@ -75308,8 +75522,11 @@ const _PresentationEditor = class _PresentationEditor2 extends EventEmitter$1 {
     __privateAdd$1(this, _headerFooterManager, null);
     __privateAdd$1(this, _headerFooterAdapter, null);
     __privateAdd$1(this, _headerFooterIdentifier, null);
+    __privateAdd$1(this, _multiSectionIdentifier, null);
     __privateAdd$1(this, _headerLayoutResults, null);
     __privateAdd$1(this, _footerLayoutResults, null);
+    __privateAdd$1(this, _headerLayoutsByRId, /* @__PURE__ */ new Map());
+    __privateAdd$1(this, _footerLayoutsByRId, /* @__PURE__ */ new Map());
     __privateAdd$1(this, _headerDecorationProvider);
     __privateAdd$1(this, _footerDecorationProvider);
     __privateAdd$1(this, _headerFooterManagerCleanups, []);
@@ -76466,8 +76683,11 @@ const _PresentationEditor = class _PresentationEditor2 extends EventEmitter$1 {
       __privateSet(this, _headerFooterManager, null);
     }, "Header/footer manager");
     __privateSet(this, _headerFooterIdentifier, null);
+    __privateSet(this, _multiSectionIdentifier, null);
     __privateSet(this, _headerLayoutResults, null);
     __privateSet(this, _footerLayoutResults, null);
+    __privateGet$1(this, _headerLayoutsByRId).clear();
+    __privateGet$1(this, _footerLayoutsByRId).clear();
     __privateSet(this, _headerDecorationProvider, void 0);
     __privateSet(this, _footerDecorationProvider, void 0);
     __privateSet(this, _session, { mode: "body" });
@@ -76521,8 +76741,11 @@ _trackedChangesOverrides = /* @__PURE__ */ new WeakMap();
 _headerFooterManager = /* @__PURE__ */ new WeakMap();
 _headerFooterAdapter = /* @__PURE__ */ new WeakMap();
 _headerFooterIdentifier = /* @__PURE__ */ new WeakMap();
+_multiSectionIdentifier = /* @__PURE__ */ new WeakMap();
 _headerLayoutResults = /* @__PURE__ */ new WeakMap();
 _footerLayoutResults = /* @__PURE__ */ new WeakMap();
+_headerLayoutsByRId = /* @__PURE__ */ new WeakMap();
+_footerLayoutsByRId = /* @__PURE__ */ new WeakMap();
 _headerDecorationProvider = /* @__PURE__ */ new WeakMap();
 _footerDecorationProvider = /* @__PURE__ */ new WeakMap();
 _headerFooterManagerCleanups = /* @__PURE__ */ new WeakMap();
@@ -77116,11 +77339,11 @@ rerender_fn = async function() {
   const sectionMetadata = [];
   let blocks;
   try {
-    const converter = __privateGet$1(this, _editor3).converter;
-    const converterContext = converter ? {
-      docx: converter.convertedXml,
-      numbering: converter.numbering,
-      linkedStyles: converter.linkedStyles
+    const converter2 = __privateGet$1(this, _editor3).converter;
+    const converterContext = converter2 ? {
+      docx: converter2.convertedXml,
+      numbering: converter2.numbering,
+      linkedStyles: converter2.linkedStyles
     } : void 0;
     const result = toFlowBlocks(docJson, {
       mediaFiles: __privateGet$1(this, _options).mediaFiles,
@@ -77178,9 +77401,12 @@ rerender_fn = async function() {
     return;
   }
   __privateSet(this, _sectionMetadata, sectionMetadata);
+  const converter = __privateGet$1(this, _editor3).converter;
+  __privateSet(this, _multiSectionIdentifier, buildMultiSectionIdentifier(sectionMetadata, converter?.pageStyles));
   __privateSet(this, _layoutState, { blocks, measures, layout });
   __privateSet(this, _headerLayoutResults, headerLayouts ?? null);
   __privateSet(this, _footerLayoutResults, footerLayouts ?? null);
+  await __privateMethod$1(this, _PresentationEditor_instances, layoutPerRIdHeaderFooters_fn).call(this, headerFooterInput, layout, sectionMetadata);
   __privateMethod$1(this, _PresentationEditor_instances, updateDecorationProviders_fn).call(this, layout);
   const painter = __privateMethod$1(this, _PresentationEditor_instances, ensurePainter_fn).call(this, blocks, measures);
   if (typeof painter.setProviders === "function") {
@@ -77194,6 +77420,10 @@ rerender_fn = async function() {
       headerMeasures.push(...headerResult.measures);
     }
   }
+  for (const rIdResult of __privateGet$1(this, _headerLayoutsByRId).values()) {
+    headerBlocks.push(...rIdResult.blocks);
+    headerMeasures.push(...rIdResult.measures);
+  }
   const footerBlocks = [];
   const footerMeasures = [];
   if (footerLayouts) {
@@ -77202,6 +77432,10 @@ rerender_fn = async function() {
       footerMeasures.push(...footerResult.measures);
     }
   }
+  for (const rIdResult of __privateGet$1(this, _footerLayoutsByRId).values()) {
+    footerBlocks.push(...rIdResult.blocks);
+    footerMeasures.push(...rIdResult.measures);
+  }
   painter.setData?.(
     blocks,
     measures,
@@ -77307,7 +77541,9 @@ buildHeaderFooterInput_fn = function() {
   }
   const headerBlocks = __privateGet$1(this, _headerFooterAdapter).getBatch("header");
   const footerBlocks = __privateGet$1(this, _headerFooterAdapter).getBatch("footer");
-  if (!headerBlocks && !footerBlocks) {
+  const headerBlocksByRId = __privateGet$1(this, _headerFooterAdapter).getBlocksByRId("header");
+  const footerBlocksByRId = __privateGet$1(this, _headerFooterAdapter).getBlocksByRId("footer");
+  if (!headerBlocks && !footerBlocks && !headerBlocksByRId && !footerBlocksByRId) {
     return null;
   }
   const constraints = __privateMethod$1(this, _PresentationEditor_instances, computeHeaderFooterConstraints_fn).call(this);
@@ -77317,6 +77553,8 @@ buildHeaderFooterInput_fn = function() {
   return {
     headerBlocks,
     footerBlocks,
+    headerBlocksByRId,
+    footerBlocksByRId,
     constraints
   };
 };
@@ -77339,6 +77577,80 @@ computeHeaderFooterConstraints_fn = function() {
     margins: { left: marginLeft, right: marginRight }
   };
 };
+layoutPerRIdHeaderFooters_fn = async function(headerFooterInput, layout, sectionMetadata) {
+  __privateGet$1(this, _headerLayoutsByRId).clear();
+  __privateGet$1(this, _footerLayoutsByRId).clear();
+  if (!headerFooterInput) return;
+  const { headerBlocksByRId, footerBlocksByRId, constraints } = headerFooterInput;
+  const displayPages = computeDisplayPageNumber(layout.pages, sectionMetadata);
+  const totalPages = layout.pages.length;
+  const pageResolver = (pageNumber) => {
+    const pageIndex = pageNumber - 1;
+    const displayInfo = displayPages[pageIndex];
+    return {
+      displayText: displayInfo?.displayText ?? String(pageNumber),
+      totalPages
+    };
+  };
+  if (headerBlocksByRId) {
+    for (const [rId, blocks] of headerBlocksByRId) {
+      if (!blocks || blocks.length === 0) continue;
+      try {
+        const batchResult = await layoutHeaderFooterWithCache(
+          { default: blocks },
+          // Treat each rId as a 'default' variant
+          constraints,
+          (block, c2) => measureBlock(block, c2),
+          void 0,
+          // Use shared cache
+          void 0,
+          // No legacy totalPages
+          pageResolver
+        );
+        if (batchResult.default) {
+          __privateGet$1(this, _headerLayoutsByRId).set(rId, {
+            kind: "header",
+            type: "default",
+            layout: batchResult.default.layout,
+            blocks: batchResult.default.blocks,
+            measures: batchResult.default.measures
+          });
+        }
+      } catch (error) {
+        console.warn(`[PresentationEditor] Failed to layout header rId=${rId}:`, error);
+      }
+    }
+  }
+  if (footerBlocksByRId) {
+    for (const [rId, blocks] of footerBlocksByRId) {
+      if (!blocks || blocks.length === 0) continue;
+      try {
+        const batchResult = await layoutHeaderFooterWithCache(
+          { default: blocks },
+          // Treat each rId as a 'default' variant
+          constraints,
+          (block, c2) => measureBlock(block, c2),
+          void 0,
+          // Use shared cache
+          void 0,
+          // No legacy totalPages
+          pageResolver
+        );
+        if (batchResult.default) {
+          __privateGet$1(this, _footerLayoutsByRId).set(rId, {
+            kind: "footer",
+            type: "default",
+            layout: batchResult.default.layout,
+            blocks: batchResult.default.blocks,
+            measures: batchResult.default.measures
+          });
+        }
+      } catch (error) {
+        console.warn(`[PresentationEditor] Failed to layout footer rId=${rId}:`, error);
+      }
+    }
+  }
+};
 updateDecorationProviders_fn = function(layout) {
   __privateSet(this, _headerDecorationProvider, __privateMethod$1(this, _PresentationEditor_instances, createDecorationProvider_fn).call(this, "header", layout));
   __privateSet(this, _footerDecorationProvider, __privateMethod$1(this, _PresentationEditor_instances, createDecorationProvider_fn).call(this, "footer", layout));
@@ -77346,15 +77658,63 @@ updateDecorationProviders_fn = function(layout) {
 };
 createDecorationProvider_fn = function(kind, layout) {
   const results = kind === "header" ? __privateGet$1(this, _headerLayoutResults) : __privateGet$1(this, _footerLayoutResults);
-  if (!results || results.length === 0) {
+  const layoutsByRId = kind === "header" ? __privateGet$1(this, _headerLayoutsByRId) : __privateGet$1(this, _footerLayoutsByRId);
+  if ((!results || results.length === 0) && layoutsByRId.size === 0) {
     return void 0;
   }
-  const identifier = __privateGet$1(this, _headerFooterIdentifier) ?? extractIdentifierFromConverter(__privateGet$1(this, _editor3).converter);
+  const multiSectionId = __privateGet$1(this, _multiSectionIdentifier);
+  const legacyIdentifier = __privateGet$1(this, _headerFooterIdentifier) ?? extractIdentifierFromConverter(__privateGet$1(this, _editor3).converter);
+  const sectionFirstPageNumbers = /* @__PURE__ */ new Map();
+  for (const p of layout.pages) {
+    const idx = p.sectionIndex ?? 0;
+    if (!sectionFirstPageNumbers.has(idx)) {
+      sectionFirstPageNumbers.set(idx, p.number);
+    }
+  }
   return (pageNumber, pageMargins, page) => {
-    const headerFooterType = getHeaderFooterType(pageNumber, identifier, { kind });
+    const sectionIndex = page?.sectionIndex ?? 0;
+    const firstPageInSection = sectionFirstPageNumbers.get(sectionIndex);
+    const sectionPageNumber = typeof firstPageInSection === "number" ? pageNumber - firstPageInSection + 1 : pageNumber;
+    const headerFooterType = multiSectionId ? getHeaderFooterTypeForSection(pageNumber, sectionIndex, multiSectionId, { kind, sectionPageNumber }) : getHeaderFooterType(pageNumber, legacyIdentifier, { kind });
+    const sectionRId = page?.sectionRefs && kind === "header" ? page.sectionRefs.headerRefs?.[headerFooterType] ?? void 0 : page?.sectionRefs && kind === "footer" ? page.sectionRefs.footerRefs?.[headerFooterType] ?? void 0 : void 0;
     if (!headerFooterType) {
       return null;
     }
+    if (sectionRId && layoutsByRId.has(sectionRId)) {
+      const rIdLayout = layoutsByRId.get(sectionRId);
+      const slotPage2 = __privateMethod$1(this, _PresentationEditor_instances, findHeaderFooterPageForPageNumber_fn).call(this, rIdLayout.layout.pages, pageNumber);
+      if (slotPage2) {
+        const fragments2 = slotPage2.fragments ?? [];
+        const pageHeight2 = page?.size?.h ?? layout.pageSize?.h ?? __privateGet$1(this, _layoutOptions).pageSize?.h ?? DEFAULT_PAGE_SIZE.h;
+        const margins2 = pageMargins ?? layout.pages[0]?.margins ?? __privateGet$1(this, _layoutOptions).margins ?? DEFAULT_MARGINS;
+        const box2 = __privateMethod$1(this, _PresentationEditor_instances, computeDecorationBox_fn).call(this, kind, margins2, pageHeight2);
+        return {
+          fragments: fragments2,
+          height: box2.height,
+          contentHeight: rIdLayout.layout.height ?? box2.height,
+          offset: box2.offset,
+          marginLeft: box2.x,
+          contentWidth: box2.width,
+          headerId: sectionRId,
+          sectionType: headerFooterType,
+          box: {
+            x: box2.x,
+            y: box2.offset,
+            width: box2.width,
+            height: box2.height
+          },
+          hitRegion: {
+            x: box2.x,
+            y: box2.offset,
+            width: box2.width,
+            height: box2.height
+          }
+        };
+      }
+    }
+    if (!results || results.length === 0) {
+      return null;
+    }
     const variant = results.find((entry) => entry.type === headerFooterType);
     if (!variant || !variant.layout?.pages?.length) {
       return null;
@@ -77367,9 +77727,8 @@ createDecorationProvider_fn = function(kind, layout) {
     const pageHeight = page?.size?.h ?? layout.pageSize?.h ?? __privateGet$1(this, _layoutOptions).pageSize?.h ?? DEFAULT_PAGE_SIZE.h;
     const margins = pageMargins ?? layout.pages[0]?.margins ?? __privateGet$1(this, _layoutOptions).margins ?? DEFAULT_MARGINS;
     const box = __privateMethod$1(this, _PresentationEditor_instances, computeDecorationBox_fn).call(this, kind, margins, pageHeight);
-    const headerId = page?.sectionRefs && kind === "header" ? page.sectionRefs.headerRefs?.[headerFooterType] ?? void 0 : page?.sectionRefs && kind === "footer" ? page.sectionRefs.footerRefs?.[headerFooterType] ?? void 0 : void 0;
     const fallbackId = __privateGet$1(this, _headerFooterManager)?.getVariantId(kind, headerFooterType);
-    const finalHeaderId = headerId ?? fallbackId ?? void 0;
+    const finalHeaderId = sectionRId ?? fallbackId ?? void 0;
     return {
       fragments,
       height: box.height,
@@ -77599,7 +77958,8 @@ enterHeaderFooterMode_fn = async function(region) {
         const doc2 = editor.state?.doc;
         if (doc2) {
           const endPos = doc2.content.size - 1;
-          editor.commands?.setTextSelection?.(Math.max(1, endPos));
+          const pos = Math.max(1, endPos);
+          editor.commands?.setTextSelection?.({ from: pos, to: pos });
         }
       } catch (cursorError) {
         console.warn("[PresentationEditor] Could not set cursor to end:", cursorError);