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: restore on paste or lib import (#3558)

Browse source
This commit is contained in:
David Luzar 2021-05-09 21:42:12 +02:00 • committed by GitHub
parent 5ee8e8249c
commit 91ab7f36e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/data/library.ts
View file

@ -2,7 +2,6 @@ import { loadLibraryFromBlob } from "./blob";
import { LibraryItems, LibraryItem } from "../types";
import { restoreElements } from "./restore";
import { getNonDeletedElements } from "../element";
import { NonDeleted, ExcalidrawElement } from "../element/types";
import App from "../components/App";
class Library {
@ -18,6 +17,11 @@ class Library {
this.libraryCache = [];
};
restoreLibraryItem = (libraryItem: LibraryItem): LibraryItem | null => {
const elements = getNonDeletedElements(restoreElements(libraryItem));
return elements.length ? elements : null;
};
/** imports library (currently merges, removing duplicates) */
async importLibrary(blob: Blob) {
const libraryFile = await loadLibraryFromBlob(blob);
@ -52,12 +56,12 @@ class Library {
const existingLibraryItems = await this.loadLibrary();
const filtered = libraryFile.library!.reduce((acc, libraryItem) => {
const restored = getNonDeletedElements(restoreElements(libraryItem));
if (isUniqueitem(existingLibraryItems, restored)) {
acc.push(restored);
const restoredItem = this.restoreLibraryItem(libraryItem);
if (restoredItem && isUniqueitem(existingLibraryItems, restoredItem)) {
acc.push(restoredItem);
}
return acc;
}, [] as (readonly NonDeleted<ExcalidrawElement>[])[]);
}, [] as Mutable<LibraryItems>);
await this.saveLibrary([...existingLibraryItems, ...filtered]);
}
@ -74,9 +78,13 @@ class Library {
return resolve([]);
}
const items = libraryItems.map(
(elements) => restoreElements(elements) as LibraryItem,
);
const items = libraryItems.reduce((acc, item) => {
const restoredItem = this.restoreLibraryItem(item);
if (restoredItem) {
acc.push(item);
}
return acc;
}, [] as Mutable<LibraryItems>);
// clone to ensure we don't mutate the cached library elements in the app
this.libraryCache = JSON.parse(JSON.stringify(items));