diff --git a/src/hooks/common/useCommonUtils.js b/src/hooks/common/useCommonUtils.js index fd021135..b5b4ed51 100644 --- a/src/hooks/common/useCommonUtils.js +++ b/src/hooks/common/useCommonUtils.js @@ -22,7 +22,7 @@ export function useCommonUtils() { const lengthTextFont = useRecoilValue(fontSelector('lengthText')) const commonTextFont = useRecoilValue(fontSelector('commonText')) const [commonUtils, setCommonUtilsState] = useRecoilState(commonUtilsState) - const { addPopup, closeAll } = usePopup() + const { addPopup, closeAll, targetClose } = usePopup() const { drawDirectionArrow, addLengthText } = usePolygon() const { applyDormers } = useObjectBatch({}) @@ -38,8 +38,9 @@ export function useCommonUtils() { const commonTextMode = () => { let textbox - closeAll() + if (commonUtils.text) { + targetClose('other') setTimeout(() => { commonTextKeyEvent() addCanvasMouseEventListener('mouse:down', (event) => { diff --git a/src/hooks/usePopup.js b/src/hooks/usePopup.js index 726ab353..c8a43b2a 100644 --- a/src/hooks/usePopup.js +++ b/src/hooks/usePopup.js @@ -128,11 +128,17 @@ export function usePopup() { } } + const targetClose = (type) => { + popup[type] = [] + setPopup({ ...popup, [type]: [] }) + } + return { popup, addPopup, closePopup, closePopups, closeAll, + targetClose, } }