From 6c37af9ef3f384faac6f516f8729fdc06f78d81f Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Tue, 22 Oct 2024 17:11:16 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A6=AC=EA=B8=B0=20=ED=8C=A8=ED=84=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/surface/usePlacementShapeDrawing.js | 6 ++++--
 src/hooks/surface/useSurfaceShapeBatch.js     | 8 +++-----
 src/store/settingAtom.js                      | 7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/hooks/surface/usePlacementShapeDrawing.js b/src/hooks/surface/usePlacementShapeDrawing.js
index 91725a1c..b3e207dc 100644
--- a/src/hooks/surface/usePlacementShapeDrawing.js
+++ b/src/hooks/surface/usePlacementShapeDrawing.js
@@ -30,15 +30,17 @@ import {
 } from '@/store/placementShapeDrawingAtom'
 import { usePolygon } from '@/hooks/usePolygon'
 import { POLYGON_TYPE } from '@/common/common'
-
+import { roofDisplaySelector } from '@/store/settingAtom'
 // 면형상 배치
 export function usePlacementShapeDrawing(setShowPlaceShapeDrawingModal) {
   const canvas = useRecoilValue(canvasState)
+  const roofDisplay = useRecoilValue(roofDisplaySelector)
   const { addCanvasMouseEventListener, addDocumentEventListener, removeAllMouseEventListeners, removeAllDocumentEventListeners, removeMouseEvent } =
     useEvent()
   const { getIntersectMousePoint } = useMouse()
   const { addLine, removeLine } = useLine()
   const { addPolygonByLines, drawDirectionArrow } = usePolygon()
+
   const { tempGridMode } = useTempGrid()
 
   const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState)
@@ -221,7 +223,7 @@ export function usePlacementShapeDrawing(setShowPlaceShapeDrawingModal) {
           pitch: globalPitch,
         })
 
-        setSurfaceShapePattern(roof)
+        setSurfaceShapePattern(roof, roofDisplay.column)
         drawDirectionArrow(roof)
 
         lines.forEach((line) => {
diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index ac28d8ed..d0c58944 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -9,17 +9,16 @@ import { QPolygon } from '@/components/fabric/QPolygon'
 import { useSwal } from '@/hooks/useSwal'
 import { useMessage } from '@/hooks/useMessage'
 import { useEvent } from '@/hooks/useEvent'
-import { settingModalFirstOptionsState, settingModalSecondOptionsState } from '@/store/settingAtom'
+import { roofDisplaySelector } from '@/store/settingAtom'
 
 export function useSurfaceShapeBatch() {
   const { getMessage } = useMessage()
 
   const canvas = useRecoilValue(canvasState)
   const globalPitch = useRecoilValue(globalPitchState)
+  const roofDisplay = useRecoilValue(roofDisplaySelector)
   const { swalFire } = useSwal()
   const { addCanvasMouseEventListener, initEvent } = useEvent()
-  const firstSettings = useRecoilValue(settingModalFirstOptionsState)
-  const secondSettings = useRecoilValue(settingModalSecondOptionsState)
 
   const applySurfaceShape = (surfaceRefs, selectedType, setShowPlacementSurfaceSettingModal) => {
     let length1, length2, length3, length4, length5
@@ -122,8 +121,7 @@ export function useSurfaceShapeBatch() {
         isDrawing = false
         obj.set('name', POLYGON_TYPE.ROOF)
         initEvent()
-        const displayMode = firstSettings.option2.filter((item) => item.selected)[0].column
-        setSurfaceShapePattern(obj, displayMode)
+        setSurfaceShapePattern(obj, roofDisplay.column)
         setShowPlacementSurfaceSettingModal(true)
       })
     }
diff --git a/src/store/settingAtom.js b/src/store/settingAtom.js
index 8560c700..c6e94029 100644
--- a/src/store/settingAtom.js
+++ b/src/store/settingAtom.js
@@ -149,10 +149,11 @@ export const corridorDimensionSelector = selector({
 })
 
 // 디스플레이 설정 - 화면 표시
-export const realDimensionSelector = selector({
-  key: 'realDimensionSelector',
+export const roofDisplaySelector = selector({
+  key: 'roofDisplaySelector',
   get: ({ get }) => {
     const settingModalFirstOptions = get(settingModalFirstOptionsState)
-    return settingModalFirstOptions.dimensionDisplay.find((option) => option.selected)
+    return settingModalFirstOptions.option2.find((option) => option.selected)
   },
+  dangerouslyAllowMutability: true,
 })