@@ -9,8 +9,16 @@ import type { SessionReviewDiffStyle } from "../../components/session-review"
99import { ResizeHandle } from "@opencode/ui/resize-handle"
1010import { useLocale } from "@kobalte/core/i18n"
1111import { 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"
1314import { 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"
1422import { SessionFilePanelV2 , SessionFilePanelV2Empty } from "./session-file-panel-v2"
1523
1624export 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 >
0 commit comments