diff --git a/packages/session-ui/src/v2/components/session-review-v2.css b/packages/session-ui/src/v2/components/session-review-v2.css index 478a1c06d27..db1475496dc 100644 --- a/packages/session-ui/src/v2/components/session-review-v2.css +++ b/packages/session-ui/src/v2/components/session-review-v2.css @@ -38,11 +38,13 @@ flex-shrink: 0; min-height: 0; overflow: hidden; + width: var(--session-review-v2-sidebar-width); border-inline-end: 1px solid var(--v2-border-border-base); background: var(--v2-background-bg-base); } -[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][aria-hidden="true"] { +[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][data-presence="closing"] { + width: 0; border-inline-end-width: 0; } @@ -53,6 +55,19 @@ border-inline-end-width 200ms cubic-bezier(0.22, 1, 0.36, 1); } +/* A toggle slides the sidebar in from zero width; mounting it open, as a tab or session switch does, doesn't. */ +[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][data-presence="opening"] { + @starting-style { + width: 0; + border-inline-end-width: 0; + } +} + +/* The contents keep their open width while the sidebar slides, so rows don't rewrap or re-truncate on every frame. */ +[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][data-transition] > * { + min-width: calc(var(--session-review-v2-sidebar-width) - 1px); +} + [data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar-resize"] { position: absolute; inset-block: 0; diff --git a/packages/session-ui/src/v2/components/session-review-v2.tsx b/packages/session-ui/src/v2/components/session-review-v2.tsx index 274ff46a871..4e7a2be3093 100644 --- a/packages/session-ui/src/v2/components/session-review-v2.tsx +++ b/packages/session-ui/src/v2/components/session-review-v2.tsx @@ -9,8 +9,16 @@ import type { SessionReviewDiffStyle } from "../../components/session-review" import { ResizeHandle } from "@opencode/ui/resize-handle" import { useLocale } from "@kobalte/core/i18n" import { makeEventListener } from "@solid-primitives/event-listener" -import { Show, createEffect, createMemo, createSignal, type JSX } from "solid-js" +import { prefersReducedMotion } from "@opencode/ui/motion" +import { Show, createEffect, createMemo, createSignal, on, onCleanup, untrack, type JSX } from "solid-js" import { getWorkerPool } from "../../pierre/worker" +import { + SIDEBAR_EXIT_TIMEOUT_MS, + createSidebarPresenceState, + selectSidebarMounted, + transitionSidebarPresence, + type SidebarPresenceEvent, +} from "./sidebar-presence-machine" import { SessionFilePanelV2, SessionFilePanelV2Empty } from "./session-file-panel-v2" export const SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT = 240 @@ -69,15 +77,48 @@ export function SessionReviewV2Sidebar(props: SessionReviewV2SidebarProps) { const width = () => props.width ?? SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT const minWidth = () => props.minWidth ?? SESSION_REVIEW_V2_SIDEBAR_WIDTH_MIN const maxWidth = () => props.maxWidth ?? SESSION_REVIEW_V2_SIDEBAR_WIDTH_MAX + const [presence, setPresence] = createSignal(createSidebarPresenceState(untrack(() => props.open))) + let exitTimer: ReturnType | undefined + + const dispatch = (event: SidebarPresenceEvent) => { + const next = transitionSidebarPresence(untrack(presence), event) + + setPresence(next.state) + next.effects.forEach((effect) => { + clearTimeout(exitTimer) + exitTimer = setTimeout( + () => dispatch({ type: "exit.timed-out", attempt: effect.attempt }), + SIDEBAR_EXIT_TIMEOUT_MS, + ) + }) + } + + createEffect( + on( + () => props.open, + (open) => + dispatch({ type: "open.changed", open, animate: untrack(() => props.transition) && !prefersReducedMotion() }), + { defer: true }, + ), + ) + onCleanup(() => clearTimeout(exitTimer)) + + const closing = () => presence().status === "closing" return (
- +