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

fixed DynChild not removing the text generated on SSR

Browse source
This commit is contained in:
Jose Quesada 2022-12-08 11:10:34 -06:00
parent d29d29c1d4
commit 838d0d27c9
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
leptos_dom/src/components/dyn_child.rs
View file

@ -122,30 +122,36 @@ where
let child = component.child.clone();
#[cfg(all(target_arch = "wasm32", feature = "web"))]
let prev_text_node = RefCell::new(None::<web_sys::Node>);
let span = tracing::Span::current();
#[cfg(all(target_arch = "wasm32", feature = "web"))]
create_effect(cx, move |prev_run| {
create_effect(cx, move |prev_run: Option<Option<web_sys::Node>>| {
let _guard = span.enter();
let _guard = trace_span!("DynChild reactive").entered();
let new_child = child_fn().into_view(cx);
if let Some(t) = new_child.get_text() {
let mut prev_text_node_borrow = prev_text_node.borrow_mut();
if let Some(prev_t) = &*prev_text_node_borrow {
let new_child = child_fn().into_view(cx);
if let Some(t) = new_child.get_text() {
if let Some(Some(prev_t)) = prev_run {
prev_t.unchecked_ref::<web_sys::Text>().set_data(&t.content);
Some(prev_t)
} else {
// We need to remove the node that was generated from SSR
if HydrationCtx::is_hydrating() {
if let Some(text_node) = closing.previous_sibling() {
text_node.unchecked_into::<web_sys::Element>().remove();
}
}
closing
.unchecked_ref::<web_sys::Element>()
.before_with_node_1(&t.node)
.expect("before to not err");
*prev_text_node_borrow = Some(t.node.clone());
Some(t.node.clone())
}
} else {
*prev_text_node.borrow_mut() = None;
if prev_run.is_some() {
let opening =
child.borrow().as_ref().as_ref().unwrap().get_opening_node();
@ -165,6 +171,8 @@ where
mount_child(MountKind::Before(&closing), &new_child);
**child.borrow_mut() = Some(new_child);
None
}
});