diff --git a/src/app/floor-plan/FloorPlanProvider.js b/src/app/floor-plan/FloorPlanProvider.js index cb47d702..d46a4038 100644 --- a/src/app/floor-plan/FloorPlanProvider.js +++ b/src/app/floor-plan/FloorPlanProvider.js @@ -43,18 +43,19 @@ export const FloorPlanContext = createContext({ const FloorPlanProvider = ({ children }) => { const pathname = usePathname() - const setCurrentObjectNo = useSetRecoilState(correntObjectNoState) + const setCorrentObjectNo = useSetRecoilState(correntObjectNoState) const searchParams = useSearchParams() const objectNo = searchParams.get('objectNo') const pid = searchParams.get('pid') useEffect(() => { + console.log('๐Ÿš€ ~ useEffect ~ objectNo:') if (pathname === '/floor-plan') { if (pid === undefined || pid === '' || pid === null || objectNo === undefined || objectNo === '' || objectNo === null) { notFound() } - setCurrentObjectNo(objectNo) + setCorrentObjectNo(objectNo) } - }, [pathname]) + }, []) //useEffect(() => { // ์˜ค๋ฅ˜ ๋ฐœ์ƒ์œผ๋กœ useEffect ์‚ฌ์šฉ // if (pathname === '/floor-plan') { diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index 080c78c4..74a3bfc5 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -1,4 +1,4 @@ -import { useEffect, useState, useRef } from 'react' +import { useEffect, useState, useRef, useContext } from 'react' import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil' import { adsorptionPointModeState, @@ -35,6 +35,7 @@ import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementSha import { useCanvasMenu } from '../common/useCanvasMenu' import { menuTypeState } from '@/store/menuAtom' import { usePopup } from '../usePopup' +import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider' const defaultDotLineGridSetting = { INTERVAL: { @@ -122,6 +123,8 @@ export function useCanvasSetting() { const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector) + const { floorPlanState } = useContext(FloorPlanContext) + const { closeAll } = usePopup() useEffect(() => { @@ -300,7 +303,8 @@ export function useCanvasSetting() { // ๊ธฐ๋ณธ์„ค์ •(PlacementShapeSetting) ์กฐํšŒ ๋ฐ ์ดˆ๊ธฐํ™” const fetchBasicSettings = async () => { try { - await get({ url: `/api/canvas-management/canvas-basic-settings/by-object/${correntObjectNo}` }).then((res) => { + console.log('๐Ÿš€ ~ fetchBasicSettings ~ floorPlanState:', floorPlanState) + await get({ url: `/api/canvas-management/canvas-basic-settings/by-object/${floorPlanState.objectNo}` }).then((res) => { console.log('๐Ÿš€ ~ fetchBasicSettings ~ res >>>>>>>>>> :', res) let roofsRow = {} @@ -454,7 +458,7 @@ export function useCanvasSetting() { // CanvasSetting ์กฐํšŒ ๋ฐ ์ดˆ๊ธฐํ™” const fetchSettings = async () => { try { - const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${correntObjectNo}` }) + const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${floorPlanState.objectNo}` }) console.log('res', res) if (Object.keys(res).length > 0) {