Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-01 17:59:09 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(MinAppPage): replace useRef with useState for initial navbar state

Browse Source 
fix: Error: Cannot access refs during render
This commit is contained in:
icarus 2025-10-14 18:04:33 +08:00
parent d2c4231458
commit 4e7c714ea2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/renderer/src/pages/minapps/MinAppPage.tsx
View File

@ -28,7 +28,9 @@ const MinAppPage: FC = () => {
const navigate = useNavigate() const navigate = useNavigate()
// Remember the initial navbar position when component mounts // Remember the initial navbar position when component mounts
const initialIsTopNavbar = useRef<boolean>(isTopNavbar) // It's immutable state
const [initialIsTopNavbar] = useState<boolean>(isTopNavbar)
const initialIsTopNavbarRef = useRef<boolean>(initialIsTopNavbar)
const hasRedirected = useRef<boolean>(false) const hasRedirected = useRef<boolean>(false)
// Initialize TabsService with cache reference // Initialize TabsService with cache reference
@ -40,8 +42,8 @@ const MinAppPage: FC = () => {
// Debug: track navbar position changes // Debug: track navbar position changes
useEffect(() => { useEffect(() => {
if (initialIsTopNavbar.current !== isTopNavbar) { if (initialIsTopNavbarRef.current !== isTopNavbar) {
logger.debug(`NavBar position changed from ${initialIsTopNavbar.current} to ${isTopNavbar}`) logger.debug(`NavBar position changed from ${initialIsTopNavbarRef.current} to ${isTopNavbar}`)
} }
}, [isTopNavbar]) }, [isTopNavbar])
@ -69,7 +71,7 @@ const MinAppPage: FC = () => {
// For sidebar navigation, redirect to apps list and open popup // For sidebar navigation, redirect to apps list and open popup
// Only check once and only if we haven't already redirected // Only check once and only if we haven't already redirected
if (!initialIsTopNavbar.current && !hasRedirected.current) { if (!initialIsTopNavbarRef.current && !hasRedirected.current) {
hasRedirected.current = true hasRedirected.current = true
navigate('/apps') navigate('/apps')
// Open popup after navigation // Open popup after navigation
@ -80,11 +82,11 @@ const MinAppPage: FC = () => {
} }
// For top navbar mode, integrate with cache system // For top navbar mode, integrate with cache system
if (initialIsTopNavbar.current) { if (initialIsTopNavbarRef.current) {
// 无论是否已在缓存，都调用以确保 currentMinappId 同步到路由切换的新 appId // 无论是否已在缓存，都调用以确保 currentMinappId 同步到路由切换的新 appId
openMinappKeepAlive(app) openMinappKeepAlive(app)
} }
}, [app, navigate, openMinappKeepAlive, initialIsTopNavbar]) }, [app, navigate, openMinappKeepAlive])
// -------------- 新的 Tab Shell 逻辑 -------------- // -------------- 新的 Tab Shell 逻辑 --------------
// 注意：Hooks 必须在任何 return 之前调用，因此提前定义，并在内部判空 // 注意：Hooks 必须在任何 return 之前调用，因此提前定义，并在内部判空
@ -160,7 +162,7 @@ const MinAppPage: FC = () => {
}, [app, isReady]) }, [app, isReady])
// 如果条件不满足，提前返回（所有 hooks 已调用） // 如果条件不满足，提前返回（所有 hooks 已调用）
if (!app || !initialIsTopNavbar.current) { if (!app || !initialIsTopNavbar) {
return null return null
} }