zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

chat: closing reply preview with action (#7517)

Browse Source 
This is a follow up to #7170. Closing the reply to preview overlay is
now configurable with an action (keybinding set escape in the default
keymap).


https://github.com/zed-industries/zed/assets/53836821/d679e734-f90b-4490-8e79-7dfe5407988a


Release Notes:
- N/A
This commit is contained in:
Joseph T. Lyons 2024-02-07 16:12:33 -05:00 committed by GitHub
commit e6dad23154
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/keymaps/default.json
View File

@ -565,6 +565,12 @@
"tab": "channel_modal::ToggleMode"
}
},
{
"context": "ChatPanel > MessageEditor",
"bindings": {
"escape": "chat_panel::CloseReplyPreview"
}
},
{
"context": "Terminal",
"bindings": {

23
crates/collab_ui/src/chat_panel.rs
View File

@ -70,7 +70,7 @@ struct SerializedChatPanel {
width: Option<Pixels>,
}
actions!(chat_panel, [ToggleFocus]);
actions!(chat_panel, [ToggleFocus, CloseReplyPreview]);
impl ChatPanel {
pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
@ -719,6 +719,11 @@ impl ChatPanel {
Ok(())
})
}
fn close_reply_preview(&mut self, _: &CloseReplyPreview, cx: &mut ViewContext<Self>) {
self.message_editor
.update(cx, |editor, _| editor.clear_reply_to_message_id());
}
}
impl Render for ChatPanel {
@ -726,6 +731,7 @@ impl Render for ChatPanel {
let reply_to_message_id = self.message_editor.read(cx).reply_to_message_id();
v_flex()
.key_context("ChatPanel")
.track_focus(&self.focus_handle)
.full()
.on_action(cx.listener(Self::send))
@ -810,10 +816,15 @@ impl Render for ChatPanel {
.child(
IconButton::new("close-reply-preview", IconName::Close)
.shape(ui::IconButtonShape::Square)
.on_click(cx.listener(move |this, _, cx| {
this.message_editor.update(cx, |editor, _| {
editor.clear_reply_to_message_id()
});
.tooltip(|cx| {
Tooltip::for_action(
"Close reply preview",
&CloseReplyPreview,
cx,
)
})
.on_click(cx.listener(move |_, _, cx| {
cx.dispatch_action(CloseReplyPreview.boxed_clone())
})),
),
)
@ -822,6 +833,8 @@ impl Render for ChatPanel {
.children(
Some(
h_flex()
.key_context("MessageEditor")
.on_action(cx.listener(ChatPanel::close_reply_preview))
.when(
!self.is_scrolled_to_bottom && reply_to_message_id.is_none(),
|el| el.border_t_1().border_color(cx.theme().colors().border),