Merge branch 'dev' into feature/jaeyoung

src/components/floor-plan/CanvasMenu.jsx

@@ -183,7 +183,10 @@ export default function CanvasMenu(props) {
                 //해당 메뉴 이동시 배치면 삭제
                 const moduleSurfacesArray = canvas
                   .getObjects()
-                  .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE || obj.name === POLYGON_TYPE.MODULE)
+                  .filter(
+                    (obj) =>
+                      obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE || obj.name === POLYGON_TYPE.MODULE || obj.name === POLYGON_TYPE.OBJECT_SURFACE,
+                  )
                 if (moduleSurfacesArray.length > 0) {
                   moduleSurfacesArray.forEach((moduleSurface) => {
                     canvas.remove(moduleSurface)
@@ -193,7 +196,7 @@ export default function CanvasMenu(props) {
                 setType('surface')
               },
               denyFn: () => {
-                setType('surface')
+                return
               },
             })
           }