Mirrors/leptos
2
0
Fork 0
mirror of https://github.com/leptos-rs/leptos synced 2024-11-10 06:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix increment so Suspense shows properly when refetching

Browse source
This commit is contained in:
Greg Johnston 2022-08-12 15:03:01 -04:00
parent 46fd5f6355
commit 6d9e3ce4e5
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
leptos_reactive/src/resource.rs
View file

@ -186,13 +186,23 @@ where
let v = self.value.get();
if let Some(s) = &suspense_cx {
let mut contexts = self.suspense_contexts.borrow_mut();
if !contexts.contains(s) {
contexts.insert(*s);
s.increment();
let suspense_contexts = self.suspense_contexts.clone();
let has_value = v.is_some();
self.scope.create_effect(move |_| {
if let Some(s) = &suspense_cx {
let mut contexts = suspense_contexts.borrow_mut();
if !contexts.contains(s) {
contexts.insert(*s);
// on subsequent reads, increment will be triggered in load()
// because the context has been tracked here
// on the first read, resource is already loading without having incremented
if !has_value {
s.increment();
}
}
}
}
});
v
}
@ -212,6 +222,7 @@ where
let loaded_under_transition = self.scope.runtime.running_transition().is_some();
let fut = (self.fetcher)(&self.source.get());
log::debug!("loading resource");
// `scheduled` is true for the rest of this code only
self.scheduled.set(true);
@ -225,13 +236,18 @@ where
self.set_loading.update(|n| *n = true);
self.trigger.update(|n| *n += 1);
// increment counter everywhere it's read
let suspense_contexts = self.suspense_contexts.clone();
for suspense_context in suspense_contexts.borrow().iter() {
suspense_context.increment();
}
// run the Future
spawn_local({
let resolved = self.resolved.clone();
let scope = self.scope;
let set_value = self.set_value;
let set_loading = self.set_loading;
let suspense_contexts = self.suspense_contexts.clone();
async move {
let res = fut.await;
resolved.set(true);