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

retain local appState props on restore (#2224)

Browse source 
Co-authored-by: Lipis <lipiridis@gmail.com>
This commit is contained in:
David Luzar 2020-10-13 13:46:52 +02:00 • committed by GitHub
parent b91f929503
commit 7618ca48d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 153 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/data/restore.ts
View file

@ -118,7 +118,7 @@ const restoreElement = (
}
};
const restoreElements = (
export const restoreElements = (
elements: ImportedDataState["elements"],
): ExcalidrawElement[] => {
return (elements || []).reduce((elements, element) => {
@ -134,18 +134,27 @@ const restoreElements = (
}, [] as ExcalidrawElement[]);
};
const restoreAppState = (appState: ImportedDataState["appState"]): AppState => {
const restoreAppState = (
appState: ImportedDataState["appState"],
localAppState: Partial<AppState> | null,
): AppState => {
appState = appState || {};
const defaultAppState = getDefaultAppState();
const nextAppState = {} as typeof defaultAppState;
for (const [key, val] of Object.entries(defaultAppState)) {
if ((appState as any)[key] !== undefined) {
(nextAppState as any)[key] = (appState as any)[key];
} else {
(nextAppState as any)[key] = val;
}
for (const [key, val] of Object.entries(defaultAppState) as [
keyof typeof defaultAppState,
any,
][]) {
const restoredValue = appState[key];
const localValue = localAppState ? localAppState[key] : undefined;
(nextAppState as any)[key] =
restoredValue !== undefined
? restoredValue
: localValue !== undefined
? localValue
: val;
}
return {
@ -155,9 +164,18 @@ const restoreAppState = (appState: ImportedDataState["appState"]): AppState => {
};
};
export const restore = (data: ImportedDataState): DataState => {
export const restore = (
data: ImportedDataState,
/**
* Local AppState (`this.state` or initial state from localStorage) so that we
* don't overwrite local state with default values (when values not
* explicitly specified).
* Supply `null` if you can't get access to it.
*/
localAppState: Partial<AppState> | null | undefined,
): DataState => {
return {
elements: restoreElements(data.elements),
appState: restoreAppState(data.appState),
appState: restoreAppState(data.appState, localAppState || null),
};
};