Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2025-02-17 06:08:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Create a new function for dioxus-rsx Element

Browse source
This commit is contained in:
Evan Almloff 2024-01-30 11:10:45 -06:00
parent 1f88103dca
commit 300a7dc12b
1 changed files with 43 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
packages/rsx/src/element.rs
View file

@ -20,11 +20,52 @@ pub struct Element {
pub name: ElementName,
pub key: Option<IfmtInput>,
pub attributes: Vec<AttributeType>,
pub merged_attributes: Vec<AttributeType>,
pub(crate) merged_attributes: Vec<AttributeType>,
pub children: Vec<BodyNode>,
pub brace: syn::token::Brace,
}
impl Element {
/// Create a new element with the given name, attributes and children
pub fn new(
key: Option<IfmtInput>,
name: ElementName,
attributes: Vec<AttributeType>,
children: Vec<BodyNode>,
brace: syn::token::Brace,
) -> Self {
// Deduplicate any attributes that can be combined
// For example, if there are two `class` attributes, combine them into one
let mut merged_attributes: Vec<AttributeType> = Vec::new();
for attr in &attributes {
let attr_index = merged_attributes
.iter()
.position(|a| a.matches_attr_name(attr));
if let Some(old_attr_index) = attr_index {
let old_attr = &mut merged_attributes[old_attr_index];
if let Some(combined) = old_attr.try_combine(attr) {
*old_attr = combined;
}
continue;
}
merged_attributes.push(attr.clone());
}
Self {
name,
key,
attributes,
merged_attributes,
children,
brace,
}
}
}
impl Parse for Element {
fn parse(stream: ParseStream) -> Result<Self> {
let el_name = ElementName::parse(stream)?;
@ -194,27 +235,6 @@ Like so:
break;
}
// Deduplicate any attributes that can be combined
// For example, if there are two `class` attributes, combine them into one
let mut merged_attributes: Vec<AttributeType> = Vec::new();
for attr in &attributes {
let attr_index = merged_attributes
.iter()
.position(|a| a.matches_attr_name(attr));
if let Some(old_attr_index) = attr_index {
let old_attr = &mut merged_attributes[old_attr_index];
if let Some(combined) = old_attr.try_combine(attr) {
*old_attr = combined;
}
continue;
}
merged_attributes.push(attr.clone());
}
while !content.is_empty() {
if (content.peek(LitStr) && content.peek2(Token![:])) && !content.peek3(Token![:]) {
attr_after_element!(content.span());
@ -232,14 +252,7 @@ Like so:
}
}
Ok(Self {
key,
name: el_name,
attributes,
merged_attributes,
children,
brace,
})
Ok(Self::new(key, el_name, attributes, children, brace))
}
}