Revert "fix(tabs): restore visible right-sidebar divider"

This reverts commit cf788f1302.
This commit is contained in:
brennanb2025
2026-04-25 12:05:33 -07:00
parent cf788f1302
commit 2dfbf34bf6
3 changed files with 24 additions and 10 deletions
@@ -197,7 +197,12 @@ function RightSidebarInner(): React.JSX.Element {
)}
>
{/* Panel content area */}
<div className="flex flex-col flex-1 min-w-0 bg-sidebar overflow-hidden">
<div
className="flex flex-col flex-1 min-w-0 bg-sidebar overflow-hidden"
style={{
borderLeft: rightSidebarOpen ? '1px solid var(--sidebar-border)' : 'none'
}}
>
{activityBarPosition === 'top' ? (
/* ── Top activity bar: horizontal icon row ── */
<ContextMenu>
@@ -28,6 +28,7 @@ export default function TabGroupPanel({
isWorktreeActive,
isFocused,
hasSplitGroups,
touchesRightEdge,
reserveClosedExplorerToggleSpace,
reserveCollapsedSidebarHeaderSpace,
isTabDragActive = false,
@@ -39,6 +40,7 @@ export default function TabGroupPanel({
isWorktreeActive: boolean
isFocused: boolean
hasSplitGroups: boolean
touchesRightEdge: boolean
reserveClosedExplorerToggleSpace: boolean
reserveCollapsedSidebarHeaderSpace: boolean
isTabDragActive?: boolean
@@ -188,7 +190,14 @@ export default function TabGroupPanel({
// because a lone group has nothing to contrast against.
className={`group/tab-group flex flex-col flex-1 min-w-0 min-h-0 overflow-hidden${
hasSplitGroups
? ` border-x border-border border-b ${isFocused ? 'border-b-accent' : 'opacity-95'}`
? // Why: drop only the RIGHT border on the rightmost group. The right
// sidebar paints its own `borderLeft` that already extends full
// height, so painting our own border-r in that spot stacks a
// second 1px line next to it — reading as a 2px-thick bar below
// the 8px drag strip (where the sidebar border continues alone
// above). The left edge has no such double-up, so the left
// border is always kept.
` border-l ${touchesRightEdge ? '' : 'border-r'} border-border border-b ${isFocused ? 'border-b-accent' : 'opacity-95'}`
: ''
}`}
onPointerDown={commands.focusGroup}
@@ -125,6 +125,7 @@ function SplitNode({
// "focused", Cmd/Ctrl+W and split shortcuts can hit the wrong worktree.
isFocused={isWorktreeActive && node.groupId === focusedGroupId}
hasSplitGroups={hasSplitGroups}
touchesRightEdge={touchesRightEdge}
reserveClosedExplorerToggleSpace={touchesTopEdge && touchesRightEdge}
reserveCollapsedSidebarHeaderSpace={touchesTopEdge && touchesLeftEdge}
isTabDragActive={isTabDragActive}
@@ -221,16 +222,15 @@ export default function TabGroupSplitLayout({
window-drag region at the top. Only the split layout's own panes
own the resize handles, while this strip keeps the whole top of the
center column draggable regardless of how the splits are arranged.
Why conditional `border-x`: when splits exist, the outer panes
paint their own vertical borders starting at y=8 (see
TabGroupPanel). Mirroring those borders on the drag strip extends
both seams up to y=0 so the lines between the terminal area and
the left/right sidebars reach the top of the window. Without
splits the panes have no vertical borders, so we skip them here
too to avoid dangling 8px stubs. */}
Why conditional `border-l`: when splits exist, the leftmost pane
paints its own `border-l` starting at y=8. Mirroring that border
on the drag strip extends the seam up to y=0 so the left-sidebar /
center-column line reaches the top of the window, matching the
full-height right-sidebar seam. Without splits the pane has no
`border-l`, so we skip it here too to avoid a dangling 8px stub. */}
<div className="flex flex-col flex-1 min-w-0 min-h-0 overflow-hidden">
<div
className={`h-2 shrink-0 bg-card${hasSplits ? ' border-x border-border' : ''}`}
className={`h-2 shrink-0 bg-card${hasSplits ? ' border-l border-border' : ''}`}
style={{ WebkitAppRegion: 'drag' } as React.CSSProperties}
/>
<div className="flex flex-1 min-w-0 min-h-0 overflow-hidden">