diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index e94c1ff2..9c2db6bd 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -409,7 +409,8 @@ export default function CanvasMenu(props) { return ( (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') || (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) || - (isExistModule() && ['placement', 'outline'].some((num) => num === menu.type)) + (isExistModule() && ['placement', 'outline'].some((num) => num === menu.type)) || + (['estimate', 'simulation'].includes(selectedMenu) && ['drawing', 'placement', 'outline', 'surface'].includes(menu.type)) ) } @@ -533,9 +534,7 @@ export default function CanvasMenu(props) { key={`canvas-menu-${menu.type}`} className={`canvas-menu-item ${selectedMenu === menu.type ? 'active' : ''}`} onClick={async () => { - if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'outline') return - if (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) return - if (isExistModule() && ['placement', 'outline'].some((num) => num === menu.type)) return + if (checkMenuState(menu)) return await onClickNav(menu) }} >