问题1: 侧边栏打开文件夹后根目录不显示
修复: FileTree 传入包装后的根节点 { name, path, type: 'dir', children: tree }
打开文件夹时自动展开根目录 expandDirs([rootPath])
问题2: 搜索没有高亮,上一个/下一个没反应
修复: Editor 添加完整搜索功能
- 搜索时在 textarea 上方创建 overlay div
- 用绝对定位 div 标记每个匹配位置(单行/多行)
- currentIndex 变化时选中匹配文本并滚动到可视区域
- 搜索结果随内容变化自动更新
问题3: 滚动时行号跟随不准确
修复: 行高测量改为与 CSS line-height 一致的动态测量
搜索高亮位置随编辑器滚动同步更新
238 lines
7.9 KiB
TypeScript
238 lines
7.9 KiB
TypeScript
import React, { useEffect, useCallback, useState, useRef } from 'react'
|
|
import { useTabStore } from '../../stores/tabStore'
|
|
import { useSidebarStore } from '../../stores/sidebarStore'
|
|
import { getFileName } from '../../lib/fileUtils'
|
|
import { FolderPlus, File, Folder, ChevronRight } from '../Icons'
|
|
import type { FileNode } from '../../types/file'
|
|
|
|
export function Sidebar() {
|
|
const tabs = useTabStore(s => s.tabs)
|
|
const activeTabId = useTabStore(s => s.activeTabId)
|
|
const switchToTab = useTabStore(s => s.switchToTab)
|
|
const createTab = useTabStore(s => s.createTab)
|
|
|
|
const rootPath = useSidebarStore(s => s.rootPath)
|
|
const tree = useSidebarStore(s => s.tree)
|
|
const expandedDirs = useSidebarStore(s => s.expandedDirs)
|
|
const toggleDir = useSidebarStore(s => s.toggleDir)
|
|
const setRootPath = useSidebarStore(s => s.setRootPath)
|
|
const setTree = useSidebarStore(s => s.setTree)
|
|
const isVisible = useSidebarStore(s => s.isVisible)
|
|
const expandDirs = useSidebarStore(s => s.expandDirs)
|
|
|
|
// M-01: 归一化路径分隔符
|
|
const norm = (p: string) => p.replace(/\\/g, '/')
|
|
const activeFilePath = tabs.find(t => t.id === activeTabId)?.filePath ?? null
|
|
|
|
// 自动展开到活动文件所在的目录
|
|
useEffect(() => {
|
|
if (!activeFilePath || !rootPath) return
|
|
const normActive = norm(activeFilePath)
|
|
const normRoot = norm(rootPath)
|
|
if (!normActive.startsWith(normRoot)) return
|
|
|
|
const dirsToExpand: string[] = []
|
|
let dir = activeFilePath.replace(/[/\\][^/\\]+$/, '')
|
|
let prev = ''
|
|
while (dir && dir.length >= rootPath.length && dir !== rootPath && dir !== prev) {
|
|
prev = dir
|
|
dirsToExpand.push(dir)
|
|
dir = dir.replace(/[/\\][^/\\]+$/, '')
|
|
}
|
|
|
|
if (dirsToExpand.length > 0) {
|
|
expandDirs(dirsToExpand)
|
|
}
|
|
}, [activeFilePath, rootPath, expandDirs])
|
|
|
|
const [isResizing, setIsResizing] = useState(false)
|
|
const sidebarRef = useRef<HTMLDivElement>(null)
|
|
|
|
const handleOpenFolder = useCallback(async () => {
|
|
if (!window.electronAPI) return
|
|
const dirPath = await window.electronAPI.openFolderDialog()
|
|
if (dirPath) {
|
|
setRootPath(dirPath)
|
|
// 展开根目录
|
|
expandDirs([dirPath])
|
|
const result = await window.electronAPI.readDirTree(dirPath)
|
|
if (result.success && result.tree) {
|
|
setTree(result.tree)
|
|
window.electronAPI.watchDir(dirPath)
|
|
}
|
|
}
|
|
}, [setRootPath, setTree, expandDirs])
|
|
|
|
const refreshTree = useCallback(async () => {
|
|
if (!rootPath || !window.electronAPI) return
|
|
const result = await window.electronAPI.readDirTree(rootPath)
|
|
if (result.success && result.tree) {
|
|
setTree(result.tree)
|
|
}
|
|
}, [rootPath, setTree])
|
|
|
|
useEffect(() => {
|
|
if (!window.electronAPI) return
|
|
window.electronAPI.onDirChanged(() => {
|
|
refreshTree()
|
|
})
|
|
return () => {
|
|
window.electronAPI?.removeAllListeners('sidebar:dirChanged')
|
|
}
|
|
}, [refreshTree])
|
|
|
|
useEffect(() => {
|
|
if (!isResizing) return
|
|
const handleMouseMove = (e: MouseEvent) => {
|
|
if (sidebarRef.current) {
|
|
const newWidth = Math.max(180, Math.min(500, e.clientX))
|
|
sidebarRef.current.style.width = newWidth + 'px'
|
|
}
|
|
}
|
|
const handleMouseUp = () => setIsResizing(false)
|
|
document.addEventListener('mousemove', handleMouseMove)
|
|
document.addEventListener('mouseup', handleMouseUp)
|
|
return () => {
|
|
document.removeEventListener('mousemove', handleMouseMove)
|
|
document.removeEventListener('mouseup', handleMouseUp)
|
|
}
|
|
}, [isResizing])
|
|
|
|
const handleFileClick = useCallback(async (path: string) => {
|
|
const existing = tabs.find(t => t.filePath === path)
|
|
if (existing) {
|
|
switchToTab(existing.id)
|
|
} else if (window.electronAPI) {
|
|
const result = await window.electronAPI.readFile(path)
|
|
if (result.success && result.content) {
|
|
createTab(path, result.content)
|
|
}
|
|
}
|
|
}, [tabs, switchToTab, createTab])
|
|
|
|
// M-01: 独立文件区(归一化路径比较)
|
|
const independentFiles = tabs.filter(t => {
|
|
if (!t.filePath) return false
|
|
if (!rootPath) return true
|
|
return !norm(t.filePath).startsWith(norm(rootPath))
|
|
})
|
|
|
|
if (!isVisible) return null
|
|
|
|
return (
|
|
<div id="sidebar" ref={sidebarRef}>
|
|
<div id="sidebar-header">
|
|
<span id="sidebar-title">资源管理器</span>
|
|
<button className="sidebar-header-btn" onClick={handleOpenFolder} title="打开文件夹">
|
|
<FolderPlus size={14} />
|
|
</button>
|
|
</div>
|
|
|
|
<div id="sidebar-tree">
|
|
{/* 独立文件区 */}
|
|
{independentFiles.length > 0 && (
|
|
<div className="independent-files-section">
|
|
<div className="independent-files-header">已打开的文件</div>
|
|
{independentFiles.map(tab => (
|
|
<div
|
|
key={tab.id}
|
|
className={`tree-item independent-file-item ${tab.id === activeTabId ? 'active' : ''}`}
|
|
style={{ paddingLeft: '8px' }}
|
|
onClick={() => switchToTab(tab.id)}
|
|
>
|
|
<span className="tree-icon">
|
|
<File size={14} />
|
|
</span>
|
|
<span className="tree-name">{getFileName(tab.filePath!)}</span>
|
|
{tab.isModified && <span className="independent-modified-dot"> •</span>}
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{/* 文件夹目录树 */}
|
|
{rootPath && (
|
|
<>
|
|
<div className="sidebar-section-header">文件夹目录树</div>
|
|
<FileTree
|
|
nodes={[{ name: rootPath.split(/[/\\]/).pop() || rootPath, path: rootPath, type: 'dir' as const, children: tree }]}
|
|
depth={0}
|
|
expandedDirs={expandedDirs}
|
|
toggleDir={toggleDir}
|
|
activeTabId={activeTabId}
|
|
activeFilePath={activeFilePath}
|
|
onFileClick={handleFileClick}
|
|
/>
|
|
</>
|
|
)}
|
|
</div>
|
|
|
|
<div
|
|
className="sidebar-resize-handle"
|
|
onMouseDown={() => setIsResizing(true)}
|
|
/>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
// 文件树递归组件
|
|
function FileTree({ nodes, depth, expandedDirs, toggleDir, activeTabId, activeFilePath, onFileClick }: {
|
|
nodes: FileNode[]
|
|
depth: number
|
|
expandedDirs: Set<string>
|
|
toggleDir: (path: string) => void
|
|
activeTabId: string | null
|
|
activeFilePath: string | null
|
|
onFileClick: (path: string) => void
|
|
}) {
|
|
return (
|
|
<>
|
|
{nodes.map(node => (
|
|
<React.Fragment key={node.path}>
|
|
<div
|
|
className={`tree-item ${node.type === 'file' && node.path === activeFilePath ? 'active' : ''}`}
|
|
style={{ paddingLeft: (8 + depth * 16) + 'px' }}
|
|
onClick={() => {
|
|
if (node.type === 'dir') {
|
|
toggleDir(node.path)
|
|
} else {
|
|
onFileClick(node.path)
|
|
}
|
|
}}
|
|
>
|
|
{node.type === 'dir' ? (
|
|
<>
|
|
<span className={`tree-arrow ${expandedDirs.has(node.path) ? 'expanded' : ''}`}>
|
|
<ChevronRight size={10} />
|
|
</span>
|
|
<span className="tree-icon">
|
|
<Folder size={14} />
|
|
</span>
|
|
</>
|
|
) : (
|
|
<>
|
|
<span style={{ width: '16px', flexShrink: 0 }} />
|
|
<span className="tree-icon">
|
|
<File size={14} />
|
|
</span>
|
|
</>
|
|
)}
|
|
<span className="tree-name">{node.name}</span>
|
|
</div>
|
|
{node.type === 'dir' && expandedDirs.has(node.path) && node.children && (
|
|
<FileTree
|
|
nodes={node.children}
|
|
depth={depth + 1}
|
|
expandedDirs={expandedDirs}
|
|
toggleDir={toggleDir}
|
|
activeTabId={activeTabId}
|
|
activeFilePath={activeFilePath}
|
|
onFileClick={onFileClick}
|
|
/>
|
|
)}
|
|
</React.Fragment>
|
|
))}
|
|
</>
|
|
)
|
|
}
|