foss/excalidraw
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: connect users when resumed from firebase

Browse Source
This commit is contained in:
Arnošt Pleskot 2023-06-27 17:17:12 +02:00
parent a2d371bf1d
commit a1d3350131
No known key found for this signature in database
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/excalidraw-app/collab/Collab.tsx
View File

@ -385,13 +385,11 @@ class Collab extends PureComponent<Props, CollabState> {
this.portal.socket.on("first-in-room", () => { this.portal.socket.on("first-in-room", () => {
if (this.portal.socket) { if (this.portal.socket) {
this.portal.socket.off("first-in-room"); this.portal.socket.off("first-in-room");
// Recall init event to initialize collab with other users (fixes https://github.com/excalidraw/excalidraw/pull/6638#issuecomment-1600799080)
this.portal.socket.emit(WS_SCENE_EVENT_TYPES.INIT);
} }
fallbackResumeHandler(); fallbackResumeHandler();
if (this.fallbackResumeTimeout) {
clearTimeout(this.fallbackResumeTimeout);
}
}); });
} }
@ -403,6 +401,11 @@ class Collab extends PureComponent<Props, CollabState> {
break; break;
} }
case PauseCollaborationState.SYNCED: { case PauseCollaborationState.SYNCED: {
if (this.fallbackResumeTimeout) {
clearTimeout(this.fallbackResumeTimeout);
this.fallbackResumeTimeout = null;
}
if (this.isPaused()) { if (this.isPaused()) {
this.setIsCollaborationPaused(false); this.setIsCollaborationPaused(false);
@ -410,11 +413,7 @@ class Collab extends PureComponent<Props, CollabState> {
appState: { viewModeEnabled: false }, appState: { viewModeEnabled: false },
}); });
this.excalidrawAPI.setToast(null); this.excalidrawAPI.setToast(null);
this.excalidrawAPI.scrollToContent();
if (this.fallbackResumeTimeout) {
clearTimeout(this.fallbackResumeTimeout);
this.fallbackResumeTimeout = null;
}
} }
} }
} }