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

Fix view handle leaks in ListState callbacks

Browse source
This commit is contained in:
Max Brunsfeld 2023-12-20 16:33:10 -08:00
parent 42bdc11112
commit 24970c1da9
3 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/collab_ui2/src/chat_panel.rs
View file

@ -92,11 +92,15 @@ impl ChatPanel {
let workspace_handle = workspace.weak_handle(); let workspace_handle = workspace.weak_handle();
cx.build_view(|cx| { cx.build_view(|cx: &mut ViewContext<Self>| {
let view: View<ChatPanel> = cx.view().clone(); let view = cx.view().downgrade();
let message_list = let message_list =
ListState::new(0, gpui::ListAlignment::Bottom, px(1000.), move |ix, cx| { ListState::new(0, gpui::ListAlignment::Bottom, px(1000.), move |ix, cx| {
view.update(cx, |view, cx| view.render_message(ix, cx)) if let Some(view) = view.upgrade() {
view.update(cx, |view, cx| view.render_message(ix, cx))
} else {
div().into_any()
}
}); });
message_list.set_scroll_handler(cx.listener(|this, event: &ListScrollEvent, cx| { message_list.set_scroll_handler(cx.listener(|this, event: &ListScrollEvent, cx| {

9
crates/collab_ui2/src/collab_panel.rs
View file

@ -178,8 +178,6 @@ enum ListEntry {
impl CollabPanel { impl CollabPanel {
pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> { pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
cx.build_view(|cx| { cx.build_view(|cx| {
let view = cx.view().clone();
let filter_editor = cx.build_view(|cx| { let filter_editor = cx.build_view(|cx| {
let mut editor = Editor::single_line(cx); let mut editor = Editor::single_line(cx);
editor.set_placeholder_text("Filter...", cx); editor.set_placeholder_text("Filter...", cx);
@ -219,9 +217,14 @@ impl CollabPanel {
}) })
.detach(); .detach();
let view = cx.view().downgrade();
let list_state = let list_state =
ListState::new(0, gpui::ListAlignment::Top, px(1000.), move |ix, cx| { ListState::new(0, gpui::ListAlignment::Top, px(1000.), move |ix, cx| {
view.update(cx, |view, cx| view.render_list_entry(ix, cx)) if let Some(view) = view.upgrade() {
view.update(cx, |view, cx| view.render_list_entry(ix, cx))
} else {
div().into_any()
}
}); });
let mut this = Self { let mut this = Self {

12
crates/collab_ui2/src/notification_panel.rs
View file

@ -88,8 +88,6 @@ impl NotificationPanel {
let workspace_handle = workspace.weak_handle(); let workspace_handle = workspace.weak_handle();
cx.build_view(|cx: &mut ViewContext<Self>| { cx.build_view(|cx: &mut ViewContext<Self>| {
let view = cx.view().clone();
let mut status = client.status(); let mut status = client.status();
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
while let Some(_) = status.next().await { while let Some(_) = status.next().await {
@ -105,12 +103,14 @@ impl NotificationPanel {
}) })
.detach(); .detach();
let view = cx.view().downgrade();
let notification_list = let notification_list =
ListState::new(0, ListAlignment::Top, px(1000.), move |ix, cx| { ListState::new(0, ListAlignment::Top, px(1000.), move |ix, cx| {
view.update(cx, |this, cx| { view.upgrade()
this.render_notification(ix, cx) .and_then(|view| {
.unwrap_or_else(|| div().into_any()) view.update(cx, |this, cx| this.render_notification(ix, cx))
}) })
.unwrap_or_else(|| div().into_any())
}); });
notification_list.set_scroll_handler(cx.listener( notification_list.set_scroll_handler(cx.listener(
|this, event: &ListScrollEvent, cx| { |this, event: &ListScrollEvent, cx| {