@@ -18,6 +18,7 @@ export function TabNavItem(props: {
1818 href : string
1919 server : ServerConnection . Key
2020 session : ( ) => Session | undefined
21+ fallbackTitle ?: string
2122 onTitleChange ?: ( title : string ) => void
2223 onTitleChangeFailed ?: ( title : string ) => void
2324 onClose : ( ) => void
@@ -53,6 +54,7 @@ export function TabNavItem(props: {
5354 if ( ! session ) return
5455 return projectForSession ( session , serverCtx ( ) ?. projects . list ( ) ?? [ ] )
5556 } )
57+ const title = createMemo ( ( ) => props . session ( ) ?. title ?? props . fallbackTitle )
5658
5759 const measureTitleOverflow = ( ) => {
5860 if ( ! titleEl || editing ( ) ) {
@@ -71,7 +73,7 @@ export function TabNavItem(props: {
7173 }
7274
7375 createEffect ( ( ) => {
74- props . session ( ) ?. title
76+ title ( )
7577 props . forceTruncate
7678 editing ( )
7779 scheduleTitleOverflow ( )
@@ -130,9 +132,9 @@ export function TabNavItem(props: {
130132 createEffect ( ( ) => {
131133 if ( editing ( ) ) return
132134 if ( ! titleEl ) return
133- const title = props . session ( ) ?. title
134- if ( title === undefined ) return
135- titleEl . textContent = title
135+ const value = title ( )
136+ if ( value === undefined ) return
137+ titleEl . textContent = value
136138 } )
137139
138140 const openRename = ( event : MouseEvent ) => {
@@ -188,26 +190,26 @@ export function TabNavItem(props: {
188190 closeTab ( event )
189191 } }
190192 >
191- < Show when = { props . session ( ) } >
192- { ( session ) => {
193- return (
194- < a
195- data-slot = "tab-link"
196- data-titlebar-tab-link
197- href = { props . href }
198- draggable = { false }
199- onDragStart = { ( event ) => {
200- event . preventDefault ( )
201- event . stopPropagation ( )
202- } }
203- onClick = { ( event ) => {
204- event . preventDefault ( )
205- if ( editing ( ) ) return
206- if ( props . suppressNavigation ?. ( ) ) return
207- props . onNavigate ( )
208- } }
209- class = "flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base group-data-[editing='true']:text-v2-text-text-base [-webkit-user-drag:none]"
210- >
193+ < Show when = { title ( ) !== undefined } >
194+ < a
195+ data-slot = "tab-link"
196+ data-titlebar-tab-link
197+ href = { props . href }
198+ draggable = { false }
199+ onDragStart = { ( event ) => {
200+ event . preventDefault ( )
201+ event . stopPropagation ( )
202+ } }
203+ onClick = { ( event ) => {
204+ event . preventDefault ( )
205+ if ( editing ( ) ) return
206+ if ( props . suppressNavigation ?. ( ) ) return
207+ props . onNavigate ( )
208+ } }
209+ class = "flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base group-data-[editing='true']:text-v2-text-text-base [-webkit-user-drag:none]"
210+ >
211+ < Show when = { props . session ( ) } >
212+ { ( session ) => (
211213 < span data-slot = "project-avatar-slot" >
212214 < SessionTabAvatar
213215 project = { project ( ) }
@@ -216,45 +218,45 @@ export function TabNavItem(props: {
216218 activeServer = { props . activeServer }
217219 />
218220 </ span >
219- < span
220- ref = { ( el ) => {
221- titleEl = el
222- titleEl . textContent = session ( ) . title
223- } }
224- data-slot = "tab- title"
225- data-titlebar-tab-title
226- class = "min-w-0 flex-1 outline-none leading-4 "
227- classList = { {
228- "overflow-hidden text-clip whitespace-nowrap" : ! editing ( ) ,
229- "select-text" : editing ( ) ,
230- } }
231- contenteditable = { editing ( ) ? true : undefined }
232- onDblClick = { openRename }
233- onKeyDown = { ( event ) => {
234- event . stopPropagation ( )
235- if ( event . key === "Enter" ) {
236- event . preventDefault ( )
237- void closeRename ( true )
238- return
239- }
240- if ( event . key !== "Escape" ) return
241- event . preventDefault ( )
242- titleEl . textContent = session ( ) . title
243- void closeRename ( false )
244- } }
245- onBlur = { ( ) => void closeRename ( true ) }
246- onPointerDown = { ( event ) => {
247- if ( ! editing ( ) ) return
248- event . stopPropagation ( )
249- } }
250- onClick = { ( event ) => {
251- if ( ! editing ( ) ) return
252- event . preventDefault ( )
253- } }
254- />
255- </ a >
256- )
257- } }
221+ ) }
222+ </ Show >
223+ < span
224+ ref = { ( el ) => {
225+ titleEl = el
226+ titleEl . textContent = title ( ) ?? " "
227+ } }
228+ data-slot = "tab-title "
229+ data-titlebar-tab-title
230+ class = "min-w-0 flex-1 outline-none leading-4"
231+ classList = { {
232+ "overflow-hidden text-clip whitespace-nowrap" : ! editing ( ) ,
233+ "select-text" : editing ( ) ,
234+ } }
235+ contenteditable = { editing ( ) ? true : undefined }
236+ onDblClick = { openRename }
237+ onKeyDown = { ( event ) => {
238+ event . stopPropagation ( )
239+ if ( event . key === "Enter" ) {
240+ event . preventDefault ( )
241+ void closeRename ( true )
242+ return
243+ }
244+ if ( event . key !== "Escape" ) return
245+ event . preventDefault ( )
246+ titleEl . textContent = props . session ( ) ?. title ?? ""
247+ void closeRename ( false )
248+ } }
249+ onBlur = { ( ) => void closeRename ( true ) }
250+ onPointerDown = { ( event ) => {
251+ if ( ! editing ( ) ) return
252+ event . stopPropagation ( )
253+ } }
254+ onClick = { ( event ) => {
255+ if ( ! editing ( ) ) return
256+ event . preventDefault ( )
257+ } }
258+ />
259+ </ a >
258260 </ Show >
259261
260262 < div data-slot = "tab-close" class = "group-hover:bg-[var(--tab-bg)] group-data-[active=true]:bg-[var(--tab-bg)]" >
0 commit comments