Skip to content

Commit 08dd43e

Browse files
committed
fix: room 이름 통일
1 parent 99c36ff commit 08dd43e

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

apps/frontend/src/features/canvas/model/useCanvas.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export const useCanvas = () => {
3838
const { cursors, handleMouseMove, handleNodeDrag, handleMouseLeave } =
3939
useCollaborativeCursors({
4040
ydoc,
41-
roomName: `flow-room-${workspace}`,
4241
});
4342

4443
const provider = useRef<SocketIOProvider>();
@@ -81,7 +80,7 @@ export const useCanvas = () => {
8180
const existingNode = nodesMap.get(pageId) as YNode;
8281

8382
const newNode: YNode = {
84-
id: pageId,
83+
id: existingNode.id,
8584
type: "note",
8685
data: { title: value, id: pageId, emoji: existingNode.data.emoji },
8786
position: existingNode.position,
@@ -116,7 +115,7 @@ export const useCanvas = () => {
116115
useEffect(() => {
117116
if (!ydoc) return;
118117

119-
const wsProvider = createSocketIOProvider("flow-room", ydoc);
118+
const wsProvider = createSocketIOProvider(`flow-room-${workspace}`, ydoc);
120119

121120
provider.current = wsProvider;
122121

apps/frontend/src/features/canvas/model/useCollaborativeCursors.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useReactFlow, type XYPosition } from "@xyflow/react";
55

66
import { createSocketIOProvider } from "@/shared/api/socketProvider";
77
import { useUserStore } from "@/entities/user/model/userStore";
8+
import { useWorkspace } from "@/shared/lib/useWorkspace";
89

910
export interface AwarenessState {
1011
cursor: XYPosition | null;
@@ -14,13 +15,9 @@ export interface AwarenessState {
1415

1516
interface CollaborativeCursorsProps {
1617
ydoc: Y.Doc;
17-
roomName?: string;
1818
}
1919

20-
export function useCollaborativeCursors({
21-
ydoc,
22-
roomName = "cursor-room",
23-
}: CollaborativeCursorsProps) {
20+
export function useCollaborativeCursors({ ydoc }: CollaborativeCursorsProps) {
2421
const flowInstance = useReactFlow();
2522
const provider = useRef<SocketIOProvider>();
2623
const [cursors, setCursors] = useState<Map<number, AwarenessState>>(
@@ -29,8 +26,10 @@ export function useCollaborativeCursors({
2926
const { currentUser } = useUserStore();
3027
const { color, clientId } = currentUser;
3128

29+
const workspace = useWorkspace();
30+
3231
useEffect(() => {
33-
const wsProvider = createSocketIOProvider("flow-room", ydoc);
32+
const wsProvider = createSocketIOProvider(`flow-room-${workspace}`, ydoc);
3433
provider.current = wsProvider;
3534

3635
wsProvider.awareness.setLocalState({
@@ -53,7 +52,7 @@ export function useCollaborativeCursors({
5352
return () => {
5453
wsProvider.destroy();
5554
};
56-
}, [ydoc, roomName, color, clientId]);
55+
}, [ydoc, color, clientId, workspace]);
5756

5857
const updateCursorPosition = useCallback(
5958
(x: number | null, y: number | null) => {

0 commit comments

Comments
 (0)