Merge pull request #291 from boostcampwm-2024/Hotfix/#288_스페이스만_있을때_캐…

…럿_튀는_문제 Hotfix/#288 다른 블록에서 캐럿 튀는 문제, 배치 처리 다시 추가
boostcampwm-2024 · Dec 4, 2024 · 80d12dd · 80d12dd
2 parents db95d3f + 7e8d8bd
commit 80d12dd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 30 deletions.
diff --git a/client/src/features/editor/utils/domSyncUtils.ts b/client/src/features/editor/utils/domSyncUtils.ts
@@ -139,14 +139,13 @@ const setsEqual = (a: Set<string>, b: Set<string>): boolean => {
 };
 
 const sanitizeText = (text: string): string => {
-  return text.replace(/<br>/g, "\u00A0").replace(/[<>&"'\s]/g, (match) => {
+  return text.replace(/<br>/g, "\u00A0").replace(/[<>&"']/g, (match) => {
     const escapeMap: Record<string, string> = {
       "<": "&lt;",
       ">": "&gt;",
       "&": "&amp;",
       '"': "&quot;",
       "'": "&#x27;",
-      " ": "&nbsp;",
     };
     return escapeMap[match] || match;
   });

diff --git a/client/src/stores/useSocketStore.ts b/client/src/stores/useSocketStore.ts
@@ -242,45 +242,45 @@ export const useSocketStore = create<SocketStore>((set, get) => ({
   },
 
   sendBlockInsertOperation: (operation: RemoteBlockInsertOperation) => {
-    const { socket } = get();
-    socket?.emit("insert/block", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("insert/block", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendCharInsertOperation: (operation: RemoteCharInsertOperation) => {
-    const { socket } = get();
-    socket?.emit("insert/char", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("insert/char", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendBlockUpdateOperation: (operation: RemoteBlockUpdateOperation) => {
-    const { socket } = get();
-    socket?.emit("update/block", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("update/block", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendBlockDeleteOperation: (operation: RemoteBlockDeleteOperation) => {
-    const { socket } = get();
-    socket?.emit("delete/block", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("delete/block", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendCharDeleteOperation: (operation: RemoteCharDeleteOperation) => {
-    const { socket } = get();
-    socket?.emit("delete/char", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("delete/char", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendCharUpdateOperation: (operation: RemoteCharUpdateOperation) => {
-    const { socket } = get();
-    socket?.emit("update/char", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("update/char", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendCursorPosition: (position: CursorPosition) => {
@@ -289,10 +289,10 @@ export const useSocketStore = create<SocketStore>((set, get) => ({
   },
 
   sendBlockReorderOperation: (operation: RemoteBlockReorderOperation) => {
-    const { socket } = get();
-    socket?.emit("reorder/block", operation);
-    // const { sendOperation } = get();
-    // sendOperation(operation);
+    // const { socket } = get();
+    // socket?.emit("reorder/block", operation);
+    const { sendOperation } = get();
+    sendOperation(operation);
   },
 
   sendBlockCheckboxOperation: (operation: RemoteBlockCheckboxOperation) => {