@univerjs/engine-render 1.0.0-alpha.1 → 1.0.0-insiders.20260701-0ef51b0

package/lib/cjs/index.js

@@ -12707,6 +12707,34 @@ var DocumentViewModel = class DocumentViewModel {
 	}
 };
 
+//#endregion
+//#region src/components/docs/custom-block-render-viewport.ts
+let docsCustomBlockRenderViewportProvider = null;
+const docsCustomBlockRenderViewportProviders = /* @__PURE__ */ new Set();
+function setDocsCustomBlockRenderViewportProvider(provider) {
+	if (provider == null) {
+		docsCustomBlockRenderViewportProvider = null;
+		docsCustomBlockRenderViewportProviders.clear();
+		return () => {};
+	}
+	docsCustomBlockRenderViewportProvider = provider;
+	docsCustomBlockRenderViewportProviders.add(provider);
+	return () => {
+		var _providers;
+		docsCustomBlockRenderViewportProviders.delete(provider);
+		const providers = Array.from(docsCustomBlockRenderViewportProviders);
+		docsCustomBlockRenderViewportProvider = (_providers = providers[providers.length - 1]) !== null && _providers !== void 0 ? _providers : null;
+	};
+}
+function getDocsCustomBlockRenderViewport(unitId, blockId, input) {
+	const providers = docsCustomBlockRenderViewportProviders.size ? Array.from(docsCustomBlockRenderViewportProviders).reverse() : docsCustomBlockRenderViewportProvider ? [docsCustomBlockRenderViewportProvider] : [];
+	for (const provider of providers) {
+		const viewport = provider(unitId, blockId, input);
+		if (viewport != null) return viewport;
+	}
+	return null;
+}
+
 //#endregion
 //#region src/components/docs/layout/model/glyph.ts
 function isSpace(char) {
@@ -13897,7 +13925,7 @@ function _divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphCo
 				if (anchorDrawings.length > 0) {
 					var _paragraphConfig$para, _paragraphConfig$pDra;
 					const paragraphAnchorLeft = __getParagraphAnchorLeft(sectionBreakConfig, paragraphConfig, (_paragraphConfig$para = paragraphConfig.paragraphStyle) === null || _paragraphConfig$para === void 0 ? void 0 : _paragraphConfig$para.indentStart);
-					const drawings = __getDrawingPosition(currentLine.top, currentLine.lineHeight, currentLine.parent, true, (_paragraphConfig$pDra = paragraphConfig.pDrawingAnchor) === null || _paragraphConfig$pDra === void 0 || (_paragraphConfig$pDra = _paragraphConfig$pDra.get(paragraphConfig.paragraphIndex)) === null || _paragraphConfig$pDra === void 0 ? void 0 : _paragraphConfig$pDra.top, anchorDrawings, paragraphAnchorLeft);
+					const drawings = __getDrawingPosition(ctx, currentLine.top, currentLine.lineHeight, currentLine.parent, true, (_paragraphConfig$pDra = paragraphConfig.pDrawingAnchor) === null || _paragraphConfig$pDra === void 0 || (_paragraphConfig$pDra = _paragraphConfig$pDra.get(paragraphConfig.paragraphIndex)) === null || _paragraphConfig$pDra === void 0 ? void 0 : _paragraphConfig$pDra.top, anchorDrawings, paragraphAnchorLeft, false);
 					__updateDrawingPosition(currentLine.parent, drawings);
 					addGlyphToDivide(divide, glyphGroup, preOffsetLeft);
 					updateDivideInfo(divide, { breakType: breakPointType });
@@ -13997,6 +14025,7 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 		}
 	}
 	let deferredInlineGroupAnchorDrawings = [];
+	let deferredTopBottomAnchorDrawings = [];
 	if (paragraphNonInlineSkeDrawings != null && paragraphNonInlineSkeDrawings.size > 0) {
 		var _pDrawingAnchor$get;
 		let targetDrawings = [...paragraphNonInlineSkeDrawings.values()].filter((drawing) => drawing.drawingOrigin.docTransform.positionV.relativeFrom !== _univerjs_core.ObjectRelativeFromV.LINE);
@@ -14004,13 +14033,17 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 			deferredInlineGroupAnchorDrawings = targetDrawings.filter((drawing) => glyphGroupCustomBlockIds.has(drawing.drawingId) && drawing.drawingOrigin.docTransform.positionV.relativeFrom === _univerjs_core.ObjectRelativeFromV.LINE);
 			targetDrawings = targetDrawings.filter((drawing) => !deferredInlineGroupAnchorDrawings.includes(drawing));
 		}
-		__updateAndPositionDrawings(ctx, lineTop, lineHeight, column, targetDrawings, paragraphConfig.paragraphIndex, isParagraphFirstShapedText, pDrawingAnchor === null || pDrawingAnchor === void 0 || (_pDrawingAnchor$get = pDrawingAnchor.get(paragraphIndex)) === null || _pDrawingAnchor$get === void 0 ? void 0 : _pDrawingAnchor$get.top, paragraphAnchorLeft);
+		deferredTopBottomAnchorDrawings = targetDrawings.filter((drawing) => glyphGroupCustomBlockIds.has(drawing.drawingId) && drawing.drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM);
+		targetDrawings = targetDrawings.filter((drawing) => drawing.drawingOrigin.layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM);
+		__updateAndPositionDrawings(ctx, lineTop, lineHeight, column, targetDrawings, paragraphConfig.paragraphIndex, isParagraphFirstShapedText, pDrawingAnchor === null || pDrawingAnchor === void 0 || (_pDrawingAnchor$get = pDrawingAnchor.get(paragraphIndex)) === null || _pDrawingAnchor$get === void 0 ? void 0 : _pDrawingAnchor$get.top, paragraphAnchorLeft, false, deferredTopBottomAnchorDrawings.length > 0);
 	}
 	if (skeTablesInParagraph != null && skeTablesInParagraph.length > 0) {
 		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 newLineTop = positionedCustomBlockOnly ? lineTop : calculateLineTopByDrawings(lineHeight, lineTop, lastPage, headerPage, footerPage);
+	const calculatedLineTop = positionedCustomBlockOnly ? lineTop : calculateLineTopByDrawings(lineHeight, lineTop, lastPage, headerPage, footerPage);
+	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);
@@ -14044,16 +14077,21 @@ function _lineOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConf
 	}, column.width, lineIndex, isParagraphFirstShapedText, paragraphConfig, lastPage, headerPage, footerPage);
 	column.lines.push(newLine);
 	newLine.parent = column;
-	createAndUpdateBlockAnchor(paragraphIndex, newLine, lineTop, pDrawingAnchor);
+	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);
+	}
 	_divideOperator(ctx, glyphGroup, pages, sectionBreakConfig, paragraphConfig, isParagraphFirstShapedText, breakPointType, defaultGlyphLineHeight);
 	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);
 	}
 }
-function __updateAndPositionDrawings(ctx, lineTop, lineHeight, column, targetDrawings, paragraphIndex, isParagraphFirstShapedText, drawingAnchorTop, drawingAnchorLeft = 0, skipRelayoutCheck = false) {
+function __updateAndPositionDrawings(ctx, lineTop, lineHeight, column, targetDrawings, paragraphIndex, isParagraphFirstShapedText, drawingAnchorTop, drawingAnchorLeft = 0, skipRelayoutCheck = false, overwriteTopBottomPosition = false) {
 	if (targetDrawings.length === 0) return;
-	const drawings = __getDrawingPosition(lineTop, lineHeight, column, isParagraphFirstShapedText, drawingAnchorTop, targetDrawings, drawingAnchorLeft);
+	const drawings = __getDrawingPosition(ctx, lineTop, lineHeight, column, isParagraphFirstShapedText, drawingAnchorTop, targetDrawings, drawingAnchorLeft);
 	if (drawings == null || drawings.size === 0) return;
 	const floatObjects = [...drawings.values()].filter((drawing) => {
 		const layoutType = drawing.drawingOrigin.layoutType;
@@ -14075,7 +14113,7 @@ function __updateAndPositionDrawings(ctx, lineTop, lineHeight, column, targetDra
 		};
 	});
 	if (!skipRelayoutCheck) _reLayoutCheck(ctx, floatObjects, column, paragraphIndex);
-	__updateDrawingPosition(column, drawings);
+	__updateDrawingPosition(column, drawings, overwriteTopBottomPosition);
 }
 function __updateWrapTablePosition(ctx, table, lineTop, lineHeight, column, paragraphIndex, drawingAnchorTop) {
 	const wrapTablePosition = __getWrapTablePosition(table, column, lineTop, lineHeight, drawingAnchorTop);
@@ -14186,6 +14224,15 @@ 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) {
+	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);
+		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;
 }
@@ -14417,7 +14464,7 @@ function getLineHeightMetrics(glyphLineHeight, paragraphLineGapDefault, linePitc
 		lineSpacingApply: exactLineSpacingApply
 	};
 }
-function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, blockAnchorTop, paragraphNonInlineSkeDrawings) {
+function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, unitId = "", blockAnchorTop, paragraphNonInlineSkeDrawings) {
 	var _line$parent, _section$top;
 	const column = line.parent;
 	const section = column === null || column === void 0 ? void 0 : column.parent;
@@ -14429,6 +14476,7 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, blockAnch
 	const sectionTop = (_section$top = section === null || section === void 0 ? void 0 : section.top) !== null && _section$top !== void 0 ? _section$top : 0;
 	const lineTop = sectionTop + top;
 	for (const divide of line.divides) for (const glyph of divide.glyphGroup) if (glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK && glyph.width !== 0) {
+		var _viewport$width, _viewport$height, _viewport$offsetLeft;
 		const { drawingId } = glyph;
 		if (drawingId == null) continue;
 		const drawing = paragraphInlineSkeDrawings === null || paragraphInlineSkeDrawings === void 0 ? void 0 : paragraphInlineSkeDrawings.get(drawingId);
@@ -14438,7 +14486,19 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, blockAnch
 		const { size, angle } = docTransform;
 		const { width = 0, height = 0 } = size;
 		const glyphHeight = glyph.bBox.bd + glyph.bBox.ba;
-		drawing.aLeft = column.left + divide.left + divide.paddingLeft + glyph.left + .5 * glyph.width - .5 * width || 0;
+		const glyphLeft = divide.left + divide.paddingLeft + glyph.left;
+		const blockLeft = column.left + glyphLeft;
+		const viewport = getDocsCustomBlockRenderViewport(unitId, drawingId, {
+			blockLeft,
+			fallbackHeight: height,
+			fallbackWidth: width,
+			pageMarginLeft: page.marginLeft,
+			pageMarginRight: page.marginRight,
+			pageWidth: page.pageWidth
+		});
+		const drawingWidth = (_viewport$width = viewport === null || viewport === void 0 ? void 0 : viewport.width) !== null && _viewport$width !== void 0 ? _viewport$width : width;
+		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 : []) {
@@ -14448,17 +14508,25 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, blockAnch
 				const lineBottom = lineTop + lineHeight;
 				if (positionedDrawing.aTop >= lineBottom || positionedBottom <= lineTop) continue;
 				const positionedRight = positionedDrawing.aLeft + positionedDrawing.width;
-				const drawingRight = drawing.aLeft + width;
+				const drawingRight = drawing.aLeft + drawingWidth;
 				if (positionedDrawing.aLeft < drawingRight && positionedRight > drawing.aLeft) {
 					var _positionedOrigin$dis;
 					drawing.aLeft = Math.max(drawing.aLeft, positionedDrawing.aLeft + positionedDrawing.width + ((_positionedOrigin$dis = positionedOrigin.distR) !== null && _positionedOrigin$dis !== void 0 ? _positionedOrigin$dis : 0));
 				}
 			}
 		}
-		drawing.aTop = lineTop + lineHeight - .5 * glyphHeight - .5 * height - marginBottom;
-		drawing.width = width;
-		drawing.height = height;
+		drawing.width = drawingWidth;
+		drawing.height = drawingHeight;
+		drawing.aTop = lineTop + lineHeight - .5 * glyphHeight - .5 * drawingHeight - marginBottom;
 		drawing.angle = angle;
+		drawing.customBlockRenderViewport = viewport ? {
+			bleedLeft: viewport.bleedLeft,
+			bleedWidth: viewport.bleedWidth,
+			contentHeight: viewport.contentHeight,
+			contentWidth: viewport.contentWidth,
+			height: viewport.height,
+			viewportHeight: viewport.viewportHeight
+		} : void 0;
 		drawing.isPageBreak = isPageBreak;
 		drawing.lineTop = lineTop;
 		drawing.columnLeft = column.left;
@@ -14468,7 +14536,7 @@ function updateInlineDrawingPosition(line, paragraphInlineSkeDrawings, blockAnch
 	}
 	page.skeDrawings = new Map([...page.skeDrawings, ...drawings]);
 }
-function __getDrawingPosition(lineTop, lineHeight, column, isParagraphFirstShapedText, blockAnchorTop, needPositionDrawings = [], blockAnchorLeft = 0) {
+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;
 	if (page == null || needPositionDrawings.length === 0) return;
@@ -14476,22 +14544,42 @@ function __getDrawingPosition(lineTop, lineHeight, column, isParagraphFirstShape
 	const isPageBreak = __checkPageBreak(column);
 	if (isPageBreak && !isParagraphFirstShapedText) return;
 	for (const drawing of needPositionDrawings) {
-		var _getPositionHorizon2, _getPositionVertical2;
+		var _ctx$dataModel$getUni, _ctx$dataModel$getUni2, _ctx$dataModel, _viewport$width2, _viewport$height2, _getPositionHorizon2, _getPositionVertical2;
 		const { drawingOrigin } = drawing;
 		if (!drawingOrigin) continue;
 		const { docTransform } = drawingOrigin;
 		const { positionH, positionV, size, angle } = docTransform;
-		const { width = 0, height = 0 } = size;
-		let aLeft = (_getPositionHorizon2 = getPositionHorizon(positionH, column, page, width, isPageBreak)) !== null && _getPositionHorizon2 !== void 0 ? _getPositionHorizon2 : 0;
+		const { width, height } = size;
+		const fallbackWidth = width !== null && width !== void 0 ? width : 0;
+		const fallbackHeight = height !== null && height !== void 0 ? height : 0;
+		const viewport = drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM ? getDocsCustomBlockRenderViewport((_ctx$dataModel$getUni = (_ctx$dataModel$getUni2 = (_ctx$dataModel = ctx.dataModel).getUnitId) === null || _ctx$dataModel$getUni2 === void 0 ? void 0 : _ctx$dataModel$getUni2.call(_ctx$dataModel)) !== null && _ctx$dataModel$getUni !== void 0 ? _ctx$dataModel$getUni : "", drawing.drawingId, {
+			fallbackHeight,
+			fallbackWidth,
+			pageMarginLeft: page.marginLeft,
+			pageMarginRight: page.marginRight,
+			pageWidth: page.pageWidth
+		}) : null;
+		const drawingWidth = (_viewport$width2 = viewport === null || viewport === void 0 ? void 0 : viewport.width) !== null && _viewport$width2 !== void 0 ? _viewport$width2 : fallbackWidth;
+		const drawingHeight = (_viewport$height2 = viewport === null || viewport === void 0 ? void 0 : viewport.height) !== null && _viewport$height2 !== void 0 ? _viewport$height2 : fallbackHeight;
+		let aLeft = (_getPositionHorizon2 = getPositionHorizon(positionH, column, page, drawingWidth, isPageBreak)) !== null && _getPositionHorizon2 !== void 0 ? _getPositionHorizon2 : 0;
 		if (positionH.relativeFrom === _univerjs_core.ObjectRelativeFromH.COLUMN && blockAnchorLeft > 0) {
 			const renderedColumnOrigin = isPageBreak ? 0 : column.left || page.marginLeft;
 			aLeft += blockAnchorLeft - renderedColumnOrigin;
+			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, height, blockAnchorTop, isPageBreak)) !== null && _getPositionVertical2 !== void 0 ? _getPositionVertical2 : 0;
-		drawing.width = width;
-		drawing.height = height;
+		drawing.aTop = (_getPositionVertical2 = getPositionVertical(positionV, page, lineTop, lineHeight, drawingHeight, blockAnchorTop, isPageBreak)) !== null && _getPositionVertical2 !== void 0 ? _getPositionVertical2 : 0;
+		drawing.width = drawingWidth;
+		drawing.height = drawingHeight;
 		drawing.angle = angle;
+		drawing.customBlockRenderViewport = viewport ? {
+			bleedLeft: viewport.bleedLeft,
+			bleedWidth: viewport.bleedWidth,
+			contentHeight: viewport.contentHeight,
+			contentWidth: viewport.contentWidth,
+			height: viewport.height,
+			viewportHeight: viewport.viewportHeight
+		} : void 0;
 		drawing.initialState = true;
 		drawing.columnLeft = column.left;
 		drawing.lineTop = lineTop;
@@ -14502,16 +14590,18 @@ function __getDrawingPosition(lineTop, lineHeight, column, isParagraphFirstShape
 	}
 	return drawings;
 }
-function __updateDrawingPosition(column, 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;
 	if (drawings == null || drawings.size === 0 || page == null) return;
 	for (const drawing of drawings.values()) {
 		const originDrawing = page.skeDrawings.get(drawing.drawingId);
-		if (originDrawing) if (originDrawing.drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) {
+		if (originDrawing) if (originDrawing.drawingOrigin.layoutType === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM) if (overwriteTopBottomPosition) page.skeDrawings.set(drawing.drawingId, drawing);
+		else {
 			const lowerDrawing = originDrawing.aTop > drawing.aTop ? originDrawing : drawing;
 			page.skeDrawings.set(drawing.drawingId, lowerDrawing);
-		} else page.skeDrawings.set(drawing.drawingId, drawing);
+		}
+		else page.skeDrawings.set(drawing.drawingId, drawing);
 		else page.skeDrawings.set(drawing.drawingId, drawing);
 	}
 }
@@ -14840,7 +14930,10 @@ function updateInlineDrawingCoordsAndBorder(ctx, pages) {
 		const affectInlineDrawings = paragraphConfig === null || paragraphConfig === void 0 ? void 0 : paragraphConfig.paragraphInlineSkeDrawings;
 		const affectNonInlineDrawings = paragraphConfig === null || paragraphConfig === void 0 ? void 0 : paragraphConfig.paragraphNonInlineSkeDrawings;
 		const drawingAnchor = (_ctx$skeletonResource = ctx.skeletonResourceReference) === null || _ctx$skeletonResource === void 0 || (_ctx$skeletonResource = _ctx$skeletonResource.drawingAnchor) === null || _ctx$skeletonResource === void 0 || (_ctx$skeletonResource = _ctx$skeletonResource.get(segmentId)) === null || _ctx$skeletonResource === void 0 ? void 0 : _ctx$skeletonResource.get(line.paragraphIndex);
-		if (affectInlineDrawings && affectInlineDrawings.size > 0) updateInlineDrawingPosition(line, affectInlineDrawings, drawingAnchor === null || drawingAnchor === void 0 ? void 0 : drawingAnchor.top, affectNonInlineDrawings);
+		if (affectInlineDrawings && affectInlineDrawings.size > 0) {
+			var _ctx$dataModel$getUni, _ctx$dataModel$getUni2, _ctx$dataModel;
+			updateInlineDrawingPosition(line, affectInlineDrawings, (_ctx$dataModel$getUni = (_ctx$dataModel$getUni2 = (_ctx$dataModel = ctx.dataModel).getUnitId) === null || _ctx$dataModel$getUni2 === void 0 ? void 0 : _ctx$dataModel$getUni2.call(_ctx$dataModel)) !== null && _ctx$dataModel$getUni !== void 0 ? _ctx$dataModel$getUni : "", drawingAnchor === null || drawingAnchor === void 0 ? void 0 : drawingAnchor.top, affectNonInlineDrawings);
+		}
 		const paragraphStyle = paragraphConfig === null || paragraphConfig === void 0 ? void 0 : paragraphConfig.paragraphStyle;
 		const paragraphBackgroundColor = paragraphStyle === null || paragraphStyle === void 0 || (_paragraphStyle$shadi = paragraphStyle.shading) === null || _paragraphStyle$shadi === void 0 ? void 0 : _paragraphStyle$shadi.backgroundColor;
 		if (paragraphBackgroundColor) line.backgroundColor = paragraphBackgroundColor;
@@ -16169,22 +16262,66 @@ function _isDocxColumnBreakVisuallyBlankColumn(column) {
 function _hasOnlyCustomBlockGlyphs(glyphs) {
 	return glyphs.length > 0 && glyphs.every((glyph) => glyph.streamType === _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK);
 }
-function _mergeAdjacentCustomBlockShapedTexts(shapedTextList) {
+function _mergeAdjacentCustomBlockShapedTexts(shapedTextList, customBlockDrawings) {
 	const mergedShapedTextList = [];
-	for (const shapedText of shapedTextList) {
-		const lastShapedText = mergedShapedTextList[mergedShapedTextList.length - 1];
-		if (lastShapedText && _hasOnlyCustomBlockGlyphs(lastShapedText.glyphs) && _hasOnlyCustomBlockGlyphs(shapedText.glyphs)) {
-			lastShapedText.text += shapedText.text;
-			lastShapedText.glyphs.push(...shapedText.glyphs);
-			lastShapedText.breakPointType = shapedText.breakPointType;
-			continue;
+	for (const originShapedText of shapedTextList) {
+		const splitShapedTexts = _splitTopBottomCustomBlockShapedText(originShapedText, customBlockDrawings);
+		for (const shapedText of splitShapedTexts) {
+			const lastShapedText = mergedShapedTextList[mergedShapedTextList.length - 1];
+			if (lastShapedText && _hasOnlyCustomBlockGlyphs(lastShapedText.glyphs) && _hasOnlyCustomBlockGlyphs(shapedText.glyphs) && !_hasTopBottomCustomBlockGlyph(lastShapedText.glyphs, customBlockDrawings) && !_hasTopBottomCustomBlockGlyph(shapedText.glyphs, customBlockDrawings)) {
+				lastShapedText.text += shapedText.text;
+				lastShapedText.glyphs.push(...shapedText.glyphs);
+				lastShapedText.breakPointType = shapedText.breakPointType;
+				continue;
+			}
+			mergedShapedTextList.push({
+				...shapedText,
+				glyphs: [...shapedText.glyphs]
+			});
 		}
-		mergedShapedTextList.push({
+	}
+	return mergedShapedTextList;
+}
+function _splitTopBottomCustomBlockShapedText(shapedText, customBlockDrawings) {
+	const splitShapedTexts = [];
+	let pendingGlyphs = [];
+	let pendingText = "";
+	let textOffset = 0;
+	const flushPending = () => {
+		if (pendingGlyphs.length === 0) return;
+		splitShapedTexts.push({
 			...shapedText,
-			glyphs: [...shapedText.glyphs]
+			text: pendingText,
+			glyphs: pendingGlyphs
 		});
+		pendingGlyphs = [];
+		pendingText = "";
+	};
+	for (const glyph of shapedText.glyphs) {
+		const glyphText = shapedText.text.slice(textOffset, textOffset + glyph.count);
+		textOffset += glyph.count;
+		if (_isTopBottomCustomBlockGlyph(glyph, customBlockDrawings)) {
+			flushPending();
+			splitShapedTexts.push({
+				...shapedText,
+				text: glyphText,
+				glyphs: [glyph]
+			});
+			continue;
+		}
+		pendingGlyphs.push(glyph);
+		pendingText += glyphText;
 	}
-	return mergedShapedTextList;
+	flushPending();
+	return splitShapedTexts.length > 0 ? splitShapedTexts : [shapedText];
+}
+function _hasTopBottomCustomBlockGlyph(glyphs, customBlockDrawings) {
+	return glyphs.some((glyph) => _isTopBottomCustomBlockGlyph(glyph, customBlockDrawings));
+}
+function _isTopBottomCustomBlockGlyph(glyph, customBlockDrawings) {
+	var _customBlockDrawings$;
+	if (glyph.streamType !== _univerjs_core.DataStreamTreeTokenType.CUSTOM_BLOCK || glyph.drawingId == null) return false;
+	return ((_customBlockDrawings$ = customBlockDrawings.get(glyph.drawingId)) === null || _customBlockDrawings$ === void 0 ? void 0 : _customBlockDrawings$.drawingOrigin.layoutType) === _univerjs_core.PositionedObjectLayoutType.WRAP_TOP_AND_BOTTOM;
 }
 function _getListLevelAncestors(bullet, listLevel) {
 	if (!bullet || !listLevel) return;
@@ -16367,7 +16504,7 @@ function lineBreaking(ctx, viewModel, shapedTextList, curPage, paragraphNode, se
 	let allPages = [curPage];
 	let isParagraphFirstShapedText = true;
 	let shapedTextOffset = 0;
-	for (const [_index, { text, glyphs, breakPointType }] of _mergeAdjacentCustomBlockShapedTexts(shapedTextList).entries()) {
+	for (const [_index, { text, glyphs, breakPointType }] of _mergeAdjacentCustomBlockShapedTexts(shapedTextList, paragraphNonInlineSkeDrawingsByBlockId).entries()) {
 		const textStartIndex = paragraphNode.startIndex + shapedTextOffset;
 		const textGlyphCount = _glyphCount(glyphs);
 		const textEndIndex = textStartIndex + textGlyphCount;
@@ -17061,10 +17198,15 @@ function shaping(ctx, content, viewModel, paragraphNode, sectionBreakConfig, use
 						const { blockId } = customBlock;
 						const drawingOrigin = drawings[blockId];
 						if ((drawingOrigin === null || drawingOrigin === void 0 ? void 0 : drawingOrigin.layoutType) === _univerjs_core.PositionedObjectLayoutType.INLINE) {
+							var _viewModel$getDataMod, _viewModel$getDataMod2, _viewModel$getDataMod3, _boundingBox$height, _boundingBox$width, _ref, _viewport$layoutWidth, _viewport$height;
 							const { angle } = drawingOrigin.docTransform;
 							const { width = 0, height = 0 } = drawingOrigin.docTransform.size;
 							const boundingBox = getBoundingBox(angle, 0, width, 0, height);
-							newGlyph = createSkeletonCustomBlockGlyph(config, boundingBox.width, boundingBox.height, drawingOrigin.drawingId);
+							const viewport = getDocsCustomBlockRenderViewport((_viewModel$getDataMod = (_viewModel$getDataMod2 = (_viewModel$getDataMod3 = viewModel.getDataModel()).getUnitId) === null || _viewModel$getDataMod2 === void 0 ? void 0 : _viewModel$getDataMod2.call(_viewModel$getDataMod3)) !== null && _viewModel$getDataMod !== void 0 ? _viewModel$getDataMod : "", drawingOrigin.drawingId, {
+								fallbackHeight: (_boundingBox$height = boundingBox.height) !== null && _boundingBox$height !== void 0 ? _boundingBox$height : 0,
+								fallbackWidth: (_boundingBox$width = boundingBox.width) !== null && _boundingBox$width !== void 0 ? _boundingBox$width : 0
+							});
+							newGlyph = createSkeletonCustomBlockGlyph(config, (_ref = (_viewport$layoutWidth = viewport === null || viewport === void 0 ? void 0 : viewport.layoutWidth) !== null && _viewport$layoutWidth !== void 0 ? _viewport$layoutWidth : viewport === null || viewport === void 0 ? void 0 : viewport.width) !== null && _ref !== void 0 ? _ref : boundingBox.width, (_viewport$height = viewport === null || viewport === void 0 ? void 0 : viewport.height) !== null && _viewport$height !== void 0 ? _viewport$height : boundingBox.height, drawingOrigin.drawingId);
 						} else if (drawingOrigin != null) newGlyph = createSkeletonCustomBlockGlyph(config, 0, 0, drawingOrigin.drawingId);
 					}
 					if (newGlyph == null) newGlyph = createSkeletonLetterGlyph(char, config);
@@ -26555,7 +26697,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "1.0.0-alpha.1";
+var version = "1.0.0-insiders.20260701-0ef51b0";
 
 //#endregion
 //#region src/config/config.ts
@@ -27909,8 +28051,8 @@ var Transformer = class extends _univerjs_core.Disposable {
 	}
 	_getOutlinePosition(width, height, borderSpacing, borderStrokeWidth) {
 		return {
-			left: borderSpacing - borderStrokeWidth,
-			top: -borderSpacing - this.borderStrokeWidth,
+			left: -borderSpacing - borderStrokeWidth,
+			top: -borderSpacing - borderStrokeWidth,
 			width: width + borderSpacing * 2,
 			height: height + borderSpacing * 2
 		};
@@ -27986,7 +28128,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 				top += -borderSpacing - borderStrokeWidth;
 				break;
 			case "__SpreadsheetTransformerResizeLM__":
-				left += borderSpacing - borderStrokeWidth;
+				left += -borderSpacing - borderStrokeWidth;
 				top += height / 2 - longEdge / 2;
 				break;
 			case "__SpreadsheetTransformerResizeRM__":
@@ -27994,7 +28136,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 				top += height / 2 - longEdge / 2;
 				break;
 			case "__SpreadsheetTransformerResizeLB__":
-				left += -this.borderSpacing - borderStrokeWidth;
+				left += -borderSpacing - borderStrokeWidth;
 				top += height + borderSpacing - borderStrokeWidth - longEdge;
 				break;
 			case "__SpreadsheetTransformerResizeCB__":
@@ -28038,7 +28180,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 				top += -borderSpacing - borderStrokeWidth;
 				break;
 			case "__SpreadsheetTransformerResizeLM__":
-				left += borderSpacing - borderStrokeWidth;
+				left += -borderSpacing - borderStrokeWidth;
 				top += height / 2;
 				break;
 			case "__SpreadsheetTransformerResizeRM__":
@@ -28046,7 +28188,7 @@ var Transformer = class extends _univerjs_core.Disposable {
 				top += height / 2;
 				break;
 			case "__SpreadsheetTransformerResizeLB__":
-				left += -this.borderSpacing - borderStrokeWidth;
+				left += -borderSpacing - borderStrokeWidth;
 				top += height + borderSpacing - borderStrokeWidth;
 				break;
 			case "__SpreadsheetTransformerResizeCB__":
@@ -29433,10 +29575,11 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 		if (((_init$createUnitOptio = init.createUnitOptions) === null || _init$createUnitOptio === void 0 ? void 0 : _init$createUnitOptio.makeCurrent) === false) this.deactivate();
 	}
 	dispose() {
-		this._injector.dispose();
-		super.dispose();
+		if (this._disposed) return;
 		this._activated$.next(false);
 		this._activated$.complete();
+		super.dispose();
+		this._injector.dispose();
 		this._renderContext.unit = null;
 		this._renderContext.components.clear();
 	}
@@ -29447,7 +29590,10 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 	* Get a dependency from the RenderUnit's injector.
 	*/
 	with(dependency) {
-		return this._injector.get(dependency);
+		return this._injector.get(dependency, _univerjs_core.LookUp.SELF);
+	}
+	getInjector() {
+		return this._injector;
 	}
 	/**
 	* Add render dependencies to the RenderUnit's injector. Note that the dependencies would be initialized immediately
@@ -29458,15 +29604,16 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 	}
 	_initDependencies(dependencies) {
 		const j = this._injector;
-		dependencies.forEach((dep) => {
+		const uniqueDependencies = dedupeRenderDependencies(dependencies);
+		uniqueDependencies.forEach((dep) => {
 			const [identifier, implOrNull] = Array.isArray(dep) ? dep : [dep, null];
 			if (!implOrNull) j.add([identifier, { useFactory: () => j.createInstance(identifier, this._renderContext) }]);
 			else if ((0, _univerjs_core.isClassDependencyItem)(implOrNull)) j.add([identifier, { useFactory: () => j.createInstance(implOrNull.useClass, this._renderContext) }]);
 			else throw new Error("[RenderUnit]: render dependency could only be an class!");
 		});
-		dependencies.forEach((dep) => {
+		uniqueDependencies.forEach((dep) => {
 			const [identifier] = Array.isArray(dep) ? dep : [dep, null];
-			j.get(identifier);
+			j.get(identifier, _univerjs_core.LookUp.SELF);
 		});
 	}
 	getRenderContext() {
@@ -29480,6 +29627,20 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
 	}
 };
 RenderUnit = __decorate([__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector))], RenderUnit);
+function dedupeRenderDependencies(dependencies) {
+	const seen = /* @__PURE__ */ new Set();
+	return dependencies.filter((dependency) => {
+		const key = getRenderDependencyIdentifierKey$1(Array.isArray(dependency) ? dependency[0] : dependency);
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+}
+function getRenderDependencyIdentifierKey$1(identifier) {
+	const decoratorName = identifier === null || identifier === void 0 ? void 0 : identifier.decoratorName;
+	if (typeof decoratorName === "string" && decoratorName) return `identifier:${decoratorName}`;
+	return identifier;
+}
 
 //#endregion
 //#region src/render-manager/render-manager.service.ts
@@ -29520,10 +29681,11 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 	registerRenderModules(type, deps) {
 		if (!this._renderDependencies.has(type)) this._renderDependencies.set(type, []);
 		const dependencies = this._renderDependencies.get(type);
-		dependencies.push(...deps);
-		for (const [_, render] of this._renderMap) if (render.type === type) this._tryAddRenderDependencies(render, deps);
+		const registeredDeps = deps.filter((dep) => !hasRenderDependency(dependencies, dep));
+		dependencies.push(...registeredDeps);
+		for (const [_, render] of this._renderMap) if (render.type === type) this._tryAddRenderDependencies(render, registeredDeps);
 		return (0, _univerjs_core.toDisposable)(() => {
-			deps.forEach((dep) => (0, _univerjs_core.remove)(dependencies, dep));
+			registeredDeps.forEach((dep) => (0, _univerjs_core.remove)(dependencies, dep));
 		});
 	}
 	/**
@@ -29534,6 +29696,7 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 	registerRenderModule(type, depCtor) {
 		if (!this._renderDependencies.has(type)) this._renderDependencies.set(type, []);
 		const dependencies = this._renderDependencies.get(type);
+		if (hasRenderDependency(dependencies, depCtor)) return (0, _univerjs_core.toDisposable)(() => {});
 		dependencies.push(depCtor);
 		for (const [_, render] of this._renderMap) if (render.type === type) this._tryAddRenderDependencies(render, [depCtor]);
 		return (0, _univerjs_core.toDisposable)(() => (0, _univerjs_core.remove)(dependencies, depCtor));
@@ -29566,7 +29729,9 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 	* @returns renderUnit:IRender
 	*/
 	createRender(unitId, createUnitOptions) {
-		const renderer = this._createRender(unitId, this._injector.createInstance(Engine, unitId, void 0), true, createUnitOptions);
+		var _createUnitOptions$re;
+		const parentInjector = (_createUnitOptions$re = createUnitOptions === null || createUnitOptions === void 0 ? void 0 : createUnitOptions.renderParentInjector) !== null && _createUnitOptions$re !== void 0 ? _createUnitOptions$re : this._injector;
+		const renderer = this._createRender(unitId, parentInjector.createInstance(Engine, unitId, void 0), (createUnitOptions === null || createUnitOptions === void 0 ? void 0 : createUnitOptions.embeddedRender) !== true, createUnitOptions, parentInjector);
 		this._renderCreated$.next(renderer);
 		return renderer;
 	}
@@ -29590,7 +29755,7 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 	* @param isMainScene
 	* @returns renderUnit:IRender
 	*/
-	_createRender(unitId, engine, isMainScene = true, createUnitOptions) {
+	_createRender(unitId, engine, isMainScene = true, createUnitOptions, parentInjector = this._injector) {
 		const existItem = this.getRenderById(unitId);
 		let shouldDestroyEngine = true;
 		if (existItem != null) {
@@ -29607,7 +29772,7 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 		if (unit) {
 			const type = this._univerInstanceService.getUnitType(unitId);
 			const ctorOfDeps = this._getRenderDepsByType(type);
-			renderUnit = this._injector.createInstance(RenderUnit, {
+			renderUnit = parentInjector.createInstance(RenderUnit, {
 				unit,
 				engine,
 				scene,
@@ -29615,7 +29780,16 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
 				createUnitOptions
 			});
 			this._addRenderUnit(unitId, renderUnit);
-			this._tryAddRenderDependencies(renderUnit, ctorOfDeps);
+			try {
+				this._tryAddRenderDependencies(renderUnit, ctorOfDeps);
+			} catch (error) {
+				try {
+					this._disposeItem(renderUnit);
+				} finally {
+					this._renderMap.delete(unitId);
+				}
+				throw error;
+			}
 		} else {
 			renderUnit = {
 				isThumbNail: true,
@@ -29678,6 +29852,18 @@ RenderManagerService = __decorate([
 	__decorateParam(1, _univerjs_core.IUniverInstanceService),
 	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.ThemeService))
 ], RenderManagerService);
+function hasRenderDependency(dependencies, dep) {
+	const key = getRenderDependencyIdentifierKey(getRenderDependencyIdentifier(dep));
+	return dependencies.some((registered) => getRenderDependencyIdentifierKey(getRenderDependencyIdentifier(registered)) === key);
+}
+function getRenderDependencyIdentifier(dep) {
+	return Array.isArray(dep) ? dep[0] : dep;
+}
+function getRenderDependencyIdentifierKey(identifier) {
+	const decoratorName = identifier.decoratorName;
+	if (typeof decoratorName === "string" && decoratorName) return `identifier:${decoratorName}`;
+	return identifier;
+}
 const IRenderManagerService = (0, _univerjs_core.createIdentifier)("engine-render.render-manager.service");
 function isDisposable(thing) {
 	return !!thing && typeof thing.dispose === "function";
@@ -31033,6 +31219,7 @@ exports.getCurrentScrollXY = getCurrentScrollXY;
 exports.getCurrentTypeOfRenderer = getCurrentTypeOfRenderer;
 exports.getDPI = getDPI;
 exports.getDevicePixelRatio = getDevicePixelRatio;
+exports.getDocsCustomBlockRenderViewport = getDocsCustomBlockRenderViewport;
 exports.getDocsSkeletonPageSize = getDocsSkeletonPageSize;
 exports.getDocsTableRenderViewport = getDocsTableRenderViewport;
 exports.getDocumentSkeletonColumnPagePathInfo = getDocumentSkeletonColumnPagePathInfo;
@@ -31113,6 +31300,7 @@ exports.renderTextWatermark = renderTextWatermark;
 exports.renderUserInfoWatermark = renderUserInfoWatermark;
 exports.renderWatermark = renderWatermark;
 exports.requestNewFrame = requestNewFrame;
+exports.setDocsCustomBlockRenderViewportProvider = setDocsCustomBlockRenderViewportProvider;
 exports.setDocsTableRenderViewportProvider = setDocsTableRenderViewportProvider;
 exports.setLineType = setLineType;
 exports.sheetContentViewportKeys = sheetContentViewportKeys;