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

package/lib/es/index.js

@@ -1,9 +1,9 @@
 import { AlignTypeH, AlignTypeV, BooleanNumber, COLORS, CommandType, DOC_DRAWING_PRINTING_COMPONENT_KEY, DependentOn, Direction, Disposable, DisposableCollection, DocumentFlavor, DrawingTypeEnum, FOCUSING_COMMON_DRAWINGS, FOCUSING_DOC, FOCUSING_UNIVER_EDITOR, ICommandService, IConfigService, IContextService, IImageIoService, IUniverInstanceService, ImageSourceType, ImageUploadStatusType, Inject, Injector, JSONX, LifecycleService, LifecycleStages, LocaleService, ObjectRelativeFromH, ObjectRelativeFromV, Plugin, PositionedObjectLayoutType, RedoCommand, RxDisposable, TextX, TextXActionType, Tools, UndoCommand, UniverInstanceType, WrapTextType, fromEventSubject, generateRandomId, getRichTextEditPath, isInternalEditorID, merge, throttle, toDisposable } from "@univerjs/core";
 import { IDocDrawingAdapterService, IDocDrawingService, InsertDocDrawingCommand, RemoveDocDrawingCommand, SetDocDrawingArrangeCommand, TextWrappingStyle, UniverDocsDrawingPlugin, UpdateDocDrawingWrappingStyleCommand, UpdateDrawingDocTransformCommand, getDocDrawingRenderOrder } from "@univerjs/docs-drawing";
-import { CURSOR_TYPE, DocumentEditArea, DocumentSkeletonPageType, IRenderManagerService, Liquid, PageLayoutType, Rect, TRANSFORM_CHANGE_OBSERVABLE_TYPE, Vector2, getColor, getCurrentTypeOfRenderer, getDocsTableRenderViewport, getTableIdAndSliceIndex } from "@univerjs/engine-render";
+import { CURSOR_TYPE, DocumentEditArea, DocumentSkeletonPageType, IRenderManagerService, Liquid, PageLayoutType, Rect, TRANSFORM_CHANGE_OBSERVABLE_TYPE, UniverRenderEnginePlugin, Vector2, getColor, getCurrentTypeOfRenderer, getDocsTableRenderViewport, getTableIdAndSliceIndex } from "@univerjs/engine-render";
 import { Checkbox, InputNumber, MessageType, Radio, RadioGroup, Select, clsx, render, unmount } from "@univerjs/design";
-import { DocSelectionManagerService, DocSkeletonManagerService, RichTextEditingMutation, buildDocTransform, docDrawingPositionToTransform } from "@univerjs/docs";
-import { DOC_CONTENT_INSERT_MENU_ID, DOC_PARAGRAPH_T_INSERT_BELOW_MENU_ID, DOC_PARAGRAPH_T_INSERT_MENU_ID, DocCanvasPopManagerService, DocPrintInterceptorService, DocSelectionRenderService, EMPTY_PARAGRAPH_MENU_ID, IEditorService, INSERT_BELLOW_MENU_ID, NodePositionConvertToCursor, SetDocZoomRatioOperation, TEXT_RANGE_LAYER_INDEX, VIEWPORT_KEY, getAnchorBounding, getDocObject, getOneTextSelectionRange } from "@univerjs/docs-ui";
+import { DocSelectionManagerService, DocSkeletonManagerService, RichTextEditingMutation, UniverDocsPlugin, buildDocTransform, docDrawingPositionToTransform } from "@univerjs/docs";
+import { DOC_CONTENT_INSERT_MENU_ID, DOC_PARAGRAPH_T_INSERT_BELOW_MENU_ID, DOC_PARAGRAPH_T_INSERT_MENU_ID, DocCanvasPopManagerService, DocPrintInterceptorService, DocSelectionRenderService, EMPTY_PARAGRAPH_MENU_ID, IEditorService, INSERT_BELLOW_MENU_ID, NodePositionConvertToCursor, SetDocZoomRatioOperation, TEXT_RANGE_LAYER_INDEX, UniverDocsUIPlugin, VIEWPORT_KEY, getAnchorBounding, getOneTextSelectionRange, neoGetDocObject } from "@univerjs/docs-ui";
 import { DRAWING_IMAGE_ALLOW_IMAGE_LIST, DRAWING_IMAGE_COUNT_LIMIT, DRAWING_IMAGE_HEIGHT_LIMIT, DRAWING_IMAGE_WIDTH_LIMIT, IDrawingManagerService, UniverDrawingPlugin, getDrawingImageAllowSize, getDrawingShapeKeyByDrawingSearch, getImageSize } from "@univerjs/drawing";
 import { CanvasFloatDomService, ComponentManager, ContextMenuGroup, ContextMenuPosition, ILocalFileService, IMenuManagerService, IMessageService, IShortcutService, ISidebarService, KeyCode, MenuItemType, PrintFloatDomSingle, RibbonInsertGroup, UniverUIPlugin, connectInjector, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
 import { BehaviorSubject, Observable, debounceTime, filter, map, of, switchMap, takeUntil } from "rxjs";
@@ -73,7 +73,7 @@ const UngroupDocDrawingCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -84,7 +84,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -97,14 +97,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -127,7 +127,7 @@ var DocRefreshDrawingsService = class {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -135,7 +135,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -264,7 +264,7 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 	_isInsertInHeaderFooter() {
 		var _this$_renderManagerS;
 		const { unitId } = this._context;
-		const viewModel = (_this$_renderManagerS = this._renderManagerSrv.getRenderById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSkeletonManagerService).getViewModel();
+		const viewModel = (_this$_renderManagerS = this._renderManagerSrv.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSkeletonManagerService).getViewModel();
 		const editArea = viewModel === null || viewModel === void 0 ? void 0 : viewModel.getEditArea();
 		return editArea === DocumentEditArea.HEADER || editArea === DocumentEditArea.FOOTER;
 	}
@@ -367,7 +367,7 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 		var _this$_renderManagerS2;
 		if (!this._context) return;
 		const { unit: docDataModel, scene, unitId } = this._context;
-		const viewModel = (_this$_renderManagerS2 = this._renderManagerSrv.getRenderById(unitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSkeletonManagerService).getViewModel();
+		const viewModel = (_this$_renderManagerS2 = this._renderManagerSrv.getRenderUnitById(unitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSkeletonManagerService).getViewModel();
 		if (viewModel == null || docDataModel == null) return;
 		const { drawings = {} } = docDataModel.getSnapshot();
 		const isEditBody = viewModel.getEditArea() === DocumentEditArea.BODY;
@@ -398,7 +398,7 @@ let DocDrawingUpdateRenderController = class DocDrawingUpdateRenderController ex
 	_editAreaChangeListener() {
 		var _this$_renderManagerS3;
 		const { unitId } = this._context;
-		const viewModel = (_this$_renderManagerS3 = this._renderManagerSrv.getRenderById(unitId)) === null || _this$_renderManagerS3 === void 0 ? void 0 : _this$_renderManagerS3.with(DocSkeletonManagerService).getViewModel();
+		const viewModel = (_this$_renderManagerS3 = this._renderManagerSrv.getRenderUnitById(unitId)) === null || _this$_renderManagerS3 === void 0 ? void 0 : _this$_renderManagerS3.with(DocSkeletonManagerService).getViewModel();
 		if (viewModel == null) return;
 		this._updateDrawingsEditStatus();
 		this.disposeWithMe(viewModel.editAreaChange$.subscribe(() => {
@@ -529,7 +529,7 @@ const MoveDocDrawingsCommand = {
 		const drawings = docDrawingService.getFocusDrawings();
 		if (drawings.length === 0) return false;
 		const unitId = drawings[0].unitId;
-		const renderObject = renderManagerService.getRenderById(unitId);
+		const renderObject = renderManagerService.getRenderUnitById(unitId);
 		const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 		if (scene == null) return false;
 		const transformer = scene.getTransformerByCreate();
@@ -581,7 +581,7 @@ const ClearDocDrawingTransformerOperation = {
 		const renderManagerService = accessor.get(IRenderManagerService);
 		params.forEach((unitId) => {
 			var _renderManagerService;
-			(_renderManagerService = renderManagerService.getRenderById(unitId)) === null || _renderManagerService === void 0 || (_renderManagerService = _renderManagerService.scene.getTransformer()) === null || _renderManagerService === void 0 || _renderManagerService.debounceRefreshControls();
+			(_renderManagerService = renderManagerService.getRenderUnitById(unitId)) === null || _renderManagerService === void 0 || (_renderManagerService = _renderManagerService.scene.getTransformer()) === null || _renderManagerService === void 0 || _renderManagerService.debounceRefreshControls();
 		});
 		return true;
 	}
@@ -727,7 +727,7 @@ let DocFloatDomController = class DocFloatDomController extends Disposable {
 	}
 	_getSceneAndTransformerByDrawingSearch(unitId) {
 		if (unitId == null) return;
-		const renderObject = this._renderManagerService.getRenderById(unitId);
+		const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 		if (renderObject == null) return null;
 		const scene = renderObject.scene;
 		return {
@@ -863,7 +863,7 @@ let DocFloatDomController = class DocFloatDomController extends Disposable {
 		this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_DOC).pipe(map((documentDataModel) => {
 			if (!documentDataModel) return null;
 			const unitId = documentDataModel.getUnitId();
-			const render = this._renderManagerService.getRenderById(unitId);
+			const render = this._renderManagerService.getRenderUnitById(unitId);
 			return render ? {
 				render,
 				unitId
@@ -1196,7 +1196,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/docs-drawing-ui";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/config/config.ts
@@ -1227,7 +1227,7 @@ const DocDrawingPosition = (props) => {
 	var _renderManagerService;
 	const renderManagerService = useDependency(IRenderManagerService);
 	const drawingParam = props.drawings[0];
-	const scene = drawingParam ? (_renderManagerService = renderManagerService.getRenderById(drawingParam.unitId)) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.scene : void 0;
+	const scene = drawingParam ? (_renderManagerService = renderManagerService.getRenderUnitById(drawingParam.unitId)) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.scene : void 0;
 	return drawingParam && scene ? /* @__PURE__ */ jsx(DocDrawingPositionContent, { ...props }) : null;
 };
 function DocDrawingPositionContent(props) {
@@ -1240,7 +1240,7 @@ function DocDrawingPositionContent(props) {
 	const { unitId } = drawings[0];
 	const documentDataModel = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
 	const documentFlavor = documentDataModel === null || documentDataModel === void 0 ? void 0 : documentDataModel.getSnapshot().documentStyle.documentFlavor;
-	const transformer = renderManagerService.getRenderById(unitId).scene.getTransformerByCreate();
+	const transformer = renderManagerService.getRenderUnitById(unitId).scene.getTransformerByCreate();
 	const HORIZONTAL_RELATIVE_FROM = [
 		{
 			label: localeService.t("docs-drawing-ui.image-position.column"),
@@ -1309,7 +1309,7 @@ function DocDrawingPositionContent(props) {
 				value
 			}))
 		});
-		const docSelectionRenderService = (_renderManagerService2 = renderManagerService.getRenderById(unitId)) === null || _renderManagerService2 === void 0 ? void 0 : _renderManagerService2.with(DocSelectionRenderService);
+		const docSelectionRenderService = (_renderManagerService2 = renderManagerService.getRenderUnitById(unitId)) === null || _renderManagerService2 === void 0 ? void 0 : _renderManagerService2.with(DocSelectionRenderService);
 		if (docSelectionRenderService) docSelectionRenderService.blur();
 		transformer.refreshControls();
 	}
@@ -1325,7 +1325,7 @@ function DocDrawingPositionContent(props) {
 		const unitId = focusDrawings[0].unitId;
 		let drawing = null;
 		let pageMarginLeft = 0;
-		const skeleton = (_renderManagerService3 = renderManagerService.getRenderById(unitId)) === null || _renderManagerService3 === void 0 ? void 0 : _renderManagerService3.with(DocSkeletonManagerService).getSkeleton();
+		const skeleton = (_renderManagerService3 = renderManagerService.getRenderUnitById(unitId)) === null || _renderManagerService3 === void 0 ? void 0 : _renderManagerService3.with(DocSkeletonManagerService).getSkeleton();
 		const skeletonData = skeleton === null || skeleton === void 0 ? void 0 : skeleton.getSkeletonData();
 		if (skeletonData == null) return;
 		const { pages, skeHeaders, skeFooters } = skeletonData;
@@ -1764,7 +1764,7 @@ const ITransformNonInlineDrawingCommand = {
 		const docSelectionRenderService = (_renderManagerService2 = renderManagerService.getRenderUnitById(unitId)) === null || _renderManagerService2 === void 0 ? void 0 : _renderManagerService2.with(DocSelectionRenderService);
 		const renderObject = renderManagerService.getRenderUnitById(unitId);
 		const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
-		if (scene == null || docSelectionRenderService == null) return false;
+		if (renderObject == null || scene == null || docSelectionRenderService == null) return false;
 		const transformer = scene.getTransformerByCreate();
 		const commandService = accessor.get(ICommandService);
 		const documentDataModel = accessor.get(IUniverInstanceService).getUnit(unitId, UniverInstanceType.UNIVER_DOC);
@@ -1826,6 +1826,8 @@ const ITransformNonInlineDrawingCommand = {
 			return JSONX.compose(acc, cur);
 		}, null);
 		const result = commandService.syncExecuteCommand(doMutation.id, doMutation.params);
+		const skeleton = renderObject.with(DocSkeletonManagerService).getSkeleton();
+		accessor.get(DocRefreshDrawingsService).refreshDrawings(skeleton);
 		transformer.refreshControls();
 		return Boolean(result);
 	}
@@ -1899,10 +1901,11 @@ function DocDrawingTextWrapContent(props) {
 	}
 	function handleDistToTextChange(value, direction) {
 		if (value == null) return;
-		setDistToText({
+		const newDistToText = {
 			...distToText,
 			[direction]: value
-		});
+		};
+		setDistToText(newDistToText);
 		const focusDrawings = drawingManagerService.getFocusDrawings();
 		if (focusDrawings.length === 0) return;
 		const drawings = focusDrawings.map((drawing) => {
@@ -2264,7 +2267,7 @@ let DocDrawingAddRemoveController = class DocDrawingAddRemoveController extends
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id !== UpdateDrawingDocTransformCommand.id && command.id !== UpdateDocDrawingWrappingStyleCommand.id) return;
 			const { unitId } = command.params;
-			const renderObject = this._renderManagerService.getRenderById(unitId);
+			const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 			const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 			if (renderObject == null || scene == null) return;
 			this._docRefreshDrawingsService.refreshDrawings(renderObject.with(DocSkeletonManagerService).getSkeleton());
@@ -2287,7 +2290,7 @@ let DocDrawingAddRemoveController = class DocDrawingAddRemoveController extends
 		if (params.wrappingStyle === TextWrappingStyle.INLINE) return;
 		const { unitId } = params;
 		const documentDataModel = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
-		const renderObject = this._renderManagerService.getRenderById(unitId);
+		const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 		const skeletonManager = renderObject === null || renderObject === void 0 ? void 0 : renderObject.with(DocSkeletonManagerService);
 		const skeletonData = skeletonManager === null || skeletonManager === void 0 ? void 0 : skeletonManager.getSkeleton().getSkeletonData();
 		const viewModel = skeletonManager === null || skeletonManager === void 0 ? void 0 : skeletonManager.getViewModel();
@@ -2767,11 +2770,11 @@ let DocDrawingTransformUpdateController = class DocDrawingTransformUpdateControl
 				clipOffsetTop: clipOffset === null || clipOffset === void 0 ? void 0 : clipOffset.top,
 				page: clipPage
 			});
-			const pageRelativeAnchorPage = drawingOrigin.layoutType === PositionedObjectLayoutType.INLINE ? void 0 : getDocsPageRelativeDrawingAnchorPage({
+			const pageRelativeAnchorPage = drawingOrigin.layoutType === PositionedObjectLayoutType.WRAP_NONE ? getDocsPageRelativeDrawingAnchorPage({
 				page,
 				clipPage,
 				hostPage
-			});
+			}) : void 0;
 			const pageRelativeLeft = pageRelativeAnchorPage != null ? getDocsPageRelativeDrawingLeft({
 				hostPage: pageRelativeAnchorPage,
 				positionH: drawingOrigin.docTransform.positionH,
@@ -3031,7 +3034,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 	}
 	_getInlineDrawingAnchor(drawing, offsetX, offsetY) {
 		var _this$_renderManagerS, _getOneTextSelectionR;
-		const currentRender = this._renderManagerService.getRenderById(drawing.unitId);
+		const currentRender = this._renderManagerService.getRenderUnitById(drawing.unitId);
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(DocSkeletonManagerService).getSkeleton();
 		if (currentRender == null) return;
 		const { mainComponent, scene } = currentRender;
@@ -3045,7 +3048,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		const HALF = .5;
 		const coord = this._getTransformCoordForDocumentOffset(documentComponent, activeViewport, offsetX, offsetY);
 		if (coord == null) return;
-		const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderById(drawing.unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSelectionRenderService);
+		const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(drawing.unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSelectionRenderService);
 		if (docSelectionRenderService == null) return;
 		const nodeInfo = skeleton === null || skeleton === void 0 ? void 0 : skeleton.findNodeByCoord(coord, pageLayoutType, pageMarginLeft, pageMarginTop, {
 			strict: false,
@@ -3061,8 +3064,8 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		}
 		if (glyphAnchor == null) return;
 		const nodePosition = skeleton === null || skeleton === void 0 ? void 0 : skeleton.findPositionByGlyph(glyphAnchor, segmentPageIndex);
-		const docObject = this._getDocObject();
-		if (nodePosition == null || skeleton == null || docObject == null) return;
+		const docObject = neoGetDocObject(currentRender);
+		if (nodePosition == null || skeleton == null) return;
 		const positionWithIsBack = {
 			...nodePosition,
 			isBack
@@ -3078,8 +3081,8 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		};
 	}
 	_getDrawingAnchor(drawing, object) {
-		var _this$_renderManagerS2, _glyphAnchor$parent, _column$lines$find, _column$parent, _tableCellContext$hos, _getOneTextSelectionR2;
-		const currentRender = this._renderManagerService.getRenderById(drawing.unitId);
+		var _this$_renderManagerS2, _glyphAnchor$parent, _column$parent$top, _column$parent, _column$lines$find, _column$parent2, _tableCellContext$hos, _getOneTextSelectionR2;
+		const currentRender = this._renderManagerService.getRenderUnitById(drawing.unitId);
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(DocSkeletonManagerService).getSkeleton();
 		const skeletonData = skeleton === null || skeleton === void 0 ? void 0 : skeleton.getSkeletonData();
 		if (skeletonData == null || currentRender == null) return;
@@ -3097,7 +3100,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		let glyphAnchor = null;
 		let segmentId = "";
 		let segmentPage = -1;
-		const isBack = false;
+		const isBack = true;
 		const docTransform = {
 			...drawing.docTransform,
 			size: {
@@ -3109,7 +3112,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		const { x, y } = scene.getViewportScrollXY(activeViewport);
 		const coord = this._getTransformCoordForDocumentOffset(documentComponent, activeViewport, left - x, top - y);
 		if (coord == null) return;
-		const docSelectionRenderService = (_this$_renderManagerS2 = this._renderManagerService.getRenderById(drawing.unitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSelectionRenderService);
+		const docSelectionRenderService = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(drawing.unitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSelectionRenderService);
 		if (docSelectionRenderService == null) return;
 		const nodeInfo = skeleton === null || skeleton === void 0 ? void 0 : skeleton.findNodeByCoord(coord, pageLayoutType, pageMarginLeft, pageMarginTop, {
 			strict: false,
@@ -3125,8 +3128,9 @@ 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 page = column === null || column === void 0 || (_column$parent = column.parent) === null || _column$parent === void 0 ? void 0 : _column$parent.parent;
+		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 === DocumentSkeletonPageType.CELL ? getDocsTableCellAnchorContext(drawing.unitId, page) : null;
@@ -3195,16 +3199,16 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - page.marginTop;
 				break;
 			case ObjectRelativeFromV.LINE:
-				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - line.top;
+				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - sectionTop - line.top;
 				break;
 			case ObjectRelativeFromV.PARAGRAPH:
-				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - paragraphStartLine.top;
+				docTransform.positionV.posOffset = top - this._liquid.y - docsTop - sectionTop - paragraphStartLine.top;
 				break;
 		}
 		if (glyphAnchor == null) return;
 		const nodePosition = skeleton === null || skeleton === void 0 ? void 0 : skeleton.findPositionByGlyph(glyphAnchor, segmentPage);
-		const docObject = this._getDocObject();
-		if (nodePosition == null || skeleton == null || docObject == null) return;
+		const docObject = neoGetDocObject(currentRender);
+		if (nodePosition == null || skeleton == null) return;
 		const positionWithIsBack = {
 			...nodePosition,
 			isBack
@@ -3260,7 +3264,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		});
 	}
 	_limitDrawingInPage(drawing, object) {
-		const currentRender = this._renderManagerService.getRenderById(drawing.unitId);
+		const currentRender = this._renderManagerService.getRenderUnitById(drawing.unitId);
 		const { left, top, width, height, angle } = object;
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(DocSkeletonManagerService).getSkeleton();
 		const skeletonData = skeleton === null || skeleton === void 0 ? void 0 : skeleton.getSkeletonData();
@@ -3310,7 +3314,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 	}
 	_getSceneAndTransformerByDrawingSearch(unitId) {
 		if (unitId == null) return;
-		const renderObject = this._renderManagerService.getRenderById(unitId);
+		const renderObject = this._renderManagerService.getRenderUnitById(unitId);
 		const scene = renderObject === null || renderObject === void 0 ? void 0 : renderObject.scene;
 		if (scene == null) return;
 		return {
@@ -3325,7 +3329,7 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		return documentTransform.clone().invert().applyPoint(originCoord);
 	}
 	_createOrUpdateInlineAnchor(unitId, pointsGroup) {
-		const currentRender = this._renderManagerService.getRenderById(unitId);
+		const currentRender = this._renderManagerService.getRenderUnitById(unitId);
 		if (currentRender == null) return;
 		const { mainComponent, scene } = currentRender;
 		const { docsLeft, docsTop } = mainComponent.getOffsetConfig();
@@ -3352,11 +3356,8 @@ let DocDrawingTransformerController = class DocDrawingTransformerController exte
 		this._anchorShape = anchor;
 		scene.addObject(anchor, TEXT_RANGE_LAYER_INDEX);
 	}
-	_getDocObject() {
-		return getDocObject(this._univerInstanceService, this._renderManagerService);
-	}
 	_getPageContentSize(drawing) {
-		const currentRender = this._renderManagerService.getRenderById(drawing.unitId);
+		const currentRender = this._renderManagerService.getRenderUnitById(drawing.unitId);
 		const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(DocSkeletonManagerService).getSkeleton();
 		const MAX_WIDTH = 500;
 		const MAX_HEIGHT = 500;
@@ -3603,7 +3604,7 @@ let DocDrawingPopupMenuController = class DocDrawingPopupMenuController extends
 	}
 	_popupMenuListener(unitId) {
 		var _this$_renderManagerS;
-		const scene = (_this$_renderManagerS = this._renderManagerService.getRenderById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.scene;
+		const scene = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.scene;
 		if (!scene) return;
 		const transformer = scene.getTransformerByCreate();
 		if (!transformer) return;
@@ -3785,7 +3786,7 @@ _defineProperty(UniverDocsDrawingUIPlugin, "pluginName", "DOC_DRAWING_UI_PLUGIN"
 _defineProperty(UniverDocsDrawingUIPlugin, "packageName", name);
 _defineProperty(UniverDocsDrawingUIPlugin, "version", version);
 UniverDocsDrawingUIPlugin = __decorate([
-	DependentOn(UniverDrawingUIPlugin, UniverDrawingPlugin, UniverDocsDrawingPlugin, UniverUIPlugin),
+	DependentOn(UniverDocsPlugin, UniverDrawingPlugin, UniverRenderEnginePlugin, UniverDocsDrawingPlugin, UniverUIPlugin, UniverDocsUIPlugin, UniverDrawingUIPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, IRenderManagerService),
 	__decorateParam(3, IConfigService)

package/lib/es/locale/ru-RU.js

@@ -3,9 +3,9 @@ const locale = { "docs-drawing-ui": {
 	title: "Изображение",
 	upload: { float: "Вставить изображение" },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "Вставить фигуру",
+		rectangle: "Вставить прямоугольник",
+		ellipse: "Вставить эллипс"
 	} },
 	panel: { title: "Редактировать изображение" },
 	"image-popup": {
@@ -16,39 +16,39 @@ const locale = { "docs-drawing-ui": {
 		reset: "Сбросить размер"
 	},
 	"image-text-wrap": {
-		title: "Text Wrapping",
-		wrappingStyle: "Wrapping Style",
-		square: "Square",
-		topAndBottom: "Top and Bottom",
-		inline: "In line with text",
-		behindText: "Behind text",
-		inFrontText: "In front of text",
-		wrapText: "Wrap text",
-		bothSide: "Both sides",
-		leftOnly: "Left only",
-		rightOnly: "Right only",
-		distanceFromText: "Distance from text",
-		top: "Top(px)",
-		left: "Left(px)",
-		bottom: "Bottom(px)",
-		right: "Right(px)"
+		title: "Обтекание текстом",
+		wrappingStyle: "Стиль обтекания",
+		square: "Квадрат",
+		topAndBottom: "Сверху и снизу",
+		inline: "В тексте",
+		behindText: "За текстом",
+		inFrontText: "Перед текстом",
+		wrapText: "Обтекание текстом",
+		bothSide: "С обеих сторон",
+		leftOnly: "Только слева",
+		rightOnly: "Только справа",
+		distanceFromText: "Расстояние от текста",
+		top: "Сверху (px)",
+		left: "Слева (px)",
+		bottom: "Снизу (px)",
+		right: "Справа (px)"
 	},
 	"image-position": {
-		title: "Position",
-		horizontal: "Horizontal",
-		vertical: "Vertical",
-		absolutePosition: "Absolute Position(px)",
-		relativePosition: "Relative Position",
-		toTheRightOf: "to the right of",
-		relativeTo: "relative to",
-		bellow: "bellow",
-		options: "Options",
-		moveObjectWithText: "Move object with text",
-		column: "Column",
-		margin: "Margin",
-		page: "Page",
-		line: "Line",
-		paragraph: "Paragraph"
+		title: "Положение",
+		horizontal: "По горизонтали",
+		vertical: "По вертикали",
+		absolutePosition: "Абсолютное положение (px)",
+		relativePosition: "Относительное положение",
+		toTheRightOf: "справа от",
+		relativeTo: "относительно",
+		bellow: "снизу",
+		options: "Параметры",
+		moveObjectWithText: "Перемещать объект с текстом",
+		column: "Колонка",
+		margin: "Поле",
+		page: "Страница",
+		line: "Строка",
+		paragraph: "Абзац"
 	},
 	"update-status": {
 		exceedMaxSize: "Размер изображения превышает лимит, лимит составляет {0}М",

package/lib/es/locale/vi-VN.js

@@ -3,9 +3,9 @@ const locale = { "docs-drawing-ui": {
 	title: "Hình ảnh",
 	upload: { float: "Chèn hình ảnh" },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "Chèn hình",
+		rectangle: "Chèn hình chữ nhật",
+		ellipse: "Chèn hình elip"
 	} },
 	panel: { title: "Chỉnh sửa hình ảnh" },
 	"image-popup": {
@@ -16,39 +16,39 @@ const locale = { "docs-drawing-ui": {
 		reset: "Đặt lại kích thước"
 	},
 	"image-text-wrap": {
-		title: "Text Wrapping",
-		wrappingStyle: "Wrapping Style",
-		square: "Square",
-		topAndBottom: "Top and Bottom",
-		inline: "In line with text",
-		behindText: "Behind text",
-		inFrontText: "In front of text",
-		wrapText: "Wrap text",
-		bothSide: "Both sides",
-		leftOnly: "Left only",
-		rightOnly: "Right only",
-		distanceFromText: "Distance from text",
-		top: "Top(px)",
-		left: "Left(px)",
-		bottom: "Bottom(px)",
-		right: "Right(px)"
+		title: "Bọc văn bản",
+		wrappingStyle: "Kiểu bọc văn bản",
+		square: "Hình vuông",
+		topAndBottom: "Trên và dưới",
+		inline: "Cùng dòng với văn bản",
+		behindText: "Phía sau văn bản",
+		inFrontText: "Phía trước văn bản",
+		wrapText: "Bọc văn bản",
+		bothSide: "Cả hai bên",
+		leftOnly: "Chỉ bên trái",
+		rightOnly: "Chỉ bên phải",
+		distanceFromText: "Khoảng cách với văn bản",
+		top: "Trên (px)",
+		left: "Trái (px)",
+		bottom: "Dưới (px)",
+		right: "Phải (px)"
 	},
 	"image-position": {
-		title: "Position",
-		horizontal: "Horizontal",
-		vertical: "Vertical",
-		absolutePosition: "Absolute Position(px)",
-		relativePosition: "Relative Position",
-		toTheRightOf: "to the right of",
-		relativeTo: "relative to",
-		bellow: "bellow",
-		options: "Options",
-		moveObjectWithText: "Move object with text",
-		column: "Column",
-		margin: "Margin",
-		page: "Page",
-		line: "Line",
-		paragraph: "Paragraph"
+		title: "Vị trí",
+		horizontal: "Ngang",
+		vertical: "Dọc",
+		absolutePosition: "Vị trí tuyệt đối (px)",
+		relativePosition: "Vị trí tương đối",
+		toTheRightOf: "ở bên phải",
+		relativeTo: "tương đối với",
+		bellow: "bên dưới",
+		options: "Tùy chọn",
+		moveObjectWithText: "Di chuyển đối tượng cùng văn bản",
+		column: "Cột",
+		margin: "Lề",
+		page: "Trang",
+		line: "Dòng",
+		paragraph: "Đoạn văn"
 	},
 	"update-status": {
 		exceedMaxSize: "Kích thước hình ảnh vượt quá giới hạn, giới hạn là {0}M",
@@ -58,11 +58,11 @@ const locale = { "docs-drawing-ui": {
 	},
 	shortcut: {
 		"drawing-view": "Chế độ xem bản vẽ",
-		"drawing-move-down": "Move Drawing down",
-		"drawing-move-up": "Move Drawing up",
-		"drawing-move-left": "Move Drawing left",
-		"drawing-move-right": "Move Drawing right",
-		"drawing-delete": "Delete Drawing"
+		"drawing-move-down": "Di chuyển bản vẽ xuống",
+		"drawing-move-up": "Di chuyển bản vẽ lên",
+		"drawing-move-left": "Di chuyển bản vẽ sang trái",
+		"drawing-move-right": "Di chuyển bản vẽ sang phải",
+		"drawing-delete": "Xóa bản vẽ"
 	}
 } };
 

package/lib/es/locale/zh-HK.js

@@ -3,9 +3,9 @@ const locale = { "docs-drawing-ui": {
 	title: "圖片",
 	upload: { float: "插入圖片" },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "插入圖形",
+		rectangle: "插入矩形",
+		ellipse: "插入橢圓形"
 	} },
 	panel: { title: "編圖" },
 	"image-popup": {

package/lib/es/locale/zh-TW.js

@@ -3,9 +3,9 @@ const locale = { "docs-drawing-ui": {
 	title: "圖片",
 	upload: { float: "插入圖片" },
 	shape: { insert: {
-		title: "Insert Shape",
-		rectangle: "Insert Rectangle",
-		ellipse: "Insert Ellipse"
+		title: "插入圖形",
+		rectangle: "插入矩形",
+		ellipse: "插入橢圓形"
 	} },
 	panel: { title: "編圖" },
 	"image-popup": {