fix(app): slide the file tree sidebar open and shut again (#62773)

This commit is contained in:
Aiden Cline
2026-11-10 13:42:43 -06:00
committed by GitHub
Unverified
parent d22bc1d1b6
commit 95aa28e5c8
4 changed files with 185 additions and 4 deletions
@@ -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;
@@ -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<typeof setTimeout> | 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 (
<div data-component="session-review-v2-sidebar-root">
<Show when={props.open}>
<Show when={selectSidebarMounted(presence())}>
<aside
data-slot="session-review-v2-sidebar"
data-presence={presence().status}
data-transition={props.transition ? "" : undefined}
data-resizing={resizing() ? "" : undefined}
style={{ width: `${width()}px` }}
aria-hidden={closing() || undefined}
inert={closing() || undefined}
style={{ "--session-review-v2-sidebar-width": `${width()}px` }}
onTransitionEnd={(event) => {
if (event.target === event.currentTarget && event.propertyName === "width") dispatch({ type: "exit.ended" })
}}
>
<div data-slot="session-review-v2-sidebar-header">
<div data-slot="session-review-v2-sidebar-title">{props.title}</div>
@@ -0,0 +1,56 @@
import { describe, expect, test } from "bun:test"
import {
createSidebarPresenceState,
selectSidebarMounted,
transitionSidebarPresence,
type SidebarPresenceEvent,
type SidebarPresenceState,
} from "./sidebar-presence-machine"
const close = { type: "open.changed", open: false, animate: true } as const
const open = { type: "open.changed", open: true, animate: true } as const
function replay(events: SidebarPresenceEvent[], state = createSidebarPresenceState(true)) {
return events.reduce<SidebarPresenceState>((current, event) => transitionSidebarPresence(current, event).state, state)
}
describe("transitionSidebarPresence", () => {
test("a close stays mounted until its slide ends", () => {
const closing = transitionSidebarPresence(createSidebarPresenceState(true), close)
expect(closing.state).toEqual({ status: "closing", attempt: 1 })
expect(closing.effects).toEqual([{ type: "exit.timer", attempt: 1 }])
expect(selectSidebarMounted(closing.state)).toBe(true)
expect(replay([{ type: "exit.ended" }], closing.state)).toEqual({ status: "closed", attempt: 1 })
})
test("a close lands when the slide never reports its end", () => {
const closing = replay([close])
expect(replay([{ type: "exit.timed-out", attempt: 1 }], closing).status).toBe("closed")
})
test("a reopen mid-close keeps the sidebar, and the old close's timer is stale", () => {
const reopened = replay([close, open])
expect(reopened.status).toBe("open")
expect(transitionSidebarPresence(reopened, { type: "exit.timed-out", attempt: 1 }).state).toBe(reopened)
expect(transitionSidebarPresence(reopened, { type: "exit.ended" }).state).toBe(reopened)
const again = transitionSidebarPresence(reopened, close)
expect(again.state).toEqual({ status: "closing", attempt: 2 })
expect(replay([{ type: "exit.timed-out", attempt: 1 }], again.state).status).toBe("closing")
})
test("a toggle opens with a slide in; without motion it opens and closes at once", () => {
expect(replay([open], createSidebarPresenceState(false)).status).toBe("opening")
expect(replay([{ ...open, animate: false }], createSidebarPresenceState(false)).status).toBe("open")
expect(replay([{ ...close, animate: false }]).status).toBe("closed")
})
test("a mount reflects the preference without a slide", () => {
expect(createSidebarPresenceState(true).status).toBe("open")
expect(selectSidebarMounted(createSidebarPresenceState(false))).toBe(false)
})
})
@@ -0,0 +1,69 @@
/** The CSS slide's 200ms, plus slack, after which a close lands even when no `transitionend` arrives. */
export const SIDEBAR_EXIT_TIMEOUT_MS = 300
/**
* The review and file tree sidebar. It mounts while open and slides its width on the user's toggles; a close keeps it
* mounted until the slide ends, then unmounts it, so no hidden tree is left behind.
*/
export type SidebarPresenceState =
| { readonly status: "open"; readonly attempt: number }
/** Opened by a toggle, so it slides in from zero width when it mounts. */
| { readonly status: "opening"; readonly attempt: number }
| { readonly status: "closing"; readonly attempt: number }
| { readonly status: "closed"; readonly attempt: number }
export type SidebarPresenceEvent =
/** `animate` is false while the preference hydrates and under reduced motion. */
| { readonly type: "open.changed"; readonly open: boolean; readonly animate: boolean }
| { readonly type: "exit.ended" }
| { readonly type: "exit.timed-out"; readonly attempt: number }
export type SidebarPresenceEffect = { readonly type: "exit.timer"; readonly attempt: number }
export type SidebarPresenceTransition = {
readonly state: SidebarPresenceState
readonly effects: readonly SidebarPresenceEffect[]
}
const NO_EFFECTS: readonly SidebarPresenceEffect[] = []
export function createSidebarPresenceState(open: boolean): SidebarPresenceState {
return { status: open ? "open" : "closed", attempt: 0 }
}
export function transitionSidebarPresence(
state: SidebarPresenceState,
event: SidebarPresenceEvent,
): SidebarPresenceTransition {
if (event.type === "exit.ended") {
if (state.status !== "closing") return { state, effects: NO_EFFECTS }
return { state: { status: "closed", attempt: state.attempt }, effects: NO_EFFECTS }
}
if (event.type === "exit.timed-out") {
if (state.status !== "closing" || state.attempt !== event.attempt) return { state, effects: NO_EFFECTS }
return { state: { status: "closed", attempt: state.attempt }, effects: NO_EFFECTS }
}
if (event.open) {
if (state.status === "open" || state.status === "opening") return { state, effects: NO_EFFECTS }
// Reopening mid-close keeps the mounted sidebar, so its width turns around from where it is.
if (state.status === "closing") return { state: { status: "open", attempt: state.attempt }, effects: NO_EFFECTS }
return { state: { status: event.animate ? "opening" : "open", attempt: state.attempt }, effects: NO_EFFECTS }
}
if (state.status === "closed" || state.status === "closing") return { state, effects: NO_EFFECTS }
if (!event.animate) return { state: { status: "closed", attempt: state.attempt }, effects: NO_EFFECTS }
const attempt = state.attempt + 1
return { state: { status: "closing", attempt }, effects: [{ type: "exit.timer", attempt }] }
}
/** The sidebar is in the page: open, sliding in, or sliding out. */
export const selectSidebarMounted = (state: SidebarPresenceState) => state.status !== "closed"