assistant2: Show the popover keybinding when context is empty (#22452)

This PR makes it so we always show the "Add Context {keybinding}" text
when there's no context pills attached. Also, while we haven't fully
implemented the mention system (triggered by typing `@`), we removed the
instruction on the message editor placeholder. Once that's fully in
place, we should return with it!

<img width="800" alt="Screenshot 2024-12-27 at 1 35 56 PM"
src="https://github.com/user-attachments/assets/201cf784-e7ac-420a-adf2-51b6e075c2b6"
/>

Release Notes:

- N/A

---------

Co-authored-by: Agus Zubiaga <hi@aguz.me>
This commit is contained in:
Danilo Leal 2024-12-27 13:54:31 -03:00 committed by GitHub
parent ed61abb8b8
commit 56b425fced
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 15 deletions

View file

@ -9,6 +9,7 @@ use crate::context_store::ContextStore;
use crate::thread_store::ThreadStore; use crate::thread_store::ThreadStore;
use crate::ui::ContextPill; use crate::ui::ContextPill;
use crate::ToggleContextPicker; use crate::ToggleContextPicker;
use settings::Settings;
pub struct ContextStrip { pub struct ContextStrip {
context_store: Model<ContextStore>, context_store: Model<ContextStore>,
@ -45,7 +46,7 @@ impl ContextStrip {
impl Render for ContextStrip { impl Render for ContextStrip {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement { fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let context = self.context_store.read(cx).context(); let context = self.context_store.read(cx).context().clone();
let context_picker = self.context_picker.clone(); let context_picker = self.context_picker.clone();
let focus_handle = self.focus_handle.clone(); let focus_handle = self.focus_handle.clone();
@ -76,6 +77,29 @@ impl Render for ContextStrip {
}) })
.with_handle(self.context_picker_menu_handle.clone()), .with_handle(self.context_picker_menu_handle.clone()),
) )
.when(context.is_empty(), {
|parent| {
parent.child(
h_flex()
.id("no-content-info")
.ml_1p5()
.gap_2()
.font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
.text_size(TextSize::Small.rems(cx))
.text_color(cx.theme().colors().text_muted)
.child("Add Context")
.children(
ui::KeyBinding::for_action_in(
&ToggleContextPicker,
&self.focus_handle,
cx,
)
.map(|binding| binding.into_any_element()),
)
.opacity(0.5),
)
}
})
.children(context.iter().map(|context| { .children(context.iter().map(|context| {
ContextPill::new(context.clone()).on_remove({ ContextPill::new(context.clone()).on_remove({
let context = context.clone(); let context = context.clone();
@ -88,19 +112,21 @@ impl Render for ContextStrip {
})) }))
}) })
})) }))
.when(!context.is_empty(), |parent| { .when(!context.is_empty(), {
parent.child( move |parent| {
IconButton::new("remove-all-context", IconName::Eraser) parent.child(
.icon_size(IconSize::Small) IconButton::new("remove-all-context", IconName::Eraser)
.tooltip(move |cx| Tooltip::text("Remove All Context", cx)) .icon_size(IconSize::Small)
.on_click({ .tooltip(move |cx| Tooltip::text("Remove All Context", cx))
let context_store = self.context_store.clone(); .on_click({
cx.listener(move |_this, _event, cx| { let context_store = self.context_store.clone();
context_store.update(cx, |this, _cx| this.clear()); cx.listener(move |_this, _event, cx| {
cx.notify(); context_store.update(cx, |this, _cx| this.clear());
}) cx.notify();
}), })
) }),
)
}
}) })
} }
} }

View file

@ -54,7 +54,7 @@ impl MessageEditor {
let editor = cx.new_view(|cx| { let editor = cx.new_view(|cx| {
let mut editor = Editor::auto_height(10, cx); let mut editor = Editor::auto_height(10, cx);
editor.set_placeholder_text("Ask anything, @ to add context", cx); editor.set_placeholder_text("Ask anything", cx);
editor.set_show_indent_guides(false, cx); editor.set_show_indent_guides(false, cx);
editor editor