Skip to content

Sidebar: show a session hover card beside each chat row #903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wingleeio merged 9 commits into from
Oct 17, 2026
Merged

Sidebar: show a session hover card beside each chat row #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
793ffab
Sidebar: show a session hover card beside each chat row
jsgrrchg Oct 13, 2026
396c01f
Sidebar: drop the PR badge tooltip now that the hover card shows the PR
jsgrrchg Oct 13, 2026
ea29cde
Merge branch 'main' of https://github.com/jsgrrchg/comet into zeron/c…
jsgrrchg Oct 13, 2026
173481f
Session hover card: fold the pull request into one line
jsgrrchg Oct 14, 2026
9586578
Session hover card: drop the worktree folder and the status word
jsgrrchg Oct 14, 2026
1d0b6ae
Session hover card: show the device as a corner glyph
jsgrrchg Oct 14, 2026
0a8d857
Session hover card: list the pull request as a row under the branch
jsgrrchg Oct 14, 2026
2db8a14
Fix session hover card lifecycle and preserve PR tooltips
jsgrrchg Oct 14, 2026
a39d1ee
Session hover card: reconcile once per frame, in the sidebar's render
wingleeio Oct 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions crates/ui/src/change_requests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ impl Render for ChangeRequestTooltip {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let theme = Theme::of(cx);
let card = div()
.debug_selector(|| "change-request-tooltip".into())
.max_w(px(320.0))
.px(px(9.0))
.py(px(7.0))
Expand Down Expand Up @@ -104,6 +105,8 @@ impl Render for ChangeRequestTooltip {
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub(crate) enum ChangeRequestBadgeSurface {
Sidebar,
/// A sidebar session row supplies the PR details in its hover card.
SessionRow,
Composer,
}

Expand Down Expand Up @@ -195,6 +198,10 @@ fn render_badge_model(
let accessible_label = format!("Open pull request {}: {}", model.number, model.title);

div()
.debug_selector({
let id = id.clone();
move || format!("pull-request-badge-{id}")
})
.id(id)
.h(px(if composer { 20.0 } else { 16.0 }))
.flex_none()
Expand All @@ -219,14 +226,20 @@ fn render_badge_model(
cx.stop_propagation();
crate::pull_request_detail::open_on_device(&url, device.clone(), window, cx);
})
.tooltip(move |_, cx| {
})
// Sidebar rows spell the pull request out in their hover card.
.when(
interactive && surface != ChangeRequestBadgeSurface::SessionRow,
|el| {
el.tooltip(move |_, cx| {
cx.new(|_| ChangeRequestTooltip {
model: tooltip_model.clone(),
})
.into()
})
.tooltip_show_delay(std::time::Duration::from_millis(350))
})
},
)
.child(
crate::icons::icon(crate::icons::PULL_REQUEST)
.size(px(if composer { 11.0 } else { 10.0 }))
Expand Down
126 changes: 108 additions & 18 deletions crates/ui/src/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ use panel_layout::{AuxiliaryPanel, FitInputs, HorizontalPanelFit, panel_content_
mod panel_interaction_tests;
pub(crate) mod project_icon;
mod pull_request_pane;
mod session_hover_card;
mod session_info;
mod side_chats;
mod sidebar_pins;
Expand Down Expand Up @@ -2132,6 +2133,8 @@ pub struct Shell {
/// under a still pointer would otherwise never show its archive pill;
/// while set, rows adopt the hover from a paint-time hit test instead.
chat_hover_resync: bool,
/// The sidebar row whose hover card shows (or waits out its dwell).
session_hover_card: session_hover_card::SessionHoverCard,
/// Scroll position of the sidebar lists region (drives its edge fades).
sidebar_scroll: gpui::ScrollHandle,
/// In-flight reorder for the pinned section only.
Expand Down Expand Up @@ -2623,6 +2626,7 @@ impl Shell {
project_icons: Default::default(),
chat_status_hover: None,
chat_hover_resync: false,
session_hover_card: Default::default(),
sidebar_scroll: gpui::ScrollHandle::new(),
pinned_session_drag: None,
pinned_session_drag_generation: 0,
Expand Down Expand Up @@ -3291,6 +3295,7 @@ impl Shell {
}
let from = self.sidebar_now();
let before = self.painted_panels(cx);
self.session_hover_card.dismiss();
self.sidebar_edge_bounce = None;
self.sidebar_resize_edge = None;
self.pane_resize_active = None;
Expand Down Expand Up @@ -8053,6 +8058,11 @@ impl Shell {
.find(|chat| chat.id == id)
.map(|chat| chat.device_id.clone());
let compact = search_query.is_none() && self.settings.sidebar_compact;
let pr_surface = if search_query.is_some() {
crate::change_requests::ChangeRequestBadgeSurface::Sidebar
} else {
crate::change_requests::ChangeRequestBadgeSurface::SessionRow
};
let show_label = search_query.is_some() || self.settings.sidebar_show_project_label;
let remote = self
.state
Expand Down Expand Up @@ -8329,18 +8339,24 @@ impl Shell {
.items_center()
.when(!preview, |el| el.cursor_pointer())
.when(corner_hovered, |el| {
el.on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
.on_click(cx.listener(move |this, _, _, cx| {
el.on_mouse_down(
MouseButton::Left,
cx.listener(|this, _, _, cx| {
this.dismiss_session_card(cx);
cx.stop_propagation();
this.chat_hover_resync = true;
this.set_chat_archived(archive_id.clone(), !archived, cx);
}))
// Above the pill: below it the chip would cover the next row.
.tooltip(crate::settings::widgets::text_tooltip_above(if archived {
"Unarchive session"
} else {
ShortcutId::ArchiveSession.label()
}))
}),
)
.on_click(cx.listener(move |this, _, _, cx| {
cx.stop_propagation();
this.chat_hover_resync = true;
this.set_chat_archived(archive_id.clone(), !archived, cx);
}))
// Above the pill: below it the chip would cover the next row.
.tooltip(crate::settings::widgets::text_tooltip_above(if archived {
"Unarchive session"
} else {
ShortcutId::ArchiveSession.label()
}))
})
.child(corner_body)
.into_any_element()
Expand All @@ -8359,6 +8375,21 @@ impl Shell {
let rename_input = (search_query_none && !preview)
.then(|| self.rename_input_for(&id, ChatRenameSurface::Sidebar))
.flatten();
// Sidebar rows only: the palette's copy already spells out its row,
// and a row being renamed keeps the pointer's attention on the field.
let hover_card = (search_query_none
&& !preview
&& rename_input.is_none()
&& self.session_hover_card.shown() == Some(id.as_str()))
.then(|| {
self.render_session_hover_card(
&id,
time_ago.clone(),
cx,
)
})
.flatten();
let card_id = id.clone();
// Hover fades over transition-colors (zeron session-row.tsx) — both
// the wash and the title brighten ride the same 150ms blend.
let fade_key = format!("{row_id}-hover");
Expand Down Expand Up @@ -8416,6 +8447,9 @@ impl Shell {
cx.listener(move |this, hovered: &bool, window, cx| {
fade_hover(hovered, window, cx);
this.chat_hover_resync = false;
if search_query_none {
this.hover_session_card(&card_id, *hovered, cx);
}
if *hovered {
if this.chat_status_hover.as_deref() != Some(hover_id.as_str()) {
this.chat_status_hover = Some(hover_id.clone());
Expand All @@ -8428,6 +8462,13 @@ impl Shell {
})
})
.cursor_pointer()
// Pressing, scrolling or opening the menu puts the hover card
// away: the row has the pointer's intent now.
.on_mouse_down(
MouseButton::Left,
cx.listener(|this, _, _, cx| this.dismiss_session_card(cx)),
)
.on_scroll_wheel(cx.listener(|this, _, _, cx| this.dismiss_session_card(cx)))
.on_click(cx.listener(move |this, event: &gpui::ClickEvent, _, cx| {
// The palette's copy of the row only opens; the sidebar's
// double-click edits the title in place.
Expand All @@ -8440,6 +8481,7 @@ impl Shell {
.on_mouse_down(
MouseButton::Right,
cx.listener(move |this, event: &MouseDownEvent, _, cx| {
this.dismiss_session_card(cx);
this.chat_menu.open(ChatMenuState {
tab: None,
chat_id: menu_id.clone(),
Expand Down Expand Up @@ -8513,6 +8555,41 @@ impl Shell {
.inset_0(),
)
})
// Check both shown and pending cards after layout/occlusion
// changes under a stationary pointer. Unmounted rows are handled
// by the container's reconciliation.
.when(
!preview
&& search_query_none
&& rename_input.is_none()
&& self.session_hover_card.target() == Some(id.as_str()),
|el| {
let shell = cx.weak_entity();
let chat_id = id.clone();
el.child(
gpui::canvas(
|bounds, window, _| {
window.insert_hitbox(bounds, gpui::HitboxBehavior::Normal)
},
move |_, hitbox, window, cx| {
if hitbox.is_hovered(window) {
return;
}
window.defer(cx, move |_, cx| {
shell
.update(cx, |this, cx| {
this.hover_session_card(&chat_id, false, cx)
})
.ok();
});
},
)
.absolute()
.inset_0(),
)
},
)
.children(hover_card)
// Line 1: "project @ device", status word / time-ago right.
.when(!compact && show_label, |el| {
el.child(
Expand Down Expand Up @@ -8627,14 +8704,14 @@ impl Shell {
crate::change_requests::pull_request_badge_preview(
format!("{row_id}-compact-pr").into(),
summary,
crate::change_requests::ChangeRequestBadgeSurface::Sidebar,
pr_surface,
theme,
)
} else {
crate::change_requests::pull_request_badge(
format!("{row_id}-compact-pr").into(),
summary,
crate::change_requests::ChangeRequestBadgeSurface::Sidebar,
pr_surface,
pr_device.clone(),
theme,
)
Expand Down Expand Up @@ -8666,9 +8743,13 @@ impl Shell {
})
.when(show_archive, |el| {
el.cursor_pointer()
.on_mouse_down(MouseButton::Left, |_, _, cx| {
cx.stop_propagation()
})
.on_mouse_down(
MouseButton::Left,
cx.listener(|this, _, _, cx| {
this.dismiss_session_card(cx);
cx.stop_propagation();
}),
)
.on_click(cx.listener(move |this, _, _, cx| {
cx.stop_propagation();
this.chat_hover_resync = true;
Expand Down Expand Up @@ -8745,14 +8826,14 @@ impl Shell {
crate::change_requests::pull_request_badge_preview(
format!("{row_id}-pr").into(),
summary,
crate::change_requests::ChangeRequestBadgeSurface::Sidebar,
pr_surface,
theme,
)
} else {
crate::change_requests::pull_request_badge_with_query(
format!("{row_id}-pr").into(),
summary,
crate::change_requests::ChangeRequestBadgeSurface::Sidebar,
pr_surface,
search_query,
pr_device.clone(),
theme,
Expand Down Expand Up @@ -8933,6 +9014,7 @@ impl Shell {
}

fn render_chat_sidebar(&mut self, theme: &Theme, cx: &mut Context<Self>) -> AnyElement {
self.reconcile_session_hover_card(cx);
if self.sidebar_session_transfer.as_ref().is_some_and(|drag| {
!cx.has_active_drag() || !self.sidebar_session_transfer_is_valid(&drag.payload, cx)
}) {
Expand Down Expand Up @@ -13297,6 +13379,14 @@ impl Render for Shell {
self.reduced_motion = motion::reduced_motion(cx);
self.motion_active.set(false);
self.track_horizontal_fit(cx);
// The sidebar's render reconciles the card against its rows.
if !matches!(gate, GatePhase::Ready)
|| restart_required
|| matches!(self.route, Route::Settings(_))
|| self.sidebar_target() <= 0.0
{
self.dismiss_session_card(cx);
}
self.suspend_hidden_right_images(cx);
// After the fit tracking, which starts a fit exit this frame.
let browser_active = matches!(gate, GatePhase::Ready)
Expand Down
Loading
Loading