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

clear deleted elements on room create (#2270)

Browse source
This commit is contained in:
David Luzar 2020-10-26 15:53:55 +01:00 • committed by GitHub
parent 915bda9fd8
commit f404ab6f50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 80 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/App.tsx
View file

@ -654,8 +654,10 @@ class App extends React.Component<ExcalidrawProps, AppState> {
if (isCollaborationScene) {
// when joining a room we don't want user's local scene data to be merged
// into the remote scene, so set `clearScene`
this.initializeSocketClient({ showLoadingState: true, clearScene: true });
// into the remote scene
this.resetScene();
this.initializeSocketClient({ showLoadingState: true });
} else if (scene) {
if (scene.appState) {
scene.appState = {
@ -1256,6 +1258,14 @@ class App extends React.Component<ExcalidrawProps, AppState> {
"Excalidraw",
await generateCollaborationLink(),
);
// remove deleted elements from elements array & history to ensure we don't
// expose potentially sensitive user data in case user manually deletes
// existing elements (or clears scene), which would otherwise be persisted
// to database even if deleted before creating the room.
history.clear();
history.resumeRecording();
this.scene.replaceAllElements(this.scene.getElements());
this.initializeSocketClient({ showLoadingState: false });
};
@ -1365,14 +1375,11 @@ class App extends React.Component<ExcalidrawProps, AppState> {
private initializeSocketClient = async (opts: {
showLoadingState: boolean;
clearScene?: boolean;
}) => {
if (this.portal.socket) {
return;
}
if (opts.clearScene) {
this.resetScene();
}
const roomMatch = getCollaborationLinkData(window.location.href);
if (roomMatch) {
const roomID = roomMatch[1];