@univerjs/docs-drawing-ui 1.0.0-alpha.8 → 1.0.0-beta.0

package/lib/cjs/index.js

@@ -227,7 +227,7 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 				const scaleHeight = _univerjs_drawing.DRAWING_IMAGE_HEIGHT_LIMIT / height;
 				scale = Math.min(scaleWidth, scaleHeight);
 			}
-			const imagePosition = insertPosition !== null && insertPosition !== void 0 ? insertPosition : this._getCurrentImageInsertPosition();
+			const imagePosition = insertPosition ?? this._getCurrentImageInsertPosition();
 			const docTransform = this._getImagePosition(width * scale, height * scale, imagePosition);
 			if (docTransform == null) return;
 			const transform = (0, _univerjs_docs.docDrawingPositionToTransform)(docTransform);
@@ -270,8 +270,7 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 		return editArea === _univerjs_engine_render.DocumentEditArea.HEADER || editArea === _univerjs_engine_render.DocumentEditArea.FOOTER;
 	}
 	_getImagePosition(imageWidth, imageHeight, insertPosition) {
-		var _ref;
-		return (0, _univerjs_docs.buildDocTransform)(imageWidth, imageHeight, { left: ((_ref = insertPosition !== null && insertPosition !== void 0 ? insertPosition : this._getCurrentImageInsertPosition()) !== null && _ref !== void 0 ? _ref : {
+		return (0, _univerjs_docs.buildDocTransform)(imageWidth, imageHeight, { left: (insertPosition ?? this._getCurrentImageInsertPosition() ?? {
 			left: 0,
 			top: 0
 		}).left });
@@ -325,8 +324,7 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 	}
 	_focusDrawingListener() {
 		this.disposeWithMe(this._drawingManagerService.focus$.subscribe((params) => {
-			var _this$_getCurrentScen;
-			const { transformer, docsLeft, docsTop } = (_this$_getCurrentScen = this._getCurrentSceneAndTransformer()) !== null && _this$_getCurrentScen !== void 0 ? _this$_getCurrentScen : {};
+			const { transformer, docsLeft, docsTop } = this._getCurrentSceneAndTransformer() ?? {};
 			if (params == null || params.length === 0) {
 				this._contextService.setContextValue(_univerjs_core.FOCUSING_COMMON_DRAWINGS, false);
 				this._docDrawingService.focusDrawing([]);
@@ -350,10 +348,9 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 		}));
 	}
 	_findSegmentIdByDrawingId(drawingId) {
-		var _body$customBlocks;
 		const { unit: DocDataModel } = this._context;
 		const { body, headers = {}, footers = {} } = DocDataModel.getSnapshot();
-		if (((_body$customBlocks = body === null || body === void 0 ? void 0 : body.customBlocks) !== null && _body$customBlocks !== void 0 ? _body$customBlocks : []).some((b) => b.blockId === drawingId)) return "";
+		if (((body === null || body === void 0 ? void 0 : body.customBlocks) ?? []).some((b) => b.blockId === drawingId)) return "";
 		for (const headerId of Object.keys(headers)) {
 			var _headers$headerId$bod;
 			if ((_headers$headerId$bod = headers[headerId].body.customBlocks) === null || _headers$headerId$bod === void 0 ? void 0 : _headers$headerId$bod.some((b) => b.blockId === drawingId)) return headerId;
@@ -427,9 +424,9 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 		}));
 	}
 	_setDrawingSelections(params) {
-		var _unit$getSnapshot$bod, _unit$getSnapshot$bod2;
+		var _unit$getSnapshot$bod;
 		const { unit } = this._context;
-		const customBlocks = (_unit$getSnapshot$bod = (_unit$getSnapshot$bod2 = unit.getSnapshot().body) === null || _unit$getSnapshot$bod2 === void 0 ? void 0 : _unit$getSnapshot$bod2.customBlocks) !== null && _unit$getSnapshot$bod !== void 0 ? _unit$getSnapshot$bod : [];
+		const customBlocks = ((_unit$getSnapshot$bod = unit.getSnapshot().body) === null || _unit$getSnapshot$bod === void 0 ? void 0 : _unit$getSnapshot$bod.customBlocks) ?? [];
 		const ranges = params.map((item) => {
 			const id = item.drawingId;
 			const block = customBlocks.find((b) => b.blockId === id);
@@ -463,10 +460,10 @@ const InsertDocImageCommand = {
 	id: "doc.command.insert-float-image",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor) => {
-		var _getCurrentTypeOfRend, _getCurrentTypeOfRend2;
+		var _getCurrentTypeOfRend;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const renderManagerService = accessor.get(_univerjs_engine_render.IRenderManagerService);
-		return (_getCurrentTypeOfRend = (_getCurrentTypeOfRend2 = (0, _univerjs_engine_render.getCurrentTypeOfRenderer)(_univerjs_core.UniverInstanceType.UNIVER_DOC, univerInstanceService, renderManagerService)) === null || _getCurrentTypeOfRend2 === void 0 ? void 0 : _getCurrentTypeOfRend2.with(DocDrawingUpdateRenderController).insertDocImage()) !== null && _getCurrentTypeOfRend !== void 0 ? _getCurrentTypeOfRend : false;
+		return ((_getCurrentTypeOfRend = (0, _univerjs_engine_render.getCurrentTypeOfRenderer)(_univerjs_core.UniverInstanceType.UNIVER_DOC, univerInstanceService, renderManagerService)) === null || _getCurrentTypeOfRend === void 0 ? void 0 : _getCurrentTypeOfRend.with(DocDrawingUpdateRenderController).insertDocImage()) ?? false;
 	}
 };
 
@@ -543,19 +540,10 @@ const MoveDocDrawingsCommand = {
 			const { positionH, positionV } = drawingData.docTransform;
 			const newPositionH = { ...positionH };
 			const newPositionV = { ...positionV };
-			if (direction === _univerjs_core.Direction.UP) {
-				var _newPositionV$posOffs;
-				newPositionV.posOffset = ((_newPositionV$posOffs = newPositionV.posOffset) !== null && _newPositionV$posOffs !== void 0 ? _newPositionV$posOffs : 0) - 2;
-			} else if (direction === _univerjs_core.Direction.DOWN) {
-				var _newPositionV$posOffs2;
-				newPositionV.posOffset = ((_newPositionV$posOffs2 = newPositionV.posOffset) !== null && _newPositionV$posOffs2 !== void 0 ? _newPositionV$posOffs2 : 0) + 2;
-			} else if (direction === _univerjs_core.Direction.LEFT) {
-				var _newPositionH$posOffs;
-				newPositionH.posOffset = ((_newPositionH$posOffs = newPositionH.posOffset) !== null && _newPositionH$posOffs !== void 0 ? _newPositionH$posOffs : 0) - 2;
-			} else if (direction === _univerjs_core.Direction.RIGHT) {
-				var _newPositionH$posOffs2;
-				newPositionH.posOffset = ((_newPositionH$posOffs2 = newPositionH.posOffset) !== null && _newPositionH$posOffs2 !== void 0 ? _newPositionH$posOffs2 : 0) + 2;
-			}
+			if (direction === _univerjs_core.Direction.UP) newPositionV.posOffset = (newPositionV.posOffset ?? 0) - 2;
+			else if (direction === _univerjs_core.Direction.DOWN) newPositionV.posOffset = (newPositionV.posOffset ?? 0) + 2;
+			else if (direction === _univerjs_core.Direction.LEFT) newPositionH.posOffset = (newPositionH.posOffset ?? 0) - 2;
+			else if (direction === _univerjs_core.Direction.RIGHT) newPositionH.posOffset = (newPositionH.posOffset ?? 0) + 2;
 			return {
 				drawingId,
 				key: direction === _univerjs_core.Direction.UP || direction === _univerjs_core.Direction.DOWN ? "positionV" : "positionH",
@@ -670,7 +658,7 @@ function calcDocFloatDomPositionByRect(rect, scene, opacity = 1, angle = 0) {
 			left: false,
 			top: false
 		},
-		opacity: opacity !== null && opacity !== void 0 ? opacity : 1
+		opacity: opacity ?? 1
 	};
 }
 function calcDocFloatDomPosition(object, renderUnit) {
@@ -697,6 +685,9 @@ function pickValidCustomBlockRenderViewport(viewport) {
 	if (isPositiveNumber(viewport === null || viewport === void 0 ? void 0 : viewport.contentHeight)) result.contentHeight = viewport.contentHeight;
 	if (isPositiveNumber(viewport === null || viewport === void 0 ? void 0 : viewport.contentWidth)) result.contentWidth = viewport.contentWidth;
 	if (isPositiveNumber(viewport === null || viewport === void 0 ? void 0 : viewport.height)) result.height = viewport.height;
+	if (isPositiveNumber(viewport === null || viewport === void 0 ? void 0 : viewport.pageContentWidth)) result.pageContentWidth = viewport.pageContentWidth;
+	const viewScale = viewport === null || viewport === void 0 ? void 0 : viewport.viewScale;
+	if (isPositiveNumber(viewScale)) result.viewScale = viewScale;
 	if (isPositiveNumber(viewport === null || viewport === void 0 ? void 0 : viewport.viewportHeight)) result.viewportHeight = viewport.viewportHeight;
 	return Object.keys(result).length ? result : void 0;
 }
@@ -783,6 +774,10 @@ let DocFloatDomController = class DocFloatDomController extends _univerjs_core.D
 					position$,
 					id: rectParam.drawingId,
 					componentKey: rectParam.componentKey,
+					contentBox: isSheetLikeEmbedFloatDomRuntimeParam(runtimeParam) ? {
+						contentInset: 0,
+						wrapperInset: 0
+					} : void 0,
 					eventPassThrough: preserveRuntimeGeometry ? false : void 0,
 					preserveOnFocusChange: preserveRuntimeGeometry,
 					onPointerDown: (evt) => {
@@ -820,7 +815,7 @@ let DocFloatDomController = class DocFloatDomController extends _univerjs_core.D
 			params.forEach((param) => {
 				var _this$_canvasFloatDom;
 				const floatDomInfo = this._domLayerInfoMap.get(param.drawingId);
-				if (!floatDomInfo) return;
+				if (!floatDomInfo || floatDomInfo.unitId !== param.unitId) return;
 				const runtimeParam = param;
 				const runtimeViewport = pickValidCustomBlockRenderViewport(runtimeParam.customBlockRenderViewport);
 				if (runtimeViewport) floatDomInfo.runtimeViewport = runtimeViewport;
@@ -877,12 +872,14 @@ let DocFloatDomController = class DocFloatDomController extends _univerjs_core.D
 		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id === _univerjs_docs_ui.SetDocZoomRatioOperation.id) {
 				const { unitId } = commandInfo.params;
-				updateDoc(unitId);
+				globalThis.queueMicrotask(() => {
+					if (!this._disposed) updateDoc(unitId);
+				});
 			}
 		}));
 	}
 	insertFloatDom(floatDom, opts) {
-		var _skeleton$getSkeleton, _opts$width, _opts$drawingId;
+		var _skeleton$getSkeleton;
 		const currentDoc = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_DOC);
 		if (!currentDoc) return false;
 		const render = this._getSceneAndTransformerByDrawingSearch(currentDoc.getUnitId());
@@ -893,7 +890,7 @@ let DocFloatDomController = class DocFloatDomController extends _univerjs_core.D
 		const width = pageWidth - marginLeft - marginRight;
 		const docTransform = {
 			size: {
-				width: (_opts$width = opts.width) !== null && _opts$width !== void 0 ? _opts$width : width,
+				width: opts.width ?? width,
 				height: opts.height
 			},
 			positionH: {
@@ -906,7 +903,7 @@ let DocFloatDomController = class DocFloatDomController extends _univerjs_core.D
 			},
 			angle: 0
 		};
-		const drawingId = (_opts$drawingId = opts.drawingId) !== null && _opts$drawingId !== void 0 ? _opts$drawingId : (0, _univerjs_core.generateRandomId)();
+		const drawingId = opts.drawingId ?? (0, _univerjs_core.generateRandomId)();
 		const params = {
 			unitId: currentDoc.getUnitId(),
 			drawings: [{
@@ -941,20 +938,16 @@ function syncRectWithRuntimeParam(rect, param, fallbackViewport, fallbackTransfo
 	return true;
 }
 function getRuntimeTransform(param, rect, fallbackViewport, fallbackTransform, preserveRuntimeGeometry) {
-	var _param$transform, _param$transforms, _param$customBlockRen, _runtimeViewport$heig2;
-	const transform = (_param$transform = param.transform) !== null && _param$transform !== void 0 ? _param$transform : (_param$transforms = param.transforms) === null || _param$transforms === void 0 ? void 0 : _param$transforms[0];
-	const runtimeViewport = (_param$customBlockRen = param.customBlockRenderViewport) !== null && _param$customBlockRen !== void 0 ? _param$customBlockRen : fallbackViewport;
-	if (!param.customBlockRenderViewport && preserveRuntimeGeometry && fallbackTransform && transform) {
-		var _fallbackTransform$wi, _fallbackTransform$he;
-		return {
-			...transform,
-			width: (_fallbackTransform$wi = fallbackTransform.width) !== null && _fallbackTransform$wi !== void 0 ? _fallbackTransform$wi : transform.width,
-			height: (_fallbackTransform$he = fallbackTransform.height) !== null && _fallbackTransform$he !== void 0 ? _fallbackTransform$he : transform.height
-		};
-	}
+	var _param$transforms;
+	const transform = param.transform ?? ((_param$transforms = param.transforms) === null || _param$transforms === void 0 ? void 0 : _param$transforms[0]);
+	const runtimeViewport = param.customBlockRenderViewport ?? fallbackViewport;
+	if (!param.customBlockRenderViewport && preserveRuntimeGeometry && fallbackTransform && transform) return {
+		...transform,
+		width: fallbackTransform.width ?? transform.width,
+		height: fallbackTransform.height ?? transform.height
+	};
 	if (!transform) {
-		var _runtimeViewport$heig;
-		const height = (_runtimeViewport$heig = runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.height) !== null && _runtimeViewport$heig !== void 0 ? _runtimeViewport$heig : runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.contentHeight;
+		const height = (runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.height) ?? (runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.contentHeight);
 		if (!isPositiveNumber(height)) return;
 		return {
 			left: rect.left,
@@ -964,7 +957,7 @@ function getRuntimeTransform(param, rect, fallbackViewport, fallbackTransform, p
 			angle: rect.angle
 		};
 	}
-	const height = (_runtimeViewport$heig2 = runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.height) !== null && _runtimeViewport$heig2 !== void 0 ? _runtimeViewport$heig2 : runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.contentHeight;
+	const height = (runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.height) ?? (runtimeViewport === null || runtimeViewport === void 0 ? void 0 : runtimeViewport.contentHeight);
 	if (!isPositiveNumber(height)) return transform;
 	return {
 		...transform,
@@ -977,6 +970,11 @@ function isEmbedFloatDomRuntimeParam(param) {
 	const candidate = data;
 	return candidate.version === 1 && typeof candidate.embedId === "string" && typeof candidate.hostAnchorId === "string";
 }
+function isSheetLikeEmbedFloatDomRuntimeParam(param) {
+	if (!isEmbedFloatDomRuntimeParam(param)) return false;
+	const data = param.data;
+	return !!data && typeof data === "object" && "childType" in data && typeof data.childType === "number" && (0, _univerjs_docs.isSheetLikeDocsCustomBlockChildType)(data.childType);
+}
 function createTransformFromRect(rect) {
 	return {
 		angle: rect.angle,
@@ -1197,7 +1195,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/docs-drawing-ui";
-var version = "1.0.0-alpha.8";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -1360,7 +1358,7 @@ function DocDrawingPositionContent(props) {
 		else if (relativeFrom === _univerjs_core.ObjectRelativeFromH.PAGE) {}
 		handlePositionChange("positionH", {
 			relativeFrom,
-			posOffset: (prevPosOffset !== null && prevPosOffset !== void 0 ? prevPosOffset : 0) - delta
+			posOffset: (prevPosOffset ?? 0) - delta
 		});
 	}
 	function handleVerticalRelativeFromChange(value) {
@@ -1395,7 +1393,7 @@ function DocDrawingPositionContent(props) {
 		else if (relativeFrom === _univerjs_core.ObjectRelativeFromV.PAGE) delta -= page.marginTop;
 		handlePositionChange("positionV", {
 			relativeFrom,
-			posOffset: (prevPosOffset !== null && prevPosOffset !== void 0 ? prevPosOffset : 0) - delta
+			posOffset: (prevPosOffset ?? 0) - delta
 		});
 	}
 	function updateState(drawingParam) {
@@ -1707,7 +1705,7 @@ const IMoveInlineDrawingCommand = {
 	id: "doc.command.move-inline-drawing",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _renderManagerService, _docSelectionRenderSe;
+		var _renderManagerService;
 		if (params == null) return false;
 		const { drawing, unitId, offset, segmentId: newSegmentId, segmentPage, needRefreshDrawings } = params;
 		const renderManagerService = accessor.get(_univerjs_engine_render.IRenderManagerService);
@@ -1728,7 +1726,7 @@ const IMoveInlineDrawingCommand = {
 		}
 		const rawActions = [];
 		const { drawingId } = drawing;
-		const actions = getDeleteAndInsertCustomBlockActions(newSegmentId, (_docSelectionRenderSe = docSelectionRenderService.getSegment()) !== null && _docSelectionRenderSe !== void 0 ? _docSelectionRenderSe : "", segmentPage, offset, drawingId, documentDataModel, docSelectionRenderService);
+		const actions = getDeleteAndInsertCustomBlockActions(newSegmentId, docSelectionRenderService.getSegment() ?? "", segmentPage, offset, drawingId, documentDataModel, docSelectionRenderService);
 		if (actions == null || actions.length === 0) {
 			docRefreshDrawingsService.refreshDrawings(skeleton);
 			transformer.refreshControls();
@@ -1758,7 +1756,7 @@ const ITransformNonInlineDrawingCommand = {
 	id: "doc.command.transform-non-inline-drawing",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
-		var _renderManagerService2, _docSelectionRenderSe2;
+		var _renderManagerService2;
 		if (params == null) return false;
 		const { drawing, unitId, offset, docTransform, segmentId: newSegmentId, segmentPage } = params;
 		const renderManagerService = accessor.get(_univerjs_engine_render.IRenderManagerService);
@@ -1772,7 +1770,7 @@ const ITransformNonInlineDrawingCommand = {
 		if (documentDataModel == null) return false;
 		const rawActions = [];
 		const { drawingId } = drawing;
-		const actions = getDeleteAndInsertCustomBlockActions(newSegmentId, (_docSelectionRenderSe2 = docSelectionRenderService.getSegment()) !== null && _docSelectionRenderSe2 !== void 0 ? _docSelectionRenderSe2 : "", segmentPage, offset, drawingId, documentDataModel, docSelectionRenderService);
+		const actions = getDeleteAndInsertCustomBlockActions(newSegmentId, docSelectionRenderService.getSegment() ?? "", segmentPage, offset, drawingId, documentDataModel, docSelectionRenderService);
 		if (actions == null) return false;
 		if (actions.length > 0) rawActions.push(...actions);
 		const jsonX = _univerjs_core.JSONX.getInstance();
@@ -2282,12 +2280,12 @@ let DocDrawingAddRemoveController = class DocDrawingAddRemoveController extends
 			if (unitId == null || focusedDrawings.length === 0) return;
 			const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 			const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
-			if (scene == null) return false;
+			if (renderObject == null || scene == null) return false;
+			this._docRefreshDrawingsService.refreshDrawings(renderObject.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton());
 			scene.getTransformerByCreate().refreshControls();
 		}));
 	}
 	_preserveWrappingStylePosition(params) {
-		var _documentDataModel$ge;
 		if (params.wrappingStyle === _univerjs_docs_drawing.TextWrappingStyle.INLINE) return;
 		const { unitId } = params;
 		const documentDataModel = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_DOC);
@@ -2298,7 +2296,7 @@ let DocDrawingAddRemoveController = class DocDrawingAddRemoveController extends
 		if (!documentDataModel || !skeletonData || !viewModel) return;
 		const editArea = viewModel.getEditArea();
 		const { pages, skeHeaders, skeFooters } = skeletonData;
-		const oldDrawings = (_documentDataModel$ge = documentDataModel.getDrawings()) !== null && _documentDataModel$ge !== void 0 ? _documentDataModel$ge : {};
+		const oldDrawings = documentDataModel.getDrawings() ?? {};
 		params.drawings = params.drawings.map((drawing) => {
 			const oldDrawing = oldDrawings[drawing.drawingId];
 			if (!oldDrawing) return drawing;
@@ -2596,8 +2594,7 @@ function getDocsTableCellDrawingOffset(unitId, table, row, cell) {
 	};
 }
 function hasHorizontalTableViewport(viewport) {
-	var _viewport$leadingInse, _viewport$trailingIns;
-	return viewport != null && ((_viewport$leadingInse = viewport.leadingInsetLeft) !== null && _viewport$leadingInse !== void 0 ? _viewport$leadingInse : 0) + viewport.contentWidth + ((_viewport$trailingIns = viewport.trailingInsetRight) !== null && _viewport$trailingIns !== void 0 ? _viewport$trailingIns : 0) > viewport.viewportWidth;
+	return viewport != null && (viewport.leadingInsetLeft ?? 0) + viewport.contentWidth + (viewport.trailingInsetRight ?? 0) > viewport.viewportWidth;
 }
 let DocDrawingTransformUpdateController = class DocDrawingTransformUpdateController extends _univerjs_core.Disposable {
 	constructor(_context, _docSkeletonManagerService, _commandService, _editorService, _drawingManagerService, _docRefreshDrawingsService, _univerInstanceService, _lifecycleService) {
@@ -2617,7 +2614,7 @@ let DocDrawingTransformUpdateController = class DocDrawingTransformUpdateControl
 	_initialize() {
 		this._initialRenderRefresh();
 		this._drawingInitializeListener();
-		this._initResize();
+		this._initTransformRefresh();
 	}
 	_initialRenderRefresh() {
 		this.disposeWithMe(this._docSkeletonManagerService.currentSkeleton$.subscribe((documentSkeleton) => {
@@ -2646,8 +2643,8 @@ let DocDrawingTransformUpdateController = class DocDrawingTransformUpdateControl
 			}
 		}));
 	}
-	_initResize() {
-		this.disposeWithMe((0, _univerjs_core.fromEventSubject)(this._context.engine.onTransformChange$).pipe((0, rxjs.filter)((evt) => evt.type === _univerjs_engine_render.TRANSFORM_CHANGE_OBSERVABLE_TYPE.resize), (0, rxjs.debounceTime)(16)).subscribe(() => {
+	_initTransformRefresh() {
+		this.disposeWithMe((0, rxjs.merge)((0, _univerjs_core.fromEventSubject)(this._context.engine.onTransformChange$).pipe((0, rxjs.filter)((evt) => evt.type === _univerjs_engine_render.TRANSFORM_CHANGE_OBSERVABLE_TYPE.resize)), (0, _univerjs_core.fromEventSubject)(this._context.scene.onTransformChange$).pipe((0, rxjs.filter)((evt) => evt.type === _univerjs_engine_render.TRANSFORM_CHANGE_OBSERVABLE_TYPE.scale))).pipe((0, rxjs.debounceTime)(16)).subscribe(() => {
 			var _scene$getTransformer;
 			const skeleton = this._docSkeletonManagerService.getSkeleton();
 			const { scene } = this._context;
@@ -2701,21 +2698,17 @@ let DocDrawingTransformUpdateController = class DocDrawingTransformUpdateControl
 		this._handleMultiDrawingsTransform(multiDrawings);
 	}
 	_getStaleNonMultiDrawings(unitId, updateDrawingMap) {
-		var _this$_drawingManager;
-		const drawingData = (_this$_drawingManager = this._drawingManagerService.getDrawingData(unitId, unitId)) !== null && _this$_drawingManager !== void 0 ? _this$_drawingManager : {};
-		return Object.values(drawingData).filter((drawing) => drawing.isMultiTransform !== _univerjs_core.BooleanNumber.TRUE).filter((drawing) => updateDrawingMap[drawing.drawingId] == null).map((drawing) => {
-			var _drawing$transforms, _drawing$isMultiTrans;
-			return {
-				unitId,
-				subUnitId: unitId,
-				drawingId: drawing.drawingId,
-				behindText: false,
-				hidden: true,
-				transform: drawing.transform,
-				transforms: (_drawing$transforms = drawing.transforms) !== null && _drawing$transforms !== void 0 ? _drawing$transforms : [],
-				isMultiTransform: (_drawing$isMultiTrans = drawing.isMultiTransform) !== null && _drawing$isMultiTrans !== void 0 ? _drawing$isMultiTrans : _univerjs_core.BooleanNumber.FALSE
-			};
-		});
+		const drawingData = this._drawingManagerService.getDrawingData(unitId, unitId) ?? {};
+		return Object.values(drawingData).filter((drawing) => drawing.isMultiTransform !== _univerjs_core.BooleanNumber.TRUE).filter((drawing) => updateDrawingMap[drawing.drawingId] == null).map((drawing) => ({
+			unitId,
+			subUnitId: unitId,
+			drawingId: drawing.drawingId,
+			behindText: false,
+			hidden: true,
+			transform: drawing.transform,
+			transforms: drawing.transforms ?? [],
+			isMultiTransform: drawing.isMultiTransform ?? _univerjs_core.BooleanNumber.FALSE
+		}));
 	}
 	_handleMultiDrawingsTransform(multiDrawings) {
 		const { scene, unitId } = this._context;
@@ -2787,8 +2780,8 @@ let DocDrawingTransformUpdateController = class DocDrawingTransformUpdateControl
 				height
 			}) : void 0;
 			const transform = {
-				left: (pageRelativeLeft !== null && pageRelativeLeft !== void 0 ? pageRelativeLeft : aLeft) + docsLeft + (pageRelativeLeft == null ? this._liquid.x : pageOffsetLeft),
-				top: (pageRelativeTop !== null && pageRelativeTop !== void 0 ? pageRelativeTop : aTop) + docsTop + (pageRelativeTop == null ? this._liquid.y : pageOffsetTop),
+				left: (pageRelativeLeft ?? aLeft) + docsLeft + (pageRelativeLeft == null ? this._liquid.x : pageOffsetLeft),
+				top: (pageRelativeTop ?? aTop) + docsTop + (pageRelativeTop == null ? this._liquid.y : pageOffsetTop),
 				width,
 				height,
 				angle,
@@ -2869,6 +2862,28 @@ function getDocsTableCellAnchorContext(unitId, cell) {
 		table
 	};
 }
+function shouldUseDocsDrawingOuterPageOrigin(config) {
+	const { drawing, height, hostPage, page, width } = config;
+	if (drawing.layoutType !== _univerjs_core.PositionedObjectLayoutType.WRAP_NONE) return false;
+	return getDocsPageRelativeDrawingAnchorPage({
+		page,
+		clipPage: getDocsDrawingClipPage({
+			drawing: {
+				behindText: getDocsDrawingBehindText({
+					drawingOrigin: drawing,
+					hostPage
+				}),
+				transform: {
+					width,
+					height
+				}
+			},
+			hostPage,
+			page
+		}),
+		hostPage
+	}) != null;
+}
 let DocDrawingTransformerController = class DocDrawingTransformerController extends _univerjs_core.Disposable {
 	constructor(_commandService, _univerInstanceService, _drawingManagerService, _renderManagerService) {
 		super();
@@ -2925,7 +2940,6 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 			}
 		})));
 		const throttleMultipleDrawingUpdate = (0, _univerjs_core.throttle)(this._updateMultipleDrawingDocTransform.bind(this), 50);
-		(0, _univerjs_core.throttle)(this._nonInlineDrawingTransform.bind(this), 50);
 		this.disposeWithMe((0, _univerjs_core.toDisposable)(transformer.changing$.subscribe((state) => {
 			const { objects, offsetX, offsetY } = state;
 			if (objects.size > 1) throttleMultipleDrawingUpdate(objects);
@@ -2933,7 +2947,6 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 				const drawingCache = this._transformerCache.values().next().value;
 				const { width, height, top, left, angle } = objects.values().next().value;
 				if (drawingCache && width === drawingCache.width && height === drawingCache.height && top === drawingCache.top && left === drawingCache.left && angle === drawingCache.angle) return;
-				if (drawingCache && drawingCache.drawing.layoutType !== _univerjs_core.PositionedObjectLayoutType.INLINE) {}
 				if (drawingCache && drawingCache.drawing.layoutType === _univerjs_core.PositionedObjectLayoutType.INLINE && offsetX != null && offsetY != null) this._updateInlineDrawingAnchor(drawingCache.drawing, offsetX, offsetY);
 			}
 		})));
@@ -3027,14 +3040,13 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		this._getDrawingAnchor(drawingCache.drawing, object);
 	}
 	_updateInlineDrawingAnchor(drawing, offsetX, offsetY) {
-		var _this$_getInlineDrawi;
 		if (this._transformerCache.size !== 1) return;
-		const { contentBoxPointGroup } = (_this$_getInlineDrawi = this._getInlineDrawingAnchor(drawing, offsetX, offsetY)) !== null && _this$_getInlineDrawi !== void 0 ? _this$_getInlineDrawi : {};
+		const { contentBoxPointGroup } = this._getInlineDrawingAnchor(drawing, offsetX, offsetY) ?? {};
 		if (contentBoxPointGroup == null) return;
 		this._createOrUpdateInlineAnchor(drawing.unitId, contentBoxPointGroup);
 	}
 	_getInlineDrawingAnchor(drawing, offsetX, offsetY) {
-		var _this$_renderManagerS, _getOneTextSelectionR;
+		var _this$_renderManagerS;
 		const currentRender = this._renderManagerService.getRenderUnitById(drawing.unitId);
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
 		if (currentRender == null) return;
@@ -3072,7 +3084,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 			isBack
 		};
 		const { cursorList, contentBoxPointGroup } = new _univerjs_docs_ui.NodePositionConvertToCursor(docObject.document.getOffsetConfig(), skeleton).getRangePointData(positionWithIsBack, positionWithIsBack);
-		const { startOffset } = (_getOneTextSelectionR = (0, _univerjs_docs_ui.getOneTextSelectionRange)(cursorList)) !== null && _getOneTextSelectionR !== void 0 ? _getOneTextSelectionR : {};
+		const { startOffset } = (0, _univerjs_docs_ui.getOneTextSelectionRange)(cursorList) ?? {};
 		if (startOffset == null) return;
 		return {
 			offset: startOffset,
@@ -3082,7 +3094,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		};
 	}
 	_getDrawingAnchor(drawing, object) {
-		var _this$_renderManagerS2, _glyphAnchor$parent, _column$parent$top, _column$parent, _column$lines$find, _column$parent2, _tableCellContext$hos, _getOneTextSelectionR2;
+		var _this$_renderManagerS2, _glyphAnchor$parent, _column$parent, _column$parent2;
 		const currentRender = this._renderManagerService.getRenderUnitById(drawing.unitId);
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
 		const skeletonData = skeleton === null || skeleton === void 0 ? void 0 : skeleton.getSkeletonData();
@@ -3129,18 +3141,30 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		if (glyphAnchor == null) return;
 		const line = (_glyphAnchor$parent = glyphAnchor.parent) === null || _glyphAnchor$parent === void 0 ? void 0 : _glyphAnchor$parent.parent;
 		const column = line === null || line === void 0 ? void 0 : line.parent;
-		const sectionTop = (_column$parent$top = column === null || column === void 0 || (_column$parent = column.parent) === null || _column$parent === void 0 ? void 0 : _column$parent.top) !== null && _column$parent$top !== void 0 ? _column$parent$top : 0;
-		const paragraphStartLine = (_column$lines$find = column === null || column === void 0 ? void 0 : column.lines.find((l) => l.paragraphIndex === (line === null || line === void 0 ? void 0 : line.paragraphIndex) && l.paragraphStart)) !== null && _column$lines$find !== void 0 ? _column$lines$find : column === null || column === void 0 ? void 0 : column.lines[0];
+		const sectionTop = (column === null || column === void 0 || (_column$parent = column.parent) === null || _column$parent === void 0 ? void 0 : _column$parent.top) ?? 0;
+		const paragraphStartLine = (column === null || column === void 0 ? void 0 : column.lines.find((l) => l.paragraphIndex === (line === null || line === void 0 ? void 0 : line.paragraphIndex) && l.paragraphStart)) ?? (column === null || column === void 0 ? void 0 : column.lines[0]);
 		const page = column === null || column === void 0 || (_column$parent2 = column.parent) === null || _column$parent2 === void 0 ? void 0 : _column$parent2.parent;
 		if (line == null || column == null || paragraphStartLine == null || page == null) return;
 		this._liquid.reset();
 		const tableCellContext = page.type === _univerjs_engine_render.DocumentSkeletonPageType.CELL ? getDocsTableCellAnchorContext(drawing.unitId, page) : null;
-		const anchorPage = (_tableCellContext$hos = tableCellContext === null || tableCellContext === void 0 ? void 0 : tableCellContext.hostPage) !== null && _tableCellContext$hos !== void 0 ? _tableCellContext$hos : page;
+		const anchorPage = (tableCellContext === null || tableCellContext === void 0 ? void 0 : tableCellContext.hostPage) ?? page;
 		const pageType = anchorPage.type;
+		const drawingHostPage = (page.type === _univerjs_engine_render.DocumentSkeletonPageType.HEADER || page.type === _univerjs_engine_render.DocumentSkeletonPageType.FOOTER) && segmentPage > -1 ? pages[segmentPage] : void 0;
+		const useOuterPageOrigin = shouldUseDocsDrawingOuterPageOrigin({
+			drawing,
+			height: object.height,
+			hostPage: drawingHostPage,
+			page,
+			width: object.width
+		});
+		let pageOffsetLeft = this._liquid.x;
+		let pageOffsetTop = this._liquid.y;
 		for (const p of pages) {
 			const { headerId, footerId, pageHeight, pageWidth, marginLeft, marginBottom } = p;
 			const pIndex = pages.indexOf(p);
 			if (segmentPage > -1 && pIndex === segmentPage) {
+				pageOffsetLeft = this._liquid.x;
+				pageOffsetTop = this._liquid.y;
 				switch (pageType) {
 					case _univerjs_engine_render.DocumentSkeletonPageType.HEADER: {
 						var _skeHeaders$get;
@@ -3168,6 +3192,10 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 				}
 				break;
 			}
+			if (p === anchorPage) {
+				pageOffsetLeft = this._liquid.x;
+				pageOffsetTop = this._liquid.y;
+			}
 			this._liquid.translatePagePadding(p);
 			if (p === anchorPage) break;
 			this._liquid.restorePagePadding(p);
@@ -3176,14 +3204,17 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		if (tableCellContext) this._liquid.translate(tableCellContext.offset.left, tableCellContext.offset.top);
 		if (positionV.relativeFrom === _univerjs_core.ObjectRelativeFromV.LINE) glyphAnchor = line.divides[0].glyphGroup[0];
 		else {
-			var _paragraphStartLine$d, _paragraphStartLine$d2;
-			glyphAnchor = (_paragraphStartLine$d = (_paragraphStartLine$d2 = paragraphStartLine.divides) === null || _paragraphStartLine$d2 === void 0 || (_paragraphStartLine$d2 = _paragraphStartLine$d2[0]) === null || _paragraphStartLine$d2 === void 0 || (_paragraphStartLine$d2 = _paragraphStartLine$d2.glyphGroup) === null || _paragraphStartLine$d2 === void 0 ? void 0 : _paragraphStartLine$d2[0]) !== null && _paragraphStartLine$d !== void 0 ? _paragraphStartLine$d : glyphAnchor;
+			var _paragraphStartLine$d;
+			glyphAnchor = ((_paragraphStartLine$d = paragraphStartLine.divides) === null || _paragraphStartLine$d === void 0 || (_paragraphStartLine$d = _paragraphStartLine$d[0]) === null || _paragraphStartLine$d === void 0 || (_paragraphStartLine$d = _paragraphStartLine$d.glyphGroup) === null || _paragraphStartLine$d === void 0 ? void 0 : _paragraphStartLine$d[0]) ?? glyphAnchor;
 		}
 		docTransform.positionH = {
 			relativeFrom: positionH.relativeFrom,
 			posOffset: left - this._liquid.x - docsLeft
 		};
 		switch (positionH.relativeFrom) {
+			case _univerjs_core.ObjectRelativeFromH.PAGE:
+				if (useOuterPageOrigin) docTransform.positionH.posOffset = left - pageOffsetLeft - docsLeft;
+				break;
 			case _univerjs_core.ObjectRelativeFromH.MARGIN:
 				docTransform.positionH.posOffset = left - this._liquid.x - docsLeft - page.marginLeft;
 				break;
@@ -3197,7 +3228,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		};
 		switch (positionV.relativeFrom) {
 			case _univerjs_core.ObjectRelativeFromV.PAGE:
-				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - page.marginTop;
+				docTransform.positionV.posOffset = useOuterPageOrigin ? top - pageOffsetTop - docsTop : top - this._liquid.y - docsTop + page.marginTop;
 				break;
 			case _univerjs_core.ObjectRelativeFromV.LINE:
 				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - sectionTop - line.top;
@@ -3215,7 +3246,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 			isBack
 		};
 		const { cursorList } = new _univerjs_docs_ui.NodePositionConvertToCursor(docObject.document.getOffsetConfig(), skeleton).getRangePointData(positionWithIsBack, positionWithIsBack);
-		const { startOffset } = (_getOneTextSelectionR2 = (0, _univerjs_docs_ui.getOneTextSelectionRange)(cursorList)) !== null && _getOneTextSelectionR2 !== void 0 ? _getOneTextSelectionR2 : {};
+		const { startOffset } = (0, _univerjs_docs_ui.getOneTextSelectionRange)(cursorList) ?? {};
 		if (startOffset == null) return;
 		return {
 			offset: startOffset,
@@ -3252,8 +3283,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		});
 	}
 	_moveInlineDrawing(drawing, offsetX, offsetY) {
-		const anchor = this._getInlineDrawingAnchor(drawing, offsetX, offsetY);
-		const { offset, segmentId, segmentPage } = anchor !== null && anchor !== void 0 ? anchor : {};
+		const { offset, segmentId, segmentPage } = this._getInlineDrawingAnchor(drawing, offsetX, offsetY) ?? {};
 		return this._commandService.executeCommand(IMoveInlineDrawingCommand.id, {
 			unitId: drawing.unitId,
 			subUnitId: drawing.unitId,
@@ -3269,7 +3299,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		const { left, top, width, height, angle } = object;
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
 		const skeletonData = skeleton === null || skeleton === void 0 ? void 0 : skeleton.getSkeletonData();
-		const { pages } = skeletonData !== null && skeletonData !== void 0 ? skeletonData : {};
+		const { pages } = skeletonData ?? {};
 		if (skeletonData == null || currentRender == null || pages == null) return {
 			left,
 			top,
@@ -3300,8 +3330,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 	_nonInlineDrawingTransform(drawing, object, isMoving = false) {
 		const objectPosition = drawing.isMultiTransform === _univerjs_core.BooleanNumber.TRUE ? object : this._limitDrawingInPage(drawing, object);
 		if (isMoving && objectPosition.top !== object.top) return;
-		const anchor = this._getDrawingAnchor(drawing, objectPosition);
-		const { offset, docTransform, segmentId, segmentPage } = anchor !== null && anchor !== void 0 ? anchor : {};
+		const { offset, docTransform, segmentId, segmentPage } = this._getDrawingAnchor(drawing, objectPosition) ?? {};
 		if (offset == null || docTransform == null) return this._updateMultipleDrawingDocTransform(/* @__PURE__ */ new Map([[drawing.drawingId, object]]));
 		return this._commandService.executeCommand(ITransformNonInlineDrawingCommand.id, {
 			unitId: drawing.unitId,
@@ -3661,7 +3690,6 @@ let DocDrawingPopupMenuController = class DocDrawingPopupMenuController extends
 		}));
 	}
 	_getDrawingPopupMenuItems(unitId, subUnitId, drawingId, drawingType) {
-		var _editCommandInfo$labe, _editCommandInfo$comm, _editCommandInfo$comm2, _editCommandInfo$disa;
 		const drawing = this._drawingManagerService.getDrawingByParam({
 			unitId,
 			subUnitId,
@@ -3680,15 +3708,15 @@ let DocDrawingPopupMenuController = class DocDrawingPopupMenuController extends
 		}) : null;
 		return [
 			{
-				label: (_editCommandInfo$labe = editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.label) !== null && _editCommandInfo$labe !== void 0 ? _editCommandInfo$labe : "docs-drawing-ui.image-popup.edit",
+				label: (editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.label) ?? "docs-drawing-ui.image-popup.edit",
 				index: 0,
-				commandId: (_editCommandInfo$comm = editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.commandId) !== null && _editCommandInfo$comm !== void 0 ? _editCommandInfo$comm : EditDocDrawingOperation.id,
-				commandParams: (_editCommandInfo$comm2 = editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.commandParams) !== null && _editCommandInfo$comm2 !== void 0 ? _editCommandInfo$comm2 : {
+				commandId: (editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.commandId) ?? EditDocDrawingOperation.id,
+				commandParams: (editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.commandParams) ?? {
 					unitId,
 					subUnitId,
 					drawingId
 				},
-				disable: (_editCommandInfo$disa = editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.disable) !== null && _editCommandInfo$disa !== void 0 ? _editCommandInfo$disa : drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_DOM,
+				disable: (editCommandInfo === null || editCommandInfo === void 0 ? void 0 : editCommandInfo.disable) ?? drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_DOM,
 				hideOnClick: true,
 				icon: "DrawingEditIcon"
 			},
@@ -3787,7 +3815,7 @@ _defineProperty(UniverDocsDrawingUIPlugin, "pluginName", "DOC_DRAWING_UI_PLUGIN"
 _defineProperty(UniverDocsDrawingUIPlugin, "packageName", name);
 _defineProperty(UniverDocsDrawingUIPlugin, "version", version);
 UniverDocsDrawingUIPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_docs.UniverDocsPlugin, _univerjs_drawing.UniverDrawingPlugin, _univerjs_engine_render.UniverRenderEnginePlugin, _univerjs_docs_drawing.UniverDocsDrawingPlugin, _univerjs_ui.UniverUIPlugin, _univerjs_docs_ui.UniverDocsUIPlugin, _univerjs_drawing_ui.UniverDrawingUIPlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_docs.UniverDocsPlugin, _univerjs_drawing.UniverDrawingPlugin, _univerjs_engine_render.UniverRenderEnginePlugin, _univerjs_docs_drawing.UniverDocsDrawingPlugin, _univerjs_docs_ui.UniverDocsUIPlugin, _univerjs_drawing_ui.UniverDrawingUIPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, _univerjs_engine_render.IRenderManagerService),
 	__decorateParam(3, _univerjs_core.IConfigService)