From fa176a540c2313c65e0edd3646af26a61be99e20 Mon Sep 17 00:00:00 2001 From: Serhii Vecherenko Date: Sun, 24 May 2026 17:01:30 -0700 Subject: [PATCH] feat(sidebar): pass active git state to worktree group header --- .../MainView/parts/Sidebar/parts/SidebarWorktreeGroup.tsx | 3 +++ .../views/MainView/parts/Sidebar/parts/WorktreeGroupHeader.tsx | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/renderer/views/MainView/parts/Sidebar/parts/SidebarWorktreeGroup.tsx b/src/renderer/views/MainView/parts/Sidebar/parts/SidebarWorktreeGroup.tsx index b5ac91db..40ed56cf 100644 --- a/src/renderer/views/MainView/parts/Sidebar/parts/SidebarWorktreeGroup.tsx +++ b/src/renderer/views/MainView/parts/Sidebar/parts/SidebarWorktreeGroup.tsx @@ -5,6 +5,7 @@ import { ContextMenu } from "@/renderer/components/common"; import { useDragSource, useIsDraggingWorktreeGroup, type DragSourceData } from "@/renderer/dnd"; import { useIsWorktreeFilesPanelActive, + useIsWorktreeGitPanelActive, useIsWorktreeTerminalActive, useIsWorktreeTerminalOpen, } from "@/renderer/hooks/uiSelectors"; @@ -42,6 +43,7 @@ export function SidebarWorktreeGroup(props: { const hasTerminal = useIsWorktreeTerminalOpen(group.worktreePath); const isActiveTerminal = useIsWorktreeTerminalActive(group.worktreePath); const isActiveFiles = useIsWorktreeFilesPanelActive(group.worktreePath); + const isActiveGit = useIsWorktreeGitPanelActive(group.worktreePath); const groupThreadIds = group.threads.map((t) => t.id); const { ref } = useSortable({ @@ -122,6 +124,7 @@ export function SidebarWorktreeGroup(props: { hasTerminal={hasTerminal} isActiveTerminal={isActiveTerminal} isActiveFiles={isActiveFiles} + isActiveGit={isActiveGit} onToggleCollapse={() => toggleWorktreeCollapsed(group.worktreePath)} onOpenFiles={() => openFilesPanel(project.id, group.worktreePath)} onOpenGitReview={() => openGitReview(project.id, group.worktreePath)} diff --git a/src/renderer/views/MainView/parts/Sidebar/parts/WorktreeGroupHeader.tsx b/src/renderer/views/MainView/parts/Sidebar/parts/WorktreeGroupHeader.tsx index c35e753f..bc73f28a 100644 --- a/src/renderer/views/MainView/parts/Sidebar/parts/WorktreeGroupHeader.tsx +++ b/src/renderer/views/MainView/parts/Sidebar/parts/WorktreeGroupHeader.tsx @@ -13,6 +13,7 @@ export function WorktreeGroupHeader(props: { hasTerminal: boolean; isActiveTerminal: boolean; isActiveFiles?: boolean; + isActiveGit: boolean; onToggleCollapse: () => void; onOpenFiles: () => void; onOpenGitReview: () => void; @@ -80,6 +81,7 @@ export function WorktreeGroupHeader(props: { projectName={props.worktreeBranch} worktreePath={props.worktreePath} onPress={props.onOpenGitReview} + isActive={props.isActiveGit} /> }