smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix restoring appState (#2182)

Browse source
This commit is contained in:
David Luzar 2020-09-22 21:51:49 +02:00 • committed by GitHub
parent b2822f3538
commit adb1ac5788
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 74 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/data/index.ts
View file

@ -18,7 +18,7 @@ import { serializeAsJSON } from "./json";
import { ExportType } from "../scene/types";
import { restore } from "./restore";
import { DataState } from "./types";
import { ImportedDataState } from "./types";
export { loadFromBlob } from "./blob";
export { saveAsJSON, loadFromJSON } from "./json";
@ -232,7 +232,7 @@ export const exportToBackend = async (
const importFromBackend = async (
id: string | null,
privateKey?: string | null,
) => {
): Promise<ImportedDataState> => {
let elements: readonly ExcalidrawElement[] = [];
let appState = getDefaultAppState();
@ -364,19 +364,15 @@ export const exportCanvas = async (
export const loadScene = async (
id: string | null,
privateKey?: string | null,
initialData?: DataState,
initialData?: ImportedDataState,
) => {
let data;
if (id != null) {
// the private key is used to decrypt the content from the server, take
// extra care not to leak it
const { elements, appState } = await importFromBackend(id, privateKey);
data = restore(elements, appState);
data = restore(await importFromBackend(id, privateKey));
} else {
data = restore(
initialData?.elements ?? [],
initialData?.appState ?? getDefaultAppState(),
);
data = restore(initialData || {});
}
return {