Merge pull request #1081 from VisActor/fix/memory-leak

Fix/memory leak
VisActor · Mar 19, 2024 · 5b9c7ad · 5b9c7ad
2 parents fee289b + 1f0502b
commit 5b9c7ad
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/packages/vrender-core/src/core/layer-service.ts b/packages/vrender-core/src/core/layer-service.ts
@@ -118,4 +118,8 @@ export class DefaultLayerService implements ILayerService {
     }
     return 0;
   }
+
+  releaseStage(stage: IStage) {
+    this.layerMap.delete(stage);
+  }
 }
diff --git a/packages/vrender-core/src/core/stage.ts b/packages/vrender-core/src/core/stage.ts
@@ -870,7 +870,12 @@ export class Stage extends Group implements IStage {
 
   release() {
     super.release();
+
+    this.hooks.beforeRender.unTap('constructor', this.beforeRender);
+    this.hooks.afterRender.unTap('constructor', this.afterRender);
+
     this.eventSystem && this.eventSystem.release();
+    this.layerService.releaseStage(this);
     this.pluginService.release();
     this.forEach(layer => {
       layer.release();

diff --git a/packages/vrender-core/src/core/window.ts b/packages/vrender-core/src/core/window.ts
@@ -82,13 +82,11 @@ export class DefaultWindow implements IWindow {
   }
 
   protected postInit() {
-    this.global.hooks.onSetEnv.tap('window', () => {
-      this.active();
-    });
+    this.global.hooks.onSetEnv.tap('window', this.active);
     this.active();
   }
 
-  protected active() {
+  protected active = () => {
     const global = this.global;
     if (!global.env || this.actived) {
       return;
@@ -99,7 +97,7 @@ export class DefaultWindow implements IWindow {
     //   handlerContribution.configure(this, this.global);
     // });
     this.actived = true;
-  }
+  };
 
   get style(): CSSStyleDeclaration | Record<string, any> {
     return this._handler.getStyle() ?? {};
@@ -152,6 +150,8 @@ export class DefaultWindow implements IWindow {
     throw new Error('暂不支持');
   }
   release(): void {
+    this.global.hooks.onSetEnv.unTap('window', this.active);
+
     return this._handler.releaseWindow();
   }
   getContext(): IContext2d {

diff --git a/packages/vrender-core/src/event/event-manager.ts b/packages/vrender-core/src/event/event-manager.ts
@@ -832,4 +832,13 @@ export class EventManager {
     }
     return target;
   }
+
+  release() {
+    this.dispatch.removeAllListeners();
+    this.eventPool.clear();
+    this.rootTarget = null;
+    this.mappingTable = null;
+    this.mappingState = null;
+    this.cursorTarget = null;
+  }
 }
diff --git a/packages/vrender-core/src/event/event-system.ts b/packages/vrender-core/src/event/event-system.ts
@@ -128,7 +128,11 @@ export class EventSystem {
   }
 
   release(): void {
-    this.setTargetElement(null);
+    this.removeEvents();
+    this.manager && this.manager.release();
+    this.domElement = null;
+    (this as any).manager = null;
+    (this as any).globalObj = null;
   }
 
   setCursor(mode: string, target: IEventTarget | null | 'ignore'): void {

diff --git a/packages/vrender-core/src/interface/core.ts b/packages/vrender-core/src/interface/core.ts
@@ -43,4 +43,5 @@ export interface ILayerService {
   restLayerCount: (stage: IStage) => number;
   getStageLayer: (stage: IStage) => ILayer[];
   layerCount: (stage: IStage) => number;
+  releaseStage: (stage: IStage) => void;
 }