diff --git a/frontend/src/admin/AdminLayout.tsx b/frontend/src/admin/AdminLayout.tsx index 31c3ff3..848775d 100644 --- a/frontend/src/admin/AdminLayout.tsx +++ b/frontend/src/admin/AdminLayout.tsx @@ -1,5 +1,5 @@ import { Suspense, useEffect, useState } from 'react' -import { Outlet, useNavigate, useLocation , useOutlet } from 'react-router-dom' +import { Outlet, useNavigate, useLocation } from 'react-router-dom' import { Layout, Menu, Button, Typography } from 'antd' import { DashboardOutlined, VideoCameraOutlined, PlusOutlined, MonitorOutlined, @@ -36,11 +36,9 @@ export default function AdminLayout() { const navigate = useNavigate() const location = useLocation() function navigateWithTransition(path: string) { - const startViewTransition = (document as unknown as { startViewTransition?: (callback: () => void) => void }).startViewTransition - if (startViewTransition) startViewTransition(() => navigate(path)) - else navigate(path) + if (path !== location.pathname) navigate(path) } - const outlet = useOutlet() + const selectedKey = menuItems.find( item => location.pathname === item.key || (location.pathname === '/' && item.key === '/admin') @@ -85,7 +83,7 @@ export default function AdminLayout() {
- {outlet} +