diff --git a/src/common/common.js b/src/common/common.js
index c9c60f48..903f6fd7 100644
--- a/src/common/common.js
+++ b/src/common/common.js
@@ -169,6 +169,7 @@ export const SAVE_KEY = [
'supFitQty',
'supFitIntvlPct',
'rackLen',
+ 'trestleDetail',
]
export const OBJECT_PROTOTYPE = [fabric.Line.prototype, fabric.Polygon.prototype, fabric.Triangle.prototype]
diff --git a/src/components/Playground.jsx b/src/components/Playground.jsx
index 230eecd1..a55f4e46 100644
--- a/src/components/Playground.jsx
+++ b/src/components/Playground.jsx
@@ -25,6 +25,8 @@ import SampleReducer from './sample/SampleReducer'
import styles from './playground.module.css'
import useSWR from 'swr'
import useSWRMutation from 'swr/mutation'
+import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
+import { canvasPopupStatusStore } from '@/store/canvasPopupStatusAtom'
export default function Playground() {
const [useCadFile, setUseCadFile] = useRecoilState(useCadFileState)
@@ -267,6 +269,12 @@ export default function Playground() {
return
Error...
}
+ useCanvasPopupStatusController(1)
+
+ const [canvasPopupStatusState, setCanvasPopupStatusState] = useRecoilState(canvasPopupStatusStore)
+ useEffect(() => {
+ console.log('๐ ~ Playground ~ canvasPopupStatusState:', canvasPopupStatusState)
+ }, [canvasPopupStatusState])
return (
<>
diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index 13cfd956..3b3e0003 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -78,7 +78,6 @@ export default function CanvasMenu(props) {
const { commonFunctions } = useCommonUtils()
const { floorPlanState, setFloorPlanState } = useContext(FloorPlanContext)
- const { restoreModuleInstArea } = useModuleBasicSetting()
const [addedRoofs, setAddedRoofsState] = useRecoilState(addedRoofsState)
const [basicSetting, setBasicSetting] = useRecoilState(basicSettingState)
@@ -162,10 +161,6 @@ export default function CanvasMenu(props) {
setType('outline')
break
case 3:
- if (type === 'module') {
- restoreModuleInstArea()
- }
-
setType('surface')
break
case 4:
diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx
index ea46bd3b..392c1eda 100644
--- a/src/components/floor-plan/modal/basic/BasicSetting.jsx
+++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx
@@ -5,8 +5,8 @@ import Module from '@/components/floor-plan/modal/basic/step/Module'
import PitchModule from '@/components/floor-plan/modal/basic/step/pitch/PitchModule'
import PitchPlacement from '@/components/floor-plan/modal/basic/step/pitch/PitchPlacement'
import Placement from '@/components/floor-plan/modal/basic/step/Placement'
-import { useRecoilValue } from 'recoil'
-import { canvasSettingState } from '@/store/canvasAtom'
+import { useRecoilValue, useRecoilState } from 'recoil'
+import { canvasSettingState, isManualModuleSetupState } from '@/store/canvasAtom'
import { usePopup } from '@/hooks/usePopup'
import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientation'
import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
@@ -19,6 +19,8 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
const canvasSetting = useRecoilValue(canvasSettingState)
const orientationRef = useRef(null)
const { initEvent } = useEvent()
+ const [isManualModuleSetup, setIsManualModuleSetup] = useRecoilState(isManualModuleSetupState)
+
// const { initEvent } = useContext(EventContext)
const { manualModuleSetup, autoModuleSetup, manualFlatroofModuleSetup, autoFlatroofModuleSetup } = useModuleBasicSetting()
const handleBtnNextStep = () => {
@@ -38,6 +40,14 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
setupLocation: useRef('south'),
}
+ const handleManualModuleSetup = () => {
+ setIsManualModuleSetup(!isManualModuleSetup)
+ }
+
+ useEffect(() => {
+ manualModuleSetup()
+ }, [isManualModuleSetup])
+
return (
@@ -83,7 +93,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
<>
{canvasSetting.roofSizeSet && canvasSetting.roofSizeSet != 3 && (
<>
-