resetCommonUtils 위치 수정

This commit is contained in:
hyojun.choi 2025-06-05 15:22:14 +09:00
parent c65615465a
commit 5c1c50bd46
3 changed files with 11 additions and 11 deletions

View File

@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from 'react'
import { usePathname, useRouter, useSearchParams } from 'next/navigation' import { usePathname, useRouter, useSearchParams } from 'next/navigation'
import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil' import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
@ -98,7 +98,7 @@ export default function CanvasMenu(props) {
const [lockButtonStyle, setLockButtonStyle] = useState('') // const [lockButtonStyle, setLockButtonStyle] = useState('') //
const setFloorPlanObjectNo = useSetRecoilState(floorPlanObjectState) // const setFloorPlanObjectNo = useSetRecoilState(floorPlanObjectState) //
const resetCommonUtils = useResetRecoilState(commonUtilsState)
// //
const { objectNo, pid } = floorPlanState const { objectNo, pid } = floorPlanState
@ -166,6 +166,7 @@ export default function CanvasMenu(props) {
} }
const onClickNav = async (menu) => { const onClickNav = async (menu) => {
resetCommonUtils()
switch (menu.type) { switch (menu.type) {
case 'drawing': case 'drawing':
swalFire({ swalFire({

View File

@ -5,9 +5,10 @@ import { useEffect } from 'react'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import useMenu from '@/hooks/common/useMenu' import useMenu from '@/hooks/common/useMenu'
import { canvasState, currentMenuState } from '@/store/canvasAtom' import { canvasState, currentMenuState } from '@/store/canvasAtom'
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil'
import { subMenusState } from '@/store/menuAtom' import { subMenusState } from '@/store/menuAtom'
import { useCanvasMenu } from '@/hooks/common/useCanvasMenu' import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
import { commonUtilsState } from '@/store/commonUtilsAtom'
export default function MenuDepth01() { export default function MenuDepth01() {
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
@ -16,8 +17,10 @@ export default function MenuDepth01() {
const { selectedMenu, setSelectedMenu } = useCanvasMenu() const { selectedMenu, setSelectedMenu } = useCanvasMenu()
const [currentMenu, setCurrentMenu] = useRecoilState(currentMenuState) const [currentMenu, setCurrentMenu] = useRecoilState(currentMenuState)
const subMenus = useRecoilValue(subMenusState) const subMenus = useRecoilValue(subMenusState)
const resetCommonUtils = useResetRecoilState(commonUtilsState)
const onClickMenu = ({ id, menu }) => { const onClickMenu = ({ id, menu }) => {
resetCommonUtils()
if (menu === currentMenu) { if (menu === currentMenu) {
handleMenu(selectedMenu) handleMenu(selectedMenu)
} else { } else {

View File

@ -8,7 +8,6 @@ import { commonUtilsState } from '@/store/commonUtilsAtom'
* @returns * @returns
*/ */
export function usePopup() { export function usePopup() {
const resetCommonUtils = useResetRecoilState(commonUtilsState)
const [popup, setPopup] = useRecoilState(popupState) const [popup, setPopup] = useRecoilState(popupState)
const [contextMenuPopup, setContextMenuPopup] = useRecoilState(contextPopupState) const [contextMenuPopup, setContextMenuPopup] = useRecoilState(contextPopupState)
@ -20,9 +19,6 @@ export function usePopup() {
* @param {*} isConfig 팝업 타입 * @param {*} isConfig 팝업 타입
*/ */
const addPopup = (id, depth, component, isConfig = false) => { const addPopup = (id, depth, component, isConfig = false) => {
//팝업 전 처리
resetCommonUtils()
//
setPopup({ setPopup({
config: isConfig ? [...filterDepth(depth, isConfig), { id, depth, component, isConfig }] : [...popup.config], config: isConfig ? [...filterDepth(depth, isConfig), { id, depth, component, isConfig }] : [...popup.config],
other: !isConfig ? [...filterDepth(depth, isConfig), { id, depth, component, isConfig }] : [...popup.other], other: !isConfig ? [...filterDepth(depth, isConfig), { id, depth, component, isConfig }] : [...popup.other],