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

Allow opening empty excalidraw file (#1348)

Browse Source 
* allow openning empty file

* correctly throw error

* fix error handling

* switch back to error objects

Co-authored-by: dwelle <luzar.david@gmail.com>
This commit is contained in:
Kostas Bariotis 2020-04-10 10:58:09 +01:00 committed by GitHub
parent 70e7dd6e3b
commit 0a284adc18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/actionExport.tsx
View File

@ -92,7 +92,7 @@ export const actionLoadScene = register({
updateData({ elements: elements, appState: appState }); updateData({ elements: elements, appState: appState });
}) })
.catch((error) => { .catch((error) => {
updateData({ error: error }); updateData({ error: error.message });
}); });
}} }}
/> />

2
src/components/App.tsx
View File

@ -2358,7 +2358,7 @@ export class App extends React.Component<any, AppState> {
}), }),
) )
.catch((error) => { .catch((error) => {
this.setState({ isLoading: false, errorMessage: error }); this.setState({ isLoading: false, errorMessage: error.message });
}); });
} else { } else {
this.setState({ this.setState({

11
src/data/blob.ts
View File

@ -1,5 +1,4 @@
import { getDefaultAppState } from "../appState"; import { getDefaultAppState } from "../appState";
import { DataState } from "./types";
import { restore } from "./restore"; import { restore } from "./restore";
import { t } from "../i18n"; import { t } from "../i18n";
@ -16,7 +15,7 @@ export async function loadFromBlob(blob: any) {
elements = data.elements || []; elements = data.elements || [];
appState = { ...defaultAppState, ...data.appState }; appState = { ...defaultAppState, ...data.appState };
} catch { } catch {
// Do nothing because elements array is already empty throw new Error(t("alerts.couldNotLoadInvalidFile"));
} }
return { elements, appState }; return { elements, appState };
}; };
@ -38,11 +37,7 @@ export async function loadFromBlob(blob: any) {
}; };
}); });
} }
const { elements, appState } = updateAppState(contents); const { elements, appState } = updateAppState(contents);
if (!elements.length) { return restore(elements, appState, { scrollToContent: true });
return Promise.reject(t("alerts.couldNotLoadInvalidFile"));
}
return new Promise<DataState>((resolve) => {
resolve(restore(elements, appState, { scrollToContent: true }));
});
} }