Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-26 14:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow children shorthand in components

Browse source
This commit is contained in:
Jonathan Kelley 2024-01-10 23:52:38 -08:00
parent 8a77d2560e
commit aff5259654
No known key found for this signature in database
GPG key ID: 1FBB50F7EB0A08BE
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/shorthand.rs
View file

@ -15,17 +15,18 @@ fn app(cx: Scope) -> Element {
let children = render! { "Child" };
render! {
div { class, id, {children} }
Component { a, b, c }
Component { a, ..ComponentProps { a: 1, b: 2, c: 3 } }
div { class, id, {&children} }
Component { a, b, c, children }
Component { a, ..ComponentProps { a: 1, b: 2, c: 3, children: None } }
}
}
#[component]
fn Component(cx: Scope, a: i32, b: i32, c: i32) -> Element {
fn Component<'a>(cx: Scope<'a>, a: i32, b: i32, c: i32, children: Element<'a>) -> Element {
render! {
div { "{a}" }
div { "{b}" }
div { "{c}" }
div { {children} }
}
}

21
packages/rsx/src/component.rs
View file

@ -55,23 +55,14 @@ impl Parse for Component {
manual_props = Some(content.parse()?);
} else if
// Named fields
content.peek(Ident) && content.peek2(Token![:]) && !content.peek3(Token![:]) {
fields.push(content.parse()?);
} else if
(content.peek(Ident) && content.peek2(Token![:]) && !content.peek3(Token![:]))
// shorthand struct initialization
// Not a div {}, mod::Component {}, or web-component {}
content.peek(Ident)
&& !content.peek2(Brace)
&& !content.peek2(Token![:])
&& !content.peek2(Token![-])
// Not a div {}, mod::Component {}, or web-component {}
|| (content.peek(Ident)
&& !content.peek2(Brace)
&& !content.peek2(Token![:])
&& !content.peek2(Token![-]))
{
let name = content.fork().parse::<Ident>().unwrap().to_string();
// If the shorthand field is children, these are actually children!
if name == "children" {
panic!("children must be wrapped in braces");
};
fields.push(content.parse()?);
} else {
children.push(content.parse()?);