Standardize ScopedFuture::new_untracked like untrack() and untrack_with_diagnostics()

Author: Zak Stucke

reactive_graph/src/actions/action.rs

@@ -1,6 +1,7 @@
 use crate::{
     computed::{ArcMemo, Memo, ScopedFuture},
     diagnostics::is_suppressing_resource_load,
+    graph::untrack,
     owner::{ArcStoredValue, ArenaItem, Owner},
     send_wrapper_ext::SendOption,
     signal::{ArcMappedSignal, ArcRwSignal, MappedSignal, RwSignal},
@@ -207,10 +208,9 @@ where
             version: Default::default(),
             dispatched: Default::default(),
             action_fn: Arc::new(move |input| {
-                Box::pin(
-                    owner
-                        .with(|| ScopedFuture::new_untracked(action_fn(input))),
-                )
+                Box::pin(owner.with(|| {
+                    ScopedFuture::new_untracked(untrack(|| action_fn(input)))
+                }))
             }),
             #[cfg(any(debug_assertions, leptos_debuginfo))]
             defined_at: Location::caller(),
@@ -385,10 +385,9 @@ where
             version: Default::default(),
             dispatched: Default::default(),
             action_fn: Arc::new(move |input| {
-                Box::pin(SendWrapper::new(
-                    owner
-                        .with(|| ScopedFuture::new_untracked(action_fn(input))),
-                ))
+                Box::pin(SendWrapper::new(owner.with(|| {
+                    ScopedFuture::new_untracked(untrack(|| action_fn(input)))
+                })))
             }),
             #[cfg(any(debug_assertions, leptos_debuginfo))]
             defined_at: Location::caller(),

reactive_graph/src/computed/async_derived/arc_async_derived.rs

@@ -521,9 +521,10 @@ impl<T: 'static> ArcAsyncDerived<T> {
     {
         let fun = move || {
             let fut = fun();
-            let fut = ScopedFuture::new_untracked(async move {
-                SendOption::new(Some(fut.await))
-            });
+            let fut =
+                ScopedFuture::new_untracked_with_diagnostics(async move {
+                    SendOption::new(Some(fut.await))
+                });
             #[cfg(feature = "sandboxed-arenas")]
             let fut = Sandboxed::new(fut);
             fut

reactive_graph/src/computed/async_derived/mod.rs

@@ -25,6 +25,7 @@ pin_project! {
     pub struct ScopedFuture<Fut> {
         pub owner: Owner,
         pub observer: Option<AnySubscriber>,
+        pub diagnostics: bool,
         #[pin]
         pub fut: Fut,
     }
@@ -39,6 +40,7 @@ impl<Fut> ScopedFuture<Fut> {
         Self {
             owner,
             observer,
+            diagnostics: true,
             fut,
         }
     }
@@ -51,6 +53,19 @@ impl<Fut> ScopedFuture<Fut> {
         Self {
             owner,
             observer: None,
+            diagnostics: false,
+            fut,
+        }
+    }
+
+    #[doc(hidden)]
+    #[track_caller]
+    pub fn new_untracked_with_diagnostics(fut: Fut) -> Self {
+        let owner = Owner::current().unwrap_or_default();
+        Self {
+            owner,
+            observer: None,
+            diagnostics: true,
             fut,
         }
     }
@@ -61,8 +76,17 @@ impl<Fut: Future> Future for ScopedFuture<Fut> {
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
-        this.owner
-            .with(|| this.observer.with_observer(|| this.fut.poll(cx)))
+        this.owner.with(|| {
+            this.observer.with_observer(|| {
+                #[cfg(debug_assertions)]
+                let _maybe_guard = if *this.diagnostics {
+                    None
+                } else {
+                    Some(crate::diagnostics::SpecialNonReactiveZone::enter())
+                };
+                this.fut.poll(cx)
+            })
+        })
     }
 }