Bump-Scoped rendering and SVG class attribute fix #136
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,8 +21,8 @@ use wasm_bindgen::UnwrapThrowExt; | |
| /// | ||
| /// pub struct MyComponent; | ||
| /// | ||
| /// impl<'a> Render<'a> for MyComponent { | ||
| /// fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> { | ||
| /// use dodrio::builder::*; | ||
| /// | ||
| /// p(&cx) | ||
|
|
@@ -35,26 +35,26 @@ use wasm_bindgen::UnwrapThrowExt; | |
| /// } | ||
| /// } | ||
| /// ``` | ||
| pub trait Render<'a> { | ||
| /// Render `self` as a virtual DOM. Use the given context's `Bump` for | ||
| /// temporary allocations. | ||
| fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a>; | ||
| } | ||
|
|
||
| impl<'a, 'r, R> Render<'a> for &'r R | ||
| where | ||
| R: Render<'a>, | ||
| { | ||
| fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> { | ||
| (**self).render(cx) | ||
| } | ||
| } | ||
|
|
||
| impl<'a, R> Render<'a> for Rc<R> | ||
| where | ||
| R: Render<'a>, | ||
| { | ||
| fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> { | ||
| (**self).render(cx) | ||
| } | ||
| } | ||
|
|
@@ -69,7 +69,7 @@ where | |
| /// You do not need to implement this trait by hand: there is a blanket | ||
| /// implementation for all `Render` types that fulfill the `RootRender` | ||
| /// requirements. | ||
| pub trait RootRender: Any + for<'a> Render<'a> { | ||
|
There was a problem hiding this comment. In #46 @fitzgen mentioned this is the same as The way I understand it, this trait bound says RootRender requires its types to also implement Any and Render for all lifetimes Am I missing something? There was a problem hiding this comment. If something is valid for all lifetimes then it must be The only time that For this case, I think There was a problem hiding this comment. So I think we both might be right. Even though Render is a generic trait, it is object safe when used with higher-order lifetimes. That indicates to me that you are correct about That being said, the bound use dodrio::{bumpalo::{self, Bump}};
struct Context<'a> {
bump: &'a Bump
}
#[derive(Debug, PartialEq, Eq)]
struct Node<'a> {
name: &'a str
}
trait Render<'a> {
fn render(&self, cx: &mut Context<'a>) -> Node<'a>;
}
struct Test;
impl<'a> Render<'a> for Test {
fn render(&self, cx: &mut Context<'a>) -> Node<'a> {
Node { name: bumpalo::format!(in cx.bump, "Test{}", 1).into_bump_str() }
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
let bump = Bump::default();
let mut cx = Context { bump: &bump };
let comp: Box<dyn for<'a> Render<'a>> = Box::new(Test);
assert_eq!(Node { name: "Test1" }, comp.render(&mut cx));
}
}This test compiles and runs as expected. It's emulating the situation I currently have in my fork of dodrio. Now, when I switch the type of comp to use dodrio::{bumpalo::{self, Bump}};
struct Context<'a> {
bump: &'a Bump
}
#[derive(Debug, PartialEq, Eq)]
struct Node<'a> {
name: &'a str
}
trait Render<'a> {
fn render(&self, cx: &mut Context<'a>) -> Node<'a>;
}
struct Test;
impl<'a> Render<'a> for Test {
fn render(&self, cx: &mut Context<'a>) -> Node<'a> {
Node { name: bumpalo::format!(in cx.bump, "Test{}", 1).into_bump_str() }
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
let bump = Bump::default();
let mut cx = Context { bump: &bump };
let comp: Box<dyn Render<'static> + 'static> = Box::new(Test);
assert_eq!(Node { name: "Test1" }, comp.render(&mut cx));
}
}Compiler output: This is because while the If I'm missing something, could you show me what you mean with this example? Maybe we're talking about different things. There was a problem hiding this comment. Ah ok, this makes sense. Thanks for breaking it down! |
||
| /// Get this `&RootRender` trait object as an `&Any` trait object reference. | ||
| fn as_any(&self) -> &dyn Any; | ||
|
|
||
|
|
@@ -80,7 +80,7 @@ pub trait RootRender: Any + Render { | |
|
|
||
| impl<T> RootRender for T | ||
| where | ||
| T: Any + for<'a> Render<'a>, | ||
| { | ||
| fn as_any(&self) -> &dyn Any { | ||
| self | ||
|
|
@@ -138,4 +138,31 @@ mod tests { | |
| #[allow(dead_code)] | ||
| fn takes_dyn_render(_: &dyn super::RootRender) {} | ||
| } | ||
|
|
||
| #[test] | ||
| fn render_bump_scoped_child() { | ||
| use crate::{builder::*, bumpalo::collections::String, Node, Render, RenderContext}; | ||
|
|
||
| struct Child<'a> { | ||
| name: &'a str, | ||
| } | ||
|
|
||
| impl<'a> Render<'a> for Child<'a> { | ||
| fn render(&self, _cx: &mut RenderContext<'a>) -> Node<'a> { | ||
| text(self.name) | ||
| } | ||
| } | ||
|
|
||
| struct Parent; | ||
|
|
||
| impl<'a> Render<'a> for Parent { | ||
| fn render(&self, cx: &mut RenderContext<'a>) -> Node<'a> { | ||
| let child_name = String::from_str_in("child", cx.bump).into_bump_str(); | ||
|
|
||
| div(&cx) | ||
| .children([Child { name: child_name }.render(cx)]) | ||
| .finish() | ||
| } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. This should act as a smoke test for bump-scoped lifetimes in child components There was a problem hiding this comment. Sorry I should have been more clear. This does ensure that code with bump-scoped child components compiles, but I was hoping for a rendering test that ensures that we also get the expected physical dom. Should be fine to put it in the There was a problem hiding this comment. Ah, ok. I'll get that taken care of sometime tonight. |
||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here's where the SVG change begins and ends. I believe it's just this one if statement.