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: Resource::with() pt. 2 — (closes #1742 without reopening #1711) (#1750)

Browse source
This commit is contained in:
Greg Johnston 2023-09-18 16:13:48 -04:00 committed by GitHub
parent 7d3e2a41b9
commit 2b59ae18bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
leptos_reactive/src/resource.rs
View file

@ -1132,7 +1132,7 @@ where
.ok()?
.flatten();
self.handle_result(location, global_suspense_cx, suspense_cx, v)
self.handle_result(location, global_suspense_cx, suspense_cx, v, false)
}
#[track_caller]
@ -1152,6 +1152,7 @@ where
global_suspense_cx,
suspense_cx,
was_loaded.then_some(v),
true,
)
} else {
Some(v)
@ -1164,6 +1165,7 @@ where
global_suspense_cx: Option<GlobalSuspenseContext>,
suspense_cx: Option<SuspenseContext>,
v: Option<U>,
force_suspend: bool,
) -> Option<U> {
let suspense_contexts = self.suspense_contexts.clone();
let has_value = v.is_some();
@ -1223,7 +1225,7 @@ where
// 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 {
if !has_value || force_suspend {
s.increment(
serializable != ResourceSerialization::Local,
);
@ -1242,7 +1244,7 @@ where
if !contexts.contains(s) {
contexts.insert(*s);
if !has_value {
if !has_value || force_suspend {
s.increment(
serializable
!= ResourceSerialization::Local,