Merge pull request 'dev' (#776) from dev into prd-deploy

Reviewed-on: #776

src/hooks/common/useRoofFn.js

@@ -250,7 +250,7 @@ export function useRoofFn() {
 
       const allRoofObject = canvas
         .getObjects()
-        .filter((obj) => obj !== roof && (obj.attributes?.roofId === roof.id || obj.parentId === roof.id || obj.parentId === wall.id))
+        .filter((obj) => obj !== roof && (obj.attributes?.roofId === roof.id || obj.parentId === roof.id || (wall && obj.parentId === wall.id)))
 
       /** 지붕이 움직인 만큼의 delta를 구한다. */
       const originalRoofLeft = roof.left
@@ -276,15 +276,33 @@ export function useRoofFn() {
       // Move all related objects by the delta
       allRoofObject.forEach((obj) => {
         if (obj.points !== undefined) {
-          obj.set({
+          if (obj.name === 'arrow') {
-            left: obj.left + deltaX,
+            // arrow 는 originX='left' 기본값이며 polygonMoved 가 left=pathOffset(중심) 으로
-            top: obj.top + deltaY,
+            // 리셋하면 origin 불일치로 위치가 밀리므로, 단순 점 이동만 수행.
-            originX: 'center',
+            obj.points = obj.points.map((p) => ({ x: p.x + deltaX, y: p.y + deltaY }))
-            originY: 'center',
+            const dim = obj._calcDimensions({})
-            objectCaching: false,
+            obj.set({
-          })
+              left: dim.left + dim.width / 2,
-          obj.fire('polygonMoved')
+              top: dim.top + dim.height / 2,
-          obj.fire('modified')
+              width: dim.width,
+              height: dim.height,
+              pathOffset: { x: dim.left + dim.width / 2, y: dim.top + dim.height / 2 },
+              originX: 'center',
+              originY: 'center',
+              objectCaching: false,
+            })
+            obj.setCoords()
+          } else {
+            obj.set({
+              left: obj.left + deltaX,
+              top: obj.top + deltaY,
+              originX: 'center',
+              originY: 'center',
+              objectCaching: false,
+            })
+            obj.fire('polygonMoved')
+            obj.fire('modified')
+          }
         } else {
           obj.set({
             left: obj.left + deltaX,

src/hooks/floorPlan/useImgLoader.js

@@ -84,15 +84,25 @@ export function useImgLoader() {
       const originalBg = canvas.backgroundColor
       canvas.backgroundColor = '#ffffff'
 
-      // CORS 대응: 이미지 오브젝트에 crossOrigin 설정
+      // CORS 대응: 이미지 오브젝트에 crossOrigin 설정 (로드 완료 대기)
-      canvas.getObjects('image').forEach((obj) => {
+      const imageObjects = canvas.getObjects('image').filter((obj) => obj.getSrc)
-        if (obj.getSrc) {
+      await Promise.all(
-          const img = new Image()
+        imageObjects.map(
-          img.crossOrigin = 'anonymous'
+          (obj) =>
-          img.src = obj.getSrc()
+            new Promise((resolve) => {
-          obj.setElement(img)
+              const img = new Image()
-        }
+              img.crossOrigin = 'anonymous'
-      })
+              img.onload = () => {
+                obj.setElement(img)
+                resolve()
+              }
+              img.onerror = () => {
+                resolve()
+              }
+              img.src = obj.getSrc()
+            }),
+        ),
+      )
 
       canvas.renderAll()