mirror of
https://github.com/SECTL/SecScore.git
synced 2026-07-19 19:04:23 +08:00
fix: 修复退出沉浸模式导航栏无过渡动画
This commit is contained in:
+18
-48
@@ -7,8 +7,6 @@ import { ContentArea } from "./components/ContentArea"
|
|||||||
import { OOBE } from "./components/OOBE/OOBE"
|
import { OOBE } from "./components/OOBE/OOBE"
|
||||||
import { ThemeProvider, useTheme } from "./contexts/ThemeContext"
|
import { ThemeProvider, useTheme } from "./contexts/ThemeContext"
|
||||||
|
|
||||||
const IMMERSIVE_TRANSITION_MS = 260
|
|
||||||
|
|
||||||
function MainContent(): React.JSX.Element {
|
function MainContent(): React.JSX.Element {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
@@ -17,8 +15,6 @@ function MainContent(): React.JSX.Element {
|
|||||||
const [messageApi, contextHolder] = message.useMessage()
|
const [messageApi, contextHolder] = message.useMessage()
|
||||||
const { isIosDevice, isAndroidDevice, defaultPortraitMode } = useMemo(getMobileDeviceInfo, [])
|
const { isIosDevice, isAndroidDevice, defaultPortraitMode } = useMemo(getMobileDeviceInfo, [])
|
||||||
const [immersiveMode, setImmersiveMode] = useState(false)
|
const [immersiveMode, setImmersiveMode] = useState(false)
|
||||||
const [sidebarVisible, setSidebarVisible] = useState(true)
|
|
||||||
const sidebarTransitionTimerRef = useRef<number | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const api = (window as any).api
|
const api = (window as any).api
|
||||||
@@ -354,30 +350,6 @@ function MainContent(): React.JSX.Element {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (sidebarTransitionTimerRef.current) {
|
|
||||||
window.clearTimeout(sidebarTransitionTimerRef.current)
|
|
||||||
sidebarTransitionTimerRef.current = null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!immersiveMode) {
|
|
||||||
setSidebarVisible(true)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
sidebarTransitionTimerRef.current = window.setTimeout(() => {
|
|
||||||
setSidebarVisible(false)
|
|
||||||
sidebarTransitionTimerRef.current = null
|
|
||||||
}, IMMERSIVE_TRANSITION_MS)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
if (sidebarTransitionTimerRef.current) {
|
|
||||||
window.clearTimeout(sidebarTransitionTimerRef.current)
|
|
||||||
sidebarTransitionTimerRef.current = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [immersiveMode])
|
|
||||||
|
|
||||||
const isDark = currentTheme?.mode === "dark"
|
const isDark = currentTheme?.mode === "dark"
|
||||||
const brandColor = currentTheme?.config?.tdesign?.brandColor || "#0052D9"
|
const brandColor = currentTheme?.config?.tdesign?.brandColor || "#0052D9"
|
||||||
|
|
||||||
@@ -394,26 +366,24 @@ function MainContent(): React.JSX.Element {
|
|||||||
>
|
>
|
||||||
{contextHolder}
|
{contextHolder}
|
||||||
<Layout style={{ height: "100%", flexDirection: "row", overflow: "hidden" }}>
|
<Layout style={{ height: "100%", flexDirection: "row", overflow: "hidden" }}>
|
||||||
{sidebarVisible && (
|
<div
|
||||||
<div
|
className={`ss-immersive-sidebar ${immersiveMode ? "is-hidden" : "is-visible"}`}
|
||||||
className={`ss-immersive-sidebar ${immersiveMode ? "is-hidden" : "is-visible"}`}
|
style={
|
||||||
style={
|
{
|
||||||
{
|
"--ss-sidebar-width": `${sidebarCollapsed ? 64 : 200}px`,
|
||||||
"--ss-sidebar-width": `${sidebarCollapsed ? 64 : 200}px`,
|
} as React.CSSProperties
|
||||||
} as React.CSSProperties
|
}
|
||||||
}
|
>
|
||||||
>
|
<Sidebar
|
||||||
<Sidebar
|
activeMenu={activeMenu}
|
||||||
activeMenu={activeMenu}
|
permission={permission}
|
||||||
permission={permission}
|
onMenuChange={onMenuChange}
|
||||||
onMenuChange={onMenuChange}
|
collapsed={sidebarCollapsed}
|
||||||
collapsed={sidebarCollapsed}
|
floatingExpand={isPortraitMode}
|
||||||
floatingExpand={isPortraitMode}
|
floatingExpanded={floatingSidebarExpanded}
|
||||||
floatingExpanded={floatingSidebarExpanded}
|
onFloatingExpandedChange={setFloatingSidebarExpanded}
|
||||||
onFloatingExpandedChange={setFloatingSidebarExpanded}
|
/>
|
||||||
/>
|
</div>
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<ContentArea
|
<ContentArea
|
||||||
permission={permission}
|
permission={permission}
|
||||||
hasAnyPassword={hasAnyPassword}
|
hasAnyPassword={hasAnyPassword}
|
||||||
|
|||||||
Reference in New Issue
Block a user