@univerjs/engine-render 1.0.0-alpha.6 → 1.0.0-alpha.7

package/lib/cjs/index.js

@@ -13019,8 +13019,14 @@ function baseAdjustability(content, width) {
 function createSkeletonWordGlyph(content, config, glyphWidth) {
 	return _createSkeletonWordOrLetter(1, content, config, glyphWidth);
 }
-function createSkeletonLetterGlyph(content, config, glyphWidth, glyphInfo) {
-	return _createSkeletonWordOrLetter(0, content, config, glyphWidth, glyphInfo);
+function createSkeletonLetterGlyph(content, config, glyphMetrics, glyphInfo) {
+	const glyphWidth = typeof glyphMetrics === "number" ? glyphMetrics : glyphMetrics === null || glyphMetrics === void 0 ? void 0 : glyphMetrics.width;
+	const glyph = _createSkeletonWordOrLetter(0, content, config, glyphWidth, glyphInfo);
+	if (typeof glyphMetrics === "object") {
+		if (glyphMetrics.ascent != null) glyph.bBox.ba = glyph.bBox.aba = glyphMetrics.ascent;
+		if (glyphMetrics.descent != null) glyph.bBox.bd = glyph.bBox.abd = glyphMetrics.descent;
+	}
+	return glyph;
 }
 function createSkeletonTabGlyph(config, glyphWidth) {
 	return _createSkeletonWordOrLetter(4, _univerjs_core.DataStreamTreeTokenType.TAB, config, glyphWidth);
@@ -13215,7 +13221,7 @@ function glyphShrinkLeft(glyph, amount) {
 
 //#endregion
 //#region src/components/docs/layout/model/line.ts
-function createSkeletonLine(paragraphIndex, lineType, lineBoundingBox, columnWidth, lineIndex = 0, isParagraphStart = false, paragraphConfig, page, headerPage, footerPage) {
+function createSkeletonLine(paragraphIndex, lineType, lineBoundingBox, columnWidth, lineIndex = 0, isParagraphStart = false, paragraphConfig, page, headerPage, footerPage, columnLeft = 0, sectionTop = 0) {
 	var _page$skeDrawings, _page$skeTables;
 	const { lineHeight = 15.6, lineTop = 0, contentHeight = 0, paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0, marginTop = 0, spaceBelowApply = 0 } = lineBoundingBox;
 	const { skeTablesInParagraph } = paragraphConfig;
@@ -13240,35 +13246,36 @@ function createSkeletonLine(paragraphIndex, lineType, lineBoundingBox, columnWid
 	}
 	const affectSkeDrawings = new Map(Array.from(pageSkeDrawings).filter(([_, drawing]) => drawing.drawingOrigin.layoutType !== _univerjs_core.PositionedObjectLayoutType.INLINE && drawing.drawingOrigin.layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_NONE));
 	const wrapTypeTables = new Map(Array.from(pageSkeTables).filter(([_, table]) => table.tableSource.textWrap === _univerjs_core.TableTextWrapType.WRAP));
-	lineSke.divides = lineHeight <= .01 ? [__getDivideSKe(0, columnWidth)] : _calculateDividesByDrawings(lineHeight, lineTop, columnWidth, paddingLeft, paddingRight, page, headerPage, footerPage, affectSkeDrawings, headersDrawings, footersDrawings, wrapTypeTables);
+	lineSke.divides = lineHeight <= .01 ? [__getDivideSKe(0, columnWidth)] : _calculateDividesByDrawings(lineHeight, sectionTop + lineTop, columnLeft, columnWidth, paddingLeft, paddingRight, page, headerPage, footerPage, affectSkeDrawings, headersDrawings, footersDrawings, wrapTypeTables);
 	for (const divide of lineSke.divides) divide.parent = lineSke;
 	return lineSke;
 }
-function calculateLineTopByDrawings(lineHeight = 15.6, lineTop = 0, page, headerPage, footerPage, columnLeft = 0, columnWidth = 0) {
-	let maxTop = lineTop;
+function calculateLineTopByDrawings(lineHeight = 15.6, lineTop = 0, page, headerPage, footerPage, columnLeft = 0, columnWidth = 0, sectionTop = 0) {
+	const absoluteLineTop = sectionTop + lineTop;
+	let maxTop = absoluteLineTop;
 	const pageSkeDrawings = page.skeDrawings;
 	const skeNonWrapTables = new Map(Array.from(page.skeTables).filter(([_, table]) => table.tableSource.textWrap === _univerjs_core.TableTextWrapType.NONE));
 	const headersDrawings = headerPage === null || headerPage === void 0 ? void 0 : headerPage.skeDrawings;
 	const footersDrawings = footerPage === null || footerPage === void 0 ? void 0 : footerPage.skeDrawings;
 	if (headerPage && headersDrawings) headersDrawings.forEach((drawing) => {
-		const top = _getLineTopWidthWrapTopBottom(translateHeaderFooterDrawingPosition(drawing, headerPage, page, true), lineHeight, lineTop);
+		const top = _getLineTopWidthWrapTopBottom(translateHeaderFooterDrawingPosition(drawing, headerPage, page, true), lineHeight, absoluteLineTop, columnLeft, columnWidth);
 		if (top) maxTop = Math.max(maxTop, top);
 	});
 	if (footerPage && footersDrawings) footersDrawings.forEach((drawing) => {
-		const top = _getLineTopWidthWrapTopBottom(translateHeaderFooterDrawingPosition(drawing, footerPage, page, false), lineHeight, lineTop);
+		const top = _getLineTopWidthWrapTopBottom(translateHeaderFooterDrawingPosition(drawing, footerPage, page, false), lineHeight, absoluteLineTop, columnLeft, columnWidth);
 		if (top) maxTop = Math.max(maxTop, top);
 	});
 	pageSkeDrawings === null || pageSkeDrawings === void 0 || pageSkeDrawings.forEach((drawing) => {
-		const top = _getLineTopWidthWrapTopBottom(drawing, lineHeight, lineTop);
+		const top = _getLineTopWidthWrapTopBottom(drawing, lineHeight, absoluteLineTop, columnLeft, columnWidth);
 		if (top) maxTop = Math.max(maxTop, top);
-		const blockingWrapTop = _getLineTopWithFullColumnWrap(drawing, lineHeight, lineTop, columnLeft, columnWidth);
+		const blockingWrapTop = _getLineTopWithFullColumnWrap(drawing, lineHeight, absoluteLineTop, columnLeft, columnWidth);
 		if (blockingWrapTop) maxTop = Math.max(maxTop, blockingWrapTop);
 	});
 	skeNonWrapTables === null || skeNonWrapTables === void 0 || skeNonWrapTables.forEach((table) => {
-		const top = _getLineTopWidthWrapNone(table, lineHeight, lineTop);
+		const top = _getLineTopWidthWrapNone(table, lineHeight, absoluteLineTop, columnLeft, columnWidth);
 		if (top) maxTop = Math.max(maxTop, top);
 	});
-	return maxTop;
+	return maxTop - sectionTop;
 }
 function _getLineTopWithFullColumnWrap(drawing, lineHeight, lineTop, columnLeft, columnWidth) {
 	if (columnWidth <= 0) return;
@@ -13301,15 +13308,25 @@ function _getLineTopWithFullColumnWrap(drawing, lineHeight, lineTop, columnLeft,
 	if (split.left > 0 || split.left + split.width < columnWidth) return;
 	return bottom;
 }
-function _getLineTopWidthWrapNone(table, lineHeight, lineTop) {
-	const { top, height } = table;
+function _getLineTopWidthWrapNone(table, lineHeight, lineTop, columnLeft, columnWidth) {
+	const { top, height, left, width } = table;
+	if (columnWidth > 0 && (left + width <= columnLeft || left >= columnLeft + columnWidth)) return;
 	if (top + height < lineTop || top > lineHeight + lineTop) return;
 	return top + height;
 }
-function _getLineTopWidthWrapTopBottom(drawing, lineHeight, lineTop) {
+function _getLineTopWidthWrapTopBottom(drawing, lineHeight, lineTop, columnLeft, columnWidth) {
 	const { aTop, height, aLeft, width, angle = 0, drawingOrigin } = drawing;
 	const { layoutType, distT = 0, distB = 0 } = drawingOrigin;
 	if (layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) return;
+	if (columnWidth > 0) {
+		var _bounds$left, _bounds$width;
+		const bounds = angle === 0 ? {
+			left: aLeft,
+			width
+		} : getBoundingBox(angle, aLeft, width, aTop, height);
+		const drawingLeft = (_bounds$left = bounds.left) !== null && _bounds$left !== void 0 ? _bounds$left : aLeft;
+		if (drawingLeft + ((_bounds$width = bounds.width) !== null && _bounds$width !== void 0 ? _bounds$width : width) <= columnLeft || drawingLeft >= columnLeft + columnWidth) return;
+	}
 	if (angle === 0) {
 		const newAtop = aTop - distT;
 		const newHeight = distT + height + distB;
@@ -13322,7 +13339,7 @@ function _getLineTopWidthWrapTopBottom(drawing, lineHeight, lineTop) {
 	if (sTop + sHeight < lineTop || sTop > lineHeight + lineTop) return;
 	return sTop + sHeight;
 }
-function _calculateDividesByDrawings(lineHeight, lineTop, columnWidth, paddingLeft, paddingRight, page, headerPage, footerPage, paragraphNonInlineSkeDrawings, headersDrawings, footersDrawings, wrapTypeTables) {
+function _calculateDividesByDrawings(lineHeight, lineTop, columnLeft, columnWidth, paddingLeft, paddingRight, page, headerPage, footerPage, paragraphNonInlineSkeDrawings, headersDrawings, footersDrawings, wrapTypeTables) {
 	const drawingsMix = [];
 	drawingsMix.push({
 		left: 0,
@@ -13332,21 +13349,21 @@ function _calculateDividesByDrawings(lineHeight, lineTop, columnWidth, paddingLe
 		width: paddingRight
 	});
 	if (headerPage && headersDrawings) headersDrawings.forEach((drawing) => {
-		const split = _calculateSplit(translateHeaderFooterDrawingPosition(drawing, headerPage, page, true), lineHeight, lineTop, columnWidth);
+		const split = _calculateSplit(translateHeaderFooterDrawingPosition(drawing, headerPage, page, true), lineHeight, lineTop, columnLeft, columnWidth);
 		if (split) drawingsMix.push(split);
 	});
 	if (footerPage && footersDrawings) footersDrawings.forEach((drawing) => {
-		const split = _calculateSplit(translateHeaderFooterDrawingPosition(drawing, footerPage, page, false), lineHeight, lineTop, columnWidth);
+		const split = _calculateSplit(translateHeaderFooterDrawingPosition(drawing, footerPage, page, false), lineHeight, lineTop, columnLeft, columnWidth);
 		if (split) drawingsMix.push(split);
 	});
 	paragraphNonInlineSkeDrawings === null || paragraphNonInlineSkeDrawings === void 0 || paragraphNonInlineSkeDrawings.forEach((drawing) => {
-		const split = _calculateSplit(drawing, lineHeight, lineTop, columnWidth);
+		const split = _calculateSplit(drawing, lineHeight, lineTop, columnLeft, columnWidth);
 		if (split) drawingsMix.push(split);
 	});
 	if (wrapTypeTables && wrapTypeTables.size > 0) wrapTypeTables.forEach((table) => {
 		const { left, top, width, height, tableSource } = table;
 		const { dist } = tableSource;
-		const split = __getSplitWidthNoAngle(top, height, left, width, lineTop, lineHeight, columnWidth, dist);
+		const split = __getSplitWidthNoAngle(top, height, left - columnLeft, width, lineTop, lineHeight, columnWidth, dist);
 		if (split) drawingsMix.push(split);
 	});
 	return _calculateDivideByDrawings(columnWidth, drawingsMix);
@@ -13364,7 +13381,7 @@ function collisionDetection(floatObject, lineHeight, lineTop, columnLeft, column
 	if (left + width < columnLeft || left > columnLeft + columnWidth) return false;
 	return true;
 }
-function _calculateSplit(drawing, lineHeight, lineTop, columnWidth) {
+function _calculateSplit(drawing, lineHeight, lineTop, columnLeft, columnWidth) {
 	const { aTop, height, aLeft, width, angle = 0, drawingOrigin } = drawing;
 	const { layoutType } = drawingOrigin;
 	if (layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_NONE || layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) return;
@@ -13377,6 +13394,9 @@ function _calculateSplit(drawing, lineHeight, lineTop, columnWidth) {
 			const point = lineTo[i];
 			points.push(new Vector2(point[0], point[1]));
 		}
+		points.forEach((point) => {
+			point.x -= columnLeft;
+		});
 		if (angle !== 0) {
 			const transform = new Transform().rotate(angle);
 			for (let i = 0; i < points.length; i++) {
@@ -13393,8 +13413,8 @@ function _calculateSplit(drawing, lineHeight, lineTop, columnWidth) {
 		distB,
 		distR
 	};
-	if (angle === 0) return __getSplitWidthNoAngle(aTop, height, aLeft, width, lineTop, lineHeight, columnWidth, dist, layoutType, wrapText);
-	const boundingBox = getBoundingBox(angle, aLeft, width, aTop, height);
+	if (angle === 0) return __getSplitWidthNoAngle(aTop, height, aLeft - columnLeft, width, lineTop, lineHeight, columnWidth, dist, layoutType, wrapText);
+	const boundingBox = getBoundingBox(angle, aLeft - columnLeft, width, aTop, height);
 	if (layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_SQUARE) {
 		const { left: sLeft, width: sWidth, top: sTop, height: sHeight } = boundingBox;
 		return __getSplitWidthNoAngle(sTop, sHeight, sLeft, sWidth, lineTop, lineHeight, columnWidth, dist, layoutType, wrapText);
@@ -13708,7 +13728,7 @@ function createTableSkeleton(ctx, curPage, viewModel, tableNode, sectionBreakCon
 	tableSkeleton.height = rowTop;
 	applyMergedCellSpanHeights(tableSkeleton);
 	const { pageWidth, marginLeft = 0, marginRight = 0 } = curPage;
-	tableSkeleton.left = _getTableLeft(pageWidth - marginLeft - marginRight, tableWidth, table.align, table.indent);
+	tableSkeleton.left = getTableLeft(pageWidth - marginLeft - marginRight, tableWidth, table.align, table.indent);
 	return tableSkeleton;
 }
 function rollbackListCache(listLevel, table) {
@@ -13752,7 +13772,7 @@ function createTableSkeletons(ctx, curPage, viewModel, tableNode, sectionBreakCo
 function updateTableSkeletonsPosition(cache, curPage, skeTables, table) {
 	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);
 	let tableIndex = 0;
 	for (const tableSkeleton of skeTables) {
 		applyMergedCellSpanHeights(tableSkeleton);
@@ -13957,7 +13977,7 @@ function findMergedMasterCell(table, row, col) {
 function isCoveredTableCell(cellConfig) {
 	return (cellConfig === null || cellConfig === void 0 ? void 0 : cellConfig.rowSpan) === 0 || (cellConfig === null || cellConfig === void 0 ? void 0 : cellConfig.columnSpan) === 0;
 }
-function _getTableLeft(pageWidth, tableWidth, align, indent = { v: 0 }) {
+function getTableLeft(pageWidth, tableWidth, align, indent = { v: 0 }) {
 	switch (align) {
 		case _univerjs_core.TableAlignmentType.START: return indent.v;
 		case _univerjs_core.TableAlignmentType.END: return Math.max(0, pageWidth - tableWidth);
@@ -14095,7 +14115,7 @@ function _popHyphenSlice(divide) {
 	}
 	return glyphGroup;
 }
-function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanLineHeight) {
+function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanMetrics) {
 	const divideInfo = getLastNotFullDivideInfo(getLastPage(pages));
 	if (divideInfo) {
 		var _divide$glyphGroup;
@@ -14122,7 +14142,8 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 			else if (!isLast && (divide === null || divide === void 0 ? void 0 : divide.glyphGroup.length) === 0 && glyphGroup.length === 1 && glyphGroup[0].streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyphGroup[0].width > divide.width) {
 				addGlyphToDivide(divide, glyphGroup, preOffsetLeft);
 				updateDivideInfo(divide, { breakType: breakPointType });
-			} else if ((divide === null || divide === void 0 ? void 0 : divide.glyphGroup.length) === 0) {
+			} else if (!isLast && (divide === null || divide === void 0 ? void 0 : divide.glyphGroup.length) === 0) _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
+			else if ((divide === null || divide === void 0 ? void 0 : divide.glyphGroup.length) === 0) {
 				const sliceGlyphGroup = [];
 				while (glyphGroup.length) {
 					sliceGlyphGroup.push(glyphGroup.shift());
@@ -14132,22 +14153,22 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 					}
 				}
 				if (sliceGlyphGroup.length > 0) addGlyphToDivide(divide, sliceGlyphGroup, preOffsetLeft);
-				if (glyphGroup.length) _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, false, breakPointType, defaultSpanLineHeight);
+				if (glyphGroup.length) _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, false, breakPointType, defaultSpanMetrics);
 			} else if (hyphenLineCount > consecutiveHyphenLimit) {
 				const hyphenSliceGlyphGroup = _popHyphenSlice(divide);
 				if (hyphenSliceGlyphGroup.length > 0) {
 					updateDivideInfo(divide, { breakType: "Normal" });
 					_divideOperator(ctx, hyphenSliceGlyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, "Hyphen");
 				}
-				_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
-			} else _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
+				_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
+			} else _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 		} else if (isLast && hyphenationZone && hyphenationZone > 0 && preOffsetLeft >= divide.width - hyphenationZone && breakPointType === "Hyphen" && divide.breakType === "Normal") {
 			updateDivideInfo(divide, { isFull: true });
-			_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
+			_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 		} else {
 			const currentLine = divide.parent;
 			const maxBox = __maxFontBoundingBoxByGlyphGroup(glyphGroup);
-			if (currentLine && __isZeroWidthNonFlowFloatingAnchorLine(__getGlyphGroupByLine(currentLine), paragraphConfig.paragraphNonInlineSkeDrawings) && __hasFlowGlyph(glyphGroup)) {
+			if (currentLine && __isPositionedCustomBlockOnlyLine(__getGlyphGroupByLine(currentLine), paragraphConfig.paragraphNonInlineSkeDrawings) && __hasFlowGlyph(glyphGroup)) {
 				for (const lineDivide of currentLine.divides) updateDivideInfo(lineDivide, { isFull: true });
 				_lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, false, breakPointType);
 				return;
@@ -14166,7 +14187,10 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 						startIndex = 2;
 					} else newGlyphGroup = [spanGroupCached[0]];
 					const { paragraphStart: lineIsStart } = currentLine.parent.lines.pop();
-					_lineOperator(ctx, newGlyphGroup, pages, sectionBreakConfig, paragraphConfig, lineIsStart, breakPointType, boundingBoxAscent + boundingBoxDescent);
+					_lineOperator(ctx, newGlyphGroup, pages, sectionBreakConfig, paragraphConfig, lineIsStart, breakPointType, {
+						lineHeight: boundingBoxAscent + boundingBoxDescent,
+						hasInlineCustomBlock: glyphGroup.some((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyph.width !== 0)
+					});
 					for (let i = startIndex; i < spanGroupCached.length; i++) _divideOperator(ctx, [spanGroupCached[i]], pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText);
 					_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType);
 					return;
@@ -14188,9 +14212,9 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 			addGlyphToDivide(divide, glyphGroup, preOffsetLeft);
 			updateDivideInfo(divide, { breakType: breakPointType });
 		}
-	} else _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
+	} else _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 }
-function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultGlyphLineHeight) {
+function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanMetrics) {
 	var _originParagraphStyle, _originParagraphStyle2, _skeHeaders$get, _skeFooters$get;
 	let lastPage = getLastPage(pages);
 	let columnInfo = getLastNotFullColumnInfo(lastPage);
@@ -14221,7 +14245,7 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 	const preLine = getLastLineByColumn(column);
 	const ascent = Math.max(...glyphGroup.map((glyph) => glyph.bBox.ba));
 	const descent = Math.max(...glyphGroup.map((glyph) => glyph.bBox.bd));
-	const glyphLineHeight = defaultGlyphLineHeight || ascent + descent;
+	const glyphLineHeight = (defaultSpanMetrics === null || defaultSpanMetrics === void 0 ? void 0 : defaultSpanMetrics.lineHeight) || ascent + descent;
 	const { paragraphStyle: originParagraphStyle = {}, paragraphNonInlineSkeDrawings, skeTablesInParagraph, skeHeaders, skeFooters, pDrawingAnchor, paragraphIndex } = paragraphConfig;
 	const isZeroWidthNonFlowFloatingAnchorLine = __isZeroWidthNonFlowFloatingAnchorLine(glyphGroup, paragraphNonInlineSkeDrawings);
 	const { namedStyleType } = originParagraphStyle;
@@ -14232,7 +14256,7 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 		spaceBelow: (_originParagraphStyle2 = originParagraphStyle.spaceBelow) !== null && _originParagraphStyle2 !== void 0 ? _originParagraphStyle2 : namedStyle === null || namedStyle === void 0 ? void 0 : namedStyle.spaceBelow
 	};
 	const { paragraphLineGapDefault, linePitch, lineSpacing, spacingRule, snapToGrid, gridType } = getLineHeightConfig(sectionBreakConfig, paragraphConfig);
-	const hasInlineCustomBlock = glyphGroup.some((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyph.width !== 0);
+	const hasInlineCustomBlock = (defaultSpanMetrics === null || defaultSpanMetrics === void 0 ? void 0 : defaultSpanMetrics.hasInlineCustomBlock) || glyphGroup.some((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyph.width !== 0);
 	const positionedCustomBlockOnly = glyphGroup.length > 0 && paragraphNonInlineSkeDrawings != null && paragraphNonInlineSkeDrawings.size > 0 && glyphGroup.every((glyph) => {
 		if (!glyph) return false;
 		if (glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK) return [...paragraphNonInlineSkeDrawings.values()].some((drawing) => drawing.drawingId === glyph.drawingId);
@@ -14293,12 +14317,12 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 		var _pDrawingAnchor$get2;
 		needOpenNewPageByTableLayout = _updateAndPositionTable(ctx, lineTop, lineHeight, lastPage, 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 calculatedLineTop = positionedCustomBlockOnly ? lineTop : calculateLineTopByDrawings(lineHeight, lineTop, lastPage, headerPage, footerPage);
+	const calculatedLineTop = positionedCustomBlockOnly ? lineTop : calculateLineTopByDrawings(lineHeight, lineTop, lastPage, headerPage, footerPage, column.left, column.width, section.top);
 	const previousTopBottomCustomBlockFlowBottom = deferredTopBottomAnchorDrawings.length > 0 ? paragraphConfig.topBottomCustomBlockFlowBottom : void 0;
 	const newLineTop = previousTopBottomCustomBlockFlowBottom == null ? calculatedLineTop : Math.max(calculatedLineTop, previousTopBottomCustomBlockFlowBottom);
 	if (lineHeight + newLineTop - section.height > LINE_LAYOUT_OVERFLOW_TOLERANCE && column.lines.length > 0 && lastPage.sections.length > 0 || needOpenNewPageByTableLayout) {
 		setColumnFullState(column, true);
-		_columnOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultGlyphLineHeight);
+		_columnOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 		if (isParagraphFirstShapedText && paragraphNonInlineSkeDrawings && paragraphNonInlineSkeDrawings.size > 0) for (const drawing of paragraphNonInlineSkeDrawings.values()) {
 			if (lastPage.skeDrawings.has(drawing.drawingId)) lastPage.skeDrawings.delete(drawing.drawingId);
 			if (ctx.floatObjectsCache.has(drawing.drawingId)) {
@@ -14326,16 +14350,16 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 		paddingBottom,
 		marginTop,
 		spaceBelowApply
-	}, column.width, lineIndex, isParagraphFirstShapedText, paragraphConfig, lastPage, headerPage, footerPage);
+	}, column.width, lineIndex, isParagraphFirstShapedText, paragraphConfig, lastPage, headerPage, footerPage, column.left, section.top);
 	column.lines.push(newLine);
 	newLine.parent = column;
 	const blockAnchorTop = deferredTopBottomAnchorDrawings.length > 0 ? newLineTop : lineTop;
 	createAndUpdateBlockAnchor(paragraphIndex, newLine, blockAnchorTop, pDrawingAnchor);
 	if (deferredTopBottomAnchorDrawings.length > 0) {
-		__updateAndPositionDrawings(ctx, newLineTop, lineHeight, column, deferredTopBottomAnchorDrawings, paragraphConfig.paragraphIndex, isParagraphFirstShapedText, blockAnchorTop, paragraphAnchorLeft, true, true);
-		__updateTopBottomCustomBlockFlowBottom(paragraphConfig, deferredTopBottomAnchorDrawings);
+		__updateAndPositionDrawings(ctx, newLineTop, lineHeight, column, deferredTopBottomAnchorDrawings, paragraphConfig.paragraphIndex, isParagraphFirstShapedText, blockAnchorTop, paragraphAnchorLeft, false, true);
+		__updateTopBottomCustomBlockFlowBottom(paragraphConfig, deferredTopBottomAnchorDrawings, section.top);
 	}
-	_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultGlyphLineHeight);
+	_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 	if (deferredInlineGroupAnchorDrawings.length > 0) {
 		var _pDrawingAnchor$get3;
 		__updateAndPositionDrawings(ctx, lineTop, lineHeight, column, deferredInlineGroupAnchorDrawings, paragraphConfig.paragraphIndex, isParagraphFirstShapedText, pDrawingAnchor === null || pDrawingAnchor === void 0 || (_pDrawingAnchor$get3 = pDrawingAnchor.get(paragraphIndex)) === null || _pDrawingAnchor$get3 === void 0 ? void 0 : _pDrawingAnchor$get3.top, paragraphAnchorLeft, true);
@@ -14386,18 +14410,21 @@ function __updateWrapTablePosition(ctx, table, lineTop, lineHeight, column, para
 	table.left = left;
 }
 function __getWrapTablePosition(table, column, lineTop, lineHeight, drawingAnchorTop) {
-	var _column$parent, _getPositionHorizon, _getPositionVertical;
+	var _column$parent, _column$parent$top, _column$parent2, _getPositionHorizon, _getPositionVertical;
 	const page = (_column$parent = column.parent) === null || _column$parent === void 0 ? void 0 : _column$parent.parent;
+	const sectionTop = (_column$parent$top = (_column$parent2 = column.parent) === null || _column$parent2 === void 0 ? void 0 : _column$parent2.top) !== null && _column$parent$top !== void 0 ? _column$parent$top : 0;
 	if (page == null) return;
 	const isPageBreak = __checkPageBreak(column);
 	const { tableSource, width, height } = table;
 	const { positionH, positionV } = tableSource.position;
 	return {
 		left: (_getPositionHorizon = getPositionHorizon(positionH, column, page, width, isPageBreak)) !== null && _getPositionHorizon !== void 0 ? _getPositionHorizon : 0,
-		top: (_getPositionVertical = getPositionVertical(positionV, page, lineTop, lineHeight, height, drawingAnchorTop, isPageBreak)) !== null && _getPositionVertical !== void 0 ? _getPositionVertical : 0
+		top: (_getPositionVertical = getPositionVertical(positionV, page, sectionTop + lineTop, lineHeight, height, drawingAnchorTop == null ? void 0 : sectionTop + drawingAnchorTop, isPageBreak)) !== null && _getPositionVertical !== void 0 ? _getPositionVertical : 0
 	};
 }
 function __avoidFlowAffectingDrawingsForTable(table, page, column) {
+	var _column$left;
+	const columnLeft = (_column$left = column.left) !== null && _column$left !== void 0 ? _column$left : 0;
 	const tableTop = table.top;
 	const tableBottom = table.top + table.height;
 	const tableRight = table.left + table.width;
@@ -14410,7 +14437,7 @@ function __avoidFlowAffectingDrawingsForTable(table, page, column) {
 		if (drawingTop >= tableBottom || drawingBottom <= tableTop) continue;
 		const drawingRight = drawing.aLeft + drawing.width + ((_drawingOrigin$distR = drawingOrigin.distR) !== null && _drawingOrigin$distR !== void 0 ? _drawingOrigin$distR : 0);
 		if (drawing.aLeft >= tableRight || drawingRight <= table.left) continue;
-		if (drawingRight + table.width <= column.width) table.left = Math.max(table.left, drawingRight);
+		if (drawingRight + table.width <= columnLeft + column.width) table.left = Math.max(table.left, drawingRight);
 	}
 }
 function _updateAndPositionTable(ctx, lineTop, lineHeight, page, column, section, skeTablesInParagraph, paragraphIndex, sectionBreakConfig, drawingAnchorTop) {
@@ -14419,9 +14446,10 @@ function _updateAndPositionTable(ctx, lineTop, lineHeight, page, column, section
 	if (firstUnPositionedTable == null) return false;
 	const { tableId, table } = firstUnPositionedTable;
 	const { tableSource } = table;
-	if (firstUnPositionedTable.isSlideTable === false) switch (tableSource.textWrap) {
+	if (firstUnPositionedTable.isSlideTable === false || tableSource.textWrap === _univerjs_core.TableTextWrapType.NONE) switch (tableSource.textWrap) {
 		case _univerjs_core.TableTextWrapType.NONE:
-			table.top = lineTop;
+			table.top = section.top + lineTop;
+			table.left = column.left + getTableLeft(column.width, table.width, tableSource.align, tableSource.indent);
 			__avoidFlowAffectingDrawingsForTable(table, page, column);
 			break;
 		case _univerjs_core.TableTextWrapType.WRAP:
@@ -14430,9 +14458,10 @@ function _updateAndPositionTable(ctx, lineTop, lineHeight, page, column, section
 		default: throw new Error(`Unsupported table text wrap type: ${tableSource.textWrap}`);
 	}
 	const { top, left, height } = table;
-	if (!ctx.isDirty && top + height > section.height && firstUnPositionedTable.isSlideTable === false) {
+	const localTop = top - section.top;
+	if (!ctx.isDirty && localTop + height > section.height && firstUnPositionedTable.isSlideTable === false) {
 		skeTablesInParagraph.pop();
-		const availableHeight = section.height - top;
+		const availableHeight = section.height - localTop;
 		const { segmentId } = page;
 		const viewModel = ctx.viewModel.getSelfOrHeaderFooterViewModel(segmentId);
 		const tableNode = firstUnPositionedTable.tableNode;
@@ -14476,18 +14505,30 @@ function _getCustomBlockIdsInLine(line) {
 	for (const divide of line.divides) for (const glyph of divide.glyphGroup) if (glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK) customBlockIds.push(glyph.drawingId);
 	return customBlockIds;
 }
-function __updateTopBottomCustomBlockFlowBottom(paragraphConfig, drawings) {
+function __updateTopBottomCustomBlockFlowBottom(paragraphConfig, drawings, sectionTop) {
 	for (const drawing of drawings) {
 		var _drawingOrigin$distB, _paragraphConfig$topB;
 		const { drawingOrigin } = drawing;
 		if (drawingOrigin.layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM || drawingOrigin.behindDoc === _univerjs_core.BooleanNumber.TRUE) continue;
-		const bottom = drawing.aTop + drawing.height + ((_drawingOrigin$distB = drawingOrigin.distB) !== null && _drawingOrigin$distB !== void 0 ? _drawingOrigin$distB : 0);
+		const bottom = drawing.aTop + drawing.height + ((_drawingOrigin$distB = drawingOrigin.distB) !== null && _drawingOrigin$distB !== void 0 ? _drawingOrigin$distB : 0) - sectionTop;
 		paragraphConfig.topBottomCustomBlockFlowBottom = Math.max((_paragraphConfig$topB = paragraphConfig.topBottomCustomBlockFlowBottom) !== null && _paragraphConfig$topB !== void 0 ? _paragraphConfig$topB : Number.NEGATIVE_INFINITY, bottom);
 	}
 }
 function __isZeroWidthNonFlowFloatingAnchorLine(glyphGroup, paragraphNonInlineSkeDrawings) {
 	return __getZeroWidthNonFlowFloatingAnchorDrawings(glyphGroup, paragraphNonInlineSkeDrawings).length > 0;
 }
+function __isPositionedCustomBlockOnlyLine(glyphGroup, paragraphNonInlineSkeDrawings) {
+	let hasPositionedCustomBlock = false;
+	for (const glyph of glyphGroup) {
+		var _paragraphNonInlineSk;
+		if (__isStructuralTerminatorGlyph(glyph) || __isIgnorableZeroSizeGlyph(glyph)) continue;
+		if (glyph.streamType !== _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK || glyph.drawingId == null) return false;
+		const drawingOrigin = paragraphNonInlineSkeDrawings === null || paragraphNonInlineSkeDrawings === void 0 || (_paragraphNonInlineSk = paragraphNonInlineSkeDrawings.get(glyph.drawingId)) === null || _paragraphNonInlineSk === void 0 ? void 0 : _paragraphNonInlineSk.drawingOrigin;
+		if (drawingOrigin == null || drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.INLINE) return false;
+		hasPositionedCustomBlock = true;
+	}
+	return hasPositionedCustomBlock;
+}
 function __getZeroWidthNonFlowFloatingAnchorDrawings(glyphGroup, paragraphNonInlineSkeDrawings) {
 	const drawings = [];
 	for (const glyph of glyphGroup) {
@@ -14516,26 +14557,25 @@ function __hasFlowGlyph(glyphGroup) {
 	});
 }
 function _reLayoutCheck(ctx, floatObjects, column, paragraphIndex) {
-	var _column$parent2;
-	const page = (_column$parent2 = column.parent) === null || _column$parent2 === void 0 ? void 0 : _column$parent2.parent;
+	var _column$parent3;
+	const page = (_column$parent3 = column.parent) === null || _column$parent3 === void 0 ? void 0 : _column$parent3.parent;
 	const flowAffectingFloatObjects = floatObjects.filter((floatObject) => floatObject.behindDoc !== _univerjs_core.BooleanNumber.TRUE || floatObject.layoutType != null && floatObject.layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_NONE);
 	if (flowAffectingFloatObjects.length === 0 || page == null) return;
 	let needBreakLineIterator = false;
 	for (const floatObject of flowAffectingFloatObjects) {
-		var _floatObjectCache$pag, _page$sections$;
 		const floatObjectCache = ctx.floatObjectsCache.get(floatObject.id);
 		if (floatObjectCache == null || floatObjectCache.page.segmentId !== page.segmentId) continue;
 		if (floatObjectCache.count >= FLOAT_OBJECT_RELAYOUT_LIMIT) continue;
-		const cachePageStartParagraphIndex = (_floatObjectCache$pag = floatObjectCache.page.sections[0]) === null || _floatObjectCache$pag === void 0 || (_floatObjectCache$pag = _floatObjectCache$pag.columns[0]) === null || _floatObjectCache$pag === void 0 || (_floatObjectCache$pag = _floatObjectCache$pag.lines[0]) === null || _floatObjectCache$pag === void 0 ? void 0 : _floatObjectCache$pag.paragraphIndex;
-		const startIndex = (_page$sections$ = page.sections[0]) === null || _page$sections$ === void 0 || (_page$sections$ = _page$sections$.columns[0]) === null || _page$sections$ === void 0 || (_page$sections$ = _page$sections$.lines[0]) === null || _page$sections$ === void 0 ? void 0 : _page$sections$.paragraphIndex;
-		if (floatObjectCache.page && cachePageStartParagraphIndex && startIndex && cachePageStartParagraphIndex !== startIndex) {
+		if (floatObjectCache.page.pageNumber !== page.pageNumber) {
 			floatObjectCache.page.skeDrawings.delete(floatObject.id);
 			ctx.floatObjectsCache.delete(floatObject.id);
 			lineIterator([floatObjectCache.page], (line) => {
-				const { lineHeight, top } = line;
+				var _column$parent$top2, _column$parent4;
+				const { lineHeight } = line;
 				const column = line.parent;
 				if (needBreakLineIterator || column == null) return;
 				const { width: columnWidth, left: columnLeft } = column;
+				const top = ((_column$parent$top2 = (_column$parent4 = column.parent) === null || _column$parent4 === void 0 ? void 0 : _column$parent4.top) !== null && _column$parent$top2 !== void 0 ? _column$parent$top2 : 0) + line.top;
 				if (collisionDetection(floatObjectCache.floatObject, lineHeight, top, columnLeft, columnWidth)) {
 					var _ctx$layoutStartPoint;
 					needBreakLineIterator = true;
@@ -14548,9 +14588,12 @@ function _reLayoutCheck(ctx, floatObjects, column, paragraphIndex) {
 	}
 	needBreakLineIterator = false;
 	lineIterator([page], (line) => {
-		const { lineHeight, top } = line;
-		const { width: columnWidth, left: columnLeft } = column;
-		if (needBreakLineIterator) return;
+		var _lineColumn$parent$to, _lineColumn$parent;
+		const { lineHeight } = line;
+		const lineColumn = line.parent;
+		if (needBreakLineIterator || lineColumn == null) return;
+		const { width: columnWidth, left: columnLeft } = lineColumn;
+		const top = ((_lineColumn$parent$to = (_lineColumn$parent = lineColumn.parent) === null || _lineColumn$parent === void 0 ? void 0 : _lineColumn$parent.top) !== null && _lineColumn$parent$to !== void 0 ? _lineColumn$parent$to : 0) + line.top;
 		for (const floatObject of flowAffectingFloatObjects.values()) {
 			let targetObject = floatObject;
 			if (ctx.floatObjectsCache.has(floatObject.id)) {
@@ -14593,18 +14636,18 @@ function checkRelativeDrawingNeedRePosition(ctx, floatObject) {
 	}
 	return false;
 }
-function _columnOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanLineHeight) {
-	if (isColumnFull(getLastPage(pages)) === true) _pageOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
-	else _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
+function _columnOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanMetrics) {
+	if (isColumnFull(getLastPage(pages)) === true) _pageOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
+	else _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 }
-function _pageOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanLineHeight) {
+function _pageOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType = "Normal", defaultSpanMetrics) {
 	const curSkeletonPage = getLastPage(pages);
 	const { skeHeaders, skeFooters } = paragraphConfig;
 	pages.push(createSkeletonPage(ctx, sectionBreakConfig, {
 		skeHeaders,
 		skeFooters
 	}, (curSkeletonPage === null || curSkeletonPage === void 0 ? void 0 : curSkeletonPage.pageNumber) + 1));
-	_columnOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanLineHeight);
+	_columnOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultSpanMetrics);
 }
 /**
 * 17.3.1.12 ind (Paragraph Indentation)
@@ -14753,8 +14796,8 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId =
 		const drawingHeight = (_viewport$height = viewport === null || viewport === void 0 ? void 0 : viewport.height) !== null && _viewport$height !== void 0 ? _viewport$height : height;
 		drawing.aLeft = viewport ? blockLeft + ((_viewport$offsetLeft = viewport.offsetLeft) !== null && _viewport$offsetLeft !== void 0 ? _viewport$offsetLeft : 0) : blockLeft + .5 * glyph.width - .5 * drawingWidth || 0;
 		if (glyph.width > divide.width) {
-			var _paragraphNonInlineSk;
-			for (const positionedDrawing of (_paragraphNonInlineSk = paragraphNonInlineSkeDrawings === null || paragraphNonInlineSkeDrawings === void 0 ? void 0 : paragraphNonInlineSkeDrawings.values()) !== null && _paragraphNonInlineSk !== void 0 ? _paragraphNonInlineSk : []) {
+			var _paragraphNonInlineSk2;
+			for (const positionedDrawing of (_paragraphNonInlineSk2 = paragraphNonInlineSkeDrawings === null || paragraphNonInlineSkeDrawings === void 0 ? void 0 : paragraphNonInlineSkeDrawings.values()) !== null && _paragraphNonInlineSk2 !== void 0 ? _paragraphNonInlineSk2 : []) {
 				const positionedOrigin = positionedDrawing.drawingOrigin;
 				if (positionedOrigin == null || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.INLINE || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_NONE || positionedOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) continue;
 				const positionedBottom = positionedDrawing.aTop + positionedDrawing.height;
@@ -14790,11 +14833,14 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId =
 	page.skeDrawings = new Map([...page.skeDrawings, ...drawings]);
 }
 function __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirstShapedText, blockAnchorTop, needPositionDrawings = [], blockAnchorLeft = 0, normalizeTraditionalColumnAnchor = true) {
-	var _column$parent3;
-	const page = (_column$parent3 = column.parent) === null || _column$parent3 === void 0 ? void 0 : _column$parent3.parent;
+	var _column$parent5, _column$parent$top3, _column$parent6;
+	const page = (_column$parent5 = column.parent) === null || _column$parent5 === void 0 ? void 0 : _column$parent5.parent;
 	if (page == null || needPositionDrawings.length === 0) return;
 	const drawings = /* @__PURE__ */ new Map();
 	const isPageBreak = __checkPageBreak(column);
+	const sectionTop = (_column$parent$top3 = (_column$parent6 = column.parent) === null || _column$parent6 === void 0 ? void 0 : _column$parent6.top) !== null && _column$parent$top3 !== void 0 ? _column$parent$top3 : 0;
+	const absoluteLineTop = sectionTop + lineTop;
+	const absoluteBlockAnchorTop = blockAnchorTop == null ? void 0 : sectionTop + blockAnchorTop;
 	if (isPageBreak && !isParagraphFirstShapedText) return;
 	for (const drawing of needPositionDrawings) {
 		var _ctx$dataModel$getUni, _ctx$dataModel$getUni2, _ctx$dataModel, _viewport$width2, _viewport$height2, _getPositionHorizon2, _getPositionVertical2;
@@ -14821,7 +14867,7 @@ function __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirst
 			if (normalizeTraditionalColumnAnchor && ctx.dataModel.documentStyle.documentFlavor === _univerjs_core.DocumentFlavor.TRADITIONAL && positionV.relativeFrom === _univerjs_core.ObjectRelativeFromV.PARAGRAPH) aLeft -= page.marginLeft;
 		}
 		drawing.aLeft = aLeft;
-		drawing.aTop = (_getPositionVertical2 = getPositionVertical(positionV, page, lineTop, lineHeight, drawingHeight, blockAnchorTop, isPageBreak)) !== null && _getPositionVertical2 !== void 0 ? _getPositionVertical2 : 0;
+		drawing.aTop = (_getPositionVertical2 = getPositionVertical(positionV, page, absoluteLineTop, lineHeight, drawingHeight, absoluteBlockAnchorTop, isPageBreak)) !== null && _getPositionVertical2 !== void 0 ? _getPositionVertical2 : 0;
 		drawing.width = drawingWidth;
 		drawing.height = drawingHeight;
 		drawing.angle = angle;
@@ -14835,17 +14881,17 @@ function __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirst
 		} : void 0;
 		drawing.initialState = true;
 		drawing.columnLeft = column.left;
-		drawing.lineTop = lineTop;
+		drawing.lineTop = absoluteLineTop;
 		drawing.lineHeight = lineHeight;
 		drawing.isPageBreak = isPageBreak;
-		drawing.blockAnchorTop = blockAnchorTop !== null && blockAnchorTop !== void 0 ? blockAnchorTop : lineTop;
+		drawing.blockAnchorTop = absoluteBlockAnchorTop !== null && absoluteBlockAnchorTop !== void 0 ? absoluteBlockAnchorTop : absoluteLineTop;
 		drawings.set(drawing.drawingId, drawing);
 	}
 	return drawings;
 }
 function __updateDrawingPosition(column, drawings, overwriteTopBottomPosition = false) {
-	var _column$parent4;
-	const page = (_column$parent4 = column.parent) === null || _column$parent4 === void 0 ? void 0 : _column$parent4.parent;
+	var _column$parent7;
+	const page = (_column$parent7 = column.parent) === null || _column$parent7 === void 0 ? void 0 : _column$parent7.parent;
 	if (drawings == null || drawings.size === 0 || page == null) return;
 	for (const drawing of drawings.values()) {
 		const originDrawing = page.skeDrawings.get(drawing.drawingId);
@@ -14859,8 +14905,11 @@ function __updateDrawingPosition(column, drawings, overwriteTopBottomPosition =
 	}
 }
 function __checkPageBreak(column) {
+	var _section$parent;
 	const section = column.parent;
 	if (!section) return false;
+	const pageSections = (_section$parent = section.parent) === null || _section$parent === void 0 ? void 0 : _section$parent.sections;
+	if (pageSections && pageSections[0] !== section) return false;
 	const columns = section === null || section === void 0 ? void 0 : section.columns;
 	if (!columns) return false;
 	const columnLength = columns.length;
@@ -15681,11 +15730,17 @@ function getFontCreateConfig(index, viewModel, paragraphNode, sectionBreakConfig
 	if (!hasAddonStyle && originTextRun) fontCreateConfigCache.setValue(st, ed, result);
 	return result;
 }
-function getCustomRangeGlyphWidth(index, viewModel, paragraphNode, config) {
+function getCustomRangeGlyphMetrics(index, viewModel, paragraphNode, config) {
 	const customRange = viewModel.getCustomRange(index + paragraphNode.startIndex);
-	const glyphWidthEm = customRange === null || customRange === void 0 ? void 0 : customRange.glyphWidthEm;
-	if (typeof glyphWidthEm !== "number" || !Number.isFinite(glyphWidthEm) || glyphWidthEm < 0) return;
-	return glyphWidthEm * config.fontStyle.originFontSize;
+	if (!customRange) return;
+	const fontSize = ptToPixel(config.fontStyle.originFontSize);
+	const toPixels = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value * fontSize : void 0;
+	const metrics = {
+		ascent: toPixels(customRange.glyphAscentEm),
+		descent: toPixels(customRange.glyphDescentEm),
+		width: toPixels(customRange.glyphWidthEm)
+	};
+	return metrics.ascent == null && metrics.descent == null && metrics.width == null ? void 0 : metrics;
 }
 function getNullSkeleton() {
 	return {
@@ -16056,10 +16111,25 @@ function createSkeletonCellPages(ctx, viewModel, cellNode, sectionBreakConfig, t
 	var _sectionBreakConfig$d2, _ctx$dataModel, _ctx$dataModel$getBod;
 	const sectionNode = cellNode.children[0];
 	const { page: areaPage, sectionBreakConfig: cellSectionBreakConfig } = createNullCellPage(ctx, sectionBreakConfig, tableConfig, row, col, availableHeight, maxCellPageHeight);
-	const { pages } = dealWithSection(ctx, viewModel, sectionNode, areaPage, cellSectionBreakConfig);
+	const segmentId = tableConfig.tableId;
+	const retainedPages = [];
+	let currentPage = areaPage;
+	let pages = [];
+	for (let count = 0; count <= 10; count++) {
+		const layoutAnchor = ctx.layoutStartPointer[segmentId];
+		ctx.layoutStartPointer[segmentId] = null;
+		const result = dealWithSection(ctx, viewModel, sectionNode, currentPage, cellSectionBreakConfig, layoutAnchor);
+		pages = [...retainedPages, ...result.pages];
+		if (!ctx.isDirty || ctx.layoutStartPointer[segmentId] == null || count === 10) break;
+		const retryPage = pages.at(-1);
+		if (retryPage == null) break;
+		retainedPages.splice(0, retainedPages.length, ...pages.slice(0, -1));
+		currentPage = retryPage;
+		resetContext(ctx);
+	}
 	for (const p of pages) {
 		p.type = 3;
-		p.segmentId = tableConfig.tableId;
+		p.segmentId = segmentId;
 	}
 	updateBlockIndex(pages, cellNode.startIndex, (_sectionBreakConfig$d2 = sectionBreakConfig.documentCompatibilityPolicy) !== null && _sectionBreakConfig$d2 !== void 0 ? _sectionBreakConfig$d2 : getDocumentCompatibilityPolicy());
 	applyTrailingBlockRangeSpaceBelow(pages, (_ctx$dataModel = ctx.dataModel) === null || _ctx$dataModel === void 0 || (_ctx$dataModel$getBod = _ctx$dataModel.getBody) === null || _ctx$dataModel$getBod === void 0 ? void 0 : _ctx$dataModel$getBod.call(_ctx$dataModel), cellNode.endIndex);
@@ -16241,6 +16311,11 @@ function horizontalAlignHandler(line, horizontalAlign, allowOverflowHorizontalOf
 	for (let i = 0; i < divides.length; i++) {
 		const divide = divides[i];
 		const { width } = divide;
+		if (divide.glyphGroup.length === 0) {
+			divide.glyphGroupWidth = 0;
+			divide.paddingLeft = 0;
+			continue;
+		}
 		let glyphGroupWidth = getGlyphGroupWidth(divide);
 		divide.glyphGroupWidth = glyphGroupWidth;
 		if (width === Number.POSITIVE_INFINITY) continue;
@@ -16753,10 +16828,16 @@ function lineBreaking(ctx, viewModel, shapedTextList, curPage, paragraphNode, se
 		segmentDrawingAnchorCache = /* @__PURE__ */ new Map();
 		drawingAnchor === null || drawingAnchor === void 0 || drawingAnchor.set(segmentId, segmentDrawingAnchorCache);
 	}
+	const resolvedParagraphStyle = _applyBlockRangeLayoutParagraphStyle((_viewModel$getBody2 = (_viewModel$getBody3 = viewModel.getBody) === null || _viewModel$getBody3 === void 0 ? void 0 : _viewModel$getBody3.call(viewModel)) !== null && _viewModel$getBody2 !== void 0 ? _viewModel$getBody2 : null, paragraph, paragraphStyle, documentStyle, shouldApplyDocumentDefaults);
+	const borderBottom = resolvedParagraphStyle.borderBottom;
+	if (borderBottom) {
+		var _borderBottom$padding, _borderBottom$width;
+		_withMinSpacing(resolvedParagraphStyle, "spaceBelow", Math.max(0, (_borderBottom$padding = borderBottom.padding) !== null && _borderBottom$padding !== void 0 ? _borderBottom$padding : 0) + Math.max(0, (_borderBottom$width = borderBottom.width) !== null && _borderBottom$width !== void 0 ? _borderBottom$width : 1) / 2);
+	}
 	const paragraphConfig = {
 		paragraphIndex: endIndex,
 		documentCompatibilityPolicy,
-		paragraphStyle: _applyBlockRangeLayoutParagraphStyle((_viewModel$getBody2 = (_viewModel$getBody3 = viewModel.getBody) === null || _viewModel$getBody3 === void 0 ? void 0 : _viewModel$getBody3.call(viewModel)) !== null && _viewModel$getBody2 !== void 0 ? _viewModel$getBody2 : null, paragraph, paragraphStyle, documentStyle, shouldApplyDocumentDefaults),
+		paragraphStyle: resolvedParagraphStyle,
 		docxFallbackAnchorLeft: _getFollowingIndentedParagraphAnchorLeft(viewModel, paragraph, paragraphNode, drawings, isTraditionalDocumentCompatibility(documentCompatibilityPolicy)),
 		useWordStyleLineHeight,
 		paragraphNonInlineSkeDrawings,
@@ -17317,7 +17398,7 @@ function otherHandler(index, charArray, viewModel, paragraphNode, sectionBreakCo
 		if (char == null) break;
 		if (hasSpace(char) || startWithEmoji(charArray.substring(step))) break;
 		const config = getFontCreateConfig(index + step, viewModel, paragraphNode, sectionBreakConfig, paragraph);
-		const glyph = createSkeletonLetterGlyph(char, config, getCustomRangeGlyphWidth(index + step, viewModel, paragraphNode, config));
+		const glyph = createSkeletonLetterGlyph(char, config, getCustomRangeGlyphMetrics(index + step, viewModel, paragraphNode, config));
 		glyphGroup.push(glyph);
 		src = src.substring(char.length);
 		step += char.length;
@@ -17475,7 +17556,7 @@ function shaping(ctx, content, viewModel, paragraphNode, sectionBreakConfig, use
 					const newSpan = createSkeletonLetterGlyph(char, config);
 					shapedGlyphs.push(newSpan);
 				} else {
-					const newSpan = createSkeletonLetterGlyph(char, config, getCustomRangeGlyphWidth(start, viewModel, paragraphNode, config), glyphInfo);
+					const newSpan = createSkeletonLetterGlyph(char, config, getCustomRangeGlyphMetrics(start, viewModel, paragraphNode, config), glyphInfo);
 					shapedGlyphs.push(newSpan);
 				}
 			}
@@ -17516,7 +17597,7 @@ function shaping(ctx, content, viewModel, paragraphNode, sectionBreakConfig, use
 					else if (char === _univerjs_core.DataStreamTreeTokenType.PARAGRAPH) {
 						var _sectionBreakConfig$r;
 						if (((_sectionBreakConfig$r = sectionBreakConfig.renderConfig) === null || _sectionBreakConfig$r === void 0 ? void 0 : _sectionBreakConfig$r.zeroWidthParagraphBreak) === _univerjs_core.BooleanNumber.TRUE) newGlyph = createSkeletonLetterGlyph(char, config, 0);
-						else newGlyph = createSkeletonLetterGlyph(char, config, getCustomRangeGlyphWidth(i, viewModel, paragraphNode, config));
+						else newGlyph = createSkeletonLetterGlyph(char, config, getCustomRangeGlyphMetrics(i, viewModel, paragraphNode, config));
 					} else newGlyph = createSkeletonLetterGlyph(char, config);
 					shapedGlyphs.push(newGlyph);
 					i += char.length;
@@ -17821,7 +17902,7 @@ function dealWithSection(ctx, viewModel, sectionNode, curPage, sectionBreakConfi
 		let currentPageCache = curPage;
 		if (allCurrentSkeletonPages.length > 0) currentPageCache = allCurrentSkeletonPages[allCurrentSkeletonPages.length - 1];
 		if (paragraphNode.nodeType === _univerjs_core.DataStreamTreeNodeType.PARAGRAPH) {
-			if (ctx.paragraphsOpenNewPage.has(paragraphNode.endIndex)) currentPageCache = createSkeletonPage(ctx, sectionBreakConfig, ctx.skeletonResourceReference, currentPageCache.pageNumber + 1);
+			if (ctx.paragraphsOpenNewPage.delete(paragraphNode.endIndex) && currentPageCache.sections.some((section) => section.columns.some((column) => column.lines.length > 0))) currentPageCache = createSkeletonPage(ctx, sectionBreakConfig, ctx.skeletonResourceReference, currentPageCache.pageNumber + 1);
 			skeletonPages = dealWidthParagraph(ctx, viewModel, paragraphNode, currentPageCache, sectionBreakConfig);
 		}
 		if (paragraphNode.nodeType === _univerjs_core.DataStreamTreeNodeType.COLUMN_GROUP) {
@@ -18963,7 +19044,8 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 			ctx.sectionBreakConfigCache.set(sectionNode.endIndex, sectionBreakConfig);
 			if (sectionType === _univerjs_core.SectionType.CONTINUOUS && curSkeletonPage != null) {
 				updateBlockIndex(allSkeletonPages, -1, ctx.docsConfig.documentCompatibilityPolicy);
-				this._addNewSectionByContinuous(curSkeletonPage, columnProperties, columnSeparatorType);
+				if (layoutAnchor != null && layoutAnchor >= sectionNode.startIndex && layoutAnchor <= sectionNode.endIndex) this._restoreContinuousSection(curSkeletonPage, columnProperties, columnSeparatorType);
+				else this._addNewSectionByContinuous(curSkeletonPage, columnProperties, columnSeparatorType);
 				isContinuous = true;
 			} else if (layoutAnchor == null || curSkeletonPage == null) {
 				var _curSkeletonPage$page;
@@ -19005,6 +19087,19 @@ var DocumentSkeleton = class DocumentSkeleton extends _univerjs_core.Skeleton {
 		newSection.parent = curSkeletonPage;
 		sections.push(newSection);
 	}
+	_restoreContinuousSection(curSkeletonPage, columnProperties, columnSeparatorType) {
+		const section = curSkeletonPage.sections[curSkeletonPage.sections.length - 1];
+		if (section == null) return;
+		const pageContentWidth = curSkeletonPage.pageWidth - curSkeletonPage.marginLeft - curSkeletonPage.marginRight;
+		const pageContentHeight = curSkeletonPage.pageHeight - curSkeletonPage.marginTop - curSkeletonPage.marginBottom;
+		const restoredSection = createSkeletonSection(columnProperties, columnSeparatorType, section.top, 0, pageContentWidth, pageContentHeight - section.top);
+		for (const column of restoredSection.columns.slice(section.columns.length)) {
+			column.parent = section;
+			section.columns.push(column);
+		}
+		section.colCount = restoredSection.colCount;
+		section.height = restoredSection.height;
+	}
 	_findNodeByIndex(charIndex, segmentId = "", segmentPageIndex = -1) {
 		const skeletonData = this.getSkeletonData();
 		if (skeletonData == null) return;
@@ -24192,6 +24287,7 @@ var Documents = class Documents extends DocComponent {
 			this._startRotation(ctx, finalAngle);
 			for (const section of sections) {
 				const { columns } = section;
+				this._drawLiquid.translateSave();
 				this._drawLiquid.translateSection(section);
 				for (const column of columns) {
 					const { lines, width: columnWidth } = column;
@@ -24234,7 +24330,7 @@ var Documents = class Documents extends DocComponent {
 							this._drawLiquid.translateSave();
 							this._drawLiquid.translateLine(line, true, true);
 							rotateTranslateXListApply && this._drawLiquid.translate(rotateTranslateXListApply[i]);
-							this._drawLineBackground(ctx, page, line);
+							this._drawLineBackground(ctx, page, line, column.width);
 							const divideLength = divides.length;
 							for (let i = 0; i < divideLength; i++) {
 								const divide = divides[i];
@@ -24263,12 +24359,13 @@ var Documents = class Documents extends DocComponent {
 								}
 								this._drawLiquid.translateRestore();
 							}
-							if (line.borderBottom) this._drawBorderBottom(ctx, page, line);
+							if (line.borderBottom) this._drawBorderBottom(ctx, page, line, column.width);
 							this._drawLiquid.translateRestore();
 						}
 					}
 					this._drawLiquid.translateRestore();
 				}
+				this._drawLiquid.translateRestore();
 			}
 			if (skeColumnGroups.size > 0) this._drawColumnGroups(ctx, page, skeColumnGroups, extensions, backgroundExtension, glyphExtensionsExcludeBackground, alignOffsetNoAngle, centerAngle, vertexAngle, renderConfig, parentScale);
 			this._resetRotation(ctx, finalAngle);
@@ -24401,30 +24498,30 @@ var Documents = class Documents extends DocComponent {
 		const skeleton = this.getSkeleton();
 		return getDocumentCompatibilityPolicy(skeleton === null || skeleton === void 0 || (_skeleton$getViewMode2 = skeleton.getViewModel) === null || _skeleton$getViewMode2 === void 0 || (_skeleton$getViewMode2 = _skeleton$getViewMode2.call(skeleton)) === null || _skeleton$getViewMode2 === void 0 || (_skeleton$getViewMode3 = _skeleton$getViewMode2.getSnapshot) === null || _skeleton$getViewMode3 === void 0 || (_skeleton$getViewMode3 = _skeleton$getViewMode3.call(_skeleton$getViewMode2)) === null || _skeleton$getViewMode3 === void 0 || (_skeleton$getViewMode3 = _skeleton$getViewMode3.documentStyle) === null || _skeleton$getViewMode3 === void 0 ? void 0 : _skeleton$getViewMode3.documentFlavor);
 	}
-	_drawLineBackground(ctx, page, line, left = 0, top = 0) {
+	_drawLineBackground(ctx, page, line, width = page.pageWidth - page.marginLeft - page.marginRight, left = 0, top = 0) {
 		var _line$backgroundColor;
 		const color = (_line$backgroundColor = line.backgroundColor) === null || _line$backgroundColor === void 0 ? void 0 : _line$backgroundColor.rgb;
 		if (!color || this._drawLiquid == null) return;
 		let { x, y } = this._drawLiquid;
-		const { pageWidth, marginLeft, marginRight, marginTop } = page;
+		const { marginLeft, marginTop } = page;
 		x += marginLeft + (left !== null && left !== void 0 ? left : 0);
 		y -= line.marginTop;
 		y -= line.paddingTop;
 		y += marginTop + top;
 		ctx.save();
 		ctx.fillStyle = color;
-		fillRectByPrecisionBounds(ctx, x, y, pageWidth - marginLeft - marginRight, line.lineHeight);
+		fillRectByPrecisionBounds(ctx, x, y, width, line.lineHeight);
 		ctx.restore();
 	}
-	_drawBorderBottom(ctx, page, line, left = 0, top = 0) {
+	_drawBorderBottom(ctx, page, line, width = page.pageWidth - page.marginLeft - page.marginRight, left = 0, top = 0) {
 		var _line$borderBottom$pa, _line$borderBottom, _border$width, _border$color$rgb;
 		if (this._drawLiquid == null) return;
 		let { x, y } = this._drawLiquid;
-		const { pageWidth, marginLeft, marginRight, marginTop } = page;
+		const { marginLeft, marginTop } = page;
 		x += marginLeft + (left !== null && left !== void 0 ? left : 0);
 		y -= line.marginTop;
 		y -= line.paddingTop;
-		y += marginTop + top + line.lineHeight + ((_line$borderBottom$pa = (_line$borderBottom = line.borderBottom) === null || _line$borderBottom === void 0 ? void 0 : _line$borderBottom.padding) !== null && _line$borderBottom$pa !== void 0 ? _line$borderBottom$pa : 0);
+		y += marginTop + top + line.lineHeight - line.marginBottom + ((_line$borderBottom$pa = (_line$borderBottom = line.borderBottom) === null || _line$borderBottom === void 0 ? void 0 : _line$borderBottom.padding) !== null && _line$borderBottom$pa !== void 0 ? _line$borderBottom$pa : 0);
 		ctx.save();
 		const border = line.borderBottom;
 		ctx.setLineWidthByPrecision(Math.max(0, (_border$width = border === null || border === void 0 ? void 0 : border.width) !== null && _border$width !== void 0 ? _border$width : 1));
@@ -24433,7 +24530,7 @@ var Documents = class Documents extends DocComponent {
 		drawLineByBorderType(ctx, "b", 0, {
 			startX: x,
 			startY: y,
-			endX: x + pageWidth - marginLeft - marginRight,
+			endX: x + width,
 			endY: y
 		});
 		ctx.restore();
@@ -24506,7 +24603,7 @@ var Documents = class Documents extends DocComponent {
 					} else {
 						this._drawLiquid.translateSave();
 						this._drawLiquid.translateLine(line, true, true);
-						this._drawLineBackground(ctx, nestedPage, line);
+						this._drawLineBackground(ctx, nestedPage, line, column.width);
 						const divideLength = divides.length;
 						for (let i = 0; i < divideLength; i++) {
 							const divide = divides[i];
@@ -24535,7 +24632,7 @@ var Documents = class Documents extends DocComponent {
 							}
 							this._drawLiquid.translateRestore();
 						}
-						if (line.borderBottom) this._drawBorderBottom(ctx, nestedPage, line, parentPage.marginLeft, parentPage.marginTop);
+						if (line.borderBottom) this._drawBorderBottom(ctx, nestedPage, line, column.width, parentPage.marginLeft, parentPage.marginTop);
 						this._drawLiquid.translateRestore();
 					}
 				}
@@ -24657,7 +24754,7 @@ var Documents = class Documents extends DocComponent {
 								continue;
 							}
 						}
-						this._drawLineBackground(ctx, page, line, parentPage.marginLeft);
+						this._drawLineBackground(ctx, page, line, column.width, parentPage.marginLeft);
 						const divideLength = divides.length;
 						for (let i = 0; i < divideLength; i++) {
 							const divide = divides[i];
@@ -24686,7 +24783,7 @@ var Documents = class Documents extends DocComponent {
 							}
 							this._drawLiquid.translateRestore();
 						}
-						if (line.borderBottom) this._drawBorderBottom(ctx, page, line, parentPage.marginLeft);
+						if (line.borderBottom) this._drawBorderBottom(ctx, page, line, column.width, parentPage.marginLeft);
 						this._drawLiquid.translateRestore();
 					}
 				}
@@ -27602,7 +27699,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.7";
 
 //#endregion
 //#region src/config/config.ts
@@ -29001,14 +29098,15 @@ var Transformer = class extends _univerjs_core.Disposable {
 	}
 	_createRotateIcon(applyObject, zIndex, left, top) {
 		const { rotateSize, rotateIconStroke, rotateIconStrokeWidth, borderStroke } = this._getConfig(applyObject);
-		const iconOffset = (rotateSize - ROTATE_ICON_SIZE) / 2;
+		const iconSize = Math.min(ROTATE_ICON_SIZE, Math.max(rotateSize - 4, 1));
+		const iconOffset = (rotateSize - iconSize) / 2;
 		return new TransformerRotateIcon(`__SpreadsheetTransformerRotate___ICON_${zIndex}`, {
 			zIndex,
 			evented: false,
 			left: left + iconOffset,
 			top: top + iconOffset,
-			width: ROTATE_ICON_SIZE,
-			height: ROTATE_ICON_SIZE,
+			width: iconSize,
+			height: iconSize,
 			fill: null,
 			stroke: rotateIconStroke !== null && rotateIconStroke !== void 0 ? rotateIconStroke : borderStroke,
 			strokeWidth: rotateIconStrokeWidth,
@@ -29424,7 +29522,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 					height: rotateAnchorOffset,
 					width: 1,
 					strokeWidth: borderStrokeWidth,
-					stroke: borderStroke
+					stroke: rotateStroke !== null && rotateStroke !== void 0 ? rotateStroke : borderStroke
 				});
 				const { left: rotateLeft, top: rotateTop } = this._getRotateAnchorPosition("__SpreadsheetTransformerRotate__", height, width, applyObject);
 				const cursor = this._getRotateAnchorCursor("__SpreadsheetTransformerRotate__");