update community sidebar

crates/workspace/src/lib.rs

@@ -7,11 +7,12 @@ use auto_update::AutoUpdater;
 use chat::{ChatEvent, ChatRegistry};
 use common::download_dir;
 use community::{CommunityEvent, CommunityRegistry};
+use community_ui::CommunityPanel;
 use device::{DeviceEvent, DeviceRegistry};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     Action, AnyElement, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
-    ParentElement, Render, SharedString, Styled, Subscription, Task, Window, div, px,
+    ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity, Window, div, px,
 };
 use nostr_sdk::prelude::*;
 use person::{PersonRegistry, shorten_pubkey};
@@ -71,6 +72,8 @@ enum Command {
 pub struct Workspace {
     dock: Entity<DockArea>,
     title_bar_chrome: Rc<dock::TitleBarChrome>,
+    /// The community panel currently docked, if any
+    community_panel: Option<WeakEntity<CommunityPanel>>,
     /// Async tasks
     tasks: Vec<Task<Result<(), Error>>>,
     /// Event subscriptions
@@ -219,17 +222,40 @@ impl Workspace {
             cx.subscribe_in(
                 &communities,
                 window,
-                move |this, communities, event, window, cx| {
-                    if let CommunityEvent::Open(id) = event
-                        && let Some(community) = communities.read(cx).community(id)
-                    {
-                        this.add_panel_to_dock(
-                            community_ui::init(community, window, cx),
-                            DockPlacement::Center,
-                            window,
-                            cx,
-                        );
+                move |this, communities, event, window, cx| match event {
+                    CommunityEvent::Open(id) => {
+                        if let Some(community) = communities.read(cx).community(id) {
+                            let panel = community_ui::init(community, window, cx);
+
+                            this.community_panel = Some(panel.downgrade());
+                            this.add_panel_to_dock(panel, DockPlacement::Center, window, cx);
+                        }
                     }
+                    CommunityEvent::Close(_) => {
+                        let Some(panel) = this
+                            .community_panel
+                            .take()
+                            .and_then(|panel| panel.upgrade())
+                        else {
+                            return;
+                        };
+
+                        this.dock.update(cx, |area, cx| {
+                            ui::dock::add_panel(
+                                area,
+                                PanelHandle::new(panel),
+                                DockPlacement::Center,
+                                window,
+                                cx,
+                            );
+                            ui::dock::focus_tab_panel(area, window, cx);
+
+                            cx.defer_in(window, |_, window, cx| {
+                                window.dispatch_action(Box::new(ClosePanel), cx);
+                            });
+                        });
+                    }
+                    _ => {}
                 },
             ),
         );
@@ -255,13 +281,13 @@ impl Workspace {
         Self {
             dock,
             title_bar_chrome,
+            community_panel: None,
             tasks: vec![],
             _subscriptions: subscriptions,
         }
     }
 
-    /// Add a panel to the dock, from anywhere that has the window but not the
-    /// workspace.
+    /// Add a panel to the dock, from anywhere that has the window but not the workspace.
     pub fn add_panel<P: Panel>(
         panel: Entity<P>,
         placement: DockPlacement,
@@ -732,6 +758,7 @@ impl Render for Workspace {
         let modal_layer = Root::render_modal_layer(window, cx);
         let notification_layer = Root::render_notification_layer(window, cx);
 
+        // Render the title bar chrome
         self.title_bar_chrome.set_trailing(Self::titlebar_right);
 
         div()