Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

One more socket listener moved to Portal (#1507)

Kent Beckdd1dfc595037
diff --git a/src/components/App.tsx b/src/components/App.tsx
index cd76be3172..d1b3edf241 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -971,22 +971,6 @@ class App extends React.Component<any, AppState> {
}
initialize();
});
- this.portal.socket!.on("room-user-change", (clients: string[]) => {
- this.setState((state) => {
- const collaborators: typeof state.collaborators = new Map();
- for (const socketID of clients) {
- if (state.collaborators.has(socketID)) {
- collaborators.set(socketID, state.collaborators.get(socketID)!);
- } else {
- collaborators.set(socketID, {});
- }
- }
- return {
- ...state,
- collaborators,
- };
- });
- });
this.setState({
isCollaborating: true,
@@ -995,6 +979,24 @@ class App extends React.Component<any, AppState> {
}
};
+ // Portal-only
+ setCollaborators(sockets: string[]) {
+ this.setState((state) => {
+ const collaborators: typeof state.collaborators = new Map();
+ for (const socketID of sockets) {
+ if (state.collaborators.has(socketID)) {
+ collaborators.set(socketID, state.collaborators.get(socketID)!);
+ } else {
+ collaborators.set(socketID, {});
+ }
+ }
+ return {
+ ...state,
+ collaborators,
+ };
+ });
+ }
+
private broadcastMouseLocation = (payload: {
pointerCoords: SocketUpdateDataSource["MOUSE_LOCATION"]["payload"]["pointerCoords"];
button: SocketUpdateDataSource["MOUSE_LOCATION"]["payload"]["button"];
diff --git a/src/components/Portal.tsx b/src/components/Portal.tsx
index 7b23c556a2..950330465c 100644
--- a/src/components/Portal.tsx
+++ b/src/components/Portal.tsx
@@ -21,16 +21,19 @@ class Portal {
this.roomKey = key;
// Initialize socket listeners (moving from App)
- this.socket!.on("init-room", () => {
+ this.socket.on("init-room", () => {
if (this.socket) {
this.socket.emit("join-room", this.roomID);
this.app.restoreUserName();
}
});
- this.socket!.on("new-user", async (_socketID: string) => {
+ this.socket.on("new-user", async (_socketID: string) => {
this.app.broadcastScene(SCENE.INIT);
});
+ this.socket.on("room-user-change", (clients: string[]) => {
+ this.app.setCollaborators(clients);
+ });
}
close() {