fix: Prevent local AppState reset during collaboration

fix-collab-local-appstate-reset
Daniel J. Geiger 2 years ago
parent fdd8552637
commit 5542e4528a

@ -46,12 +46,15 @@ class LocalFileManager extends FileManager {
const saveDataStateToLocalStorage = (
elements: readonly ExcalidrawElement[],
appState: AppState,
appStateOnly = false,
) => {
try {
localStorage.setItem(
STORAGE_KEYS.LOCAL_STORAGE_ELEMENTS,
JSON.stringify(clearElementsForLocalStorage(elements)),
);
if (!appStateOnly) {
localStorage.setItem(
STORAGE_KEYS.LOCAL_STORAGE_ELEMENTS,
JSON.stringify(clearElementsForLocalStorage(elements)),
);
}
localStorage.setItem(
STORAGE_KEYS.LOCAL_STORAGE_APP_STATE,
JSON.stringify(clearAppStateForLocalStorage(appState)),
@ -72,8 +75,12 @@ export class LocalData {
appState: AppState,
files: BinaryFiles,
onFilesSaved: () => void,
appStateOnly = false,
) => {
saveDataStateToLocalStorage(elements, appState);
saveDataStateToLocalStorage(elements, appState, appStateOnly);
if (appStateOnly) {
return;
}
await this.fileStorage.saveFiles({
elements,
@ -97,6 +104,14 @@ export class LocalData {
}
};
/** Saves the AppState, only if saving is paused. */
static saveAppState = (appState: AppState) => {
// we need to make the `isSavePaused` check synchronously (undebounced)
if (this.isSavePaused()) {
this._save([], appState, {}, () => {}, true);
}
};
static flushSave = () => {
this._save.flush();
};

@ -189,7 +189,7 @@ const initializeScene = async (opts: {
...restoreAppState(
{
...scene?.appState,
theme: localDataState?.appState?.theme || scene?.appState?.theme,
...localDataState?.appState,
},
excalidrawAPI.getAppState(),
),
@ -538,6 +538,8 @@ const ExcalidrawWrapper = () => {
}
}
});
} else {
LocalData.saveAppState(appState);
}
};

Loading…
Cancel
Save