@univerjs/sheets-drawing-ui 1.0.3 → 1.1.0

package/lib/cjs/facade.js

@@ -13,16 +13,23 @@ let _univerjs_engine_render = require("@univerjs/engine-render");
 var FWorksheetDrawingUIMixin = class extends _univerjs_sheets_facade.FWorksheet {
 	getFloatDomById(id) {
 		const info = this._injector.get(_univerjs_sheets_drawing_ui.SheetCanvasFloatDomManagerService).getFloatDomInfo(id);
-		if (!info) return null;
-		const { unitId, subUnitId } = info;
-		const { rect } = info;
-		const { left = 0, top = 0, width = 0, height = 0, flipX = false, flipY = false, angle = 0, skewX = 0, skewY = 0 } = rect.getState();
-		const drawingParm = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService).getDrawingByParam({
-			drawingId: info.id,
+		return info ? this._getFloatDomResult(info) : null;
+	}
+	getAllFloatDoms() {
+		const floatDomService = this._injector.get(_univerjs_sheets_drawing_ui.SheetCanvasFloatDomManagerService);
+		const unitId = this._workbook.getUnitId();
+		const subUnitId = this._worksheet.getSheetId();
+		return floatDomService.getFloatDomsBySubUnitId(unitId, subUnitId).map((info) => this._getFloatDomResult(info)).filter((dom) => dom != null);
+	}
+	_getFloatDomResult(info) {
+		const { unitId, subUnitId, id, rect, runtimeMetadata } = info;
+		const metadata = runtimeMetadata ?? this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService).getDrawingByParam({
+			drawingId: id,
 			unitId,
 			subUnitId
 		});
-		if (!drawingParm) return null;
+		if (!metadata) return null;
+		const { left = 0, top = 0, width = 0, height = 0, flipX = false, flipY = false, angle = 0, skewX = 0, skewY = 0 } = rect.getState();
 		return {
 			position: {
 				left,
@@ -35,44 +42,12 @@ var FWorksheetDrawingUIMixin = class extends _univerjs_sheets_facade.FWorksheet
 				skewX,
 				skewY
 			},
-			componentKey: drawingParm.componentKey,
-			allowTransform: drawingParm.allowTransform,
-			data: drawingParm.data,
-			id: info.id
+			componentKey: metadata.componentKey,
+			allowTransform: metadata.allowTransform,
+			data: metadata.data,
+			id
 		};
 	}
-	getAllFloatDoms() {
-		const floatDomService = this._injector.get(_univerjs_sheets_drawing_ui.SheetCanvasFloatDomManagerService);
-		const unitId = this._workbook.getUnitId();
-		const subUnitId = this._worksheet.getSheetId();
-		return Array.from(floatDomService.getFloatDomsBySubUnitId(unitId, subUnitId).values()).map((info) => {
-			const { rect } = info;
-			const drawingParm = this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService).getDrawingByParam({
-				drawingId: info.id,
-				unitId,
-				subUnitId
-			});
-			if (!drawingParm) return null;
-			const { left, top, width, height, flipX, flipY, angle, skewX, skewY } = rect.getState();
-			return {
-				position: {
-					left,
-					top,
-					width,
-					height,
-					flipX,
-					flipY,
-					angle,
-					skewX,
-					skewY
-				},
-				componentKey: drawingParm.componentKey,
-				allowTransform: drawingParm.allowTransform,
-				data: drawingParm.data,
-				id: info.id
-			};
-		}).filter((dom) => dom != null);
-	}
 	updateFloatDom(id, config) {
 		const sheetSkeletonService = this._injector.get(_univerjs_sheets.SheetSkeletonService);
 		const info = this._injector.get(_univerjs_sheets_drawing_ui.SheetCanvasFloatDomManagerService).getFloatDomInfo(id);