sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap localStorage API Access in try-catch (#1241)

Browse Source
This commit is contained in:
Shriram Balaji 2020-04-07 15:39:37 +05:30 committed by GitHub
parent 2cc1105ff5
commit 22160f50d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/TopErrorBoundary.tsx
View File

@ -81,8 +81,12 @@ export class TopErrorBoundary extends React.Component<
{t("errorSplash.clearCanvasMessage")} {t("errorSplash.clearCanvasMessage")}
<button <button
onClick={() => { onClick={() => {
localStorage.clear(); try {
window.location.reload(); localStorage.clear();
window.location.reload();
} catch (error) {
console.error(error);
}
}} }}
> >
{t("errorSplash.clearCanvasMessage_button")} {t("errorSplash.clearCanvasMessage_button")}

33
src/data/localStorage.ts
View File

@ -10,19 +10,32 @@ export function saveToLocalStorage(
elements: readonly ExcalidrawElement[], elements: readonly ExcalidrawElement[],
appState: AppState, appState: AppState,
) { ) {
localStorage.setItem( try {
LOCAL_STORAGE_KEY, localStorage.setItem(
JSON.stringify(elements.filter((element) => !element.isDeleted)), LOCAL_STORAGE_KEY,
); JSON.stringify(elements.filter((element) => !element.isDeleted)),
localStorage.setItem( );
LOCAL_STORAGE_KEY_STATE, localStorage.setItem(
JSON.stringify(clearAppStateForLocalStorage(appState)), LOCAL_STORAGE_KEY_STATE,
); JSON.stringify(clearAppStateForLocalStorage(appState)),
);
} catch (error) {
// Unable to access window.localStorage
console.error(error);
}
} }
export function restoreFromLocalStorage() { export function restoreFromLocalStorage() {
const savedElements = localStorage.getItem(LOCAL_STORAGE_KEY); let savedElements = null;
const savedState = localStorage.getItem(LOCAL_STORAGE_KEY_STATE); let savedState = null;
try {
savedElements = localStorage.getItem(LOCAL_STORAGE_KEY);
savedState = localStorage.getItem(LOCAL_STORAGE_KEY_STATE);
} catch (error) {
// Unable to access localStorage
console.error(error);
}
let elements = []; let elements = [];
if (savedElements) { if (savedElements) {