reya/coop
1
0
Fork 1
Code Issues Pull Requests 1 Releases 3 Activity

refactor group meta toggle into separate show/hide actions

Browse Source
This commit is contained in:
reya
2026-10-01 11:22:04 +07:00
parent 2eba27a94c
commit 6efc00d2de
4 changed files with 80 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/nip29_ui/src/lib.rs
+31 -27
View File
@@ -33,10 +33,18 @@ mod invite;
mod message;
mod metadata;
/// Ask the shell to show or hide the sidebar's information for a group.
/// Ask the shell to show the sidebar's information for a group.
#[derive(Action, Clone, PartialEq, Eq, Deserialize)]
#[action(namespace = nip29_ui, no_json)]
pub struct ToggleGroupMeta {
pub struct ShowGroupMeta {
pub relay: RelayUrl,
pub group: String,
}
/// Ask the shell to hide the sidebar's information for a group.
#[derive(Action, Clone, PartialEq, Eq, Deserialize)]
#[action(namespace = nip29_ui, no_json)]
pub struct HideGroupMeta {
pub relay: RelayUrl,
pub group: String,
}
@@ -870,15 +878,6 @@ impl GroupPanel {
supports_text && writable
});
let meta = self.group.upgrade().map(|group| {
let group = group.read(cx);
(
group.key().relay().clone(),
group.key().id().as_str().to_owned(),
)
});
v_flex()
.flex_shrink_0()
.w_full()
@@ -889,22 +888,6 @@ impl GroupPanel {
h_flex()
.gap_1()
.items_end()
.child(
Button::new("info")
.icon(IconName::Group)
.tooltip("Toggle group information in the sidebar")
.ghost()
.large()
.on_click(move |_event, window, cx| {
let Some((relay, group)) = meta.clone() else {
return;
};
window.dispatch_action(
Box::new(ToggleGroupMeta { relay, group }),
cx,
);
}),
)
.child(
Button::new("upload")
.icon(IconName::Upload)
@@ -1000,6 +983,27 @@ impl Panel for GroupPanel {
fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
Vec::new()
}
fn set_active(&self, active: bool, window: &mut Window, cx: &mut App) {
let Some(group) = self.group.upgrade() else {
return;
};
let (relay, id) = {
let group = group.read(cx);
(
group.key().relay().clone(),
group.key().id().as_str().to_owned(),
)
};
if active {
window.dispatch_action(Box::new(ShowGroupMeta { relay, group: id }), cx);
} else {
window.dispatch_action(Box::new(HideGroupMeta { relay, group: id }), cx);
}
}
}
impl EventEmitter<PanelEvent> for GroupPanel {}
crates/ui/src/dock/panel.rs
+6 -6
View File
@@ -48,7 +48,7 @@ pub trait Panel: EventEmitter<PanelEvent> + Render + Focusable {
/// This method will be called when the panel is active or inactive.
///
/// The last_active_panel and current_active_panel will be touched when the panel is active.
fn set_active(&self, _active: bool, _cx: &mut App) {}
fn set_active(&self, _active: bool, _window: &mut Window, _cx: &mut App) {}
/// Set zoomed state of the panel.
///
@@ -74,7 +74,7 @@ pub trait PanelView: 'static + Send + Sync {
fn closable(&self, cx: &App) -> bool;
fn zoomable(&self, cx: &App) -> bool;
fn visible(&self, cx: &App) -> bool;
fn set_active(&self, active: bool, cx: &mut App);
fn set_active(&self, active: bool, window: &mut Window, cx: &mut App);
fn set_zoomed(&self, zoomed: bool, cx: &mut App);
fn popup_menu(&self, menu: PopupMenu, cx: &App) -> PopupMenu;
fn toolbar_buttons(&self, window: &Window, cx: &App) -> Vec<Button>;
@@ -103,9 +103,9 @@ impl<T: Panel> PanelView for Entity<T> {
self.read(cx).visible(cx)
}
fn set_active(&self, active: bool, cx: &mut App) {
fn set_active(&self, active: bool, window: &mut Window, cx: &mut App) {
self.update(cx, |this, cx| {
this.set_active(active, cx);
this.set_active(active, window, cx);
})
}
@@ -196,8 +196,8 @@ impl gpui_base::dock::PanelView for PanelHandle {
self.panel.visible(cx)
}
fn set_active(&self, active: bool, _: &mut Window, cx: &mut App) {
self.panel.set_active(active, cx);
fn set_active(&self, active: bool, window: &mut Window, cx: &mut App) {
self.panel.set_active(active, window, cx);
}
fn set_zoomed(&self, zoomed: bool, _: &mut Window, cx: &mut App) {
crates/workspace/src/lib.rs
+31 -6
View File
@@ -204,15 +204,27 @@ impl Workspace {
});
});
// Listen app-wide, so a group panel can toggle the sidebar without holding it.
// Listen app-wide, so a group panel can show or hide the sidebar without holding it.
let workspace = cx.entity().downgrade();
App::on_action(cx, move |action: &nip29_ui::ToggleGroupMeta, cx| {
App::on_action(cx, {
let workspace = workspace.clone();
move |action: &nip29_ui::ShowGroupMeta, cx| {
let Some(workspace) = workspace.upgrade() else {
return;
};
workspace.update(cx, |this, cx| this.show_group_meta(action, cx));
}
});
App::on_action(cx, move |action: &nip29_ui::HideGroupMeta, cx| {
let Some(workspace) = workspace.upgrade() else {
return;
};
workspace.update(cx, |this, cx| this.toggle_group_meta(action, cx));
workspace.update(cx, |this, cx| this.hide_group_meta(action, cx));
});
Self {
@@ -397,8 +409,8 @@ impl Workspace {
}
}
/// Show or hide the sidebar's information for the group a panel belongs to.
fn toggle_group_meta(&mut self, action: &nip29_ui::ToggleGroupMeta, cx: &mut Context<Self>) {
/// Show the sidebar's information for the group a panel belongs to.
fn show_group_meta(&mut self, action: &nip29_ui::ShowGroupMeta, cx: &mut Context<Self>) {
let Ok(id) = GroupId::new(action.group.clone()) else {
return;
};
@@ -406,7 +418,20 @@ impl Workspace {
let key = GroupKey::new(action.relay.clone(), id);
self.sidebar.update(cx, |sidebar, cx| {
sidebar.toggle_group(&key, cx);
sidebar.show_group_meta(&key, cx);
});
}
/// Hide the sidebar's information for the group a panel belongs to.
fn hide_group_meta(&mut self, action: &nip29_ui::HideGroupMeta, cx: &mut Context<Self>) {
let Ok(id) = GroupId::new(action.group.clone()) else {
return;
};
let key = GroupKey::new(action.relay.clone(), id);
self.sidebar.update(cx, |sidebar, cx| {
sidebar.hide_group_meta(&key, cx);
});
}
crates/workspace/src/sidebar/mod.rs
+12 -12
View File
@@ -190,28 +190,28 @@ impl Sidebar {
cx.notify();
}
/// Show or hide the group view depending on which group is being viewed.
pub(crate) fn toggle_group(&mut self, key: &GroupKey, cx: &mut Context<Self>) {
/// Show the group view without toggling it closed.
pub(crate) fn show_group_meta(&mut self, key: &GroupKey, cx: &mut Context<Self>) {
let groups = GroupsRegistry::global(cx);
let Some(entity) = groups.read(cx).group(key, cx) else {
let Some(group) = groups.read(cx).group(key, cx) else {
return;
};
let open = self
self.show_group(&group, cx);
}
/// Hide the group view if the sidebar is showing the given group.
pub(crate) fn hide_group_meta(&mut self, key: &GroupKey, cx: &mut Context<Self>) {
let showing = self
.group
.as_ref()
.and_then(|group| group.upgrade())
.is_some_and(|current| current.entity_id() == entity.entity_id());
.is_some_and(|group| group.read(cx).key() == key);
if open {
self.group_open = !self.group_open;
} else {
self.group = Some(entity.downgrade());
self.group_open = true;
if showing {
self.hide_group(cx);
}
cx.notify();
}
/// Leave the group view, returning the sidebar to its tab list.