@univerjs/engine-render 1.1.0 → 1.2.0

package/lib/es/index.js

@@ -1,4 +1,4 @@
-import { AlignTypeH, AlignTypeV, BaselineOffset, BooleanNumber, BorderStyleTypes, BulletAlignment, COLORS, CellValueType, ColorKit, ColumnResponsiveType, ColumnSeparatorType, CustomDecorationType, CustomRangeType, DEFAULT_DOCUMENT_PARAGRAPH_LINE_SPACING, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DashStyleType, DataStreamTreeNodeType, DataStreamTreeTokenType, Disposable, DisposableCollection, DocumentBlockRangeType, DocumentDataModel, DocumentFlavor, DocxBreakType, EventSubject, FontStyleType, GridType, HorizontalAlign, IConfigService, IContextService, IUniverInstanceService, Inject, Injector, JSON1, ListGlyphType, LocaleService, LookUp, MODERN_DOCUMENT_DEFAULT_MARGIN, MODERN_DOCUMENT_WIDTH, MOVE_BUFFER_VALUE, ModernDocumentWidthMode, NAMED_STYLE_MAP, NAMED_STYLE_SPACE_MAP, NumberUnitType, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRESET_LIST_TYPE, PageOrientType, Plugin, PositionedObjectLayoutType, Range, Rectangle, Registry, SHEET_TEXT_LINE_GAP, SectionType, SheetSkeleton, Skeleton, SpacingRule, TabStopAlignment, TableAlignmentType, TableRowHeightRule, TableSizeType, TableTextWrapType, TextDecoration, TextX, TextXActionType, ThemeService, Tools, UniverInstanceType, VerticalAlign, VerticalAlignmentType, WrapStrategy, WrapTextType, characterSpacingControlType, checkParagraphHasIndentByStyle, createIdentifier, deleteContent, getColorStyle, getDisplayValueFromCell, getRichTextEditPath, horizontalLineSegmentsSubtraction, insertTextToContent, invertColorByMatrix, isCellCoverable, isClassDependencyItem, isDefaultFormat, isNullCell, isWhiteColor, merge, noop, numberToABC, numberToListABC, numfmt, regexp, registerDependencies, remove, requestImmediateMacroTask, resolveDocumentParagraphStyle, resolveSectionHeaderFooterReferences, searchArray, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
+import { AlignTypeH, AlignTypeV, BaselineOffset, BooleanNumber, BorderStyleTypes, BulletAlignment, COLORS, CellValueType, ColorKit, ColumnResponsiveType, ColumnSeparatorType, CustomDecorationType, CustomRangeType, DEFAULT_DOCUMENT_PARAGRAPH_LINE_SPACING, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DashStyleType, DataStreamTreeNodeType, DataStreamTreeTokenType, Disposable, DisposableCollection, DocumentBlockRangeType, DocumentDataModel, DocumentFlavor, DocxBreakType, EventSubject, FontStyleType, GridType, HorizontalAlign, IConfigService, IContextService, IUniverInstanceService, Inject, Injector, JSON1, ListGlyphType, LocaleService, LookUp, MODERN_DOCUMENT_DEFAULT_MARGIN, MODERN_DOCUMENT_WIDTH, MOVE_BUFFER_VALUE, ModernDocumentWidthMode, NAMED_STYLE_MAP, NAMED_STYLE_SPACE_MAP, NamedStyleType, NumberUnitType, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRESET_LIST_TYPE, PageOrientType, Plugin, PositionedObjectLayoutType, Range, Rectangle, Registry, SHEET_TEXT_LINE_GAP, SectionType, SheetSkeleton, Skeleton, SpacingRule, TabStopAlignment, TableAlignmentType, TableRowHeightRule, TableSizeType, TableTextWrapType, TextDecoration, TextX, TextXActionType, ThemeService, Tools, UniverInstanceType, VerticalAlign, VerticalAlignmentType, WrapStrategy, WrapTextType, characterSpacingControlType, checkParagraphHasIndentByStyle, createIdentifier, deleteContent, getColorStyle, getDisplayValueFromCell, getRichTextEditPath, horizontalLineSegmentsSubtraction, insertTextToContent, invertColorByMatrix, isCellCoverable, isClassDependencyItem, isDefaultFormat, isNullCell, isWhiteColor, merge, noop, numberToABC, numberToListABC, numfmt, regexp, registerDependencies, remove, requestImmediateMacroTask, resolveDocumentParagraphStyle, resolveSectionHeaderFooterReferences, searchArray, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
 import { BehaviorSubject, Observable, Subject, Subscription, distinctUntilChanged, merge as merge$1, shareReplay, startWith } from "rxjs";
 import { franc } from "franc-min";
 import { getOverflowAncestors } from "@floating-ui/dom";
@@ -13125,6 +13125,48 @@ var DataStreamTreeNode = class DataStreamTreeNode {
 	}
 };
 
+//#endregion
+//#region src/components/docs/view-model/heading-sections.ts
+/** Each table cell and modern column has its own heading hierarchy. */
+function getHeadingSections(sections, getParagraph) {
+	const result = [];
+	function visitFlow(nodes, endOffset) {
+		const open = [];
+		for (const node of nodes) {
+			var _paragraph$paragraphS;
+			const paragraph = node.nodeType === DataStreamTreeNodeType.PARAGRAPH && node.children.length === 0 ? getParagraph(node.endIndex) : void 0;
+			const level = paragraph === null || paragraph === void 0 || (_paragraph$paragraphS = paragraph.paragraphStyle) === null || _paragraph$paragraphS === void 0 ? void 0 : _paragraph$paragraphS.namedStyleType;
+			if (paragraph && level != null && level >= NamedStyleType.HEADING_1 && level <= NamedStyleType.HEADING_5) {
+				while (open.length && open[open.length - 1].level >= level) open.pop().section.endOffset = node.startIndex;
+				const section = {
+					paragraphId: paragraph.paragraphId,
+					paragraphIndex: paragraph.startIndex,
+					startOffset: paragraph.startIndex + 1,
+					endOffset,
+					collapsed: paragraph.headingCollapsed === true
+				};
+				result.push(section);
+				open.push({
+					level,
+					section
+				});
+			}
+			visitContainers(node);
+		}
+	}
+	function visitContainers(node) {
+		if (node.nodeType === DataStreamTreeNodeType.TABLE_CELL || node.nodeType === DataStreamTreeNodeType.COLUMN) {
+			const nodes = node.children.flatMap((child) => child.nodeType === DataStreamTreeNodeType.SECTION_BREAK ? child.children : [child]);
+			visitFlow(nodes, nodes.length ? nodes[nodes.length - 1].endIndex + 1 : node.endIndex);
+			return;
+		}
+		for (const child of node.children) visitContainers(child);
+	}
+	const nodes = sections.flatMap((section) => section.children);
+	visitFlow(nodes, nodes.length ? nodes[nodes.length - 1].endIndex + 1 : 0);
+	return result.sort((a, b) => a.paragraphIndex - b.paragraphIndex);
+}
+
 //#endregion
 //#region src/components/docs/view-model/document-view-model.ts
 const NON_STRUCTURAL_ROOT_FIELDS = /* @__PURE__ */ new Set([
@@ -13449,6 +13491,8 @@ var DocumentViewModel = class DocumentViewModel {
 		_defineProperty(this, "_treeNodes", []);
 		_defineProperty(this, "_treeNodesByStartIndex", []);
 		_defineProperty(this, "_plainTopLevelParagraphNodes", []);
+		_defineProperty(this, "_headingSections", null);
+		_defineProperty(this, "_collapsedHeadingSections", null);
 		_defineProperty(this, "_metadataCachesDirty", false);
 		_defineProperty(this, "_textRunsOrderedAndDisjoint", true);
 		_defineProperty(this, "_paragraphsOrdered", true);
@@ -13492,6 +13536,8 @@ var DocumentViewModel = class DocumentViewModel {
 		this._treeNodes = [];
 		this._treeNodesByStartIndex = [];
 		this._plainTopLevelParagraphNodes = [];
+		this._headingSections = null;
+		this._collapsedHeadingSections = null;
 		this._lastTextRun = null;
 		this._noteTreeMap.forEach((viewModel) => viewModel.dispose());
 		this._noteTreeMap.clear();
@@ -13519,6 +13565,41 @@ var DocumentViewModel = class DocumentViewModel {
 	getChildren() {
 		return this._children;
 	}
+	getHeadingSections() {
+		const snapshot = this.getSnapshot();
+		if (snapshot.documentStyle.documentFlavor !== DocumentFlavor.MODERN) return [];
+		this._headingSections ??= getHeadingSections(this._children, (index) => {
+			var _paragraph$paragraphS;
+			const paragraph = this.getParagraph(index);
+			if (!(paragraph === null || paragraph === void 0 ? void 0 : paragraph.styleId) || ((_paragraph$paragraphS = paragraph.paragraphStyle) === null || _paragraph$paragraphS === void 0 ? void 0 : _paragraph$paragraphS.namedStyleType) != null) return paragraph;
+			return {
+				...paragraph,
+				paragraphStyle: resolveDocumentParagraphStyle(snapshot.documentStyle, paragraph.paragraphStyle, {
+					styles: snapshot.styles,
+					paragraphStyleId: paragraph.styleId
+				})
+			};
+		});
+		return this._headingSections;
+	}
+	getCollapsedHeadingAtOffset(offset) {
+		if (!this._collapsedHeadingSections) {
+			this._collapsedHeadingSections = [];
+			for (const section of this.getHeadingSections()) {
+				const previous = this._collapsedHeadingSections[this._collapsedHeadingSections.length - 1];
+				if (section.collapsed && section.endOffset > section.startOffset && (!previous || section.startOffset >= previous.endOffset)) this._collapsedHeadingSections.push(section);
+			}
+		}
+		let low = 0;
+		let high = this._collapsedHeadingSections.length - 1;
+		while (low <= high) {
+			const middle = Math.floor((low + high) / 2);
+			const section = this._collapsedHeadingSections[middle];
+			if (offset < section.startOffset) high = middle - 1;
+			else if (offset >= section.endOffset) low = middle + 1;
+			else return section;
+		}
+	}
 	getBody() {
 		const presentation = getDocumentLayoutPresentation(this._documentDataModel);
 		return presentation ? presentation.getSnapshot(this._documentDataModel.getSnapshot()).body : this._documentDataModel.getBody();
@@ -13539,6 +13620,8 @@ var DocumentViewModel = class DocumentViewModel {
 		return this;
 	}
 	reset(documentDataModel) {
+		this._headingSections = null;
+		this._collapsedHeadingSections = null;
 		this._children.forEach((child) => child.dispose());
 		this._textRunsCache.clear();
 		this._paragraphCache.clear();
@@ -13564,6 +13647,8 @@ var DocumentViewModel = class DocumentViewModel {
 			if (edit.insertText.length > 0 && !this._insertPlainText(edit.offset, edit.insertText)) return false;
 		}
 		this._documentDataModel = documentDataModel;
+		this._headingSections = null;
+		this._collapsedHeadingSections = null;
 		this._metadataCachesDirty = true;
 		this._lastTextRun = null;
 		if (!this._textRunsOrderedAndDisjoint) this._buildTextRunsCache();
@@ -13573,6 +13658,8 @@ var DocumentViewModel = class DocumentViewModel {
 		const rootFields = getNonStructuralMutationRootFields(actions);
 		if (rootFields == null) return false;
 		this._documentDataModel = documentDataModel;
+		this._headingSections = null;
+		this._collapsedHeadingSections = null;
 		this._metadataCachesDirty = true;
 		this._lastTextRun = null;
 		if (rootFields.has("tableSource")) {
@@ -16711,7 +16798,23 @@ function hasOnlyFloatingCustomBlockGlyphs(glyphs, paragraphNonInlineSkeDrawingsB
 
 //#endregion
 //#region src/components/docs/layout/block/paragraph/paragraph-layout.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 function dealWidthParagraph(ctx, viewModel, paragraphNode, curPage, sectionBreakConfig, nextParagraphNode) {
+	if (viewModel.getCollapsedHeadingAtOffset(paragraphNode.startIndex)) return [curPage];
 	clearFontCreateConfigCache();
 	const { content = "", children } = paragraphNode;
 	let tableSkeleton = null;
@@ -16964,6 +17067,7 @@ function dealWithSection(ctx, viewModel, sectionNode, curPage, sectionBreakConfi
 	const paragraphEndIndex = Math.min(sectionNode.children.length, paragraphStartIndex + ((options === null || options === void 0 ? void 0 : options.maxParagraphs) ?? Number.POSITIVE_INFINITY));
 	for (let i = paragraphStartIndex; i < paragraphEndIndex; i++) {
 		const paragraphNode = sectionNode.children[i];
+		if (viewModel.getCollapsedHeadingAtOffset(paragraphNode.startIndex)) continue;
 		let skeletonPages = [];
 		let currentPageCache = curPage;
 		if (allCurrentSkeletonPages.length > 0) currentPageCache = allCurrentSkeletonPages[allCurrentSkeletonPages.length - 1];
@@ -18392,7 +18496,9 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 		needOpenNewPageByTableLayout = _updateAndPositionTable(ctx, lineTop, lineHeight, lastPage, pages, column, section, skeTablesInParagraph, paragraphConfig.paragraphIndex, sectionBreakConfig, pDrawingAnchor === null || pDrawingAnchor === void 0 || (_pDrawingAnchor$get2 = pDrawingAnchor.get(paragraphIndex)) === null || _pDrawingAnchor$get2 === void 0 ? void 0 : _pDrawingAnchor$get2.top);
 	}
 	const hasSameParagraphTopBottomDrawingWithInline = hasInlineCustomBlock && paragraphNonInlineSkeDrawings != null && [...paragraphNonInlineSkeDrawings.values()].some((drawing) => drawing.drawingOrigin.layoutType === PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM);
-	const calculatedLineTop = positionedCustomBlockOnly ? lineTop : calculateLineTopByDrawings(lineHeight, lineTop, lastPage, headerPage, footerPage, column.left, column.width, section.top, isTraditionalDocumentCompatibility(paragraphConfig.documentCompatibilityPolicy) ? Math.max(24, Math.min(__getGlyphGroupWidth(glyphGroup) - .001, column.width - 1)) : 0);
+	let tableFlowTop = lineTop;
+	for (const item of skeTablesInParagraph ?? []) if (item.hasPositioned && item.table.parent === lastPage && item.table.tableSource.textWrap === TableTextWrapType.NONE) tableFlowTop = Math.max(lineTop, item.table.top + item.table.height - section.top);
+	const calculatedLineTop = positionedCustomBlockOnly ? tableFlowTop : calculateLineTopByDrawings(lineHeight, tableFlowTop, lastPage, headerPage, footerPage, column.left, column.width, section.top, isTraditionalDocumentCompatibility(paragraphConfig.documentCompatibilityPolicy) ? Math.max(24, Math.min(__getGlyphGroupWidth(glyphGroup) - .001, column.width - 1)) : 0);
 	const previousTopBottomCustomBlockFlowBottom = deferredTopBottomAnchorDrawings.length > 0 ? paragraphConfig.topBottomCustomBlockFlowBottom : void 0;
 	const newLineTop = previousTopBottomCustomBlockFlowBottom == null ? calculatedLineTop : Math.max(calculatedLineTop, previousTopBottomCustomBlockFlowBottom);
 	const clipsSameParagraphInlineDrawing = hasSameParagraphTopBottomDrawingWithInline && newLineTop < section.height;
@@ -23452,6 +23558,8 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		_defineProperty(this, "_paginationMetrics", null);
 		_defineProperty(this, "_completedPageCount", void 0);
 		_defineProperty(this, "_lastCompleteSkeletonData", null);
+		_defineProperty(this, "_completedHeadingCollapseSignature", "[]");
+		_defineProperty(this, "_publishedHeadingCollapseSignature", "[]");
 		_defineProperty(this, "_pendingInvalidationAnchor", null);
 		_defineProperty(this, "_layoutGeneration", 0);
 		_defineProperty(this, "_activeLayout", null);
@@ -23509,29 +23617,48 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 			ctx = retry;
 		}
 		this._lastCompleteSkeletonData = this._skeletonData;
+		this._completedHeadingCollapseSignature = this._getHeadingCollapseSignature();
+		this._publishedHeadingCollapseSignature = this._completedHeadingCollapseSignature;
 		this._completedPageCount = (_this$_skeletonData = this._skeletonData) === null || _this$_skeletonData === void 0 ? void 0 : _this$_skeletonData.pages.length;
 		this._pendingInvalidationAnchor = null;
 		this._paginationMetrics = ctx.paginationMetrics ?? null;
 		this._dirty$.next(true);
 	}
+	_getHeadingCollapseSignature() {
+		return JSON.stringify(this.getViewModel().getHeadingSections().filter((heading) => heading.collapsed).map((heading) => [
+			heading.paragraphId,
+			heading.startOffset,
+			heading.endOffset
+		]));
+	}
 	startIncrementalLayout(options) {
-		this._modernPageWidth = options === null || options === void 0 ? void 0 : options.modernPageWidth;
-		this._modernHorizontalMargin = options === null || options === void 0 ? void 0 : options.modernHorizontalMargin;
+		const headingCollapseSignature = this._getHeadingCollapseSignature();
+		const headingVisibilityChanged = headingCollapseSignature !== this._completedHeadingCollapseSignature || headingCollapseSignature !== this._publishedHeadingCollapseSignature;
+		const layoutOptions = headingVisibilityChanged ? {
+			...options,
+			anchor: 0,
+			priorityAnchor: (options === null || options === void 0 ? void 0 : options.priorityAnchor) ?? (options === null || options === void 0 ? void 0 : options.anchor) ?? 0,
+			invalidation: void 0,
+			reuseUnaffectedTail: false,
+			preserveInteractionWindow: false
+		} : options;
+		this._modernPageWidth = layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.modernPageWidth;
+		this._modernHorizontalMargin = layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.modernHorizontalMargin;
 		this.cancelIncrementalLayout();
 		this._externalLayoutProgress = null;
 		this._externalProtectedPages = null;
 		this._externalProtectedContinuousLayout = null;
 		const generation = ++this._layoutGeneration;
-		const reason = (options === null || options === void 0 ? void 0 : options.reason) ?? ((options === null || options === void 0 ? void 0 : options.anchor) == null ? "initial" : "edit");
+		const reason = (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.reason) ?? ((layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.anchor) == null ? "initial" : "edit");
 		const dataModel = this.getViewModel().getDataModel();
 		const sections = this.getViewModel().getChildren();
 		const topLevelBlocks = this._getTopLevelBlocks(sections);
 		const mode = dataModel.documentStyle.documentFlavor === DocumentFlavor.MODERN ? "continuous" : "paginated";
-		const priorityAnchor = (options === null || options === void 0 ? void 0 : options.priorityAnchor) ?? (options === null || options === void 0 ? void 0 : options.anchor);
+		const priorityAnchor = (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.priorityAnchor) ?? (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.anchor);
 		const hasPublishedCheckpoint = this._skeletonData != null || this._lastCompleteSkeletonData != null;
 		const previousSkeleton = this._lastCompleteSkeletonData ?? this._skeletonData;
-		const invalidation = options === null || options === void 0 ? void 0 : options.invalidation;
-		const layoutAnchor = options === null || options === void 0 ? void 0 : options.anchor;
+		const invalidation = layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.invalidation;
+		const layoutAnchor = layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.anchor;
 		const invalidationAnchor = layoutAnchor == null ? this._pendingInvalidationAnchor ?? void 0 : Math.min(layoutAnchor, this._pendingInvalidationAnchor ?? layoutAnchor);
 		const mutationDelta = invalidation == null ? 0 : invalidation.newEnd - invalidation.oldEnd;
 		let priorityPageAnchor = priorityAnchor;
@@ -23544,7 +23671,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		const previousPriorityPage = priorityPageIndex < 0 ? null : (previousSkeleton === null || previousSkeleton === void 0 ? void 0 : previousSkeleton.pages[priorityPageIndex]) ?? null;
 		const previousPriorityPageEnd = previousPriorityPage == null ? null : getLastBodyFlowCharIndex(previousPriorityPage);
 		const priorityPageEnd = previousPriorityPageEnd == null ? null : previousPriorityPageEnd + (invalidation != null && invalidation.oldStart <= previousPriorityPageEnd ? mutationDelta : 0);
-		const incrementalStart = this._prepareIncrementalLayoutStart(invalidationAnchor, mode, invalidation, (options === null || options === void 0 ? void 0 : options.preserveInteractionWindow) === true, (options === null || options === void 0 ? void 0 : options.reuseUnaffectedTail) === false);
+		const incrementalStart = this._prepareIncrementalLayoutStart(invalidationAnchor, mode, invalidation, (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.preserveInteractionWindow) === true, (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.reuseUnaffectedTail) === false);
 		this._pendingInvalidationAnchor = hasPublishedCheckpoint ? invalidationAnchor ?? null : null;
 		this._activeLayout = {
 			generation,
@@ -23558,6 +23685,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 			sectionBreakConfig: null,
 			layoutAnchor: incrementalStart.layoutAnchor,
 			priorityAnchor: priorityAnchor ?? null,
+			minimumPublicationHeight: mode === "continuous" && headingVisibilityChanged && this._skeletonData != null ? (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.minimumPublicationHeight) ?? 0 : 0,
 			priorityPageIndex,
 			priorityPageEnd,
 			interactionPageTail: incrementalStart.interactionPageTail,
@@ -23582,16 +23710,16 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 			lastPublishedPageCount: incrementalStart.ctx.skeleton.pages.length > 0 ? Math.max(0, incrementalStart.ctx.skeleton.pages.length - 1) : 0,
 			lastPublishedBlockCount: incrementalStart.processedBlockCount,
 			publicationRevision: 0,
-			reuseUnaffectedTail: (options === null || options === void 0 ? void 0 : options.reuseUnaffectedTail) !== false,
+			reuseUnaffectedTail: (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.reuseUnaffectedTail) !== false,
 			paginationRevision: 0,
-			allowMetadataOnlyStructuralTailReuse: (options === null || options === void 0 ? void 0 : options.allowMetadataOnlyStructuralTailReuse) === true,
+			allowMetadataOnlyStructuralTailReuse: (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.allowMetadataOnlyStructuralTailReuse) === true,
 			reusedTail: false,
 			tailConvergencePageCount: incrementalStart.ctx.skeleton.pages.length,
 			dirtyRetries: /* @__PURE__ */ new Map(),
 			preparedHyphenationNodes: /* @__PURE__ */ new WeakSet(),
 			pendingHyphenation: null,
 			hyphenationError: null,
-			waitForHyphenationPatterns: (options === null || options === void 0 ? void 0 : options.waitForHyphenationPatterns) === true
+			waitForHyphenationPatterns: (layoutOptions === null || layoutOptions === void 0 ? void 0 : layoutOptions.waitForHyphenationPatterns) === true
 		};
 		return generation;
 	}
@@ -23966,10 +24094,12 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 			if (isFinalPublication) {
 				var _state$ctx$skeleton;
 				this._lastCompleteSkeletonData = state.ctx.skeleton;
+				this._completedHeadingCollapseSignature = this._getHeadingCollapseSignature();
 				this._completedPageCount = (_state$ctx$skeleton = state.ctx.skeleton) === null || _state$ctx$skeleton === void 0 ? void 0 : _state$ctx$skeleton.pages.length;
 				this._pendingInvalidationAnchor = null;
 			}
 			this._skeletonData = isFinalPublication ? state.ctx.skeleton : !this._isolateIncrementalPublications && state.mode === "paginated" ? this._createSharedPublishablePartialSkeleton(state, publishedPageCount) : this._createPublishablePartialSkeleton(state, publishedPageCount);
+			this._publishedHeadingCollapseSignature = this._getHeadingCollapseSignature();
 			this._paginationMetrics = state.ctx.paginationMetrics ?? null;
 			this._dirty$.next(true);
 			didPublish = true;
@@ -23994,6 +24124,19 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		const startIndex = ((_stablePages$at = stablePages.at(-1)) === null || _stablePages$at === void 0 ? void 0 : _stablePages$at.ed) ?? -1;
 		updateBlockIndex(activePages, startIndex, state.ctx.docsConfig.documentCompatibilityPolicy);
 		mergeContinuousDuplicatePages(activePages, state.mode === "continuous");
+		if (state.mode === "continuous") {
+			const paragraphConfigCache = new Map([...state.ctx.paragraphConfigCache].map(([segmentId, configs]) => [segmentId, new Map([...configs].map(([index, config]) => {
+				var _config$paragraphInli;
+				return [index, ((_config$paragraphInli = config.paragraphInlineSkeDrawings) === null || _config$paragraphInli === void 0 ? void 0 : _config$paragraphInli.size) ? {
+					...config,
+					paragraphInlineSkeDrawings: new Map([...config.paragraphInlineSkeDrawings].map(([id, drawing]) => [id, { ...drawing }]))
+				} : config];
+			}))]));
+			updateInlineDrawingCoordsAndBorder({
+				...state.ctx,
+				paragraphConfigCache
+			}, activePages);
+		}
 		const flowPages = [...stablePages, ...activePages];
 		const currentPriorityPageIndex = state.priorityAnchor == null ? -1 : this._findBodyPageIndex(flowPages, state.priorityAnchor);
 		const previousPriorityPage = previous === null || previous === void 0 ? void 0 : previous.pages[state.priorityPageIndex];
@@ -24267,6 +24410,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 			if (progress.complete) {
 				setPageParent(skeletonData.pages, skeletonData);
 				this._lastCompleteSkeletonData = skeletonData;
+				this._completedHeadingCollapseSignature = this._getHeadingCollapseSignature();
 				this._completedPageCount = skeletonData === null || skeletonData === void 0 ? void 0 : skeletonData.pages.length;
 				this._pendingInvalidationAnchor = null;
 				this._externalProtectedContinuousLayout = null;
@@ -24337,6 +24481,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 			if (publicationToApply.resources.drawingAnchor != null) skeletonData.drawingAnchor = hydrateDrawingAnchors(publicationToApply.resources.drawingAnchor);
 			setPageParent(skeletonData.pages, skeletonData);
 			this._lastCompleteSkeletonData = skeletonData;
+			this._completedHeadingCollapseSignature = this._getHeadingCollapseSignature();
 			this._completedPageCount = skeletonData === null || skeletonData === void 0 ? void 0 : skeletonData.pages.length;
 			this._pendingInvalidationAnchor = null;
 			this._externalProtectedPages = null;
@@ -24344,6 +24489,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		}
 		this._skeletonData = skeletonData;
 		this._externalLayoutProgress = progress.complete ? null : progress;
+		this._publishedHeadingCollapseSignature = this._getHeadingCollapseSignature();
 		this._dirty$.next(true);
 		this._layoutProgress$.next(progress);
 		return { didReplaceProtectedPages };
@@ -24397,7 +24543,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		const firstUnprotectedLineOffset = flow.lines.findIndex((line) => line.st > protectedEndOffset);
 		if (firstUnprotectedLineOffset < 0) return null;
 		const existingColumn = (_skeletonData$pages$p = skeletonData.pages[publication.block.pageIndex]) === null || _skeletonData$pages$p === void 0 || (_skeletonData$pages$p = _skeletonData$pages$p.sections[flow.sectionIndex]) === null || _skeletonData$pages$p === void 0 ? void 0 : _skeletonData$pages$p.columns[flow.columnIndex];
-		if (existingColumn == null) throw new Error("Continuous layout cannot merge a Worker tail without the Main interaction boundary.");
+		if (existingColumn == null) return null;
 		const firstUnprotectedLine = flow.lines[firstUnprotectedLineOffset];
 		const matchingTailLineIndex = existingColumn.lines.findIndex((line) => line.st >= firstUnprotectedLine.st);
 		const targetLineIndex = matchingTailLineIndex < 0 ? existingColumn.lines.length : matchingTailLineIndex;
@@ -25132,7 +25278,23 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		const anchor = state.priorityAnchor;
 		if (anchor == null || state.complete) return true;
 		if (state.interactionPageComplete) return true;
-		if (state.mode === "continuous") return state.laidOutThrough >= anchor;
+		if (state.mode === "continuous") {
+			if (state.laidOutThrough < anchor) return false;
+			if (state.minimumPublicationHeight <= 0) return true;
+			let height = 0;
+			for (const page of state.ctx.skeleton.pages) for (const section of page.sections) {
+				let sectionHeight = 0;
+				for (const column of section.columns) for (let index = column.lines.length - 1; index >= 0; index--) {
+					const line = column.lines[index];
+					if (line.paragraphIndex <= state.stableLaidOutThrough) {
+						sectionHeight = Math.max(sectionHeight, line.top + line.lineHeight);
+						break;
+					}
+				}
+				height += sectionHeight;
+			}
+			return height >= state.minimumPublicationHeight;
+		}
 		if (state.priorityPageEnd != null) {
 			var _state$invalidation;
 			const requiredOffset = Math.max(anchor, state.priorityPageEnd, ((_state$invalidation = state.invalidation) === null || _state$invalidation === void 0 ? void 0 : _state$invalidation.newEnd) ?? anchor);
@@ -25319,7 +25481,7 @@ var DocumentSkeleton = class DocumentSkeleton extends Skeleton {
 		const curSkeletonPage = getLastPage(ctx.skeleton.pages);
 		if (sectionBreakConfig == null || curSkeletonPage == null) throw new Error("Incremental document layout failed to initialize a section page.");
 		const paragraphNode = sectionNode.children[state.paragraphIndex];
-		const tableNode = (paragraphNode === null || paragraphNode === void 0 ? void 0 : paragraphNode.children.length) === 1 && paragraphNode.children[0].nodeType === DataStreamTreeNodeType.TABLE ? paragraphNode.children[0] : null;
+		const tableNode = paragraphNode && !ctx.viewModel.getCollapsedHeadingAtOffset(paragraphNode.startIndex) && paragraphNode.children.length === 1 && paragraphNode.children[0].nodeType === DataStreamTreeNodeType.TABLE ? paragraphNode.children[0] : null;
 		if (tableNode != null) {
 			state.pendingTableBuild ??= startTableSkeletonBuild(ctx, curSkeletonPage, ctx.viewModel, tableNode, sectionBreakConfig);
 			if (state.pendingTableBuild != null && !stepTableSkeletonBuild(state.pendingTableBuild)) return;
@@ -35581,7 +35743,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/config/config.ts