restore jsdom cleanup in static canvas

due to FabricObject to canvas method
fabricjs · Jan 31, 2023 · 6761606 · 6761606
1 parent 8ad5647
commit 6761606
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/node.ts b/node.ts
@@ -2,7 +2,6 @@ import './src/env/node';
 
 import type { Canvas as NodeCanvas, JpegConfig, PngConfig } from 'canvas';
 import { getEnv, StaticCanvas as Canvas } from './fabric';
-import { cleanUpJsdomNode } from './src/util/dom_misc';
 
 export * from './fabric';
 
@@ -17,9 +16,4 @@ export class StaticCanvas extends Canvas {
   createJPEGStream(opts?: JpegConfig) {
     return this.getNodeCanvas().createJPEGStream(opts);
   }
-  destroy(): void {
-    const canvasElement = this.lowerCanvasEl;
-    super.destroy();
-    cleanUpJsdomNode(canvasElement);
-  }
 }
diff --git a/src/canvas/StaticCanvas.ts b/src/canvas/StaticCanvas.ts
@@ -25,7 +25,7 @@ import {
   cancelAnimFrame,
   requestAnimFrame,
 } from '../util/animation/AnimationFrameProvider';
-import { getElementOffset } from '../util/dom_misc';
+import { cleanUpJsdomNode, getElementOffset } from '../util/dom_misc';
 import { uid } from '../util/internals/uid';
 import { createCanvasElement, isHTMLCanvas, toDataURL } from '../util/misc/dom';
 import { invertTransform, transformPoint } from '../util/misc/matrix';
@@ -1677,6 +1677,7 @@ export class StaticCanvas<
     canvasElement.setAttribute('height', `${this.height}`);
     canvasElement.style.cssText = this._originalCanvasStyle || '';
     this._originalCanvasStyle = undefined;
+    cleanUpJsdomNode(canvasElement);
   }
 
   /**