From f5d1783972af02f29dc98647fc4f204e7bafa95a Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Tue, 27 Aug 2024 14:02:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Roof2.jsx | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx index 217d0521..6c8c4155 100644 --- a/src/components/Roof2.jsx +++ b/src/components/Roof2.jsx @@ -13,6 +13,7 @@ import { compassState, currentObjectState, fontSizeState, + guideLineState, roofMaterialState, roofState, sortedPolygonArray, @@ -30,6 +31,7 @@ import SettingsModal from './SettingsModal' import { useAxios } from '@/hooks/useAxios' import QPolygonContextMenu from '@/components/common/context-menu/QPolygonContextMenu' import QLineContextMenu from '@/components/common/context-menu/QLineContextMenu' +import { isObjectNotEmpty } from '@/util/common-utils' export default function Roof2(props) { const { name, userId, email, isLoggedIn } = props @@ -72,6 +74,8 @@ export default function Roof2(props) { const [scale, setScale] = useState(1) const currentObject = useRecoilValue(currentObjectState) + const [guideLine, setGuideLine] = useRecoilState(guideLineState) + //canvas 썸네일 const [thumbnails, setThumbnails] = useState([]) const thumbnailProps = { @@ -575,15 +579,28 @@ export default function Roof2(props) { {canvas && ( <>
- + {!isObjectNotEmpty(guideLine) ? ( + + ) : ( + + )} From 771cd32dfeba8a02e6fe7144be76b2d240c900c5 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Tue, 27 Aug 2024 15:00:28 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Roof2.jsx | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx index 6c8c4155..217d0521 100644 --- a/src/components/Roof2.jsx +++ b/src/components/Roof2.jsx @@ -13,7 +13,6 @@ import { compassState, currentObjectState, fontSizeState, - guideLineState, roofMaterialState, roofState, sortedPolygonArray, @@ -31,7 +30,6 @@ import SettingsModal from './SettingsModal' import { useAxios } from '@/hooks/useAxios' import QPolygonContextMenu from '@/components/common/context-menu/QPolygonContextMenu' import QLineContextMenu from '@/components/common/context-menu/QLineContextMenu' -import { isObjectNotEmpty } from '@/util/common-utils' export default function Roof2(props) { const { name, userId, email, isLoggedIn } = props @@ -74,8 +72,6 @@ export default function Roof2(props) { const [scale, setScale] = useState(1) const currentObject = useRecoilValue(currentObjectState) - const [guideLine, setGuideLine] = useRecoilState(guideLineState) - //canvas 썸네일 const [thumbnails, setThumbnails] = useState([]) const thumbnailProps = { @@ -579,28 +575,15 @@ export default function Roof2(props) { {canvas && ( <>
- {!isObjectNotEmpty(guideLine) ? ( - - ) : ( - - )} + From bc77a9725e3b3919918e7d4e9daa69a4d7e282f5 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Tue, 27 Aug 2024 15:42:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9E=84=EC=9D=98=20=EA=B7=B8=EB=A6=AC?= =?UTF-8?q?=EB=93=9C=20=EB=AA=A8=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Roof2.jsx | 7 ++- .../common/context-menu/QEmptyContextMenu.jsx | 50 +++++++++++++++++++ src/hooks/useMode.js | 22 +++++++- 3 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 src/components/common/context-menu/QEmptyContextMenu.jsx diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx index 217d0521..ed2e837f 100644 --- a/src/components/Roof2.jsx +++ b/src/components/Roof2.jsx @@ -30,6 +30,7 @@ import SettingsModal from './SettingsModal' import { useAxios } from '@/hooks/useAxios' import QPolygonContextMenu from '@/components/common/context-menu/QPolygonContextMenu' import QLineContextMenu from '@/components/common/context-menu/QLineContextMenu' +import QEmptyContextMenu from '@/components/common/context-menu/QEmptyContextMenu' export default function Roof2(props) { const { name, userId, email, isLoggedIn } = props @@ -588,7 +589,7 @@ export default function Roof2(props) { 모드 DEFAULT