Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix being unable to input a whitespace character in collab channels filter (#33318)

Browse source 
Before, `space` was always causing a channel join.
Now it's less fluent, one has to press `ESC` to get the focus out of the
filter editor and then `space` starts joining the channel.

Release Notes:

- Fixed being unable to input a whitespace character in collab channels
filter
This commit is contained in:
Kirill Bulatov 2025-06-24 19:11:25 +03:00 • committed by GitHub
parent deb2564b31
commit 39dc4b9040
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/collab_ui/src/collab_panel.rs
View file

@ -1645,6 +1645,10 @@ impl CollabPanel {
self.channel_name_editor.update(cx, |editor, cx| { self.channel_name_editor.update(cx, |editor, cx| {
editor.insert(" ", window, cx); editor.insert(" ", window, cx);
}); });
} else if self.filter_editor.focus_handle(cx).is_focused(window) {
self.filter_editor.update(cx, |editor, cx| {
editor.insert(" ", window, cx);
});
} }
} }
@ -2045,7 +2049,9 @@ impl CollabPanel {
dispatch_context.add("CollabPanel"); dispatch_context.add("CollabPanel");
dispatch_context.add("menu"); dispatch_context.add("menu");
let identifier = if self.channel_name_editor.focus_handle(cx).is_focused(window) { let identifier = if self.channel_name_editor.focus_handle(cx).is_focused(window)
|| self.filter_editor.focus_handle(cx).is_focused(window)
{
"editing" "editing"
} else { } else {
"not_editing" "not_editing"
@ -3031,7 +3037,7 @@ impl Render for CollabPanel {
.on_action(cx.listener(CollabPanel::start_move_selected_channel)) .on_action(cx.listener(CollabPanel::start_move_selected_channel))
.on_action(cx.listener(CollabPanel::move_channel_up)) .on_action(cx.listener(CollabPanel::move_channel_up))
.on_action(cx.listener(CollabPanel::move_channel_down)) .on_action(cx.listener(CollabPanel::move_channel_down))
.track_focus(&self.focus_handle(cx)) .track_focus(&self.focus_handle)
.size_full() .size_full()
.child(if self.user_store.read(cx).current_user().is_none() { .child(if self.user_store.read(cx).current_user().is_none() {
self.render_signed_out(cx) self.render_signed_out(cx)