@univerjs/engine-render 1.1.0 → 1.3.0

package/lib/cjs/index.js

@@ -13126,6 +13126,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 === _univerjs_core.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 >= _univerjs_core.NamedStyleType.HEADING_1 && level <= _univerjs_core.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 === _univerjs_core.DataStreamTreeNodeType.TABLE_CELL || node.nodeType === _univerjs_core.DataStreamTreeNodeType.COLUMN) {
+			const nodes = node.children.flatMap((child) => child.nodeType === _univerjs_core.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([
@@ -13450,6 +13492,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);
@@ -13493,6 +13537,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();
@@ -13520,6 +13566,41 @@ var DocumentViewModel = class DocumentViewModel {
 	getChildren() {
 		return this._children;
 	}
+	getHeadingSections() {
+		const snapshot = this.getSnapshot();
+		if (snapshot.documentStyle.documentFlavor !== _univerjs_core.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: (0, _univerjs_core.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();
@@ -13540,6 +13621,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();
@@ -13565,6 +13648,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();
@@ -13574,6 +13659,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")) {
@@ -14764,7 +14851,7 @@ function _finishTableSkeletonBuild(state) {
 	applyTableOuterBorderSpacing(tableSkeleton, state.sectionBreakConfig);
 	for (const rowSkeleton of tableSkeleton.rows) _verticalAlignInCell(rowSkeleton, table.tableRows[rowSkeleton.index]);
 	const { pageWidth, marginLeft = 0, marginRight = 0 } = curPage;
-	tableSkeleton.left = getTableLeft(pageWidth - marginLeft - marginRight, state.tableWidth, table.align, table.indent);
+	tableSkeleton.left = getTableLeft(pageWidth - marginLeft - marginRight, state.tableWidth, table.align, table.indent, shouldAllowImportedTableMarginOverflow(state.sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy(), table));
 	state.complete = true;
 }
 function applyMergedCellContentHeights(tableSkeleton, mergedCellContentHeights) {
@@ -14919,7 +15006,7 @@ function cachePrecomputedSlicedTableSkeletons(ctx, tableNode, availableHeight, r
 	});
 }
 function _finishTableSkeletonsBuild(state) {
-	updateTableSkeletonsPosition(state.createCache, state.curPage, state.skeTables, state.table);
+	updateTableSkeletonsPosition(state.createCache, state.curPage, state.skeTables, state.table, state.sectionBreakConfig);
 	state.skeTables.forEach((table) => applyTableOuterBorderSpacing(table, state.sectionBreakConfig));
 	const policy = state.sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy();
 	state.result = {
@@ -14978,7 +15065,7 @@ function createTableSkeletons(ctx, curPage, viewModel, tableNode, sectionBreakCo
 			cellPageHeights = dealWithTableRow(ctx, curPage, skeTables, viewModel, sectionBreakConfig, rowNode, row, table, createCache, false, precomputedTable === null || precomputedTable === void 0 ? void 0 : precomputedTable.rows[row], void 0, cellPageHeights);
 		while (cellPageHeights);
 	}
-	updateTableSkeletonsPosition(createCache, curPage, skeTables, table);
+	updateTableSkeletonsPosition(createCache, curPage, skeTables, table, sectionBreakConfig);
 	skeTables.forEach((table) => applyTableOuterBorderSpacing(table, sectionBreakConfig));
 	const documentCompatibilityPolicy = sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy();
 	return {
@@ -14986,10 +15073,10 @@ function createTableSkeletons(ctx, curPage, viewModel, tableNode, sectionBreakCo
 		fromCurrentPage: createCache.fromCurrentPage !== false && skeTables[0].height <= availableHeight + documentCompatibilityPolicy.table.currentPageOverflowTolerance
 	};
 }
-function updateTableSkeletonsPosition(cache, curPage, skeTables, table) {
+function updateTableSkeletonsPosition(cache, curPage, skeTables, table, sectionBreakConfig) {
 	const { pageWidth, marginLeft = 0, marginRight = 0 } = curPage;
 	const { tableWidth } = cache;
-	const tableLeft = getTableLeft(pageWidth - marginLeft - marginRight, tableWidth, table.align, table.indent);
+	const tableLeft = getTableLeft(pageWidth - marginLeft - marginRight, tableWidth, table.align, table.indent, shouldAllowImportedTableMarginOverflow(sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy(), table));
 	const rowFragments = /* @__PURE__ */ new Map();
 	for (const part of skeTables) for (const row of part.rows) if (!row.isRepeatRow) rowFragments.set(row.index, (rowFragments.get(row.index) ?? 0) + 1);
 	let tableIndex = 0;
@@ -15323,11 +15410,11 @@ function resolveTableLayoutColumns(table, availableWidth, traditional = false) {
 		}))
 	};
 }
-function getTableLeft(pageWidth, tableWidth, align, indent = { v: 0 }) {
+function getTableLeft(pageWidth, tableWidth, align, indent = { v: 0 }, allowMarginOverflow = false) {
 	switch (align) {
 		case _univerjs_core.TableAlignmentType.START: return indent.v;
-		case _univerjs_core.TableAlignmentType.END: return Math.max(0, pageWidth - tableWidth);
-		case _univerjs_core.TableAlignmentType.CENTER: return Math.max(0, (pageWidth - tableWidth) / 2);
+		case _univerjs_core.TableAlignmentType.END: return allowMarginOverflow ? pageWidth - tableWidth : Math.max(0, pageWidth - tableWidth);
+		case _univerjs_core.TableAlignmentType.CENTER: return allowMarginOverflow ? (pageWidth - tableWidth) / 2 : Math.max(0, (pageWidth - tableWidth) / 2);
 		default: throw new Error("Unknown table alignment type");
 	}
 }
@@ -15964,6 +16051,19 @@ function _isDocxColumnBreakVisuallyBlankColumn(column) {
 function _hasOnlyCustomBlockGlyphs(glyphs) {
 	return glyphs.length > 0 && glyphs.every((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK);
 }
+function _mergeTrailingBlockEndShapedTexts(shapedTextList) {
+	const result = [];
+	for (const shapedText of shapedTextList) {
+		const previous = result[result.length - 1];
+		if ((previous === null || previous === void 0 ? void 0 : previous.breakPointType) === "Mandatory" && _endsWithToken(previous.text, previous.glyphs, _univerjs_core.DataStreamTreeTokenType.PARAGRAPH) && shapedText.glyphs.length > 0 && shapedText.glyphs.some((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.BLOCK_END) && shapedText.glyphs.every((glyph, index) => glyph.width === 0 && (glyph.streamType === _univerjs_core.DataStreamTreeTokenType.BLOCK_END || index === shapedText.glyphs.length - 1 && glyph.streamType === _univerjs_core.DataStreamTreeTokenType.SECTION_BREAK))) result[result.length - 1] = {
+			...previous,
+			text: previous.text + shapedText.text,
+			glyphs: [...previous.glyphs, ...shapedText.glyphs]
+		};
+		else result.push(shapedText);
+	}
+	return result;
+}
 function _mergeAdjacentCustomBlockShapedTexts(shapedTextList, customBlockDrawings) {
 	const mergedShapedTextList = [];
 	for (const originShapedText of shapedTextList) {
@@ -16446,7 +16546,7 @@ function _prepareLineBreaking(ctx, viewModel, curPage, paragraphNode, sectionBre
 			...getFontCreateConfig(endIndex - paragraphNode.contentStartIndex, viewModel, paragraphNode, sectionBreakConfig, {
 				...paragraph,
 				paragraphStyle: resolvedParagraphStyle
-			}).textStyle,
+			}, false).textStyle,
 			ul: { s: _univerjs_core.BooleanNumber.FALSE }
 		} : void 0;
 		const bulletSkeleton = dealWithBullet(bullet, lists, listLevelAncestors, localeService, false, markerTextStyle);
@@ -16515,7 +16615,7 @@ function _layoutShapedTexts({ ctx, viewModel, shapedTextList, allPages: initialP
 	let deferredRenderedMarkers = [];
 	const retainedBreaks = (_ctx$footnoteLayout = ctx.footnoteLayout) === null || _ctx$footnoteLayout === void 0 ? void 0 : _ctx$footnoteLayout.getReferencePageBreaks(paragraphNode.endIndex);
 	const referencePageBreaks = retainedBreaks ? new Set(retainedBreaks.map((offset) => offset - paragraphNode.contentStartIndex)) : void 0;
-	const mergedShapedTextList = _mergeAdjacentCustomBlockShapedTexts(_splitAtReferencePageBreaks(shapedTextList, referencePageBreaks), paragraphNonInlineSkeDrawingsByBlockId);
+	const mergedShapedTextList = _mergeTrailingBlockEndShapedTexts(_mergeAdjacentCustomBlockShapedTexts(_splitAtReferencePageBreaks(shapedTextList, referencePageBreaks), paragraphNonInlineSkeDrawingsByBlockId));
 	for (let shapedIndex = 0; shapedIndex < mergedShapedTextList.length; shapedIndex++) {
 		const { text, glyphs, breakPointType } = mergedShapedTextList[shapedIndex];
 		const textStartIndex = paragraphNode.contentStartIndex + shapedTextOffset;
@@ -16525,6 +16625,7 @@ function _layoutShapedTexts({ ctx, viewModel, shapedTextList, allPages: initialP
 		const textEndIndex = textStartIndex + textGlyphCount;
 		const pushPending = (pendingGlyphs = glyphs, layoutBreakPointType = breakPointType) => {
 			if (pendingGlyphs.length === 0) return;
+			const markerSourceIndex = textStartIndex - paragraphNode.contentStartIndex - _glyphCount(deferredRenderedMarkers);
 			if (deferredRenderedMarkers.length > 0) {
 				pendingGlyphs = [...deferredRenderedMarkers, ...pendingGlyphs];
 				deferredRenderedMarkers = [];
@@ -16532,7 +16633,16 @@ function _layoutShapedTexts({ ctx, viewModel, shapedTextList, allPages: initialP
 			syncActiveParagraphDrawings(pendingGlyphs, paragraphNonInlineSkeDrawings, paragraphInlineSkeDrawings, paragraphNonInlineSkeDrawingsByBlockId, paragraphInlineSkeDrawingsByBlockId);
 			const nonFlowAnchor = isNonFlowFloatingAnchor(pendingGlyphs, paragraphNonInlineSkeDrawings);
 			const preserveParagraphStart = nonFlowAnchor && mergedShapedTextList.slice(shapedIndex + 1).some(({ glyphs }) => glyphs.some((glyph) => glyph.width > 0 && glyph.streamType !== _univerjs_core.DataStreamTreeTokenType.PARAGRAPH && glyph.streamType !== _univerjs_core.DataStreamTreeTokenType.SECTION_BREAK && glyph.streamType !== _univerjs_core.DataStreamTreeTokenType.DOCS_END));
-			allPages = layoutParagraph(ctx, pendingGlyphs, allPages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText || !nonFlowAnchor && hasOnlyFloatingCustomBlockGlyphs(pendingGlyphs, paragraphNonInlineSkeDrawingsByBlockId), layoutBreakPointType, renderParagraphBullet && !preserveParagraphStart, startNewLine);
+			const renderBullet = renderParagraphBullet && !preserveParagraphStart;
+			const paragraph = renderBullet && paragraphConfig.bulletSkeleton ? viewModel.getParagraph(paragraphNode.endIndex) : void 0;
+			const markerTextStyle = paragraph ? getFontCreateConfig(markerSourceIndex, viewModel, paragraphNode, sectionBreakConfig, {
+				...paragraph,
+				paragraphStyle: paragraphConfig.paragraphStyle
+			}, false).textStyle : void 0;
+			allPages = layoutParagraph(ctx, pendingGlyphs, allPages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText || !nonFlowAnchor && hasOnlyFloatingCustomBlockGlyphs(pendingGlyphs, paragraphNonInlineSkeDrawingsByBlockId), layoutBreakPointType, renderBullet, startNewLine, markerTextStyle ? {
+				cl: markerTextStyle.cl,
+				ul: markerTextStyle.ul
+			} : void 0);
 			if (!preserveParagraphStart) {
 				isParagraphFirstShapedText = false;
 				renderParagraphBullet = false;
@@ -16712,7 +16822,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;
@@ -16965,6 +17091,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];
@@ -17715,7 +17842,7 @@ function isGlyphGroupBeyondDivideWidth(glyphGroup, offsetLeft, divideWidth, hang
 	const shrinkability = precedingGlyphs !== void 0 && (wordFitsWithPunctuationCompression || spacedWesternWordFits || !precedingLineCanStretch && offsetLeft + width - trailingShrinkability - hangingExtra - divideWidth <= divideWidth - offsetLeft) && !precedingGlyphs.some((glyph) => glyph.glyphType === 4) && !glyphGroup.some((glyph) => glyph.glyphType === 4) ? getGlyphGroupShrinkability(precedingGlyphs) + getGlyphGroupShrinkability(glyphGroup) - (trailingAutoSpacing + leadingAutoSpacing) / 2 : trailingShrinkability;
 	return isBeyondDivideWidth(offsetLeft + width - shrinkability - hangingExtra, divideWidth, lineWrapTolerance);
 }
-function layoutParagraph(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", renderBullet = isParagraphFirstShapedText, startNewLine = false) {
+function layoutParagraph(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", renderBullet = isParagraphFirstShapedText, startNewLine = false, markerTextStyle) {
 	paragraphConfig.documentCompatibilityPolicy ??= sectionBreakConfig.documentCompatibilityPolicy;
 	if (isParagraphFirstShapedText || startNewLine) {
 		if (renderBullet && paragraphConfig.bulletSkeleton) {
@@ -17724,7 +17851,14 @@ function layoutParagraph(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 			const { gridType = _univerjs_core.GridType.LINES, charSpace = 0, defaultTabStop = 10.5 } = sectionBreakConfig;
 			const { snapToGrid = _univerjs_core.BooleanNumber.TRUE } = paragraphStyle;
 			const charSpaceApply = getCharSpaceApply(charSpace, defaultTabStop, gridType, snapToGrid);
-			const bulletGlyph = createSkeletonBulletGlyph(glyphGroup[0], bulletSkeleton, charSpaceApply, paragraphConfig.documentCompatibilityPolicy ?? sectionBreakConfig.documentCompatibilityPolicy);
+			const resolvedBulletSkeleton = markerTextStyle ? {
+				...bulletSkeleton,
+				ts: {
+					...markerTextStyle,
+					...bulletSkeleton.ts
+				}
+			} : bulletSkeleton;
+			const bulletGlyph = createSkeletonBulletGlyph(glyphGroup[0], resolvedBulletSkeleton, charSpaceApply, paragraphConfig.documentCompatibilityPolicy ?? sectionBreakConfig.documentCompatibilityPolicy);
 			const paragraphProperties = bulletSkeleton.paragraphProperties || {};
 			paragraphConfig.paragraphStyle = {
 				...paragraphProperties,
@@ -18228,7 +18362,7 @@ function _getParagraphContentMetrics(ctx, glyphGroup, lastPage, column, sectionB
 	};
 }
 function _getParagraphLineMetrics(ctx, glyphGroup, lastPage, column, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, defaultSpanMetrics) {
-	var _sectionBreakConfig$d2;
+	var _paragraphConfig$skeT, _sectionBreakConfig$d2;
 	const metrics = _getParagraphContentMetrics(ctx, glyphGroup, lastPage, column, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, defaultSpanMetrics);
 	const { preLine, paragraphIndex, paragraphStyle, spaceAbove, spaceBelow, spacingRule, gridType, snapToGrid, hasInlineCustomBlock, positionedCustomBlockOnly, drawingMLLineHeight, drawingMLBaselineHeight, isZeroWidthNonFlowFloatingAnchorLine, isStructuralTableAnchorLine, isEmptyFramedParagraph, isStandalonePageBoundary, wordAutoLeading } = metrics;
 	let { paddingTop, paddingBottom, contentHeight, lineSpacingApply } = metrics;
@@ -18242,10 +18376,12 @@ function _getParagraphLineMetrics(ctx, glyphGroup, lastPage, column, sectionBrea
 		var _section$children$;
 		return index > 0 && ((_section$children$ = section.children[0]) === null || _section$children$ === void 0 ? void 0 : _section$children$.endIndex) === paragraphIndex;
 	}) : void 0;
+	const hasInlineTableBoundary = isParagraphFirstShapedText && ((_paragraphConfig$skeT = paragraphConfig.skeTablesInParagraph) === null || _paragraphConfig$skeT === void 0 || (_paragraphConfig$skeT = _paragraphConfig$skeT.find((item) => !item.hasPositioned)) === null || _paragraphConfig$skeT === void 0 ? void 0 : _paragraphConfig$skeT.table.tableSource.textWrap) === _univerjs_core.TableTextWrapType.NONE;
+	const spaceBeforeTable = hasInlineTableBoundary ? Math.max(0, (preLine === null || preLine === void 0 ? void 0 : preLine.spaceBelowApply) ?? 0) : 0;
 	let { marginTop, spaceBelowApply } = isHiddenParagraph ? {
 		marginTop: 0,
 		spaceBelowApply: (preLine === null || preLine === void 0 ? void 0 : preLine.spaceBelowApply) ?? 0
-	} : __getParagraphSpace(((_sectionBreakConfig$d2 = sectionBreakConfig.documentCompatibilityPolicy) === null || _sectionBreakConfig$d2 === void 0 ? void 0 : _sectionBreakConfig$d2.mode) === "drawingml", lineSpacingApply, suppressCellAutoSpaceAbove ? void 0 : spaceAbove, spaceBelow, isParagraphFirstShapedText, preLine, _shouldSuppressPageTopSpacing(lastPage, column, paragraphConfig, preLine, firstPageNumber, startingSection != null), drawingMLLineHeight);
+	} : __getParagraphSpace(((_sectionBreakConfig$d2 = sectionBreakConfig.documentCompatibilityPolicy) === null || _sectionBreakConfig$d2 === void 0 ? void 0 : _sectionBreakConfig$d2.mode) === "drawingml", lineSpacingApply, suppressCellAutoSpaceAbove ? void 0 : spaceAbove, spaceBelow, isParagraphFirstShapedText, hasInlineTableBoundary ? void 0 : preLine, !hasInlineTableBoundary && _shouldSuppressPageTopSpacing(lastPage, column, paragraphConfig, preLine, firstPageNumber, startingSection != null), drawingMLLineHeight);
 	if (preLine) marginTop += sectionBreakConfig.lineGap ?? 0;
 	if (startingSection && marginTop > 0 && isTraditionalDocumentCompatibility(paragraphConfig.documentCompatibilityPolicy)) marginTop = _collapseSectionBeforeSpacing(ctx, startingSection.children[0].startIndex - 2, marginTop);
 	if (positionedCustomBlockOnly) spaceBelowApply = 0;
@@ -18284,6 +18420,7 @@ function _getParagraphLineMetrics(ctx, glyphGroup, lastPage, column, sectionBrea
 		paddingBottom,
 		contentHeight,
 		marginTop,
+		spaceBeforeTable,
 		spaceBelowApply,
 		borderTopSpace,
 		borderBottomSpace,
@@ -18372,7 +18509,7 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 	const previousLineHeight = preLine === null || preLine === void 0 ? void 0 : preLine.lineHeight;
 	const previousLineMarginBottom = preLine === null || preLine === void 0 ? void 0 : preLine.marginBottom;
 	const { paragraphNonInlineSkeDrawings, skeTablesInParagraph, skeHeaders, skeFooters, pDrawingAnchor, paragraphIndex } = paragraphConfig;
-	const { paragraphStyle, spacingRule, drawingMLLineHeight, drawingMLBaselineHeight, gridType, snapToGrid, hasInlineCustomBlock, positionedCustomBlockOnly, isStandalonePageBoundary, paddingTop, paddingBottom, contentHeight, marginTop, spaceBelowApply, borderTopSpace, borderBottomSpace, wordAutoLeading } = _getParagraphLineMetrics(ctx, glyphGroup, lastPage, column, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, defaultSpanMetrics);
+	const { paragraphStyle, spacingRule, drawingMLLineHeight, drawingMLBaselineHeight, gridType, snapToGrid, hasInlineCustomBlock, positionedCustomBlockOnly, isStandalonePageBoundary, paddingTop, paddingBottom, contentHeight, marginTop, spaceBeforeTable, spaceBelowApply, borderTopSpace, borderBottomSpace, wordAutoLeading } = _getParagraphLineMetrics(ctx, glyphGroup, lastPage, column, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, defaultSpanMetrics);
 	const { indentFirstLine, hanging, indentStart, indentEnd } = paragraphStyle;
 	const lineHeight = marginTop + paddingTop + contentHeight + paddingBottom;
 	const { charSpace, defaultTabStop } = getCharSpaceConfig(sectionBreakConfig, paragraphConfig);
@@ -18390,10 +18527,12 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 	const { deferredInlineGroupAnchorDrawings, deferredTopBottomAnchorDrawings } = _positionLineDrawings(ctx, glyphGroup, column, lastPage, paragraphConfig, lineTop, lineHeight, paragraphAnchorLeft, hasInlineCustomBlock, isParagraphFirstShapedText);
 	if (skeTablesInParagraph != null && skeTablesInParagraph.length > 0) {
 		var _pDrawingAnchor$get2;
-		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);
+		needOpenNewPageByTableLayout = _updateAndPositionTable(ctx, lineTop + spaceBeforeTable, 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 === _univerjs_core.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 === _univerjs_core.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;
@@ -18567,7 +18706,7 @@ function _updateAndPositionTable(ctx, lineTop, lineHeight, page, pages, column,
 	if (firstUnPositionedTable.isSlideTable === false || tableSource.textWrap === _univerjs_core.TableTextWrapType.NONE) switch (tableSource.textWrap) {
 		case _univerjs_core.TableTextWrapType.NONE:
 			table.top = section.top + lineTop;
-			table.left = column.left + getTableLeft(column.width, table.width, tableSource.align, tableSource.indent);
+			table.left = column.left + getTableLeft(column.width, table.width, tableSource.align, tableSource.indent, shouldAllowImportedTableMarginOverflow(sectionBreakConfig.documentCompatibilityPolicy ?? getDocumentCompatibilityPolicy(), tableSource));
 			__avoidFlowAffectingDrawingsForTable(table, page, column);
 			__avoidNonOverlappingFloatingTables(table, page);
 			break;
@@ -20007,7 +20146,7 @@ const DEFAULT_TEXT_RUN = {
 	st: 0,
 	ed: 0
 };
-function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig, paragraph) {
+function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig, paragraph, includeCustomRangeStyle = true) {
 	var _textStyle$eastAsiaFo;
 	const { gridType = _univerjs_core.GridType.LINES, charSpace = 0, documentTextStyle = {}, pageSize = {
 		width: Number.POSITIVE_INFINITY,
@@ -20021,7 +20160,7 @@ function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig
 	const customDecoration = viewModel.getCustomDecoration(index + startIndex);
 	const showCustomDecoration = customDecoration && customDecoration.show !== false;
 	const customDecorationStyle = showCustomDecoration ? getCustomDecorationStyle(customDecoration) : null;
-	const customRange = viewModel.getCustomRange(index + startIndex);
+	const customRange = includeCustomRangeStyle ? viewModel.getCustomRange(index + startIndex) : null;
 	const showCustomRange = customRange && customRange.show !== false;
 	const customRangeStyle = showCustomRange ? getCustomRangeStyle(customRange) : null;
 	const hasAddonStyle = showCustomRange || showCustomDecoration || !!bullet || (paragraphStyle === null || paragraphStyle === void 0 ? void 0 : paragraphStyle.namedStyleType) || (paragraphStyle === null || paragraphStyle === void 0 ? void 0 : paragraphStyle.textStyle) != null || (paragraphStyle === null || paragraphStyle === void 0 ? void 0 : paragraphStyle.paragraphMarkTextStyle) != null;
@@ -23453,6 +23592,8 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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);
@@ -23510,29 +23651,48 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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 === _univerjs_core.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;
@@ -23545,7 +23705,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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,
@@ -23559,6 +23719,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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,
@@ -23583,16 +23744,16 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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;
 	}
@@ -23967,10 +24128,12 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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;
@@ -23995,6 +24158,19 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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];
@@ -24268,6 +24444,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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;
@@ -24338,6 +24515,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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;
@@ -24345,6 +24523,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 		}
 		this._skeletonData = skeletonData;
 		this._externalLayoutProgress = progress.complete ? null : progress;
+		this._publishedHeadingCollapseSignature = this._getHeadingCollapseSignature();
 		this._dirty$.next(true);
 		this._layoutProgress$.next(progress);
 		return { didReplaceProtectedPages };
@@ -24398,7 +24577,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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;
@@ -25133,7 +25312,23 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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);
@@ -25320,7 +25515,7 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.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 === _univerjs_core.DataStreamTreeNodeType.TABLE ? paragraphNode.children[0] : null;
+		const tableNode = paragraphNode && !ctx.viewModel.getCollapsedHeadingAtOffset(paragraphNode.startIndex) && paragraphNode.children.length === 1 && paragraphNode.children[0].nodeType === _univerjs_core.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;
@@ -35582,7 +35777,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "1.1.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/config/config.ts