Add resizable inline right panels #2512
+187
−131
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
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 |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| import { Schema } from "effect"; | ||
| import { | ||
| type PointerEvent as ReactPointerEvent, | ||
| type ReactNode, | ||
| useCallback, | ||
| useEffect, | ||
| useRef, | ||
| useState, | ||
| } from "react"; | ||
|
|
||
| import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage"; | ||
| import { cn } from "~/lib/utils"; | ||
|
|
||
| const DEFAULT_RATIO = 0.4; | ||
| const MIN_RATIO = 0.3; | ||
| const MAX_RATIO = 0.8; | ||
|
|
||
| const clampRatio = (ratio: number) => Math.max(MIN_RATIO, Math.min(ratio, MAX_RATIO)); | ||
|
|
||
| function readStoredRatio(storageKey: string | undefined) { | ||
| if (!storageKey) return DEFAULT_RATIO; | ||
| const storedRatio = getLocalStorageItem(storageKey, Schema.Finite); | ||
| return storedRatio === null ? DEFAULT_RATIO : clampRatio(storedRatio); | ||
| } | ||
|
|
||
| export function ResizableRightPanel({ | ||
| children, | ||
| className, | ||
| storageKey, | ||
| }: { | ||
| children: ReactNode; | ||
| className?: string; | ||
| storageKey?: string; | ||
| }) { | ||
| const [widthRatio, setWidthRatio] = useState(() => readStoredRatio(storageKey)); | ||
| const panelRef = useRef<HTMLDivElement | null>(null); | ||
| const widthRatioRef = useRef(widthRatio); | ||
| const resizeStateRef = useRef<{ | ||
| frameId: number | null; | ||
| handle: HTMLDivElement; | ||
| panel: HTMLDivElement; | ||
| pointerId: number; | ||
| startWidth: number; | ||
| startX: number; | ||
| } | null>(null); | ||
|
|
||
| const commitWidthRatio = useCallback((ratio: number) => { | ||
| widthRatioRef.current = ratio; | ||
| setWidthRatio(ratio); | ||
| }, []); | ||
|
|
||
| const stopResize = useCallback( | ||
| (pointerId: number) => { | ||
| const resizeState = resizeStateRef.current; | ||
| if (!resizeState) return; | ||
| if (resizeState.frameId !== null) { | ||
| window.cancelAnimationFrame(resizeState.frameId); | ||
| } | ||
| if (resizeState.handle.hasPointerCapture(pointerId)) { | ||
| resizeState.handle.releasePointerCapture(pointerId); | ||
| } | ||
| document.body.style.removeProperty("cursor"); | ||
| document.body.style.removeProperty("user-select"); | ||
| resizeStateRef.current = null; | ||
| if (storageKey) { | ||
| setLocalStorageItem(storageKey, widthRatioRef.current, Schema.Finite); | ||
| } | ||
| }, | ||
| [storageKey], | ||
| ); | ||
|
|
||
| const handlePointerDown = useCallback((event: ReactPointerEvent<HTMLDivElement>) => { | ||
| if (event.button !== 0) return; | ||
| const panel = panelRef.current; | ||
| if (!panel) return; | ||
|
|
||
| event.preventDefault(); | ||
| event.stopPropagation(); | ||
| resizeStateRef.current = { | ||
| frameId: null, | ||
| handle: event.currentTarget, | ||
| panel, | ||
| pointerId: event.pointerId, | ||
| startWidth: panel.getBoundingClientRect().width, | ||
| startX: event.clientX, | ||
| }; | ||
| event.currentTarget.setPointerCapture(event.pointerId); | ||
| document.body.style.cursor = "col-resize"; | ||
| document.body.style.userSelect = "none"; | ||
| }, []); | ||
|
|
||
| const handlePointerMove = useCallback( | ||
| (event: ReactPointerEvent<HTMLDivElement>) => { | ||
| const resizeState = resizeStateRef.current; | ||
| if (!resizeState || resizeState.pointerId !== event.pointerId) return; | ||
|
|
||
| event.preventDefault(); | ||
| if (resizeState.frameId !== null) return; | ||
|
|
||
| const clientX = event.clientX; | ||
| resizeState.frameId = window.requestAnimationFrame(() => { | ||
| const activeResizeState = resizeStateRef.current; | ||
| if (!activeResizeState) return; | ||
|
|
||
| activeResizeState.frameId = null; | ||
| const containerWidth = activeResizeState.panel.parentElement?.clientWidth ?? 0; | ||
| if (containerWidth <= 0) return; | ||
|
|
||
| const nextWidth = activeResizeState.startWidth + activeResizeState.startX - clientX; | ||
| commitWidthRatio(clampRatio(nextWidth / containerWidth)); | ||
| }); | ||
| }, | ||
| [commitWidthRatio], | ||
| ); | ||
|
|
||
| const handlePointerUp = useCallback( | ||
| (event: ReactPointerEvent<HTMLDivElement>) => { | ||
| const resizeState = resizeStateRef.current; | ||
| if (!resizeState || resizeState.pointerId !== event.pointerId) return; | ||
| stopResize(event.pointerId); | ||
| }, | ||
| [stopResize], | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| return () => { | ||
| const resizeState = resizeStateRef.current; | ||
| if (resizeState?.frameId !== null && resizeState?.frameId !== undefined) { | ||
| window.cancelAnimationFrame(resizeState.frameId); | ||
| } | ||
| document.body.style.removeProperty("cursor"); | ||
| document.body.style.removeProperty("user-select"); | ||
| }; | ||
| }, []); | ||
|
|
||
| return ( | ||
| <div | ||
| className={cn("relative min-h-0 shrink-0", className)} | ||
| ref={panelRef} | ||
| style={{ width: `${widthRatio * 100}%` }} | ||
| > | ||
| <div | ||
| aria-label="Resize right panel" | ||
| className="absolute inset-y-0 left-0 z-20 w-4 -translate-x-1/2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1/2 after:w-px hover:after:bg-border" | ||
| onPointerCancel={handlePointerUp} | ||
| onPointerDown={handlePointerDown} | ||
| onPointerMove={handlePointerMove} | ||
| onPointerUp={handlePointerUp} | ||
| role="separator" | ||
| tabIndex={-1} | ||
| title="Drag to resize right panel" | ||
| /> | ||
| {children} | ||
| </div> | ||
| ); | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -11,25 +11,18 @@ import { | |
| type DiffPanelMode, | ||
| } from "../components/DiffPanelShell"; | ||
| import { finalizePromotedDraftThreadByRef, useComposerDraftStore } from "../composerDraftStore"; | ||
| import { type DiffRouteSearch, parseDiffRouteSearch } from "../diffRouteSearch"; | ||
| import { useMediaQuery } from "../hooks/useMediaQuery"; | ||
| import { RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY } from "../rightPanelLayout"; | ||
| import { selectEnvironmentState, selectThreadExistsByRef, useStore } from "../store"; | ||
| import { createThreadSelectorByRef } from "../storeSelectors"; | ||
| import { resolveThreadRouteRef, buildThreadRouteParams } from "../threadRoutes"; | ||
| import { ResizableRightPanel } from "../components/ResizableRightPanel"; | ||
| import { RightPanelSheet } from "../components/RightPanelSheet"; | ||
| import { SidebarInset } from "~/components/ui/sidebar"; | ||
|
|
||
| const DiffPanel = lazy(() => import("../components/DiffPanel")); | ||
| const DIFF_INLINE_SIDEBAR_WIDTH_STORAGE_KEY = "chat_diff_sidebar_width_ratio"; | ||
|
|
||
| const DiffLoadingFallback = (props: { mode: DiffPanelMode }) => { | ||
| return ( | ||
|
|
@@ -49,92 +42,17 @@ const LazyDiffPanel = (props: { mode: DiffPanelMode }) => { | |
| ); | ||
| }; | ||
|
|
||
|
cursor[bot] marked this conversation as resolved.
|
||
|
Contributor
There was a problem hiding this comment. Inline diff panel loses "keep mounted" optimization on closeMedium Severity The refactored Additional Locations (1)  Reviewed by Cursor Bugbot for commit 8a193e5. Configure here. |
||
| const DiffPanelInlineSidebar = (props: { diffOpen: boolean }) => { | ||
| const { diffOpen } = props; | ||
| if (!diffOpen) return null; | ||
|
|
||
| return ( | ||
| <ResizableRightPanel | ||
| className="border-l border-border bg-card text-foreground" | ||
| storageKey={DIFF_INLINE_SIDEBAR_WIDTH_STORAGE_KEY} | ||
| > | ||
| <LazyDiffPanel mode="sidebar" /> | ||
| </ResizableRightPanel> | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| ); | ||
| }; | ||
|
|
||
|
|
@@ -199,21 +117,6 @@ function ChatThreadRouteView() { | |
| search: { diff: undefined }, | ||
| }); | ||
| }, [navigate, threadRef]); | ||
| useEffect(() => { | ||
| if (!threadRef || !bootstrapComplete) { | ||
| return; | ||
|
|
@@ -239,7 +142,7 @@ function ChatThreadRouteView() { | |
|
|
||
| if (!shouldUseDiffSheet) { | ||
| return ( | ||
| <div className="flex min-h-0 min-w-0 flex-1"> | ||
| <SidebarInset className="h-svh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground md:h-dvh"> | ||
| <ChatView | ||
| environmentId={threadRef.environmentId} | ||
|
|
@@ -249,13 +152,8 @@ function ChatThreadRouteView() { | |
| routeKind="server" | ||
| /> | ||
| </SidebarInset> | ||
| <DiffPanelInlineSidebar diffOpen={diffOpen} /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.