fix: fix memory leak in skeleton manager and image cropper

dream-num · Feb 7, 2025 · bf7772e · bf7772e
1 parent ed4aea2
commit bf7772e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/drawing-ui/src/controllers/image-cropper.controller.ts b/packages/drawing-ui/src/controllers/image-cropper.controller.ts
@@ -23,7 +23,7 @@ import { MessageType } from '@univerjs/design';
 import { getDrawingShapeKeyByDrawingSearch, IDrawingManagerService, SetDrawingSelectedOperation } from '@univerjs/drawing';
 import { CURSOR_TYPE, degToRad, Image, IRenderManagerService, precisionTo, Vector2 } from '@univerjs/engine-render';
 import { IMessageService } from '@univerjs/ui';
-import { filter, switchMap } from 'rxjs';
+import { of, switchMap } from 'rxjs';
 import { AutoImageCropOperation, CloseImageCropOperation, CropType, OpenImageCropOperation } from '../commands/operations/image-crop.operation';
 import { ImageCropperObject } from '../views/crop/image-cropper-object';
 
@@ -334,14 +334,14 @@ export class ImageCropperController extends Disposable {
                 imageCropperObject?.dispose();
             })
         );
-        const sheetUnit = this._univerInstanceService
+
+        const sheetUnit$ = this._univerInstanceService
             .getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET)
             .pipe(
-                filter((workbook) => Boolean(workbook)),
-                switchMap((workbook) => workbook!.activeSheet$)
+                switchMap((workbook) => workbook ? workbook.activeSheet$ : of(null))
             );
 
-        this.disposeWithMe(sheetUnit.subscribe(() => {
+        this.disposeWithMe(sheetUnit$.subscribe(() => {
             this._commandService.syncExecuteCommand(CloseImageCropOperation.id);
         }));
     }

diff --git a/packages/sheets-ui/src/services/sheet-skeleton-manager.service.ts b/packages/sheets-ui/src/services/sheet-skeleton-manager.service.ts
@@ -67,8 +67,9 @@ export class SheetSkeletonManagerService extends Disposable implements IRenderMo
         this.disposeWithMe(() => {
             this._currentSkeletonBefore$.complete();
             this._currentSkeleton$.complete();
-            this._sheetSkeletonParamStore = new Map();
-            this._sheetSkService.deleteSkeleton(this._context.unitId, this._sheetId);
+
+            this._sheetSkeletonParamStore.forEach((sk) => this.disposeSkeleton(sk.sheetId));
+            this._sheetSkeletonParamStore.clear();
         });
 
         this._initRemoveSheet();