fix: don't have Rc cycles in DioxusElement or Queries (#3618)

packages/desktop/src/element.rs

@@ -1,21 +1,24 @@
+use std::rc::Rc;
+
 use dioxus_core::ElementId;
 use dioxus_html::{
     geometry::{PixelsRect, PixelsSize, PixelsVector2D},
     MountedResult, RenderedElementBacking,
 };
 
-use crate::{desktop_context::DesktopContext, query::QueryEngine};
+use crate::{desktop_context::DesktopContext, query::QueryEngine, WeakDesktopContext};
 
 #[derive(Clone)]
 /// A mounted element passed to onmounted events
 pub struct DesktopElement {
     id: ElementId,
-    webview: DesktopContext,
+    webview: WeakDesktopContext,
     query: QueryEngine,
 }
 
 impl DesktopElement {
     pub(crate) fn new(id: ElementId, webview: DesktopContext, query: QueryEngine) -> Self {
+        let webview = Rc::downgrade(&webview);
         Self { id, webview, query }
     }
 }
@@ -28,10 +31,13 @@ macro_rules! scripted_getter {
             Box<dyn futures_util::Future<Output = dioxus_html::MountedResult<$output_type>>>,
         > {
             let script = format!($script, id = self.id.0);
-
+            let webview = self
+                .webview
+                .upgrade()
+                .expect("Webview should be alive if the element is being queried");
             let fut = self
                 .query
-                .new_query::<Option<$output_type>>(&script, self.webview.clone())
+                .new_query::<Option<$output_type>>(&script, webview)
                 .resolve();
             Box::pin(async move {
                 match fut.await {
@@ -80,11 +86,11 @@ impl RenderedElementBacking for DesktopElement {
             self.id.0,
             serde_json::to_string(&behavior).expect("Failed to serialize ScrollBehavior")
         );
-
-        let fut = self
-            .query
-            .new_query::<bool>(&script, self.webview.clone())
-            .resolve();
+        let webview = self
+            .webview
+            .upgrade()
+            .expect("Webview should be alive if the element is being queried");
+        let fut = self.query.new_query::<bool>(&script, webview).resolve();
         Box::pin(async move {
             match fut.await {
                 Ok(true) => Ok(()),
@@ -106,11 +112,11 @@ impl RenderedElementBacking for DesktopElement {
             "return window.interpreter.setFocus({}, {});",
             self.id.0, focus
         );
-
-        let fut = self
-            .query
-            .new_query::<bool>(&script, self.webview.clone())
-            .resolve();
+        let webview = self
+            .webview
+            .upgrade()
+            .expect("Webview should be alive if the element is being queried");
+        let fut = self.query.new_query::<bool>(&script, webview).resolve();
 
         Box::pin(async move {
             match fut.await {