diff --git a/src/hooks/surface/usePlacementShapeDrawing.js b/src/hooks/surface/usePlacementShapeDrawing.js index c2b7ff98..6ebd1414 100644 --- a/src/hooks/surface/usePlacementShapeDrawing.js +++ b/src/hooks/surface/usePlacementShapeDrawing.js @@ -3,6 +3,7 @@ import { adsorptionPointAddModeState, adsorptionPointModeState, adsorptionRangeState, + canvasSettingState, canvasState, dotLineIntervalSelector, globalPitchState, @@ -49,7 +50,7 @@ export function usePlacementShapeDrawing(id) { const { addPolygonByLines, drawDirectionArrow } = usePolygon() const { tempGridMode } = useTempGrid() const { setSurfaceShapePattern } = useRoofFn() - + const canvasSetting = useRecoilValue(canvasSettingState) const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState) const adsorptionPointAddMode = useRecoilValue(adsorptionPointAddModeState) const adsorptionPointMode = useRecoilValue(adsorptionPointModeState) @@ -246,6 +247,10 @@ export function usePlacementShapeDrawing(id) { setPoints([]) canvas?.renderAll() + if (+canvasSetting?.roofSizeSet === 3) { + closePopup(id) + return + } addPopup(id, 1, , false) } diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js index abb3688b..7b0efec8 100644 --- a/src/hooks/surface/useSurfaceShapeBatch.js +++ b/src/hooks/surface/useSurfaceShapeBatch.js @@ -2,7 +2,7 @@ import { useEffect } from 'react' import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' -import { canvasState, currentCanvasPlanState, globalPitchState } from '@/store/canvasAtom' +import { canvasSettingState, canvasState, currentCanvasPlanState, globalPitchState } from '@/store/canvasAtom' import { MENU, POLYGON_TYPE } from '@/common/common' import { getIntersectionPoint } from '@/util/canvas-util' import { degreesToRadians } from '@turf/turf' @@ -29,7 +29,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) { const lengthTextFont = useRecoilValue(fontSelector('lengthText')) const resetOuterLinePoints = useResetRecoilState(outerLinePointsState) const resetPlacementShapeDrawingPoints = useResetRecoilState(placementShapeDrawingPointsState) - + const canvasSetting = useRecoilValue(canvasSettingState) const canvas = useRecoilValue(canvasState) const globalPitch = useRecoilValue(globalPitchState) const roofDisplay = useRecoilValue(roofDisplaySelector) @@ -200,6 +200,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) { // closePopup(id) initEvent() + if (+canvasSetting?.roofSizeSet === 3) return const popupId = uuidv4() addPopup(popupId, 2, ) })