wuxu/codeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

49
src/components/conversations/sidebar-conversation-list.tsx
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}
/>
)

12
src/components/layout/sidebar.tsx
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 (

8
src/components/tabs/tab-bar.tsx
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}
/>

18
src/components/tabs/tab-item.tsx
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>

4
src/i18n/messages/ar.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "إغلاق البقية",
"closeAll": "إغلاق الكل",
"tileDisplay": "عرض متجانب",
"untileDisplay": "إلغاء التجانب",
"closeFolderTabs": "إغلاق جميع علامات التبويب لـ {folder}",
"revealInSidebar": "إظهار في الشريط الجانبي"
"untileDisplay": "إلغاء التجانب"
},
"fileWorkspace": {
"files": "الملفات",

4
src/i18n/messages/de.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "Andere schließen",
"closeAll": "Alle schließen",
"tileDisplay": "Kachelansicht",
"untileDisplay": "Kachel beenden",
"closeFolderTabs": "Alle Tabs von {folder} schließen",
"revealInSidebar": "In Seitenleiste anzeigen"
"untileDisplay": "Kachel beenden"
},
"fileWorkspace": {
"files": "Dateien",

4
src/i18n/messages/en.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "Close Others",
"closeAll": "Close All",
"tileDisplay": "Tile Display",
"untileDisplay": "Exit Tile",
"closeFolderTabs": "Close all tabs of {folder}",
"revealInSidebar": "Reveal in sidebar"
"untileDisplay": "Exit Tile"
},
"fileWorkspace": {
"files": "Files",

4
src/i18n/messages/es.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "Cerrar otros",
"closeAll": "Cerrar todo",
"tileDisplay": "Vista en mosaico",
"untileDisplay": "Salir de mosaico",
"closeFolderTabs": "Cerrar todas las pestañas de {folder}",
"revealInSidebar": "Mostrar en la barra lateral"
"untileDisplay": "Salir de mosaico"
},
"fileWorkspace": {
"files": "Archivos",

4
src/i18n/messages/fr.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "Fermer les autres",
"closeAll": "Tout fermer",
"tileDisplay": "Affichage en mosaïque",
"untileDisplay": "Quitter la mosaïque",
"closeFolderTabs": "Fermer tous les onglets de {folder}",
"revealInSidebar": "Afficher dans la barre latérale"
"untileDisplay": "Quitter la mosaïque"
},
"fileWorkspace": {
"files": "Fichiers",

4
src/i18n/messages/ja.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "他を閉じる",
"closeAll": "すべて閉じる",
"tileDisplay": "タイル表示",
"untileDisplay": "タイル解除",
"closeFolderTabs": "{folder} のすべてのタブを閉じる",
"revealInSidebar": "サイドバーで表示"
"untileDisplay": "タイル解除"
},
"fileWorkspace": {
"files": "ファイル",

4
src/i18n/messages/ko.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "다른 항목 닫기",
"closeAll": "모두 닫기",
"tileDisplay": "타일 표시",
"untileDisplay": "타일 해제",
"closeFolderTabs": "{folder}의 모든 탭 닫기",
"revealInSidebar": "사이드바에서 표시"
"untileDisplay": "타일 해제"
},
"fileWorkspace": {
"files": "파일",

4
src/i18n/messages/pt.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "Fechar outros",
"closeAll": "Fechar tudo",
"tileDisplay": "Exibição em mosaico",
"untileDisplay": "Sair do mosaico",
"closeFolderTabs": "Fechar todas as abas de {folder}",
"revealInSidebar": "Mostrar na barra lateral"
"untileDisplay": "Sair do mosaico"
},
"fileWorkspace": {
"files": "Arquivos",

4
src/i18n/messages/zh-CN.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "关闭其它",
"closeAll": "关闭所有",
"tileDisplay": "平铺显示",
"untileDisplay": "取消平铺",
"closeFolderTabs": "关闭 {folder} 的所有标签",
"revealInSidebar": "在侧边栏中定位"
"untileDisplay": "取消平铺"
},
"fileWorkspace": {
"files": "文件",

4
src/i18n/messages/zh-TW.json
View File

@@ -981,9 +981,7 @@
"closeOthers": "關閉其它",
"closeAll": "關閉所有",
"tileDisplay": "平鋪顯示",
"untileDisplay": "取消平鋪",
"closeFolderTabs": "關閉 {folder} 的所有標籤",
"revealInSidebar": "在側邊欄中定位"
"untileDisplay": "取消平鋪"
},
"fileWorkspace": {
"files": "檔案",