@univerjs/sheets-drawing-ui 1.0.4 → 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);

package/lib/cjs/index.js

@@ -428,7 +428,7 @@ function readUint32Be(bytes, offset) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -439,7 +439,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -452,14 +452,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.153.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.149.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -470,7 +470,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -478,7 +478,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.153.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);
@@ -3071,7 +3071,12 @@ let SheetCanvasFloatDomManagerService = _SheetCanvasFloatDomManagerService = cla
 				domAnchor,
 				unitId,
 				subUnitId,
-				id: drawingId
+				id: drawingId,
+				runtimeMetadata: {
+					componentKey,
+					data,
+					allowTransform
+				}
 			};
 			const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeletonParam.skeleton, target.worksheet, floatDomInfo);
 			const position$ = new rxjs.BehaviorSubject(initedPosition);
@@ -3275,7 +3280,12 @@ let SheetCanvasFloatDomManagerService = _SheetCanvasFloatDomManagerService = cla
 					right: viewMain.right
 				},
 				domAnchor: domLayoutParam,
-				scrollDirectionResponse: "HORIZONTAL"
+				scrollDirectionResponse: "HORIZONTAL",
+				runtimeMetadata: {
+					componentKey,
+					data,
+					allowTransform
+				}
 			};
 			const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
 			const position$ = new rxjs.BehaviorSubject(initedPosition);
@@ -3718,7 +3728,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-drawing-ui";
-var version = "1.0.4";
+var version = "1.1.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -4899,13 +4909,14 @@ SheetCellImageCopyPasteController = __decorate([
 //#endregion
 //#region src/controllers/sheet-drawing-active-render.controller.ts
 let SheetDrawingActiveRenderController = class SheetDrawingActiveRenderController extends _univerjs_core.Disposable {
-	constructor(_context, _commandService, _sheetSkeletonService, _sheetDrawingService, _drawingManagerService) {
+	constructor(_context, _commandService, _sheetSkeletonService, _sheetDrawingService, _drawingManagerService, _logService) {
 		super();
 		this._context = _context;
 		this._commandService = _commandService;
 		this._sheetSkeletonService = _sheetSkeletonService;
 		this._sheetDrawingService = _sheetDrawingService;
 		this._drawingManagerService = _drawingManagerService;
+		this._logService = _logService;
 		_defineProperty(this, "_renderTimeout", void 0);
 		this._commandListener();
 	}
@@ -4927,64 +4938,58 @@ let SheetDrawingActiveRenderController = class SheetDrawingActiveRenderControlle
 		}, 0);
 	}
 	_commandListener() {
+		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
+			if (command.id !== _univerjs_sheets.SetWorksheetActiveOperation.id) return;
+			const { unitId, subUnitId } = command.params;
+			const { unit, unitId: contextUnitId } = this._context;
+			if (unitId !== contextUnitId || !unit.getSheetBySheetId(subUnitId) || unit.getActiveSheet().getSheetId() === subUnitId) return;
+			this._clearDrawings(unitId, subUnitId);
+		}));
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
 			if (command.id === _univerjs_sheets.SetWorksheetActiveOperation.id) {
 				const { unitId, subUnitId } = command.params;
-				this._updateDrawings(unitId, subUnitId);
+				if (unitId === this._context.unitId && subUnitId === this._context.unit.getActiveSheet().getSheetId()) this._updateDrawings(unitId, subUnitId);
 			}
 		}));
 		this.disposeWithMe(this._context.activated$.subscribe((activated) => {
 			const { unit, unitId } = this._context;
-			if (activated) this._updateDrawings(unitId, unit.getActiveSheet().getSheetId());
-			else this._clearDrawings(unitId);
+			if (activated) {
+				const subUnitId = unit.getActiveSheet().getSheetId();
+				this._clearDrawings(unitId, subUnitId);
+				this._updateDrawings(unitId, subUnitId);
+			} else this._clearDrawings(unitId);
 		}));
 	}
-	_clearDrawings(selfUnitId) {
-		this._scheduleRender(() => {
-			const drawingMap = this._drawingManagerService.drawingManagerData;
-			const removeDrawings = [];
-			Object.keys(drawingMap ?? {}).forEach((unitId) => {
-				const subUnitMap = drawingMap[unitId] ?? {};
-				Object.keys(subUnitMap).forEach((subUnitId) => {
-					var _subUnitMap$subUnitId;
-					const drawingData = ((_subUnitMap$subUnitId = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId === void 0 ? void 0 : _subUnitMap$subUnitId.data) ?? {};
-					Object.keys(drawingData).forEach((drawingId) => {
-						if (unitId === selfUnitId) removeDrawings.push(drawingData[drawingId]);
-					});
-				});
-			});
-			this._sheetDrawingService.removeNotification(removeDrawings);
-			this._drawingManagerService.removeNotification(removeDrawings);
-		});
+	_clearDrawings(unitId, keepSubUnitId) {
+		this._cancelPendingRender();
+		const subUnitMap = this._drawingManagerService.drawingManagerData[unitId] ?? {};
+		const removeDrawings = [];
+		for (const subUnitId of Object.keys(subUnitMap)) {
+			var _subUnitMap$subUnitId;
+			if (subUnitId === keepSubUnitId) continue;
+			for (const drawing of Object.values(((_subUnitMap$subUnitId = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId === void 0 ? void 0 : _subUnitMap$subUnitId.data) ?? {})) removeDrawings.push(drawing);
+		}
+		this._sheetDrawingService.removeNotification(removeDrawings);
+		this._drawingManagerService.removeNotification(removeDrawings);
 	}
 	_updateDrawings(showUnitId, showSubunitId) {
 		this._scheduleRender(() => {
+			var _subUnitMap$showSubun;
 			const sheetSkeletonParam = this._sheetSkeletonService.getSkeletonParam(showUnitId, showSubunitId);
-			const drawingMap = this._drawingManagerService.drawingManagerData;
-			const insertDrawings = [];
-			const refreshedDrawings = [];
-			const removeDrawings = [];
-			Object.keys(drawingMap ?? {}).forEach((unitId) => {
-				if (unitId !== showUnitId) return;
-				const subUnitMap = drawingMap[unitId] ?? {};
-				Object.keys(subUnitMap).forEach((subUnitId) => {
-					var _subUnitMap$subUnitId2;
-					const drawingData = ((_subUnitMap$subUnitId2 = subUnitMap[subUnitId]) === null || _subUnitMap$subUnitId2 === void 0 ? void 0 : _subUnitMap$subUnitId2.data) ?? {};
-					Object.keys(drawingData).forEach((drawingId) => {
-						if (unitId === showUnitId && subUnitId === showSubunitId) {
-							const drawing = drawingData[drawingId];
-							if (sheetSkeletonParam && drawing.sheetTransform && drawing.anchorType !== _univerjs_sheets_drawing.SheetDrawingAnchorType.None) refreshedDrawings.push((0, _univerjs_sheets_drawing.applySheetDrawingPlacement)(drawing, (0, _univerjs_sheets_drawing.getSheetDrawingPlacement)(drawing), sheetSkeletonParam.skeleton));
-							insertDrawings.push(drawingData[drawingId]);
-						} else removeDrawings.push(drawingData[drawingId]);
-					});
-				});
-			});
+			const drawingData = ((_subUnitMap$showSubun = (this._drawingManagerService.drawingManagerData[showUnitId] ?? {})[showSubunitId]) === null || _subUnitMap$showSubun === void 0 ? void 0 : _subUnitMap$showSubun.data) ?? {};
+			const { successDrawings, refreshedDrawings, failures } = prepareSheetDrawings(Object.values(drawingData), sheetSkeletonParam === null || sheetSkeletonParam === void 0 ? void 0 : sheetSkeletonParam.skeleton);
+			const removeDrawings = failures.map(({ drawingId }) => drawingData[drawingId]);
 			this._sheetDrawingService.refreshTransform(refreshedDrawings);
 			this._drawingManagerService.refreshTransform(refreshedDrawings);
 			this._sheetDrawingService.removeNotification(removeDrawings);
-			this._sheetDrawingService.addNotification(insertDrawings);
+			this._sheetDrawingService.addNotification(successDrawings);
 			this._drawingManagerService.removeNotification(removeDrawings);
-			this._drawingManagerService.addNotification(insertDrawings);
+			this._drawingManagerService.addNotification(successDrawings);
+			if (failures.length) this._logService.error("[SheetDrawingActiveRenderController]", {
+				unitId: showUnitId,
+				subUnitId: showSubunitId,
+				failures
+			});
 		});
 	}
 };
@@ -4992,8 +4997,33 @@ SheetDrawingActiveRenderController = __decorate([
 	__decorateParam(1, _univerjs_core.ICommandService),
 	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetSkeletonService)),
 	__decorateParam(3, _univerjs_sheets_drawing.ISheetDrawingService),
-	__decorateParam(4, _univerjs_drawing.IDrawingManagerService)
+	__decorateParam(4, _univerjs_drawing.IDrawingManagerService),
+	__decorateParam(5, _univerjs_core.ILogService)
 ], SheetDrawingActiveRenderController);
+function prepareSheetDrawings(drawings, skeleton) {
+	const successDrawings = [];
+	const refreshedDrawings = [];
+	const failures = [];
+	for (const drawing of drawings) {
+		if (skeleton && drawing.sheetTransform && drawing.anchorType !== _univerjs_sheets_drawing.SheetDrawingAnchorType.None) try {
+			refreshedDrawings.push((0, _univerjs_sheets_drawing.applySheetDrawingPlacement)(drawing, (0, _univerjs_sheets_drawing.getSheetDrawingPlacement)(drawing), skeleton));
+		} catch (error) {
+			failures.push({
+				drawingId: drawing.drawingId,
+				drawingType: drawing.drawingType,
+				anchorType: drawing.anchorType ?? _univerjs_sheets_drawing.SheetDrawingAnchorType.Position,
+				error
+			});
+			continue;
+		}
+		successDrawings.push(drawing);
+	}
+	return {
+		successDrawings,
+		refreshedDrawings,
+		failures
+	};
+}
 
 //#endregion
 //#region src/controllers/sheet-drawing-copy-paste.controller.ts
@@ -6965,7 +6995,7 @@ UniverSheetsDrawingUIPlugin = __decorate([
 
 //#endregion
 exports.AddWorksheetBackgroundImageCommand = AddWorksheetBackgroundImageCommand;
-Object.defineProperty(exports, 'BatchSaveImagesService', {
+Object.defineProperty(exports, "BatchSaveImagesService", {
   enumerable: true,
   get: function () {
     return BatchSaveImagesService;
@@ -6986,26 +7016,26 @@ exports.SHEETS_IMAGE_MENU_ID = SHEETS_IMAGE_MENU_ID;
 exports.SHEET_CHART_RENDER_OBJECT_CONFIG = SHEET_CHART_RENDER_OBJECT_CONFIG;
 exports.SHEET_FLOAT_DOM_PREFIX = SHEET_FLOAT_DOM_PREFIX;
 exports.SaveCellImagesCommand = SaveCellImagesCommand;
-Object.defineProperty(exports, 'SheetCanvasFloatDomManagerService', {
+Object.defineProperty(exports, "SheetCanvasFloatDomManagerService", {
   enumerable: true,
   get: function () {
     return SheetCanvasFloatDomManagerService;
   }
 });
 exports.SheetDrawingAnchor = SheetDrawingAnchor;
-Object.defineProperty(exports, 'SheetDrawingHitTestService', {
+Object.defineProperty(exports, "SheetDrawingHitTestService", {
   enumerable: true,
   get: function () {
     return SheetDrawingHitTestService;
   }
 });
-Object.defineProperty(exports, 'SheetDrawingUpdateController', {
+Object.defineProperty(exports, "SheetDrawingUpdateController", {
   enumerable: true,
   get: function () {
     return SheetDrawingUpdateController;
   }
 });
-Object.defineProperty(exports, 'SheetsDrawingGroupCopyPasteController', {
+Object.defineProperty(exports, "SheetsDrawingGroupCopyPasteController", {
   enumerable: true,
   get: function () {
     return SheetsDrawingGroupCopyPasteController;
@@ -7014,13 +7044,13 @@ Object.defineProperty(exports, 'SheetsDrawingGroupCopyPasteController', {
 exports.SheetsDrawingUIMenuSchema = menuSchema;
 exports.SidebarSheetDrawingOperation = SidebarSheetDrawingOperation;
 exports.UngroupSheetDrawingCommand = UngroupSheetDrawingCommand;
-Object.defineProperty(exports, 'UniverSheetsDrawingMobileUIPlugin', {
+Object.defineProperty(exports, "UniverSheetsDrawingMobileUIPlugin", {
   enumerable: true,
   get: function () {
     return UniverSheetsDrawingMobileUIPlugin;
   }
 });
-Object.defineProperty(exports, 'UniverSheetsDrawingUIPlugin', {
+Object.defineProperty(exports, "UniverSheetsDrawingUIPlugin", {
   enumerable: true,
   get: function () {
     return UniverSheetsDrawingUIPlugin;

package/lib/es/facade.js

@@ -13,16 +13,23 @@ import { IRenderManagerService, getCurrentTypeOfRenderer } from "@univerjs/engin
 var FWorksheetDrawingUIMixin = class extends FWorksheet {
 	getFloatDomById(id) {
 		const info = this._injector.get(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(ISheetDrawingService).getDrawingByParam({
-			drawingId: info.id,
+		return info ? this._getFloatDomResult(info) : null;
+	}
+	getAllFloatDoms() {
+		const floatDomService = this._injector.get(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(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 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(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(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(SheetSkeletonService);
 		const info = this._injector.get(SheetCanvasFloatDomManagerService).getFloatDomInfo(id);