dev #930

Merged
ysCha merged 95 commits from dev into dev-deploy 2026-06-23 18:00:25 +09:00
2 changed files with 12 additions and 1 deletions
Showing only changes of commit b49e3871d5 - Show all commits

View File

@ -21,7 +21,7 @@ import { MENU } from '@/common/common'
import { useTrestle } from '@/hooks/module/useTrestle'
import { useOrientation } from '@/hooks/module/useOrientation'
import { corridorDimensionSelector } from '@/store/settingAtom'
import { useUndoRedo } from '@/hooks/useUndoRedo'
import { useUndoRedo, isUndoRedoRestoring } from '@/hooks/useUndoRedo'
/**
* 메뉴 처리
@ -69,6 +69,8 @@ export default function useMenu() {
addPopup(popupId, 1, <RoofAllocationSetting id={popupId} />)
break
case MENU.ROOF_COVERING.ALL_REMOVE:
// undo/redo 복원 중에는 confirm 창을 띄우지 않는다
if (isUndoRedoRestoring()) break
deleteAllSurfacesAndObjects()
break
}
@ -91,6 +93,8 @@ export default function useMenu() {
addPopup(popupId, 1, <ObjectSetting id={popupId} />)
break
case MENU.BATCH_CANVAS.ALL_REMOVE:
// undo/redo 복원 중에는 confirm 창을 띄우지 않는다
if (isUndoRedoRestoring()) break
deleteAllSurfacesAndObjects()
break
}

View File

@ -25,6 +25,13 @@ const MAX_HISTORY = 3
let _isRestoring = false
let _restoreTimer = null
/**
* 외부 /모듈에서 현재 undo/redo 복원 중인지 확인할 사용
*/
export function isUndoRedoRestoring() {
return _isRestoring
}
// loadFromJSON 공통 처리 - 이벤트 일시 중단 후 복원
function _restoreFromJSON(canvas, snapshot, restoreAtomSnapshot, rebuildCanvasAtoms, setCanvasZoom) {
// 진행 중인 복원 타이머가 있으면 취소