Revert "fix: prevent multiple initialization and state race condition in PopoutPage"

This reverts commit 69bd91797d.
This commit is contained in:
2026-03-22 00:18:19 +08:00
parent 69bd91797d
commit 19e7a51b61

View File

@@ -1,4 +1,4 @@
import { useEffect, useState, useRef } from 'react' import { useEffect, useState } from 'react'
import { useSearchParams } from 'react-router-dom' import { useSearchParams } from 'react-router-dom'
import type { FileItemDTO } from '@shared/types/file' import type { FileItemDTO } from '@shared/types/file'
import { matchModule } from '@/lib/module-registry' import { matchModule } from '@/lib/module-registry'
@@ -11,14 +11,15 @@ import { useTabStore } from '@/stores'
export const PopoutPage = () => { export const PopoutPage = () => {
const [searchParams] = useSearchParams() const [searchParams] = useSearchParams()
const [file, setFile] = useState<FileItemDTO | null>(null) const [file, setFile] = useState<FileItemDTO | null>(null)
const [content, setContent] = useState<string>('')
const [unsavedContent, setUnsavedContent] = useState<string>('')
const [isEditing, setIsEditing] = useState(false)
const [isMaximized, setIsMaximized] = useState(false) const [isMaximized, setIsMaximized] = useState(false)
const [ready, setReady] = useState(false) const [ready, setReady] = useState(false)
const initializedRef = useRef(false)
const { selectFile } = useTabStore()
useEffect(() => { useEffect(() => {
if (initializedRef.current) return
initializedRef.current = true
const path = searchParams.get('path') const path = searchParams.get('path')
const name = searchParams.get('name') const name = searchParams.get('name')
const contentParam = searchParams.get('content') const contentParam = searchParams.get('content')
@@ -35,22 +36,27 @@ export const PopoutPage = () => {
const decodedUnsaved = unsavedParam ? decodeURIComponent(unsavedParam) : decodedContent const decodedUnsaved = unsavedParam ? decodeURIComponent(unsavedParam) : decodedContent
const decodedEditing = editingParam === 'true' const decodedEditing = editingParam === 'true'
const fileObj: FileItemDTO = { setFile({
name: decodedName, name: decodedName,
path: decodedPath, path: decodedPath,
type: 'file', type: 'file',
size: 0, size: 0,
modified: new Date().toISOString(), modified: new Date().toISOString(),
} })
setContent(decodedContent)
setUnsavedContent(decodedUnsaved)
setIsEditing(decodedEditing)
setFile(fileObj)
const existingTab = useTabStore.getState().tabs.get(decodedPath)
if (!existingTab) {
useTabStore.setState((state) => { useTabStore.setState((state) => {
const newTabs = new Map(state.tabs) const newTabs = new Map(state.tabs)
newTabs.set(decodedPath, { newTabs.set(decodedPath, {
file: fileObj, file: {
name: decodedName,
path: decodedPath,
type: 'file' as const,
size: 0,
modified: new Date().toISOString(),
},
content: decodedContent, content: decodedContent,
unsavedContent: decodedUnsaved, unsavedContent: decodedUnsaved,
isEditing: decodedEditing, isEditing: decodedEditing,
@@ -62,34 +68,23 @@ export const PopoutPage = () => {
activeTabId: decodedPath, activeTabId: decodedPath,
} }
}) })
} else {
useTabStore.setState((state) => { selectFile({
const newTabs = new Map(state.tabs) name: decodedName,
const existing = newTabs.get(decodedPath) path: decodedPath,
if (existing) { type: 'file',
newTabs.set(decodedPath, { size: 0,
...existing, modified: new Date().toISOString(),
content: decodedContent,
unsavedContent: decodedUnsaved,
isEditing: decodedEditing,
loaded: true,
}) })
}
return { setReady(true)
tabs: newTabs,
activeTabId: decodedPath,
}
})
}
window.electronAPI?.windowIsMaximized().then((result) => { window.electronAPI?.windowIsMaximized().then((result) => {
if (result.success) { if (result.success) {
setIsMaximized(result.isMaximized) setIsMaximized(result.isMaximized)
} }
}) })
}, [searchParams, selectFile])
setReady(true)
}, [searchParams])
const handleMinimize = () => { const handleMinimize = () => {
window.electronAPI?.windowMinimize() window.electronAPI?.windowMinimize()