fix: 스타일 적용된 텍스트 이어서 작성할 때 서버 반영 안되는 문제 해결

boostcampwm-2024 · Dec 4, 2024 · 702733c · 702733c
1 parent 7118d78
commit 702733c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/@noctaCrdt/Crdt.ts b/@noctaCrdt/Crdt.ts
@@ -294,12 +294,12 @@ export class BlockCRDT extends CRDT<Char> {
       });
     }
 
-    if (operation.color) {
-      newNode.color = operation.color;
+    if (operation.node.color) {
+      newNode.color = operation.node.color;
     }
 
-    if (operation.backgroundColor) {
-      newNode.backgroundColor = operation.backgroundColor;
+    if (operation.node.backgroundColor) {
+      newNode.backgroundColor = operation.node.backgroundColor;
     }
 
     this.LinkedList.insertById(newNode);

diff --git a/client/src/features/editor/hooks/useBlockOperation.ts b/client/src/features/editor/hooks/useBlockOperation.ts
@@ -92,14 +92,14 @@ export const useBlockOperation = ({
             addedChar,
             block.id,
             pageId,
-            prevChar ? prevChar.style : [],
-            prevChar ? prevChar.color : undefined,
-            prevChar ? prevChar.backgroundColor : undefined,
+            prevChar?.style,
+            prevChar?.color,
+            prevChar?.backgroundColor,
           );
         } else {
           // 중간에 삽입
           const prevChar = editorCRDT.currentBlock?.crdt.LinkedList.findByIndex(
-            validCaretPosition - 1,
+            validCaretPosition === 1 ? 0 : validCaretPosition - 2,
           );
           const addedChar = newContent[validCaretPosition - 1];
           charNode = block.crdt.localInsert(