refactor: reduce passing-around of canvas in export code (#3571)

This commit is contained in:
David Laban 2021-05-13 18:21:15 +01:00 committed by GitHub
parent 3b9290831a
commit f1cf28a84e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 28 deletions

View file

@ -1,6 +1,6 @@
import { fileSave } from "browser-fs-access";
import {
copyCanvasToClipboardAsPng,
copyBlobToClipboardAsPng,
copyTextToSystemClipboard,
} from "../clipboard";
import { NonDeletedExcalidrawElement } from "../element/types";
@ -18,7 +18,6 @@ export const exportCanvas = async (
type: ExportType,
elements: readonly NonDeletedExcalidrawElement[],
appState: AppState,
canvas: HTMLCanvasElement,
{
exportBackground,
exportPadding = 10,
@ -76,10 +75,11 @@ export const exportCanvas = async (
});
tempCanvas.style.display = "none";
document.body.appendChild(tempCanvas);
let blob = await canvasToBlob(tempCanvas);
tempCanvas.remove();
if (type === "png") {
const fileName = `${name}.png`;
let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
@ -95,7 +95,7 @@ export const exportCanvas = async (
});
} else if (type === "clipboard") {
try {
await copyCanvasToClipboardAsPng(tempCanvas);
await copyBlobToClipboardAsPng(blob);
} catch (error) {
if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
throw error;
@ -103,9 +103,4 @@ export const exportCanvas = async (
throw new Error(t("alerts.couldNotCopyToClipboard"));
}
}
// clean up the DOM
if (tempCanvas !== canvas) {
tempCanvas.remove();
}
};