fix: optimize dispoese minimap (#3950)

antvis · Oct 2, 2023 · 4dc74f1 · 4dc74f1
1 parent c6800af
commit 4dc74f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/packages/x6-common/src/common/disposable.ts b/packages/x6-common/src/common/disposable.ts
@@ -56,11 +56,11 @@ export namespace Disposable {
     ) => {
       const raw = descriptor.value
       const proto = target.__proto__ as IDisposable // eslint-disable-line
-      descriptor.value = function (this: IDisposable) {
+      descriptor.value = function (this: IDisposable, ...args: any[]) {
         if (this.disposed) {
           return
         }
-        raw.call(this)
+        raw.call(this, ...args)
         proto.dispose.call(this)
       }
     }

diff --git a/packages/x6-plugin-minimap/src/index.ts b/packages/x6-plugin-minimap/src/index.ts
@@ -1,12 +1,4 @@
-import {
-  FunctionExt,
-  CssLoader,
-  Dom,
-  View,
-  Graph,
-  EventArgs,
-  Model,
-} from '@antv/x6'
+import { FunctionExt, CssLoader, Dom, View, Graph, EventArgs } from '@antv/x6'
 import { content } from './style/raw'
 
 export class MiniMap extends View implements Graph.Plugin {
@@ -138,8 +130,7 @@ export class MiniMap extends View implements Graph.Plugin {
 
   protected onRemove() {
     this.stopListening()
-    this.targetGraph.model = new Model()
-    this.targetGraph.dispose()
+    this.targetGraph.dispose(false)
   }
 
   protected onTransform(options: { ui: boolean }) {

diff --git a/packages/x6/src/graph/graph.ts b/packages/x6/src/graph/graph.ts
@@ -1271,8 +1271,11 @@ export class Graph extends Basecoat<EventArgs> {
   // #region dispose
 
   @Basecoat.dispose()
-  dispose() {
-    this.clearCells()
+  dispose(clean = true) {
+    if (clean) {
+      this.clearCells()
+    }
+
     this.off()
 
     this.css.dispose()