swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: support cached ssr

Browse Source
This commit is contained in:
Jonathan Kelley committed 2022-11-02 01:00:37 -07:00
1 parent 4a31b29703
commit b6c0bce89c
11 files changed
+433 -178
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ssr/src/lib.rs
+86 -88
View File
@@ -1,9 +1,10 @@
#![doc = include_str!("../README.md")]
use std::fmt::{Display, Formatter, Write};
mod template;
use dioxus_core::exports::bumpalo;
use dioxus_core::IntoVNode;
use dioxus_core::*;
fn app(_cx: Scope) -> Element {
@@ -25,9 +26,7 @@ impl SsrRenderer {
pub fn render_lazy<'a>(&'a mut self, f: LazyNodes<'a, '_>) -> String {
let scope = self.vdom.base_scope();
let factory = NodeFactory::new(scope);
let root = f.into_vnode(factory);
let root = f.call(scope);
format!(
"{:}",
TextRenderer {
@@ -55,8 +54,7 @@ pub fn render_lazy<'a>(f: LazyNodes<'a, '_>) -> String {
// Therefore, we cast our local bump allocator to the right lifetime. This is okay because our usage of the bump
// arena is *definitely* shorter than the <'a> lifetime, and we return *owned* data - not borrowed data.
let scope = unsafe { &*scope };
let root = f.into_vnode(NodeFactory::new(scope));
let root = f.call(scope);
let vdom = Some(&vdom);
@@ -148,99 +146,99 @@ impl<'a: 'c, 'c> TextRenderer<'a, '_, 'c> {
il: u16,
last_node_was_text: &mut bool,
) -> std::fmt::Result {
match &node {
VNode::Text(text) => {
if *last_node_was_text {
write!(f, "<!--spacer-->")?;
}
// match &node {
// VNode::Text(text) => {
// if *last_node_was_text {
// write!(f, "<!--spacer-->")?;
// }
if self.cfg.indent {
for _ in 0..il {
write!(f, " ")?;
}
}
// if self.cfg.indent {
// for _ in 0..il {
// write!(f, " ")?;
// }
// }
*last_node_was_text = true;
// *last_node_was_text = true;
write!(f, "{}", text.text)?
}
VNode::Element(el) => {
*last_node_was_text = false;
// write!(f, "{}", text.text)?
// }
// VNode::Element(el) => {
// *last_node_was_text = false;
if self.cfg.indent {
for _ in 0..il {
write!(f, " ")?;
}
}
// if self.cfg.indent {
// for _ in 0..il {
// write!(f, " ")?;
// }
// }
write!(f, "<{}", el.tag)?;
// write!(f, "<{}", el.tag)?;
let inner_html = render_attributes(el.attributes.iter(), f)?;
// let inner_html = render_attributes(el.attributes.iter(), f)?;
match self.cfg.newline {
true => writeln!(f, ">")?,
false => write!(f, ">")?,
}
// match self.cfg.newline {
// true => writeln!(f, ">")?,
// false => write!(f, ">")?,
// }
if let Some(inner_html) = inner_html {
write!(f, "{}", inner_html)?;
} else {
let mut last_node_was_text = false;
for child in el.children {
self.html_render(child, f, il + 1, &mut last_node_was_text)?;
}
}
// if let Some(inner_html) = inner_html {
// write!(f, "{}", inner_html)?;
// } else {
// let mut last_node_was_text = false;
// for child in el.children {
// self.html_render(child, f, il + 1, &mut last_node_was_text)?;
// }
// }
if self.cfg.newline {
writeln!(f)?;
}
if self.cfg.indent {
for _ in 0..il {
write!(f, " ")?;
}
}
// if self.cfg.newline {
// writeln!(f)?;
// }
// if self.cfg.indent {
// for _ in 0..il {
// write!(f, " ")?;
// }
// }
write!(f, "</{}>", el.tag)?;
if self.cfg.newline {
writeln!(f)?;
}
}
VNode::Fragment(frag) => match frag.children.len() {
0 => {
*last_node_was_text = false;
if self.cfg.indent {
for _ in 0..il {
write!(f, " ")?;
}
}
write!(f, "<!--placeholder-->")?;
}
_ => {
for child in frag.children {
self.html_render(child, f, il + 1, last_node_was_text)?;
}
}
},
VNode::Component(vcomp) => {
let idx = vcomp.scope.get().unwrap();
// write!(f, "</{}>", el.tag)?;
// if self.cfg.newline {
// writeln!(f)?;
// }
// }
// VNode::Fragment(frag) => match frag.children.len() {
// 0 => {
// *last_node_was_text = false;
// if self.cfg.indent {
// for _ in 0..il {
// write!(f, " ")?;
// }
// }
// write!(f, "<!--placeholder-->")?;
// }
// _ => {
// for child in frag.children {
// self.html_render(child, f, il + 1, last_node_was_text)?;
// }
// }
// },
// VNode::Component(vcomp) => {
// let idx = vcomp.scope.get().unwrap();
if let (Some(vdom), false) = (self.vdom, self.cfg.skip_components) {
let new_node = vdom.get_scope(idx).unwrap().root_node();
self.html_render(new_node, f, il + 1, last_node_was_text)?;
} else {
}
}
VNode::Template(t) => {
if let Some(vdom) = self.vdom {
todo!()
} else {
panic!("Cannot render template without vdom");
}
}
VNode::Placeholder(_) => {
todo!()
}
}
// if let (Some(vdom), false) = (self.vdom, self.cfg.skip_components) {
// let new_node = vdom.get_scope(idx).unwrap().root_node();
// self.html_render(new_node, f, il + 1, last_node_was_text)?;
// } else {
// }
// }
// VNode::Template(t) => {
// if let Some(vdom) = self.vdom {
// todo!()
// } else {
// panic!("Cannot render template without vdom");
// }
// }
// VNode::Placeholder(_) => {
// todo!()
// }
// }
Ok(())
}