50bff3b274
## Thinking Path > - Paperclip is the open source control plane people use to manage AI agents, work, and company context. > - The board UI sidebar is the main way operators keep orientation across companies, projects, agents, issues, and settings. > - The existing fixed expanded sidebar competes with route-specific navigation, especially company settings and plugin routes that bring their own contextual sidebar. > - A collapsible primary rail preserves global navigation while giving contextual pages more horizontal room. > - This pull request adds a persisted collapsed rail, hover/focus peek, keyboard toggle, and a secondary sidebar takeover model for settings and plugin `routeSidebar` surfaces. > - The benefit is a denser board shell that keeps the app rail available without replacing it when a route needs its own navigation. ## Linked Issues or Issue Description Paperclip issue: PAP-10638 Create collapsible sidebar branch. Related GitHub PR found during duplicate search: #3838 (`feat/collapsible-sidebar`) covers a similar sidebar area but is a different head branch and implementation. This PR intentionally packages the work from `PAP-10638-collapsable-sidebar` into one reviewable branch. Problem description: The board shell needs a first-class collapsed sidebar mode. Contextual surfaces such as company settings and plugin route sidebars should not replace the global app sidebar; they should collapse the app sidebar to a rail and render their contextual navigation beside it. ## What Changed - Added desktop collapsed/sidebar-peek state to `SidebarContext`, including persisted user pins, route collapse requests, and forced collapse for secondary-sidebar routes. - Replaced the old resizable sidebar pane with `SidebarShell`, which supports a fixed 64px rail, persisted expanded width, keyboard/pointer resizing, and hover/focus peek overlay behavior. - Updated `Sidebar`, sidebar nav items, project/agent sections, badges, and account/company menu presentation for expanded, collapsed, and peeking states. - Added `RequestCollapsedSidebar` and `SecondarySidebar` so routes and plugin `routeSidebar` slots can request contextual sidebar layouts without replacing the primary app sidebar. - Wired company settings and plugin route sidebars into the secondary-pane takeover model. - Added focused Vitest coverage for sidebar state precedence, shell sizing, nav item rail rendering, keyboard shortcuts, layout takeover behavior, and route collapse requests. - Updated plugin authoring docs/spec references for route sidebar behavior. ## Verification Targeted local verification passed: ```sh NODE_ENV=test pnpm run preflight:workspace-links && NODE_ENV=test pnpm exec vitest run ui/src/context/SidebarContext.test.tsx ui/src/components/SidebarShell.test.tsx ui/src/components/Sidebar.test.tsx ui/src/components/Layout.test.tsx ui/src/components/RequestCollapsedSidebar.test.tsx ui/src/components/SidebarNavItem.test.tsx ui/src/components/SidebarAgents.test.tsx ui/src/components/SidebarProjects.test.tsx ui/src/components/KeyboardShortcutsCheatsheet.test.tsx ui/src/hooks/useKeyboardShortcuts.test.tsx ``` Result: 10 test files passed, 88 tests passed. Additional follow-up verification passed after review fixes: ```sh NODE_ENV=test pnpm run preflight:workspace-links && NODE_ENV=test pnpm exec vitest run ui/src/components/Layout.test.tsx ui/src/context/SidebarContext.test.tsx && pnpm --filter /ui typecheck ``` Result: 2 test files passed, 28 tests passed, and UI typecheck passed. Latest PR-head remote checks: Paperclip PR workflow, Snyk, Socket, and Greptile are green; commitperclip `review` is cancelled in its security-gate step after filing a non-blocking neutral `security-review` check. Notes: - A direct run without `NODE_ENV=test` loads React's production build in this workspace, where `act` is unavailable; the command above matches the repo stable runner's test environment. - I did not run Playwright/browser e2e or full workspace build/typecheck in this PR-creation heartbeat. - QA screenshots are attached in https://github.com/paperclipai/paperclip/pull/7824#issuecomment-4661968387 for expanded, collapsed rail, hover peek, and settings secondary-sidebar states. ## Risks - Medium UI layout risk: this changes the board shell and primary sidebar composition across many routes. - Local storage migration risk is low: new collapsed state uses a new key and existing width storage remains scoped to the sidebar width. - Plugin route risk: plugin `routeSidebar` slots now render as secondary panes on desktop, so plugin authors should confirm their route sidebar content fits a 240px contextual pane. - Mobile risk appears low because mobile keeps the drawer model and gates collapsed/peek behavior to desktop. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used OpenAI Codex coding agent based on GPT-5, with local shell/git/GitHub CLI tool use. Exact service-side model identifier and context window were not exposed in this runtime. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: Paperclip <noreply@paperclip.ing>
245 lines
8.3 KiB
TypeScript
245 lines
8.3 KiB
TypeScript
import {
|
|
useCallback,
|
|
useEffect,
|
|
useMemo,
|
|
useRef,
|
|
useState,
|
|
type FocusEventHandler,
|
|
type KeyboardEvent,
|
|
type MouseEventHandler,
|
|
type PointerEvent,
|
|
type ReactNode,
|
|
} from "react";
|
|
import { cn } from "@/lib/utils";
|
|
|
|
const DEFAULT_SIDEBAR_WIDTH = 240;
|
|
const MIN_SIDEBAR_WIDTH = 208;
|
|
const MAX_SIDEBAR_WIDTH = 420;
|
|
const SIDEBAR_WIDTH_STEP = 16;
|
|
|
|
// Collapsed icon rail. Width is chosen so the icon is *centered* in the rail,
|
|
// which keeps the active/hover highlight symmetric around it (PAP-10676):
|
|
// the icon's left edge sits at nav px-3 (12) + item px-3 (12) = 24px, so a
|
|
// matching 24px trailing margin (12 item px-3 + 12 nav px-3) yields
|
|
// 24 + 16 (icon) + 24 = 64. The icon's left edge is unchanged from the expanded
|
|
// layout, so icons stay pixel-identical across states.
|
|
export const SIDEBAR_RAIL_WIDTH = 64;
|
|
|
|
function clampSidebarWidth(width: number) {
|
|
return Math.min(MAX_SIDEBAR_WIDTH, Math.max(MIN_SIDEBAR_WIDTH, width));
|
|
}
|
|
|
|
function readStoredSidebarWidth(storageKey: string) {
|
|
if (typeof window === "undefined") return DEFAULT_SIDEBAR_WIDTH;
|
|
|
|
try {
|
|
const stored = window.localStorage.getItem(storageKey);
|
|
if (!stored) return DEFAULT_SIDEBAR_WIDTH;
|
|
const parsed = Number.parseInt(stored, 10);
|
|
if (!Number.isFinite(parsed)) return DEFAULT_SIDEBAR_WIDTH;
|
|
return clampSidebarWidth(parsed);
|
|
} catch {
|
|
return DEFAULT_SIDEBAR_WIDTH;
|
|
}
|
|
}
|
|
|
|
function writeStoredSidebarWidth(storageKey: string, width: number) {
|
|
if (typeof window === "undefined") return;
|
|
|
|
try {
|
|
window.localStorage.setItem(storageKey, String(clampSidebarWidth(width)));
|
|
} catch {
|
|
// Storage can be unavailable in private contexts; resizing should still work.
|
|
}
|
|
}
|
|
|
|
type SidebarShellProps = {
|
|
children: ReactNode;
|
|
/** Whether the sidebar occupies space at all (mobile back-compat / hidden). */
|
|
open: boolean;
|
|
/** Pinned collapsed (rail) mode. Desktop-only; the caller gates this. */
|
|
collapsed?: boolean;
|
|
/** Ephemeral hover/focus peek. Only meaningful while collapsed. */
|
|
peeking?: boolean;
|
|
resizable?: boolean;
|
|
storageKey?: string;
|
|
className?: string;
|
|
/** Forwarded to the overlay panel so Layout can wire peek triggers. */
|
|
onPanelMouseEnter?: MouseEventHandler<HTMLDivElement>;
|
|
onPanelMouseLeave?: MouseEventHandler<HTMLDivElement>;
|
|
onPanelFocusCapture?: FocusEventHandler<HTMLDivElement>;
|
|
onPanelBlurCapture?: FocusEventHandler<HTMLDivElement>;
|
|
};
|
|
|
|
/**
|
|
* Layout shell for the desktop sidebar. Owns the persisted expanded width and
|
|
* renders two layers:
|
|
* - an in-flow spacer that reserves `reservedWidth` (rail when collapsed,
|
|
* expanded width otherwise) so content to the right only reflows on pin, and
|
|
* - an absolutely-positioned panel of `panelWidth` (rail at rest, expanded
|
|
* while peeking) that overlays content — with shadow/raised z-index — when it
|
|
* is wider than the reserved spacer.
|
|
*
|
|
* The icon-alignment guarantee comes for free: collapsing is a pure width
|
|
* change with `overflow-hidden` clipping the labels; item padding/icon markup
|
|
* are never touched, so the left-aligned icon stays pixel-identical.
|
|
*
|
|
* Opening/closing is intentionally instant (no width transition): the pin toggle
|
|
* and peek snap between rail and expanded widths so the content never appears to
|
|
* slide. Resizing the drag handle is likewise direct.
|
|
*/
|
|
export function SidebarShell({
|
|
children,
|
|
open,
|
|
collapsed = false,
|
|
peeking = false,
|
|
resizable = false,
|
|
storageKey = "paperclip.sidebar.width",
|
|
className,
|
|
onPanelMouseEnter,
|
|
onPanelMouseLeave,
|
|
onPanelFocusCapture,
|
|
onPanelBlurCapture,
|
|
}: SidebarShellProps) {
|
|
const [width, setWidth] = useState(() => readStoredSidebarWidth(storageKey));
|
|
const [isResizing, setIsResizing] = useState(false);
|
|
const widthRef = useRef(width);
|
|
const dragState = useRef<{ startX: number; startWidth: number } | null>(null);
|
|
|
|
useEffect(() => {
|
|
const storedWidth = readStoredSidebarWidth(storageKey);
|
|
widthRef.current = storedWidth;
|
|
setWidth(storedWidth);
|
|
}, [storageKey]);
|
|
|
|
// Unified width function (plan §5): one code path for every pinned state.
|
|
const expandedWidth = open ? width : 0;
|
|
const reservedWidth = !open ? 0 : collapsed ? SIDEBAR_RAIL_WIDTH : expandedWidth;
|
|
const panelWidth = !open ? 0 : collapsed && !peeking ? SIDEBAR_RAIL_WIDTH : expandedWidth;
|
|
const isOverlay = panelWidth > reservedWidth;
|
|
|
|
// The drag handle can only resize the expanded width, so it is disabled while
|
|
// collapsed (the rail width is a fixed constant, not user-resizable).
|
|
const canResize = resizable && open && !collapsed;
|
|
|
|
const reservedStyle = useMemo(
|
|
() => ({ width: `${reservedWidth}px` }),
|
|
[reservedWidth],
|
|
);
|
|
const panelStyle = useMemo(
|
|
() => ({ width: `${panelWidth}px` }),
|
|
[panelWidth],
|
|
);
|
|
|
|
const commitWidth = useCallback(
|
|
(nextWidth: number) => {
|
|
const clamped = clampSidebarWidth(nextWidth);
|
|
widthRef.current = clamped;
|
|
setWidth(clamped);
|
|
writeStoredSidebarWidth(storageKey, clamped);
|
|
},
|
|
[storageKey],
|
|
);
|
|
|
|
const handlePointerDown = useCallback(
|
|
(event: PointerEvent<HTMLDivElement>) => {
|
|
if (!canResize) return;
|
|
|
|
event.preventDefault();
|
|
event.currentTarget.setPointerCapture(event.pointerId);
|
|
dragState.current = { startX: event.clientX, startWidth: widthRef.current };
|
|
setIsResizing(true);
|
|
},
|
|
[canResize],
|
|
);
|
|
|
|
const handlePointerMove = useCallback(
|
|
(event: PointerEvent<HTMLDivElement>) => {
|
|
if (!dragState.current) return;
|
|
|
|
const nextWidth = dragState.current.startWidth + event.clientX - dragState.current.startX;
|
|
const clamped = clampSidebarWidth(nextWidth);
|
|
widthRef.current = clamped;
|
|
setWidth(clamped);
|
|
},
|
|
[],
|
|
);
|
|
|
|
const endResize = useCallback(() => {
|
|
if (!dragState.current) return;
|
|
|
|
dragState.current = null;
|
|
setIsResizing(false);
|
|
writeStoredSidebarWidth(storageKey, widthRef.current);
|
|
}, [storageKey]);
|
|
|
|
const handleKeyDown = useCallback(
|
|
(event: KeyboardEvent<HTMLDivElement>) => {
|
|
if (!canResize) return;
|
|
|
|
if (event.key === "ArrowLeft") {
|
|
event.preventDefault();
|
|
commitWidth(width - SIDEBAR_WIDTH_STEP);
|
|
} else if (event.key === "ArrowRight") {
|
|
event.preventDefault();
|
|
commitWidth(width + SIDEBAR_WIDTH_STEP);
|
|
} else if (event.key === "Home") {
|
|
event.preventDefault();
|
|
commitWidth(MIN_SIDEBAR_WIDTH);
|
|
} else if (event.key === "End") {
|
|
event.preventDefault();
|
|
commitWidth(MAX_SIDEBAR_WIDTH);
|
|
}
|
|
},
|
|
[canResize, commitWidth, width],
|
|
);
|
|
|
|
return (
|
|
<div className={cn("relative h-full shrink-0", className)} style={reservedStyle}>
|
|
<div
|
|
className={cn(
|
|
"absolute inset-y-0 left-0 flex flex-col overflow-hidden",
|
|
// Open/close is instant (PAP-10676): no width transition so the rail and
|
|
// expanded states snap without any sliding motion.
|
|
// Overlay styling only while the panel is wider than its reserved
|
|
// spacer (i.e. peeking) so it floats above content without reflow.
|
|
isOverlay
|
|
? "z-30 border-r border-border bg-background shadow-lg"
|
|
: "z-0",
|
|
)}
|
|
style={panelStyle}
|
|
data-sidebar-overlay={isOverlay ? "" : undefined}
|
|
onMouseEnter={onPanelMouseEnter}
|
|
onMouseLeave={onPanelMouseLeave}
|
|
onFocusCapture={onPanelFocusCapture}
|
|
onBlurCapture={onPanelBlurCapture}
|
|
>
|
|
{children}
|
|
{canResize ? (
|
|
<div
|
|
role="separator"
|
|
aria-label="Resize sidebar"
|
|
aria-orientation="vertical"
|
|
aria-valuemin={MIN_SIDEBAR_WIDTH}
|
|
aria-valuemax={MAX_SIDEBAR_WIDTH}
|
|
aria-valuenow={width}
|
|
tabIndex={0}
|
|
className={cn(
|
|
"absolute inset-y-0 right-0 z-20 w-3 cursor-col-resize touch-none outline-none",
|
|
"before:absolute before:inset-y-0 before:left-1/2 before:w-px before:-translate-x-1/2 before:bg-transparent before:transition-colors",
|
|
"hover:before:bg-border focus-visible:before:bg-ring",
|
|
isResizing && "before:bg-ring",
|
|
)}
|
|
onPointerDown={handlePointerDown}
|
|
onPointerMove={handlePointerMove}
|
|
onPointerUp={endResize}
|
|
onPointerCancel={endResize}
|
|
onLostPointerCapture={endResize}
|
|
onKeyDown={handleKeyDown}
|
|
/>
|
|
) : null}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|