Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ShaMan123 committed Jan 31, 2023
1 parent c18651c commit 78bf675
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 6 additions & 0 deletions node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ 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';

Expand All @@ -16,4 +17,9 @@ export class StaticCanvas extends Canvas {
createJPEGStream(opts?: JpegConfig) {
return this.getNodeCanvas().createJPEGStream(opts);
}
destroy(): void {
const canvasElement = this.lowerCanvasEl;
super.destroy();
cleanUpJsdomNode(canvasElement);
}
}
3 changes: 1 addition & 2 deletions src/canvas/StaticCanvas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
cancelAnimFrame,
requestAnimFrame,
} from '../util/animation/AnimationFrameProvider';
import { cleanUpJsdomNode, getElementOffset } from '../util/dom_misc';
import { 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';
Expand Down Expand Up @@ -1677,7 +1677,6 @@ export class StaticCanvas<
canvasElement.setAttribute('height', `${this.height}`);
canvasElement.style.cssText = this._originalCanvasStyle || '';
this._originalCanvasStyle = undefined;
cleanUpJsdomNode(canvasElement);
}

/**
Expand Down
5 changes: 0 additions & 5 deletions src/util/dom_misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ export function makeElementSelectable(element) {
return element;
}

export function getNodeCanvas(element) {
const impl = getEnv().jsdomImplForWrapper(element);
return impl._canvas || impl._image;
}

export function cleanUpJsdomNode(element) {
if (!getEnv().isLikelyNode) {
return;
Expand Down

0 comments on commit 78bf675

Please sign in to comment.