Add main sidebar toggle #3497
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,64 @@ | ||
| import { useAtomValue } from "@effect/atom-react"; | ||
| import { useEffect, type CSSProperties, type ReactNode } from "react"; | ||
| import { useNavigate } from "@tanstack/react-router"; | ||
|
|
||
| import { isElectron } from "../env"; | ||
| import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings"; | ||
| import { isMacPlatform } from "../lib/utils"; | ||
| import { primaryServerKeybindingsAtom } from "../state/server"; | ||
| import ThreadSidebar from "./Sidebar"; | ||
| import { Sidebar, SidebarProvider, SidebarRail, SidebarTrigger, useSidebar } from "./ui/sidebar"; | ||
| import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip"; | ||
|
|
||
| const THREAD_SIDEBAR_WIDTH_STORAGE_KEY = "chat_thread_sidebar_width"; | ||
| const THREAD_SIDEBAR_MIN_WIDTH = 13 * 16; | ||
| const THREAD_MAIN_CONTENT_MIN_WIDTH = 40 * 16; | ||
| const MACOS_TRAFFIC_LIGHTS_LEFT_INSET = "90px"; | ||
|
|
||
| function SidebarControl() { | ||
| const keybindings = useAtomValue(primaryServerKeybindingsAtom); | ||
| const { toggleSidebar } = useSidebar(); | ||
| const shortcutLabel = shortcutLabelForCommand(keybindings, "sidebar.toggle"); | ||
|
|
||
| useEffect(() => { | ||
| const onKeyDown = (event: KeyboardEvent) => { | ||
| if (event.defaultPrevented) return; | ||
| if (resolveShortcutCommand(event, keybindings) !== "sidebar.toggle") return; | ||
|
|
||
| event.preventDefault(); | ||
| event.stopPropagation(); | ||
| toggleSidebar(); | ||
|
Contributor
There was a problem hiding this comment. Mod+B blocked after preventDefaultMedium Severity
  Reviewed by Cursor Bugbot for commit 41d4e81. Configure here. |
||
| }; | ||
|
|
||
| window.addEventListener("keydown", onKeyDown); | ||
| return () => window.removeEventListener("keydown", onKeyDown); | ||
| }, [keybindings, toggleSidebar]); | ||
|
|
||
| return ( | ||
| <div | ||
| className="pointer-events-none fixed left-[var(--workspace-controls-left)] top-[var(--workspace-controls-top)] z-50 flex h-[var(--workspace-topbar-height)] items-center" | ||
| data-sidebar-control="" | ||
| > | ||
| <Tooltip> | ||
| <TooltipTrigger | ||
| render={ | ||
| <SidebarTrigger className="pointer-events-auto" aria-label="Toggle main sidebar" /> | ||
| } | ||
| /> | ||
| <TooltipPopup side="bottom"> | ||
| Toggle main sidebar{shortcutLabel ? ` (${shortcutLabel})` : ""} | ||
| </TooltipPopup> | ||
| </Tooltip> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export function AppSidebarLayout({ children }: { children: ReactNode }) { | ||
| const navigate = useNavigate(); | ||
| const macosWindowControlsStyle = | ||
| isElectron && isMacPlatform(navigator.platform) | ||
| ? ({ "--workspace-controls-left": MACOS_TRAFFIC_LIGHTS_LEFT_INSET } as CSSProperties) | ||
| : undefined; | ||
|
|
||
| useEffect(() => { | ||
| const onMenuAction = window.desktopBridge?.onMenuAction; | ||
|
|
@@ -28,7 +78,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) { | |
| }, [navigate]); | ||
|
|
||
| return ( | ||
| <SidebarProvider className="h-dvh! min-h-0!" defaultOpen style={macosWindowControlsStyle}> | ||
|
Contributor
There was a problem hiding this comment. WCO inset overridden on MacMedium Severity On macOS Electron, Reviewed by Cursor Bugbot for commit 57cb362. Configure here. |
||
| <Sidebar | ||
| side="left" | ||
| collapsible="offcanvas" | ||
|
|
@@ -44,6 +94,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) { | |
| <SidebarRail /> | ||
| </Sidebar> | ||
| {children} | ||
| <SidebarControl /> | ||
| </SidebarProvider> | ||
| ); | ||
| } | ||
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Key repeat toggles sidebar repeatedly
Medium Severity
The
sidebar.togglekeydownhandler inSidebarControldoesn't checkevent.repeat, causing the sidebar to toggle rapidly when the shortcut is held down.Reviewed by Cursor Bugbot for commit 57cb362. Configure here.