From cccb5b88ea6901258fdef0f380c0e37033c3dcb7 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Tue, 21 Jan 2025 10:43:00 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=AC=BC=EA=B1=B4=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?=20=EC=A0=84=EC=9D=98=20=EC=BA=94=EB=B2=84=EC=8A=A4=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EA=B0=80=20=EB=B3=B5=EC=82=AC=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasFrame.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx index cf2e0d56..5757b379 100644 --- a/src/components/floor-plan/CanvasFrame.jsx +++ b/src/components/floor-plan/CanvasFrame.jsx @@ -1,6 +1,6 @@ 'use client' -import { useEffect, useRef } from 'react' +import { useContext, useEffect, useRef } from 'react' import { useRecoilValue } from 'recoil' @@ -14,12 +14,14 @@ import { useCanvasConfigInitialize } from '@/hooks/common/useCanvasConfigInitial import { currentMenuState } from '@/store/canvasAtom' import { totalDisplaySelector } from '@/store/settingAtom' import { MENU } from '@/common/common' +import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider' export default function CanvasFrame() { const canvasRef = useRef(null) const { canvas } = useCanvas('canvas') const { canvasLoadInit, gridInit } = useCanvasConfigInitialize() const currentMenu = useRecoilValue(currentMenuState) + const { floorPlanState } = useContext(FloorPlanContext) const { contextMenu, handleClick } = useContextMenu() const { selectedPlan } = usePlan() const totalDisplay = useRecoilValue(totalDisplaySelector) // 집계표 표시 여부 @@ -27,7 +29,7 @@ export default function CanvasFrame() { const loadCanvas = () => { if (canvas) { canvas?.clear() // 캔버스를 초기화합니다. - if (selectedPlan?.canvasStatus) { + if (selectedPlan?.canvasStatus && floorPlanState.objectNo === selectedPlan.objectNo) { canvas?.loadFromJSON(JSON.parse(selectedPlan.canvasStatus), function () { canvasLoadInit() //config된 상태로 캔버스 객체를 그린다 canvas?.renderAll() // 캔버스를 다시 그립니다.