Merge branch 'dev' into style/#271-K

Author: se030

client/src/components/Block/TextBlock.tsx

@@ -110,8 +110,6 @@ function TextBlock({
 
   // crdt의 초기화와 소켓을 통해 전달받는 리모트 연산 처리
   useEffect(() => {
-    registerRef(blockRef);
-
     socket.emit(BLOCK_EVENT.INIT, id);
 
     ee.on(`${BLOCK_EVENT.INIT}-${id}`, onInitialize);
@@ -127,6 +125,10 @@ function TextBlock({
     };
   }, []);
 
+  useEffect(() => {
+    registerRef(blockRef);
+  }, [index]);
+
   useEffect(() => {
     updateCaretPosition();
   }, [isOpen]);
@@ -240,7 +242,7 @@ function TextBlock({
         {
           ref: blockRef,
           'data-id': id,
-          'date-index': index,
+          'data-index': index,
           ...commonHandlers,
           contentEditable: true,
           suppressContentEditableWarning: true,

client/src/components/Mom/index.tsx

@@ -27,7 +27,7 @@ function Mom() {
   const titleRef = useRef<HTMLHeadingElement>(null);
 
   const onTitleUpdate: React.FormEventHandler<HTMLHeadingElement> = useDebounce(
-    (e) => {
+    () => {
       if (!titleRef.current) return;
 
       const title = titleRef.current.innerText;
@@ -46,13 +46,13 @@ function Mom() {
     focusIndex.current = idx;
   };
 
-  const setBlockFocus = () => {
+  const setBlockFocus = (index: number) => {
     if (!blockRefs.current || focusIndex.current === undefined) return;
 
     const idx = focusIndex.current;
+    if (index === undefined || index !== idx) return;
 
     const targetBlock = blockRefs.current[idx];
-
     if (!targetBlock || !targetBlock.current) return;
 
     targetBlock.current.focus();
@@ -104,17 +104,16 @@ function Mom() {
       updateBlockFocus(index - 1);
 
       setBlocks(spreadCRDT());
-      setBlockFocus();
+
+      if (focusIndex.current === undefined) return;
+      setBlockFocus(focusIndex.current);
+
       setCaretToEnd();
 
       socket.emit(MOM_EVENT.DELETE_BLOCK, id, remoteDeletion);
     }
   };
 
-  useEffect(() => {
-    setBlockFocus();
-  }, [blocks]);
-
   useEffect(() => {
     if (!selectedMom) return;
 
@@ -184,6 +183,12 @@ function Mom() {
     };
   }, [selectedMom]);
 
+  const registerRef =
+    (index: number) => (ref: React.RefObject<HTMLElement>) => {
+      blockRefs.current[index] = ref;
+      setBlockFocus(index);
+    };
+
   return selectedMom ? (
     <div className={style['mom-container']}>
       <div className={style['mom']}>
@@ -206,9 +211,7 @@ function Mom() {
               id={id}
               index={index}
               onHandleBlock={onHandleBlock}
-              registerRef={(ref: React.RefObject<HTMLElement>) => {
-                blockRefs.current[index] = ref;
-              }}
+              registerRef={registerRef(index)}
             />
           ))}
         </div>

client/src/hooks/useOffset.tsx

@@ -54,8 +54,6 @@ export function useOffset(blockRef: React.RefObject<HTMLParagraphElement>) {
   };
 
   const offsetHandlers = {
-    onFocus:
-      setOffset as unknown as React.FocusEventHandler<HTMLParagraphElement>,
     onClick:
       setOffset as unknown as React.MouseEventHandler<HTMLParagraphElement>,
     onKeyUp: onArrowKeyup,