diff --git a/src/components/common/ItemContainer.tsx b/src/components/common/ItemContainer.tsx index 46e45df..e664bbe 100644 --- a/src/components/common/ItemContainer.tsx +++ b/src/components/common/ItemContainer.tsx @@ -6,7 +6,7 @@ const ItemContainer = styled.div` border-radius: 0.75rem; border: 1px solid ${colors.basic200}; background: white; - z-index: 1000; + z-index: 500; `; export default ItemContainer; diff --git a/src/components/common/MenuTab.tsx b/src/components/common/MenuTab.tsx index 94a7d85..7bcc277 100644 --- a/src/components/common/MenuTab.tsx +++ b/src/components/common/MenuTab.tsx @@ -6,6 +6,7 @@ import Button from 'src/components/common/Button'; import { Plus } from 'src/assets'; import { useLocation, useNavigate } from 'react-router-dom'; import GroupPopup from '../onboarding/GroupPopup'; +import { useState } from 'react'; import React from 'react'; // @@ -65,8 +66,15 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => { const location = useLocation(); const isTestDetailPage = location.pathname.includes('/test'); const isEstimatePage = location.pathname.includes('/estimate'); - const [isPopupOpen, setIsPopupOpen] = React.useState(false); + const [isPopupOpen, setIsPopupOpen] = useState(false); + const handleButtonClick = () => { + setIsPopupOpen(true); + }; + + const handleClosePopup = () => { + setIsPopupOpen(false); + }; const handleTabMenu = (url: string, id?: string) => { navigate(url, { state: id }); }; @@ -271,31 +279,29 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => { }; return ( - <> - - - {type === 'monitoring' ? renderDroneSearchTab() : null} - {type === 'monitoring' ? renderDroneGroupTab() : null} - {type === 'dashboard' ? renderDroneListTab() : null} - {type === 'parts' ? renderPartsTab() : null} - {type === 'trade' ? renderTradeTab() : null} - {type === 'monitoring' ? ( -