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

Revert "improved documentation and refactored naming to be more self-explanatory"

Browse Source 
This reverts commit adfbb6c380.
This commit is contained in:
Pascal committed 2023-12-07 17:11:56 +01:00
1 parent adfbb6c380
commit 906c466e78
91 files changed
+1553 -1663
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/rsx/src/component.rs
+8 -10
View File
@@ -162,11 +162,10 @@ impl ToTokens for Component {
}
if !self.children.is_empty() {
let renderer: TemplateRenderer =
TemplateRenderer {
roots: &self.children,
location: None,
};
let renderer: TemplateRenderer = TemplateRenderer {
roots: &self.children,
location: None,
};
toks.append_all(quote! {
.children(
@@ -184,11 +183,10 @@ impl ToTokens for Component {
let fn_name = self.name.segments.last().unwrap().ident.to_string();
let gen_name =
match &self.prop_gen_args {
Some(gen) => quote! { #name #gen },
None => quote! { #name },
};
let gen_name = match &self.prop_gen_args {
Some(gen) => quote! { #name #gen },
None => quote! { #name },
};
tokens.append_all(quote! {
__cx.component(
packages/rsx/src/element.rs
+48 -49
View File
@@ -332,60 +332,59 @@ impl ToTokens for ElementAttrNamed {
}
};
let attribute =
match attr {
ElementAttr::AttrText { name, value } => {
let ns = ns(name);
let volitile = volitile(name);
let attribute = attribute(name);
quote! {
__cx.attr(
#attribute,
#value,
#ns,
#volitile
)
}
let attribute = match attr {
ElementAttr::AttrText { name, value } => {
let ns = ns(name);
let volitile = volitile(name);
let attribute = attribute(name);
quote! {
__cx.attr(
#attribute,
#value,
#ns,
#volitile
)
}
ElementAttr::AttrExpression { name, value } => {
let ns = ns(name);
let volitile = volitile(name);
let attribute = attribute(name);
quote! {
__cx.attr(
#attribute,
#value,
#ns,
#volitile
)
}
}
ElementAttr::AttrExpression { name, value } => {
let ns = ns(name);
let volitile = volitile(name);
let attribute = attribute(name);
quote! {
__cx.attr(
#attribute,
#value,
#ns,
#volitile
)
}
ElementAttr::CustomAttrText { name, value } => {
quote! {
__cx.attr(
#name,
#value,
None,
false
)
}
}
ElementAttr::CustomAttrText { name, value } => {
quote! {
__cx.attr(
#name,
#value,
None,
false
)
}
ElementAttr::CustomAttrExpression { name, value } => {
quote! {
__cx.attr(
#name,
#value,
None,
false
)
}
}
ElementAttr::CustomAttrExpression { name, value } => {
quote! {
__cx.attr(
#name,
#value,
None,
false
)
}
ElementAttr::EventTokens { name, tokens } => {
quote! {
dioxus_elements::events::#name(__cx, #tokens)
}
}
ElementAttr::EventTokens { name, tokens } => {
quote! {
dioxus_elements::events::#name(__cx, #tokens)
}
};
}
};
tokens.append_all(attribute);
}
packages/rsx/src/hot_reload/hot_reloading_file_map.rs
+5 -6
View File
@@ -77,12 +77,11 @@ impl<Ctx: HotReloadingContext> FileMap<Ctx> {
}
let FileMapSearchResult { map, errors } = find_rs_files(path, &mut filter)?;
let result =
Self {
map,
in_workspace: HashMap::new(),
phantom: std::marker::PhantomData,
};
let result = Self {
map,
in_workspace: HashMap::new(),
phantom: std::marker::PhantomData,
};
Ok(FileMapBuildResult {
map: result,
errors,
packages/rsx/src/ifmt.rs
+19 -16
View File
@@ -99,9 +99,10 @@ impl FromStr for IfmtInput {
current_literal.push(c);
continue;
} else {
return Err(
Error::new(Span::call_site(), "unmatched closing '}' in format string")
);
return Err(Error::new(
Span::call_site(),
"unmatched closing '}' in format string",
));
}
}
current_literal.push(c);
@@ -146,18 +147,17 @@ impl ToTokens for IfmtInput {
}
}
let positional_args =
self.segments.iter().filter_map(|seg| {
if let Segment::Formatted(FormattedSegment {
segment: FormattedSegmentType::Expr(expr),
..
}) = seg
{
Some(expr)
} else {
None
}
});
let positional_args = self.segments.iter().filter_map(|seg| {
if let Segment::Formatted(FormattedSegment {
segment: FormattedSegmentType::Expr(expr),
..
}) = seg
{
Some(expr)
} else {
None
}
});
// remove duplicate idents
let named_args_idents: HashSet<_> = self
@@ -228,7 +228,10 @@ impl FormattedSegmentType {
if let Ok(expr) = parse_str(input) {
Ok(Self::Expr(Box::new(expr)))
} else {
Err(Error::new(Span::call_site(), "Expected Ident or Expression"))
Err(Error::new(
Span::call_site(),
"Expected Ident or Expression",
))
}
}
}
packages/rsx/src/lib.rs
+10 -12
View File
@@ -199,11 +199,10 @@ impl<'a> ToTokens for TemplateRenderer<'a> {
_ => None,
};
let key_tokens =
match key {
Some(tok) => quote! { Some( __cx.raw_text(#tok) ) },
None => quote! { None },
};
let key_tokens = match key {
Some(tok) => quote! { Some( __cx.raw_text(#tok) ) },
None => quote! { None },
};
let spndbg = format!("{:?}", self.roots[0].span());
let root_col = spndbg
@@ -519,13 +518,12 @@ impl<'a> DynamicContext<'a> {
let attrs = quote! { #(#static_attrs),*};
let children =
el.children.iter().enumerate().map(|(idx, root)| {
self.current_path.push(idx as u8);
let out = self.render_static_node(root);
self.current_path.pop();
out
});
let children = el.children.iter().enumerate().map(|(idx, root)| {
self.current_path.push(idx as u8);
let out = self.render_static_node(root);
self.current_path.pop();
out
});
let _opt = el.children.len() == 1;
let children = quote! { #(#children),* };