[#134] fix: caret offset이 0일 때 / 입력시 에러가 발생하는 버그 수정

boostcamp-2020 · Dec 19, 2020 · 9ceef90 · 9ceef90
1 parent 06a28ac
commit 9ceef90
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/frontend/src/components/atoms/BlockContent/BlockContent.tsx b/frontend/src/components/atoms/BlockContent/BlockContent.tsx
@@ -183,11 +183,11 @@ function BlockContent(blockDTO: Block) {
             const numberListUpperBlock = isUpperBlockEqualToNumberList();
             if (!numberListUpperBlock && content[0] !== FIRST_LIST_NUMBER)
               return;
-            // if (
-            //   numberListUpperBlock &&
-            //   cntOfUpperNumberListBlock() + 1 !== +content[0]
-            // )
-            //   return;
+            if (
+              numberListUpperBlock &&
+              cntOfUpperNumberListBlock() + 1 !== +content[0]
+            )
+              return;
           }
         }
         const slicedContent = content.slice(
@@ -200,13 +200,15 @@ function BlockContent(blockDTO: Block) {
     } else if (event.key === '/') {
       let nowLetterIdx = window.getSelection().focusOffset;
       if (!nowLetterIdx) nowLetterIdx += 1;
-      const rect = window.getSelection().getRangeAt(0).getClientRects()[0];
-      setModal({
-        isOpen: true,
-        top: rect.top,
-        left: rect.left,
-        caretOffset: nowLetterIdx,
-        blockId: blockDTO.id,
+      setTimeout(() => {
+        const rect = window.getSelection().getRangeAt(0).getClientRects()[0];
+        setModal({
+          isOpen: true,
+          top: rect.top,
+          left: rect.left,
+          caretOffset: nowLetterIdx,
+          blockId: blockDTO.id,
+        });
       });
     } else if (modal.isOpen) {
       setModal({ ...modal, isOpen: false });