smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-04-14 16:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: ensure ClipboardItem created in the same tick to fix safari (#7066)

Browse source
This commit is contained in:
David Luzar 2023-10-16 11:38:57 +02:00 • committed by GitHub
parent aaf73c8ff3
commit 5b94cffc74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/data/blob.ts
View file

@ -8,7 +8,7 @@ import { t } from "../i18n";
import { calculateScrollCenter } from "../scene"; import { calculateScrollCenter } from "../scene";
import { AppState, DataURL, LibraryItem } from "../types"; import { AppState, DataURL, LibraryItem } from "../types";
import { ValueOf } from "../utility-types"; import { ValueOf } from "../utility-types";
import { bytesToHexString } from "../utils"; import { bytesToHexString, isPromiseLike } from "../utils";
import { FileSystemHandle, nativeFileSystemSupported } from "./filesystem"; import { FileSystemHandle, nativeFileSystemSupported } from "./filesystem";
import { isValidExcalidrawData, isValidLibrary } from "./json"; import { isValidExcalidrawData, isValidLibrary } from "./json";
import { restore, restoreLibraryItems } from "./restore"; import { restore, restoreLibraryItems } from "./restore";
@ -207,10 +207,13 @@ export const loadLibraryFromBlob = async (
}; };
export const canvasToBlob = async ( export const canvasToBlob = async (
canvas: HTMLCanvasElement, canvas: HTMLCanvasElement | Promise<HTMLCanvasElement>,
): Promise<Blob> => { ): Promise<Blob> => {
return new Promise((resolve, reject) => { return new Promise(async (resolve, reject) => {
try { try {
if (isPromiseLike(canvas)) {
canvas = await canvas;
}
canvas.toBlob((blob) => { canvas.toBlob((blob) => {
if (!blob) { if (!blob) {
return reject( return reject(

8
src/data/index.ts
View file

@ -66,17 +66,14 @@ export const exportCanvas = async (
} }
} }
const tempCanvas = await exportToCanvas(elements, appState, files, { const tempCanvas = exportToCanvas(elements, appState, files, {
exportBackground, exportBackground,
viewBackgroundColor, viewBackgroundColor,
exportPadding, exportPadding,
}); });
tempCanvas.style.display = "none";
document.body.appendChild(tempCanvas);
if (type === "png") { if (type === "png") {
let blob = await canvasToBlob(tempCanvas); let blob = await canvasToBlob(tempCanvas);
tempCanvas.remove();
if (appState.exportEmbedScene) { if (appState.exportEmbedScene) {
blob = await ( blob = await (
await import(/* webpackChunkName: "image" */ "./image") await import(/* webpackChunkName: "image" */ "./image")
@ -114,11 +111,8 @@ export const exportCanvas = async (
} else { } else {
throw new Error(t("alerts.couldNotCopyToClipboard")); throw new Error(t("alerts.couldNotCopyToClipboard"));
} }
} finally {
tempCanvas.remove();
} }
} else { } else {
tempCanvas.remove();
// shouldn't happen // shouldn't happen
throw new Error("Unsupported export type"); throw new Error("Unsupported export type");
} }