From 7954c45c7efe76ae79256220f950825962739846 Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Wed, 6 Nov 2024 15:04:42 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EA=B5=AC=20=EC=98=A4=ED=94=84?=
 =?UTF-8?q?=EC=85=8B=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/floor-plan/modal/object/DormerOffset.jsx | 4 ++--
 src/hooks/object/useObjectBatch.js                      | 7 +++++--
 src/hooks/useContextMenu.js                             | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/floor-plan/modal/object/DormerOffset.jsx b/src/components/floor-plan/modal/object/DormerOffset.jsx
index a90b61ee..191a94ea 100644
--- a/src/components/floor-plan/modal/object/DormerOffset.jsx
+++ b/src/components/floor-plan/modal/object/DormerOffset.jsx
@@ -9,7 +9,7 @@ import { canvasState } from '@/store/canvasAtom'
 
 export default function DormerOffset(props) {
   const contextPopupPosition = useRecoilValue(contextPopupPositionState)
-  const { id, pos = contextPopupPosition } = props
+  const { id, pos = contextPopupPosition, title } = props
   const { getMessage } = useMessage()
   const { closePopup } = usePopup()
   const [arrow1, setArrow1] = useState(null)
@@ -43,7 +43,7 @@ export default function DormerOffset(props) {
     <WithDraggable isShow={true} pos={pos}>
       <div className={`modal-pop-wrap xm mount`}>
         <div className="modal-head">
-          <h1 className="title">{getMessage('contextmenu.dormer.offset')}</h1>
+          <h1 className="title">{title}</h1>
           <button className="modal-close" onClick={() => closePopup(id)}>
             닫기
           </button>
diff --git a/src/hooks/object/useObjectBatch.js b/src/hooks/object/useObjectBatch.js
index 41583a81..a16ce0f9 100644
--- a/src/hooks/object/useObjectBatch.js
+++ b/src/hooks/object/useObjectBatch.js
@@ -1008,8 +1008,11 @@ export function useObjectBatch({ isHidden, setIsHidden }) {
     if (length1) dormer.top = arrow1 === 'down' ? dormer.top + length1 : dormer.top - length1
     if (length2) dormer.left = arrow2 === 'left' ? dormer.left - length2 : dormer.left + length2
 
-    const newDormer = reGroupObject(dormer)
-    canvas?.setActiveObject(newDormer)
+    if (dormer.type === 'group') {
+      const newDormer = reGroupObject(dormer)
+      canvas?.setActiveObject(newDormer)
+    }
+    canvas.renderAll()
   }
 
   return {
diff --git a/src/hooks/useContextMenu.js b/src/hooks/useContextMenu.js
index 7f8b9db5..34f5a952 100644
--- a/src/hooks/useContextMenu.js
+++ b/src/hooks/useContextMenu.js
@@ -296,7 +296,7 @@ export function useContextMenu() {
               {
                 id: 'dormerOffset',
                 name: getMessage('contextmenu.dormer.offset'),
-                component: <DormerOffset id={popupId} />,
+                component: <DormerOffset id={popupId} title={getMessage('contextmenu.dormer.offset')} />,
               },
             ],
           ])
@@ -376,6 +376,7 @@ export function useContextMenu() {
               {
                 id: 'openingOffset',
                 name: getMessage('contextmenu.opening.offset'),
+                component: <DormerOffset id={popupId} title={getMessage('contextmenu.opening.offset')} />,
               },
             ],
           ])