feat(apollo-vertex): migrate shell sidebar to shadcn SidebarProvider with sub-nav#681
Open
petervachon wants to merge 1 commit into
Open
feat(apollo-vertex): migrate shell sidebar to shadcn SidebarProvider with sub-nav#681petervachon wants to merge 1 commit into
petervachon wants to merge 1 commit into
Conversation
petervachon
requested review from
KokoMilev and
frankkluijtmans
and removed request for
a team
6 tasks
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Dependency License Review
License distribution
Excluded packages
|
frankkluijtmans
requested changes
May 12, 2026
| <div className="h-screen overflow-hidden flex bg-background dark:bg-sidebar relative"> | ||
| <SidebarProvider | ||
| defaultOpen | ||
| style={SIDEBAR_WIDTHS} |
Contributor
There was a problem hiding this comment.
Can the widths be set globally?
Comment on lines
+138
to
+146
| useEffect(() => { | ||
| const expanded = new Set<string>(); | ||
| for (const item of navItems) { | ||
| if (item.subItems?.some((sub) => pathname.startsWith(sub.path))) { | ||
| expanded.add(item.path); | ||
| } | ||
| } | ||
| setExpandedItems(expanded); | ||
| }, [pathname, navItems]); |
Contributor
There was a problem hiding this comment.
Setting state in an effect is an anti-pattern. I thought we set up a lint rule and added instructions to CLAUDE.md, but looks like it added this anyway 🤔
Comment on lines
+149
to
+162
| if (isCollapsed) { | ||
| toggleSidebar(); | ||
| setExpandedItems((prev) => new Set(prev).add(path)); | ||
| } else { | ||
| setExpandedItems((prev) => { | ||
| const next = new Set(prev); | ||
| if (next.has(path)) { | ||
| next.delete(path); | ||
| } else { | ||
| next.add(path); | ||
| } | ||
| return next; | ||
| }); | ||
| } |
Contributor
There was a problem hiding this comment.
Nested ternary logic affects readability. Can we use early returns instead?
Comment on lines
+166
to
+169
| if (path === "/") { | ||
| return pathname === "/"; | ||
| } | ||
| return pathname === path || pathname.startsWith(`${path}/`); |
Contributor
There was a problem hiding this comment.
Suggested change
| if (path === "/") { | |
| return pathname === "/"; | |
| } | |
| return pathname === path || pathname.startsWith(`${path}/`); | |
| return pathname === "/"; || pathname === path || pathname.startsWith(`${path}/`); |
petervachon
force-pushed
the
feat/vertex-shell-sidebar
branch
from
687670b to
1637691
Compare
github-actions
Bot
added
size:L
…with sub-nav Replaces the hand-built sidebar with the shadcn SidebarProvider stack: - shell-layout.tsx: wraps layout in SidebarProvider (with SIDEBAR_WIDTHS CSS vars), SidebarInset, and a mobile-only SidebarTrigger header. Fixes resolvedTheme check so the dark gradient background responds to the system theme preference. Uses useId() on the SVG noise filter to avoid duplicate DOM IDs when multiple shell instances render - shell-sidebar.tsx: migrates from motion.aside + useLocalStorage to the shadcn Sidebar component. Open/closed state is now persisted via a sidebar_state cookie (refresh-safe). Adds sub-nav support via Collapsible with expandedItems tracking the active route on mount. Animated text labels use AnimatePresence + textFadeVariants instead of the old spring. Deletes shell-nav-item.tsx (inlined into shell-sidebar) - shell-company.tsx: minor prop/class alignment - registry.json: updates shell entry deps and removes shell-nav-item file ref - Restores icon hover scale (whileHover iconHoverScale) on collapsed nav items that was lost during the provider migration Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
petervachon
force-pushed
the
feat/vertex-shell-sidebar
branch
from
1637691 to
4f68137
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Replaces the hand-rolled
@mantine/hooksuseLocalStorage-based sidebar with the shadcnSidebarProviderprimitive, and rebuilds the nav rendering to support collapsible sub-navigation groups.Behavioral changes:
sidebar_statecookie (refresh-safe, per reviewer feedback on Creilly11235/vertex shell sidebar provider migration #577)NavItemcomponent in favour of inline shadcnSidebarMenuButton/SidebarMenuSub/SidebarMenuSubButtoncompositionsubItemsrender as collapsible groups with a rotating chevron; clicking a parent while the sidebar is collapsed expands the sidebar and opens the group simultaneouslyuseLocation— exact match for root/, prefix match for all other pathsShellSidebarexport renamed fromSidebarto avoid collision with the shadcnSidebarprimitiveLines changed: ~338 additions / 167 deletions (M-sized slice)
Test plan
🤖 Generated with Claude Code