Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(docs-drawing): clear resources on snapshot unload (#7583)

Univere48e1553d1f0
diff --git a/packages/docs-drawing/src/controllers/__tests__/doc-drawing.controller.spec.ts b/packages/docs-drawing/src/controllers/__tests__/doc-drawing.controller.spec.ts
index a3787a1b7d..c19d16fea0 100644
--- a/packages/docs-drawing/src/controllers/__tests__/doc-drawing.controller.spec.ts
+++ b/packages/docs-drawing/src/controllers/__tests__/doc-drawing.controller.spec.ts
@@ -22,6 +22,8 @@ describe('DocDrawingController', () => {
it('should serialize snapshot and load resources into drawing services', () => {
const registerDrawingData = vi.fn();
const registerDrawingDataForManager = vi.fn();
+ const removeDrawingDataForUnit = vi.fn();
+ const removeDrawingDataForUnitFromManager = vi.fn();
let snapshot: any = {
drawings: { d1: { id: 'd1', drawingType: 'image' } },
@@ -49,8 +51,11 @@ describe('DocDrawingController', () => {
}),
};
const controller = new DocDrawingController(
- { registerDrawingData } as any,
- { registerDrawingData: registerDrawingDataForManager } as any,
+ { registerDrawingData, removeDrawingDataForUnit } as any,
+ {
+ registerDrawingData: registerDrawingDataForManager,
+ removeDrawingDataForUnit: removeDrawingDataForUnitFromManager,
+ } as any,
resourceManagerService as any,
univerInstanceService as any,
{
@@ -119,14 +124,10 @@ describe('DocDrawingController', () => {
expect(loadedDrawingData?.['doc-1']?.data?.d2).not.toHaveProperty('transform');
capturedResource.onUnLoad('doc-1');
- expect(registerDrawingData).toHaveBeenLastCalledWith('doc-1', {
- 'doc-1': {
- unitId: 'doc-1',
- subUnitId: 'doc-1',
- data: {},
- order: [],
- },
- });
+ expect(snapshot.drawings).toEqual({});
+ expect(snapshot.drawingsOrder).toEqual([]);
+ expect(removeDrawingDataForUnit).toHaveBeenCalledWith('doc-1');
+ expect(removeDrawingDataForUnitFromManager).toHaveBeenCalledWith('doc-1');
controller.dispose();
});
diff --git a/packages/docs-drawing/src/controllers/doc-drawing.controller.ts b/packages/docs-drawing/src/controllers/doc-drawing.controller.ts
index 17a4901a7b..3d5cb4f135 100644
--- a/packages/docs-drawing/src/controllers/doc-drawing.controller.ts
+++ b/packages/docs-drawing/src/controllers/doc-drawing.controller.ts
@@ -91,7 +91,7 @@ export class DocDrawingController extends Disposable {
}
try {
return JSON.parse(json);
- } catch (err) {
+ } catch {
return { data: {}, order: [] };
}
};
@@ -103,7 +103,7 @@ export class DocDrawingController extends Disposable {
toJson: (unitId) => toJson(unitId),
parseJson: (json) => parseJson(json),
onUnLoad: (unitId) => {
- this._setDrawingDataForUnit(unitId, { data: {}, order: [] });
+ this._unloadDrawingDataForUnit(unitId);
},
onLoad: (unitId, value) => {
this._setDrawingDataForUnit(unitId, { data: value.data ?? {}, order: value.order ?? [] });
@@ -112,6 +112,16 @@ export class DocDrawingController extends Disposable {
);
}
+ private _unloadDrawingDataForUnit(unitId: string): void {
+ const documentDataModel = this._univerInstanceService.getUnit<DocumentDataModel>(
+ unitId,
+ UniverInstanceType.UNIVER_DOC
+ );
+ documentDataModel?.resetDrawing({}, []);
+ this._docDrawingService.removeDrawingDataForUnit(unitId);
+ this._drawingManagerService.removeDrawingDataForUnit(unitId);
+ }
+
private _setDrawingDataForUnit(unitId: string, drawingMapItem: IDrawingMapItem<IDocDrawing>) {
const documentDataModel = this._univerInstanceService.getUnit<DocumentDataModel>(unitId);
if (documentDataModel == null) {