Skip to content

Commit 95aa28e

Browse files
authored
fix(app): slide the file tree sidebar open and shut again (#62773)
1 parent d22bc1d commit 95aa28e

4 files changed

Lines changed: 185 additions & 4 deletions

File tree

‎packages/session-ui/src/v2/components/session-review-v2.css‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@
3838
flex-shrink: 0;
3939
min-height: 0;
4040
overflow: hidden;
41+
width: var(--session-review-v2-sidebar-width);
4142
border-inline-end: 1px solid var(--v2-border-border-base);
4243
background: var(--v2-background-bg-base);
4344
}
4445

45-
[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][aria-hidden="true"] {
46+
[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][data-presence="closing"] {
47+
width: 0;
4648
border-inline-end-width: 0;
4749
}
4850

@@ -53,6 +55,19 @@
5355
border-inline-end-width 200ms cubic-bezier(0.22, 1, 0.36, 1);
5456
}
5557

58+
/* A toggle slides the sidebar in from zero width; mounting it open, as a tab or session switch does, doesn't. */
59+
[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][data-presence="opening"] {
60+
@starting-style {
61+
width: 0;
62+
border-inline-end-width: 0;
63+
}
64+
}
65+
66+
/* The contents keep their open width while the sidebar slides, so rows don't rewrap or re-truncate on every frame. */
67+
[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar"][data-transition] > * {
68+
min-width: calc(var(--session-review-v2-sidebar-width) - 1px);
69+
}
70+
5671
[data-component="session-review-v2-sidebar-root"] [data-slot="session-review-v2-sidebar-resize"] {
5772
position: absolute;
5873
inset-block: 0;

‎packages/session-ui/src/v2/components/session-review-v2.tsx‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@ import type { SessionReviewDiffStyle } from "../../components/session-review"
99
import { ResizeHandle } from "@opencode/ui/resize-handle"
1010
import { useLocale } from "@kobalte/core/i18n"
1111
import { makeEventListener } from "@solid-primitives/event-listener"
12-
import { Show, createEffect, createMemo, createSignal, type JSX } from "solid-js"
12+
import { prefersReducedMotion } from "@opencode/ui/motion"
13+
import { Show, createEffect, createMemo, createSignal, on, onCleanup, untrack, type JSX } from "solid-js"
1314
import { getWorkerPool } from "../../pierre/worker"
15+
import {
16+
SIDEBAR_EXIT_TIMEOUT_MS,
17+
createSidebarPresenceState,
18+
selectSidebarMounted,
19+
transitionSidebarPresence,
20+
type SidebarPresenceEvent,
21+
} from "./sidebar-presence-machine"
1422
import { SessionFilePanelV2, SessionFilePanelV2Empty } from "./session-file-panel-v2"
1523

1624
export const SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT = 240
@@ -69,15 +77,48 @@ export function SessionReviewV2Sidebar(props: SessionReviewV2SidebarProps) {
6977
const width = () => props.width ?? SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT
7078
const minWidth = () => props.minWidth ?? SESSION_REVIEW_V2_SIDEBAR_WIDTH_MIN
7179
const maxWidth = () => props.maxWidth ?? SESSION_REVIEW_V2_SIDEBAR_WIDTH_MAX
80+
const [presence, setPresence] = createSignal(createSidebarPresenceState(untrack(() => props.open)))
81+
let exitTimer: ReturnType<typeof setTimeout> | undefined
82+
83+
const dispatch = (event: SidebarPresenceEvent) => {
84+
const next = transitionSidebarPresence(untrack(presence), event)
85+
86+
setPresence(next.state)
87+
next.effects.forEach((effect) => {
88+
clearTimeout(exitTimer)
89+
exitTimer = setTimeout(
90+
() => dispatch({ type: "exit.timed-out", attempt: effect.attempt }),
91+
SIDEBAR_EXIT_TIMEOUT_MS,
92+
)
93+
})
94+
}
95+
96+
createEffect(
97+
on(
98+
() => props.open,
99+
(open) =>
100+
dispatch({ type: "open.changed", open, animate: untrack(() => props.transition) && !prefersReducedMotion() }),
101+
{ defer: true },
102+
),
103+
)
104+
onCleanup(() => clearTimeout(exitTimer))
105+
106+
const closing = () => presence().status === "closing"
72107

73108
return (
74109
<div data-component="session-review-v2-sidebar-root">
75-
<Show when={props.open}>
110+
<Show when={selectSidebarMounted(presence())}>
76111
<aside
77112
data-slot="session-review-v2-sidebar"
113+
data-presence={presence().status}
78114
data-transition={props.transition ? "" : undefined}
79115
data-resizing={resizing() ? "" : undefined}
80-
style={{ width: `${width()}px` }}
116+
aria-hidden={closing() || undefined}
117+
inert={closing() || undefined}
118+
style={{ "--session-review-v2-sidebar-width": `${width()}px` }}
119+
onTransitionEnd={(event) => {
120+
if (event.target === event.currentTarget && event.propertyName === "width") dispatch({ type: "exit.ended" })
121+
}}
81122
>
82123
<div data-slot="session-review-v2-sidebar-header">
83124
<div data-slot="session-review-v2-sidebar-title">{props.title}</div>
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import { describe, expect, test } from "bun:test"
2+
import {
3+
createSidebarPresenceState,
4+
selectSidebarMounted,
5+
transitionSidebarPresence,
6+
type SidebarPresenceEvent,
7+
type SidebarPresenceState,
8+
} from "./sidebar-presence-machine"
9+
10+
const close = { type: "open.changed", open: false, animate: true } as const
11+
12+
const open = { type: "open.changed", open: true, animate: true } as const
13+
14+
function replay(events: SidebarPresenceEvent[], state = createSidebarPresenceState(true)) {
15+
return events.reduce<SidebarPresenceState>((current, event) => transitionSidebarPresence(current, event).state, state)
16+
}
17+
18+
describe("transitionSidebarPresence", () => {
19+
test("a close stays mounted until its slide ends", () => {
20+
const closing = transitionSidebarPresence(createSidebarPresenceState(true), close)
21+
22+
expect(closing.state).toEqual({ status: "closing", attempt: 1 })
23+
expect(closing.effects).toEqual([{ type: "exit.timer", attempt: 1 }])
24+
expect(selectSidebarMounted(closing.state)).toBe(true)
25+
expect(replay([{ type: "exit.ended" }], closing.state)).toEqual({ status: "closed", attempt: 1 })
26+
})
27+
28+
test("a close lands when the slide never reports its end", () => {
29+
const closing = replay([close])
30+
31+
expect(replay([{ type: "exit.timed-out", attempt: 1 }], closing).status).toBe("closed")
32+
})
33+
34+
test("a reopen mid-close keeps the sidebar, and the old close's timer is stale", () => {
35+
const reopened = replay([close, open])
36+
37+
expect(reopened.status).toBe("open")
38+
expect(transitionSidebarPresence(reopened, { type: "exit.timed-out", attempt: 1 }).state).toBe(reopened)
39+
expect(transitionSidebarPresence(reopened, { type: "exit.ended" }).state).toBe(reopened)
40+
41+
const again = transitionSidebarPresence(reopened, close)
42+
expect(again.state).toEqual({ status: "closing", attempt: 2 })
43+
expect(replay([{ type: "exit.timed-out", attempt: 1 }], again.state).status).toBe("closing")
44+
})
45+
46+
test("a toggle opens with a slide in; without motion it opens and closes at once", () => {
47+
expect(replay([open], createSidebarPresenceState(false)).status).toBe("opening")
48+
expect(replay([{ ...open, animate: false }], createSidebarPresenceState(false)).status).toBe("open")
49+
expect(replay([{ ...close, animate: false }]).status).toBe("closed")
50+
})
51+
52+
test("a mount reflects the preference without a slide", () => {
53+
expect(createSidebarPresenceState(true).status).toBe("open")
54+
expect(selectSidebarMounted(createSidebarPresenceState(false))).toBe(false)
55+
})
56+
})
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/** The CSS slide's 200ms, plus slack, after which a close lands even when no `transitionend` arrives. */
2+
export const SIDEBAR_EXIT_TIMEOUT_MS = 300
3+
4+
/**
5+
* The review and file tree sidebar. It mounts while open and slides its width on the user's toggles; a close keeps it
6+
* mounted until the slide ends, then unmounts it, so no hidden tree is left behind.
7+
*/
8+
export type SidebarPresenceState =
9+
| { readonly status: "open"; readonly attempt: number }
10+
/** Opened by a toggle, so it slides in from zero width when it mounts. */
11+
| { readonly status: "opening"; readonly attempt: number }
12+
| { readonly status: "closing"; readonly attempt: number }
13+
| { readonly status: "closed"; readonly attempt: number }
14+
15+
export type SidebarPresenceEvent =
16+
/** `animate` is false while the preference hydrates and under reduced motion. */
17+
| { readonly type: "open.changed"; readonly open: boolean; readonly animate: boolean }
18+
| { readonly type: "exit.ended" }
19+
| { readonly type: "exit.timed-out"; readonly attempt: number }
20+
21+
export type SidebarPresenceEffect = { readonly type: "exit.timer"; readonly attempt: number }
22+
23+
export type SidebarPresenceTransition = {
24+
readonly state: SidebarPresenceState
25+
readonly effects: readonly SidebarPresenceEffect[]
26+
}
27+
28+
const NO_EFFECTS: readonly SidebarPresenceEffect[] = []
29+
30+
export function createSidebarPresenceState(open: boolean): SidebarPresenceState {
31+
return { status: open ? "open" : "closed", attempt: 0 }
32+
}
33+
34+
export function transitionSidebarPresence(
35+
state: SidebarPresenceState,
36+
event: SidebarPresenceEvent,
37+
): SidebarPresenceTransition {
38+
if (event.type === "exit.ended") {
39+
if (state.status !== "closing") return { state, effects: NO_EFFECTS }
40+
41+
return { state: { status: "closed", attempt: state.attempt }, effects: NO_EFFECTS }
42+
}
43+
44+
if (event.type === "exit.timed-out") {
45+
if (state.status !== "closing" || state.attempt !== event.attempt) return { state, effects: NO_EFFECTS }
46+
47+
return { state: { status: "closed", attempt: state.attempt }, effects: NO_EFFECTS }
48+
}
49+
50+
if (event.open) {
51+
if (state.status === "open" || state.status === "opening") return { state, effects: NO_EFFECTS }
52+
53+
// Reopening mid-close keeps the mounted sidebar, so its width turns around from where it is.
54+
if (state.status === "closing") return { state: { status: "open", attempt: state.attempt }, effects: NO_EFFECTS }
55+
56+
return { state: { status: event.animate ? "opening" : "open", attempt: state.attempt }, effects: NO_EFFECTS }
57+
}
58+
59+
if (state.status === "closed" || state.status === "closing") return { state, effects: NO_EFFECTS }
60+
61+
if (!event.animate) return { state: { status: "closed", attempt: state.attempt }, effects: NO_EFFECTS }
62+
63+
const attempt = state.attempt + 1
64+
65+
return { state: { status: "closing", attempt }, effects: [{ type: "exit.timer", attempt }] }
66+
}
67+
68+
/** The sidebar is in the page: open, sliding in, or sliding out. */
69+
export const selectSidebarMounted = (state: SidebarPresenceState) => state.status !== "closed"

0 commit comments

Comments
 (0)