refactor(tabs): remove close-folder-tabs and reveal-in-sidebar menu items

This commit is contained in:
xintaofei
2026-04-21 22:14:19 +08:00
parent b77842ee66
commit dd2b542df9
14 changed files with 11 additions and 116 deletions

View File

@@ -114,7 +114,6 @@ const FolderHeader = memo(function FolderHeader({
onFocus,
onCloseFolderTabs,
onRemoveFromWorkspace,
highlighted,
t,
}: {
folderId: number
@@ -126,7 +125,6 @@ const FolderHeader = memo(function FolderHeader({
onFocus: (folderId: number) => void
onCloseFolderTabs: (folderId: number) => void
onRemoveFromWorkspace: (folderId: number) => void
highlighted: boolean
t: ReturnType<typeof useTranslations>
}) {
return (
@@ -140,8 +138,7 @@ const FolderHeader = memo(function FolderHeader({
"flex h-[1.9375rem] w-full items-center gap-[0.5rem] cursor-pointer outline-none",
"rounded-[0.4375rem] px-2",
"text-sidebar-foreground hover:bg-[color-mix(in_oklab,var(--sidebar-accent),var(--sidebar-foreground)_2%)]",
"transition-[background-color,color] duration-150",
highlighted && "ring-2 ring-sidebar-primary ring-offset-1"
"transition-[background-color,color] duration-150"
)}
>
<span
@@ -200,7 +197,6 @@ export interface SidebarConversationListHandle {
scrollToActive: () => void
expandAll: () => void
collapseAll: () => void
revealFolder: (folderId: number) => void
}
export interface SidebarConversationListProps {
@@ -266,9 +262,6 @@ export function SidebarConversationList({
const [folderExpanded, setFolderExpanded] = useState<Record<number, boolean>>(
{}
)
const [highlightedFolder, setHighlightedFolder] = useState<number | null>(
null
)
const [scrollOffset, setScrollOffset] = useState(0)
const [removeConfirm, setRemoveConfirm] = useState<{
folderId: number
@@ -284,7 +277,6 @@ export function SidebarConversationList({
const scrollToActiveRef = useRef<() => void>(() => {})
const pendingScrollRef = useRef(false)
const virtualizerRef = useRef<VirtualizerHandle>(null)
const highlightTimerRef = useRef<number | null>(null)
const filteredConversations = useMemo(() => {
if (showCompleted) return conversations
@@ -403,43 +395,8 @@ export function SidebarConversationList({
return next
})
},
revealFolder(folderId: number) {
setFolderExpanded((prev) => {
if (prev[folderId] === true) return prev
const next = { ...prev, [folderId]: true }
saveFolderExpanded(next)
return next
})
setHighlightedFolder(folderId)
if (highlightTimerRef.current) {
window.clearTimeout(highlightTimerRef.current)
}
highlightTimerRef.current = window.setTimeout(() => {
setHighlightedFolder(null)
highlightTimerRef.current = null
}, 1200)
requestAnimationFrame(() => {
const idx = flatItems.findIndex(
(item) => item.type === "folder_header" && item.folderId === folderId
)
if (idx >= 0) {
virtualizerRef.current?.scrollToIndex(idx, {
align: "start",
smooth: true,
})
}
})
},
}))
useEffect(() => {
return () => {
if (highlightTimerRef.current) {
window.clearTimeout(highlightTimerRef.current)
}
}
}, [])
useEffect(() => {
scrollToActiveRef.current = () => {
if (!selectedConversation) return
@@ -728,9 +685,6 @@ export function SidebarConversationList({
onFocus={focusFolder}
onCloseFolderTabs={handleCloseFolderTabs}
onRemoveFromWorkspace={handleRemoveFolder}
highlighted={
highlightedFolder === stickyFolderItem.folderId
}
t={t}
/>
</div>
@@ -761,7 +715,6 @@ export function SidebarConversationList({
onFocus={focusFolder}
onCloseFolderTabs={handleCloseFolderTabs}
onRemoveFromWorkspace={handleRemoveFolder}
highlighted={highlightedFolder === item.folderId}
t={t}
/>
)

View File

@@ -71,18 +71,6 @@ export function Sidebar() {
}
}, [allExpanded])
useEffect(() => {
const onReveal = (e: Event) => {
const detail = (e as CustomEvent<{ folderId: number }>).detail
if (!detail) return
listRef.current?.revealFolder(detail.folderId)
}
window.addEventListener("sidebar:reveal-folder", onReveal)
return () => {
window.removeEventListener("sidebar:reveal-folder", onReveal)
}
}, [])
if (!isOpen) return null
return (

View File

@@ -19,7 +19,6 @@ export function TabBar() {
closeTab,
closeOtherTabs,
closeAllTabs,
closeTabsByFolder,
pinTab,
toggleTileMode,
reorderTabs,
@@ -33,11 +32,6 @@ export function TabBar() {
return map
}, [allFolders])
const handleRevealInSidebar = useCallback((folderId: number) => {
window.dispatchEvent(
new CustomEvent("sidebar:reveal-folder", { detail: { folderId } })
)
}, [])
const { shortcuts } = useShortcutSettings()
const scrollRef = useRef<HTMLDivElement>(null)
const [isHovered, setIsHovered] = useState(false)
@@ -115,8 +109,6 @@ export function TabBar() {
onClose={closeTab}
onCloseOthers={closeOtherTabs}
onCloseAll={closeAllTabs}
onCloseFolderTabs={closeTabsByFolder}
onRevealInSidebar={handleRevealInSidebar}
onPin={pinTab}
onToggleTile={toggleTileMode}
/>

View File

@@ -26,8 +26,6 @@ interface TabItemProps {
onClose: (tabId: string) => void
onCloseOthers: (tabId: string) => void
onCloseAll: () => void
onCloseFolderTabs: (folderId: number) => void
onRevealInSidebar: (folderId: number) => void
onPin: (tabId: string) => void
onToggleTile: () => void
}
@@ -42,8 +40,6 @@ export const TabItem = memo(function TabItem({
onClose,
onCloseOthers,
onCloseAll,
onCloseFolderTabs,
onRevealInSidebar,
onPin,
onToggleTile,
}: TabItemProps) {
@@ -56,14 +52,6 @@ export const TabItem = memo(function TabItem({
? `${resolvedFolderName} · ${folderBranch}${tab.title}`
: `${resolvedFolderName}${tab.title}`
const handleCloseFolderTabs = useCallback(() => {
onCloseFolderTabs(tab.folderId)
}, [onCloseFolderTabs, tab.folderId])
const handleRevealInSidebar = useCallback(() => {
onRevealInSidebar(tab.folderId)
}, [onRevealInSidebar, tab.folderId])
const clearResidualStyles = useCallback(() => {
const el = itemRef.current
if (!el) return
@@ -167,13 +155,7 @@ export const TabItem = memo(function TabItem({
<ContextMenuItem onSelect={handleCloseOthers}>
{t("closeOthers")}
</ContextMenuItem>
<ContextMenuItem onSelect={handleCloseFolderTabs}>
{t("closeFolderTabs", { folder: resolvedFolderName })}
</ContextMenuItem>
<ContextMenuSeparator />
<ContextMenuItem onSelect={handleRevealInSidebar}>
{t("revealInSidebar")}
</ContextMenuItem>
<ContextMenuItem onSelect={onToggleTile}>
{isTileMode ? t("untileDisplay") : t("tileDisplay")}
</ContextMenuItem>