-///
-///
-///
"Some text"
-///
"Some text with {formatting}"
-///
"Formatting basic expressions {formatting_tuple.0} and {formatting_tuple.1}"
-///
-/// "Multiple"
-/// "Text"
-/// "Blocks"
-/// "Use comments as separators in html"
-///
-///
-///
"multiple"
-/// "nested"
-/// "elements"
-///
-///
-///
"Headers and attributes!"
-///
-///
-/// {rsx!(p { "More templating!" })}
-/// {html!(
"Even HTML templating!!"
)}
-/// {(0..10).map(|i| html!(
"{i}"))}
-/// {{
-/// let data = std::collections::HashMap::<&'static str, &'static str>::new();
-/// // Iterators *should* have keys when you can provide them.
-/// // Keys make your app run faster. Make sure your keys are stable, unique, and predictable.
-/// // Using an "ID" associated with your data is a good idea.
-/// data.into_iter().map(|(k, v)| rsx!(
"{v}" ))
-/// }}
-
-/// // Matching
-/// // Matching will throw a Rust error about "no two closures are the same type"
-/// // To fix this, call "render" method or use the "in" syntax to produce VNodes.
-/// // There's nothing we can do about it, sorry :/ (unless you want *really* unhygenic macros)
-/// {match true {
-/// true => rsx!(cx,
"Top text"
),
-/// false => rsx!(cx,
"Bottom text"
),
-/// }}
-///
-/// // Conditional rendering
-/// // Dioxus conditional rendering is based around None/Some. We have no special syntax for conditionals.
-/// // You can convert a bool condition to rsx! with .then and .or
-/// {true.then(|| html!(
))}
-///
-/// // True conditions need to be rendered (same reasons as matching)
-/// {if true {
-/// html!(cx,
"Top text"
)
-/// } else {
-/// html!(cx,
"Bottom text"
)
-/// }}
-///
-/// // returning "None" is a bit noisy... but rare in practice
-/// {None as Option<()>}
-///
-/// // Use the Dioxus type-alias for less noise
-/// {NONE_ELEMENT}
-///
-/// // can also just use empty fragments
-///
-///
-/// // Fragments let you insert groups of nodes without a parent.
-/// // This lets you make components that insert elements as siblings without a container.
-///
"A"
-///
-/// "B"
-/// "C"
-///
-/// "D"
-///
-/// "heavily nested fragments is an antipattern"
-/// "they cause Dioxus to do unnecessary work"
-/// "don't use them carelessly if you can help it"
-///
-///
-///
-/// // Components
-/// // Can accept any paths
-/// // Notice how you still get syntax highlighting and IDE support :)
-///
-///
-///
-///
-/// // Can take properties
-///
-///
-/// // Can take optional properties
-///
-///
-/// // Can pass in props directly as an expression
-/// {{
-/// let props = TallerProps {a: "hello"};
-/// html!()
-/// }}
-///
-/// // Spreading can also be overridden manually
-///
-///
-/// // Can take children too!
-///
-/// "hello world!"
-///
-/// }
-/// })
-/// };
-///
-/// mod baller {
-/// use super::*;
-/// pub struct BallerProps {}
-///
-/// /// This component totally balls
-/// pub fn Baller(cx: Context<()>) -> DomTree {
-/// todo!()
-/// }
-/// }
-///
-/// #[derive(Debug, PartialEq, Props)]
-/// pub struct TallerProps {
-/// a: &'static str,
-/// }
-///
-/// /// This component is taller than most :)
-/// pub fn Taller(cx: Context) -> DomTree {
-/// let b = true;
-/// todo!()
-/// }
-/// ```
-#[proc_macro]
-pub fn html(s: TokenStream) -> TokenStream {
- match syn::parse::>(s) {
+ match syn::parse::(s) {
Err(e) => e.to_compile_error().into(),
Ok(s) => s.to_token_stream().into(),
}
diff --git a/packages/core-macro/src/props/mod.rs b/packages/core-macro/src/props/mod.rs
index cdfe7e8b6..c13f1b174 100644
--- a/packages/core-macro/src/props/mod.rs
+++ b/packages/core-macro/src/props/mod.rs
@@ -17,7 +17,7 @@ pub fn impl_my_derive(ast: &syn::DeriveInput) -> Result {
let data = match &ast.data {
syn::Data::Struct(data) => match &data.fields {
syn::Fields::Named(fields) => {
- let struct_info = struct_info::StructInfo::new(&ast, fields.named.iter())?;
+ let struct_info = struct_info::StructInfo::new(ast, fields.named.iter())?;
let builder_creation = struct_info.builder_creation_impl()?;
let conversion_helper = struct_info.conversion_helper_impl()?;
let fields = struct_info
@@ -196,7 +196,7 @@ mod field_info {
if let Some(ref name) = field.ident {
Ok(FieldInfo {
ordinal,
- name: &name,
+ name,
generic_ident: syn::Ident::new(
&format!("__{}", strip_raw_ident_prefix(name.to_string())),
proc_macro2::Span::call_site(),
@@ -585,7 +585,7 @@ mod struct_info {
// we use the heuristic: are there *any* generic parameters?
// If so, then they might have non-static lifetimes and we can't compare two generic things that *might borrow*
// Therefore, we will generate code that shortcircuits the "comparison" in memoization
- let are_there_generics = self.generics.params.len() > 0;
+ let are_there_generics = !self.generics.params.is_empty();
let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
let all_fields_param = syn::GenericParam::Type(
diff --git a/packages/core-macro/src/rsx/ambiguous.rs b/packages/core-macro/src/rsx/ambiguous.rs
index f1ed461e8..71b3a2c4c 100644
--- a/packages/core-macro/src/rsx/ambiguous.rs
+++ b/packages/core-macro/src/rsx/ambiguous.rs
@@ -16,26 +16,22 @@ use syn::{
};
#[allow(clippy::large_enum_variant)]
-pub enum AmbiguousElement {
- Element(Element),
- Component(Component),
+pub enum AmbiguousElement {
+ Element(Element),
+ Component(Component),
}
-impl Parse for AmbiguousElement {
+impl Parse for AmbiguousElement {
fn parse(input: ParseStream) -> Result {
// Try to parse as an absolute path and immediately defer to the componetn
if input.peek(Token![::]) {
- return input
- .parse::>()
- .map(AmbiguousElement::Component);
+ return input.parse::().map(AmbiguousElement::Component);
}
// If not an absolute path, then parse the ident and check if it's a valid tag
if let Ok(pat) = input.fork().parse::() {
if pat.segments.len() > 1 {
- return input
- .parse::>()
- .map(AmbiguousElement::Component);
+ return input.parse::().map(AmbiguousElement::Component);
}
}
@@ -45,45 +41,16 @@ impl Parse for AmbiguousElement {
let first_char = name_str.chars().next().unwrap();
if first_char.is_ascii_uppercase() {
- input
- .parse::>()
- .map(AmbiguousElement::Component)
+ input.parse::().map(AmbiguousElement::Component)
} else {
- input
- .parse::>()
- .map(AmbiguousElement::Element)
+ input.parse::().map(AmbiguousElement::Element)
}
} else {
Err(Error::new(input.span(), "Not a valid Html tag"))
}
}
}
-
-impl Parse for AmbiguousElement {
- fn parse(input: ParseStream) -> Result {
- if input.peek(Token![<]) {
- let forked = input.fork();
- forked.parse::().unwrap();
- let tag = forked.parse::()?;
- let name_str = tag.to_string();
-
- let first_char = name_str.chars().next().unwrap();
- if first_char.is_ascii_uppercase() {
- input
- .parse::>()
- .map(AmbiguousElement::Component)
- } else {
- input
- .parse::>()
- .map(AmbiguousElement::Element)
- }
- } else {
- Err(Error::new(input.span(), "Not a valid Html tag"))
- }
- }
-}
-
-impl ToTokens for AmbiguousElement {
+impl ToTokens for AmbiguousElement {
fn to_tokens(&self, tokens: &mut TokenStream2) {
match self {
AmbiguousElement::Element(el) => el.to_tokens(tokens),
diff --git a/packages/core-macro/src/rsx/body.rs b/packages/core-macro/src/rsx/body.rs
index 375e0344a..b5b487459 100644
--- a/packages/core-macro/src/rsx/body.rs
+++ b/packages/core-macro/src/rsx/body.rs
@@ -7,30 +7,16 @@ use syn::{
use super::*;
-pub struct CallBody {
+pub struct CallBody {
custom_context: Option,
- roots: Vec>,
+ roots: Vec,
}
/// The custom rusty variant of parsing rsx!
-impl Parse for CallBody {
+impl Parse for CallBody {
fn parse(input: ParseStream) -> Result {
let custom_context = try_parse_custom_context(input)?;
- let (_, roots, _) = BodyConfig::::new_call_body().parse_component_body(input)?;
- Ok(Self {
- custom_context,
- roots,
- })
- }
-}
-
-/// The HTML variant of parsing rsx!
-impl Parse for CallBody {
- fn parse(input: ParseStream) -> Result {
- let custom_context = try_parse_custom_context(input)?;
-
- // parsing the contents is almost like parsing the inner of any element, but with no props
- let (_, roots, _) = BodyConfig::::new_call_body().parse_component_body(input)?;
+ let (_, roots, _) = BodyConfig::new_call_body().parse_component_body(input)?;
Ok(Self {
custom_context,
roots,
@@ -50,7 +36,7 @@ fn try_parse_custom_context(input: ParseStream) -> Result> {
}
/// Serialize the same way, regardless of flavor
-impl ToTokens for CallBody {
+impl ToTokens for CallBody {
fn to_tokens(&self, out_tokens: &mut TokenStream2) {
let inner = if self.roots.len() == 1 {
let inner = &self.roots[0];
diff --git a/packages/core-macro/src/rsx/component.rs b/packages/core-macro/src/rsx/component.rs
index f28130e6b..35963b8b5 100644
--- a/packages/core-macro/src/rsx/component.rs
+++ b/packages/core-macro/src/rsx/component.rs
@@ -22,15 +22,15 @@ use syn::{
token, Error, Expr, ExprClosure, Ident, Result, Token,
};
-pub struct Component {
+pub struct Component {
// accept any path-like argument
name: syn::Path,
- body: Vec>,
- children: Vec>,
+ body: Vec,
+ children: Vec,
manual_props: Option,
}
-impl Parse for Component {
+impl Parse for Component {
fn parse(stream: ParseStream) -> Result {
// let name = s.parse::()?;
// todo: look into somehow getting the crate/super/etc
@@ -41,7 +41,7 @@ impl Parse for Component {
let content: ParseBuffer;
syn::braced!(content in stream);
- let cfg: BodyConfig = BodyConfig {
+ let cfg: BodyConfig = BodyConfig {
allow_children: true,
allow_fields: true,
allow_manual_props: true,
@@ -57,80 +57,14 @@ impl Parse for Component {
})
}
}
-impl Parse for Component {
- fn parse(stream: ParseStream) -> Result {
- let _l_tok = stream.parse::()?;
- let name = syn::Path::parse_mod_style(stream)?;
- let mut manual_props = None;
-
- let mut body: Vec> = vec![];
- let mut children: Vec> = vec![];
-
- if stream.peek(Token![..]) {
- stream.parse::()?;
- manual_props = Some(stream.parse::()?);
- }
-
- while !stream.peek(Token![>]) {
- // self-closing
- if stream.peek(Token![/]) {
- stream.parse::()?;
- stream.parse::]>()?;
-
- return Ok(Self {
- name,
- manual_props,
- body,
- children,
- });
- }
- body.push(stream.parse::>()?);
- }
-
- stream.parse::]>()?;
-
- 'parsing: loop {
- if stream.peek(Token![<]) && stream.peek2(Token![/]) {
- break 'parsing;
- }
-
- // [1] Break if empty
- if stream.is_empty() {
- break 'parsing;
- }
-
- children.push(stream.parse::>()?);
- }
-
- // closing element
- stream.parse::()?;
- stream.parse::()?;
- let close = syn::Path::parse_mod_style(stream)?;
- if close != name {
- return Err(Error::new_spanned(
- close,
- "closing element does not match opening",
- ));
- }
- stream.parse::]>()?;
-
- Ok(Self {
- name,
- body,
- children,
- manual_props,
- })
- }
-}
-
-pub struct BodyConfig {
+pub struct BodyConfig {
pub allow_fields: bool,
pub allow_children: bool,
pub allow_manual_props: bool,
}
-impl BodyConfig {
+impl BodyConfig {
/// The configuration to parse the root
pub fn new_call_body() -> Self {
Self {
@@ -141,17 +75,13 @@ impl BodyConfig {
}
}
-impl BodyConfig {
+impl BodyConfig {
// todo: unify this body parsing for both elements and components
// both are style rather ad-hoc, though components are currently more configured
pub fn parse_component_body(
&self,
content: &ParseBuffer,
- ) -> Result<(
- Vec>,
- Vec>,
- Option,
- )> {
+ ) -> Result<(Vec, Vec, Option)> {
let mut body = Vec::new();
let mut children = Vec::new();
let mut manual_props = None;
@@ -178,7 +108,7 @@ impl BodyConfig {
"Property fields is not allowed in this context. \nMake to only use fields in Components or Elements.",
));
}
- body.push(content.parse::>()?);
+ body.push(content.parse::()?);
} else {
if !self.allow_children {
return Err(Error::new(
@@ -186,65 +116,7 @@ impl BodyConfig {
"This item is not allowed to accept children.",
));
}
- children.push(content.parse::>()?);
- }
-
- // consume comma if it exists
- // we don't actually care if there *are* commas between attrs
- if content.peek(Token![,]) {
- let _ = content.parse::();
- }
- }
- Ok((body, children, manual_props))
- }
-}
-impl BodyConfig {
- // todo: unify this body parsing for both elements and components
- // both are style rather ad-hoc, though components are currently more configured
- pub fn parse_component_body(
- &self,
- content: &ParseBuffer,
- ) -> Result<(
- Vec>,
- Vec>,
- Option,
- )> {
- let mut body = Vec::new();
- let mut children = Vec::new();
- let mut manual_props = None;
-
- 'parsing: loop {
- // [1] Break if empty
- if content.is_empty() {
- break 'parsing;
- }
-
- if content.peek(Token![..]) {
- if !self.allow_manual_props {
- return Err(Error::new(
- content.span(),
- "Props spread syntax is not allowed in this context. \nMake to only use the elipsis `..` in Components.",
- ));
- }
- content.parse::()?;
- manual_props = Some(content.parse::()?);
- } else if content.peek(Ident) && content.peek2(Token![:]) && !content.peek3(Token![:]) {
- if !self.allow_fields {
- return Err(Error::new(
- content.span(),
- "Property fields is not allowed in this context. \nMake to only use fields in Components or Elements.",
- ));
- }
- body.push(content.parse::>()?);
- } else {
- if !self.allow_children {
- return Err(Error::new(
- content.span(),
- "This item is not allowed to accept children.",
- ));
- }
-
- children.push(content.parse::>()?);
+ children.push(content.parse::()?);
}
// consume comma if it exists
@@ -257,7 +129,7 @@ impl BodyConfig {
}
}
-impl ToTokens for Component {
+impl ToTokens for Component {
fn to_tokens(&self, tokens: &mut TokenStream2) {
let name = &self.name;
@@ -327,7 +199,7 @@ impl ToTokens for Component {
}
// the struct's fields info
-pub struct ComponentField {
+pub struct ComponentField {
name: Ident,
content: ContentField,
}
@@ -354,28 +226,7 @@ impl ToTokens for ContentField {
}
}
-impl Parse for ComponentField {
- fn parse(input: ParseStream) -> Result {
- let name = Ident::parse_any(input)?;
- input.parse::()?;
-
- let name_str = name.to_string();
- let content = if name_str.starts_with("on") {
- if input.peek(token::Brace) {
- let content;
- syn::braced!(content in input);
- ContentField::OnHandlerRaw(content.parse()?)
- } else {
- ContentField::OnHandler(input.parse()?)
- }
- } else {
- ContentField::ManExpr(input.parse::()?)
- };
-
- Ok(Self { name, content })
- }
-}
-impl Parse for ComponentField {
+impl Parse for ComponentField {
fn parse(input: ParseStream) -> Result {
let name = Ident::parse_any(input)?;
input.parse::()?;
@@ -397,7 +248,7 @@ impl Parse for ComponentField {
}
}
-impl ToTokens for ComponentField {
+impl ToTokens for ComponentField {
fn to_tokens(&self, tokens: &mut TokenStream2) {
let ComponentField { name, content, .. } = self;
tokens.append_all(quote! {
diff --git a/packages/core-macro/src/rsx/element.rs b/packages/core-macro/src/rsx/element.rs
index 865b8e814..0a13b1bcd 100644
--- a/packages/core-macro/src/rsx/element.rs
+++ b/packages/core-macro/src/rsx/element.rs
@@ -3,54 +3,118 @@ use super::*;
use proc_macro2::TokenStream as TokenStream2;
use quote::{quote, ToTokens, TokenStreamExt};
use syn::{
- ext::IdentExt,
- parse::{discouraged::Speculative, Parse, ParseBuffer, ParseStream},
- token, Error, Expr, ExprClosure, Ident, LitStr, Result, Token,
+ parse::{Parse, ParseBuffer, ParseStream},
+ token, Expr, ExprClosure, Ident, LitStr, Result, Token,
};
// =======================================
// Parse the VNode::Element type
// =======================================
-pub struct Element {
+pub struct Element {
name: Ident,
key: Option,
- attributes: Vec>,
- listeners: Vec>,
- children: Vec>,
+ attributes: Vec,
+ listeners: Vec,
+ children: Vec,
_is_static: bool,
}
-impl Parse for Element {
+impl Parse for Element {
fn parse(stream: ParseStream) -> Result {
- let name = Ident::parse(stream)?;
+ let el_name = Ident::parse(stream)?;
// parse the guts
let content: ParseBuffer;
syn::braced!(content in stream);
- let mut attributes: Vec> = vec![];
- let mut listeners: Vec> = vec![];
- let mut children: Vec> = vec![];
+ let mut attributes: Vec = vec![];
+ let mut listeners: Vec = vec![];
+ let mut children: Vec = vec![];
let mut key = None;
- let mut el_ref = None;
-
- 'parsing: loop {
- // [1] Break if empty
- if content.is_empty() {
- break 'parsing;
- }
+ let mut _el_ref = None;
+ // todo: more descriptive error handling
+ while !content.is_empty() {
if content.peek(Ident) && content.peek2(Token![:]) && !content.peek3(Token![:]) {
- parse_rsx_element_field(
- &content,
- &mut attributes,
- &mut listeners,
- &mut key,
- &mut el_ref,
- name.clone(),
- )?;
+ let name = content.parse::()?;
+ let name_str = name.to_string();
+ content.parse::()?;
+
+ if name_str.starts_with("on") {
+ if content.peek(token::Brace) {
+ let mycontent;
+ syn::braced!(mycontent in content);
+
+ listeners.push(ElementAttrNamed {
+ el_name: el_name.clone(),
+ attr: ElementAttr::EventTokens {
+ name,
+ tokens: mycontent.parse()?,
+ },
+ });
+ } else {
+ listeners.push(ElementAttrNamed {
+ el_name: el_name.clone(),
+ attr: ElementAttr::EventClosure {
+ name,
+ closure: content.parse()?,
+ },
+ });
+ };
+ } else {
+ match name_str.as_str() {
+ "key" => {
+ key = Some(content.parse()?);
+ }
+ "classes" => {
+ todo!("custom class list not supported")
+ }
+ "namespace" => {
+ todo!("custom namespace not supported")
+ }
+ "node_ref" => {
+ _el_ref = Some(content.parse::()?);
+ }
+ _ => {
+ if content.peek(LitStr) {
+ attributes.push(ElementAttrNamed {
+ el_name: el_name.clone(),
+ attr: ElementAttr::AttrText {
+ name,
+ value: content.parse()?,
+ },
+ });
+ } else {
+ attributes.push(ElementAttrNamed {
+ el_name: el_name.clone(),
+ attr: ElementAttr::AttrExpression {
+ name,
+ value: content.parse()?,
+ },
+ });
+ }
+ }
+ }
+ }
+ } else if content.peek(LitStr) && content.peek2(Token![:]) {
+ let name = content.parse::()?;
+ content.parse::()?;
+
+ if content.peek(LitStr) {
+ let value = content.parse::()?;
+ attributes.push(ElementAttrNamed {
+ el_name: el_name.clone(),
+ attr: ElementAttr::CustomAttrText { name, value },
+ });
+ } else {
+ let value = content.parse::()?;
+ attributes.push(ElementAttrNamed {
+ el_name: el_name.clone(),
+ attr: ElementAttr::CustomAttrExpression { name, value },
+ });
+ }
} else {
- children.push(content.parse::>()?);
+ children.push(content.parse::()?);
}
// consume comma if it exists
@@ -60,112 +124,6 @@ impl Parse for Element {
}
}
- Ok(Self {
- key,
- name,
- attributes,
- children,
- listeners,
- _is_static: false,
- })
- }
-}
-
-impl Parse for Element {
- fn parse(stream: ParseStream) -> Result {
- let _l_tok = stream.parse::()?;
- let el_name = Ident::parse(stream)?;
-
- let mut attributes: Vec> = vec![];
- let mut listeners: Vec> = vec![];
- let mut children: Vec> = vec![];
- let key = None;
-
- while !stream.peek(Token![>]) {
- // self-closing
- if stream.peek(Token![/]) {
- stream.parse::()?;
- stream.parse::]>()?;
-
- return Ok(Self {
- name: el_name,
- key: None,
- attributes,
- _is_static: false,
- listeners,
- children,
- });
- }
-
- let name = Ident::parse_any(stream)?;
- let name_str = name.to_string();
- stream.parse::()?;
- if name_str.starts_with("on") {
- let inner;
- syn::braced!(inner in stream);
- let toks = inner.parse::()?;
- let ty = AttrType::EventTokens(toks);
- listeners.push(ElementAttr {
- element_name: el_name.clone(),
- name,
- value: ty,
- namespace: None,
- })
- } else {
- match name_str.as_str() {
- "style" => {}
- "key" => {}
- _ => {
- // "classes" | "namespace" | "ref" | _ => {
- let ty = if stream.peek(LitStr) {
- let rawtext = stream.parse::().unwrap();
- AttrType::BumpText(rawtext)
- } else {
- // like JSX, we expect raw expressions
- let inner;
- syn::braced!(inner in stream);
- let toks = inner.parse::()?;
- AttrType::FieldTokens(toks)
- };
- attributes.push(ElementAttr {
- element_name: el_name.clone(),
- name,
- value: ty,
- namespace: None,
- })
- }
- }
- };
- }
-
- stream.parse::]>()?;
-
- 'parsing: loop {
- if stream.peek(Token![<]) && stream.peek2(Token![/]) {
- break 'parsing;
- }
-
- // [1] Break if empty
- if stream.is_empty() {
- break 'parsing;
- }
-
- children.push(stream.parse::>()?);
- }
-
- // closing element
- stream.parse::()?;
- stream.parse::()?;
-
- let close = Ident::parse_any(stream)?;
- if close != el_name {
- return Err(Error::new_spanned(
- close,
- "closing element does not match opening",
- ));
- }
- stream.parse::]>()?;
-
Ok(Self {
key,
name: el_name,
@@ -177,12 +135,14 @@ impl Parse for Element {
}
}
-impl ToTokens for Element {
+impl ToTokens for Element {
fn to_tokens(&self, tokens: &mut TokenStream2) {
let name = &self.name;
- let attr = &self.attributes;
let childs = &self.children;
+
let listeners = &self.listeners;
+ let attr = &self.attributes;
+
let key = match &self.key {
Some(ty) => quote! { Some(format_args_f!(#ty)) },
None => quote! { None },
@@ -200,164 +160,66 @@ impl ToTokens for Element {
}
}
-/// =======================================
-/// Parse a VElement's Attributes
-/// =======================================
-struct ElementAttr {
- element_name: Ident,
- name: Ident,
- value: AttrType,
- namespace: Option,
+enum ElementAttr {
+ // attribute: "valuee {}"
+ AttrText { name: Ident, value: LitStr },
+
+ // attribute: true,
+ AttrExpression { name: Ident, value: Expr },
+
+ // "attribute": "value {}"
+ CustomAttrText { name: LitStr, value: LitStr },
+
+ // "attribute": true,
+ CustomAttrExpression { name: LitStr, value: Expr },
+
+ // onclick: move |_| {}
+ EventClosure { name: Ident, closure: ExprClosure },
+
+ // onclick: {}
+ EventTokens { name: Ident, tokens: Expr },
}
-enum AttrType {
- BumpText(LitStr),
- FieldTokens(Expr),
- EventTokens(Expr),
- Event(ExprClosure),
+struct ElementAttrNamed {
+ el_name: Ident,
+ attr: ElementAttr,
}
-// We parse attributes and dump them into the attribute vec
-// This is because some tags might be namespaced (IE style)
-// These dedicated tags produce multiple name-spaced attributes
-fn parse_rsx_element_field(
- stream: ParseStream,
- attrs: &mut Vec>,
- listeners: &mut Vec>,
- key: &mut Option,
- el_ref: &mut Option,
- element_name: Ident,
-) -> Result<()> {
- let name = Ident::parse_any(stream)?;
- let name_str = name.to_string();
- stream.parse::()?;
-
- // Return early if the field is a listener
- if name_str.starts_with("on") {
- // remove the "on" bit
- let ty = if stream.peek(token::Brace) {
- let content;
- syn::braced!(content in stream);
-
- // Try to parse directly as a closure
- let fork = content.fork();
- if let Ok(event) = fork.parse::() {
- content.advance_to(&fork);
- AttrType::Event(event)
- } else {
- AttrType::EventTokens(content.parse()?)
- }
- } else {
- AttrType::Event(stream.parse()?)
- };
- listeners.push(ElementAttr {
- name,
- value: ty,
- namespace: None,
- element_name,
- });
- return Ok(());
- }
-
- let ty: AttrType = match name_str.as_str() {
- // short circuit early if style is using the special syntax
- "style" if stream.peek(token::Brace) => {
- let inner;
- syn::braced!(inner in stream);
-
- while !inner.is_empty() {
- let name = Ident::parse_any(&inner)?;
- inner.parse::()?;
- let ty = if inner.peek(LitStr) {
- let rawtext = inner.parse::().unwrap();
- AttrType::BumpText(rawtext)
- } else {
- let toks = inner.parse::()?;
- AttrType::FieldTokens(toks)
- };
- if inner.peek(Token![,]) {
- let _ = inner.parse::();
- }
- attrs.push(ElementAttr {
- name,
- value: ty,
- namespace: Some("style".to_string()),
- element_name: element_name.clone(),
- });
- }
-
- return Ok(());
- }
- "key" => {
- *key = Some(stream.parse::()?);
- return Ok(());
- }
- "classes" => {
- todo!("custom class list not supported")
- }
- "namespace" => {
- todo!("custom namespace not supported")
- }
- "node_ref" => {
- *el_ref = Some(stream.parse::()?);
- return Ok(());
- }
-
- // Fall through
- _ => {
- if stream.peek(LitStr) {
- let rawtext = stream.parse::().unwrap();
- AttrType::BumpText(rawtext)
- } else {
- let toks = stream.parse::()?;
- AttrType::FieldTokens(toks)
- }
- }
- };
-
- // consume comma if it exists
- // we don't actually care if there *are* commas between attrs
- if stream.peek(Token![,]) {
- let _ = stream.parse::();
- }
-
- attrs.push(ElementAttr {
- name,
- value: ty,
- namespace: None,
- element_name,
- });
- Ok(())
-}
-
-impl ToTokens for ElementAttr {
+impl ToTokens for ElementAttrNamed {
fn to_tokens(&self, tokens: &mut TokenStream2) {
- let el_name = &self.element_name;
- let nameident = &self.name;
+ let ElementAttrNamed { el_name, attr } = self;
- // TODO: wire up namespace
- let _name_str = self.name.to_string();
- let _namespace = match &self.namespace {
- Some(t) => quote! { Some(#t) },
- None => quote! { None },
+ let toks = match attr {
+ ElementAttr::AttrText { name, value } => {
+ quote! {
+ dioxus_elements::#el_name.#name(__cx, format_args_f!(#value))
+ }
+ }
+ ElementAttr::AttrExpression { name, value } => {
+ quote! {
+ dioxus_elements::#el_name.#name(__cx, #value)
+ }
+ }
+
+ ElementAttr::CustomAttrText { name, value } => {
+ quote! { __cx.attr( #name, format_args_f!(#value), None, false ) }
+ }
+ ElementAttr::CustomAttrExpression { name, value } => {
+ quote! { __cx.attr( #name, format_args_f!(#value), None, false ) }
+ }
+
+ ElementAttr::EventClosure { name, closure } => {
+ quote! {
+ dioxus::events::on::#name(__cx, #closure)
+ }
+ }
+ ElementAttr::EventTokens { name, tokens } => {
+ quote! {
+ dioxus::events::on::#name(__cx, #tokens)
+ }
+ }
};
- match &self.value {
- AttrType::BumpText(value) => tokens.append_all(quote! {
- dioxus_elements::#el_name.#nameident(__cx, format_args_f!(#value))
- }),
-
- AttrType::FieldTokens(exp) => tokens.append_all(quote! {
- dioxus_elements::#el_name.#nameident(__cx, #exp)
- }),
-
- AttrType::Event(event) => tokens.append_all(quote! {
- dioxus::events::on::#nameident(__cx, #event)
- }),
-
- AttrType::EventTokens(event) => tokens.append_all(quote! {
- dioxus::events::on::#nameident(__cx, #event)
- }),
- }
+ tokens.append_all(toks);
}
}
diff --git a/packages/core-macro/src/rsx/fragment.rs b/packages/core-macro/src/rsx/fragment.rs
index 91141538e..9743b1501 100644
--- a/packages/core-macro/src/rsx/fragment.rs
+++ b/packages/core-macro/src/rsx/fragment.rs
@@ -8,7 +8,7 @@
//! - [ ] Children
//! - [ ] Keys
-use super::{AmbiguousElement, HtmlOrRsx, AS_HTML, AS_RSX};
+use super::AmbiguousElement;
use syn::parse::ParseBuffer;
use {
proc_macro2::TokenStream as TokenStream2,
@@ -19,11 +19,11 @@ use {
},
};
-pub struct Fragment {
- children: Vec>,
+pub struct Fragment {
+ children: Vec,
}
-impl Parse for Fragment {
+impl Parse for Fragment {
fn parse(input: ParseStream) -> Result {
input.parse::()?;
@@ -33,7 +33,7 @@ impl Parse for Fragment {
let content: ParseBuffer;
syn::braced!(content in input);
while !content.is_empty() {
- content.parse::>()?;
+ content.parse::()?;
if content.peek(Token![,]) {
let _ = content.parse::();
@@ -43,27 +43,7 @@ impl Parse for Fragment {
}
}
-impl Parse for Fragment {
- fn parse(input: ParseStream) -> Result {
- input.parse::()?;
-
- let children = Vec::new();
-
- // parse the guts
- let content: ParseBuffer;
- syn::braced!(content in input);
- while !content.is_empty() {
- content.parse::>()?;
-
- if content.peek(Token![,]) {
- let _ = content.parse::();
- }
- }
- Ok(Self { children })
- }
-}
-
-impl ToTokens for Fragment {
+impl ToTokens for Fragment {
fn to_tokens(&self, tokens: &mut TokenStream2) {
let childs = &self.children;
let children = quote! {
diff --git a/packages/core-macro/src/rsx/mod.rs b/packages/core-macro/src/rsx/mod.rs
index 57f3d9bf7..5a0592b36 100644
--- a/packages/core-macro/src/rsx/mod.rs
+++ b/packages/core-macro/src/rsx/mod.rs
@@ -25,7 +25,3 @@ pub use component::*;
pub use element::*;
pub use fragment::*;
pub use node::*;
-
-pub(crate) type HtmlOrRsx = bool;
-pub const AS_HTML: bool = true;
-pub const AS_RSX: bool = false;
diff --git a/packages/core-macro/src/rsx/node.rs b/packages/core-macro/src/rsx/node.rs
index 9d0475bb7..e027711e6 100644
--- a/packages/core-macro/src/rsx/node.rs
+++ b/packages/core-macro/src/rsx/node.rs
@@ -10,13 +10,13 @@ use syn::{
// ==============================================
// Parse any div {} as a VElement
// ==============================================
-pub enum BodyNode {
- Element(AmbiguousElement),
+pub enum BodyNode {
+ Element(AmbiguousElement),
Text(TextNode),
RawExpr(Expr),
}
-impl Parse for BodyNode {
+impl Parse for BodyNode {
fn parse(stream: ParseStream) -> Result {
// Supposedly this approach is discouraged due to inability to return proper errors
// TODO: Rework this to provide more informative errors
@@ -31,33 +31,11 @@ impl Parse for BodyNode {
return Ok(BodyNode::Text(stream.parse::()?));
}
- Ok(BodyNode::Element(
- stream.parse::>()?,
- ))
- }
-}
-impl Parse for BodyNode {
- fn parse(stream: ParseStream) -> Result {
- // Supposedly this approach is discouraged due to inability to return proper errors
- // TODO: Rework this to provide more informative errors
-
- if stream.peek(token::Brace) {
- let content;
- syn::braced!(content in stream);
- return Ok(BodyNode::RawExpr(content.parse::()?));
- }
-
- if stream.peek(LitStr) {
- return Ok(BodyNode::Text(stream.parse::()?));
- }
-
- Ok(BodyNode::Element(
- stream.parse::>()?,
- ))
+ Ok(BodyNode::Element(stream.parse::()?))
}
}
-impl ToTokens for BodyNode {
+impl ToTokens for BodyNode {
fn to_tokens(&self, tokens: &mut TokenStream2) {
match &self {
BodyNode::Element(el) => el.to_tokens(tokens),
diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml
index 4d320ea7c..9c19720cf 100644
--- a/packages/core/Cargo.toml
+++ b/packages/core/Cargo.toml
@@ -42,13 +42,13 @@ serde_repr = { version = "0.1.7", optional = true }
[dev-dependencies]
anyhow = "1.0.42"
-async-std = { version = "1.9.0", features = ["attributes"] }
-criterion = "0.3.5"
dioxus-html = { path = "../html" }
fern = { version = "0.6.0", features = ["colored"] }
rand = { version = "0.8.4", features = ["small_rng"] }
simple_logger = "1.13.0"
dioxus-core-macro = { path = "../core-macro", version = "0.1.2" }
+async-std = { version = "1.9.0", features = ["attributes"] }
+criterion = "0.3.5"
[features]
default = []
diff --git a/packages/core/examples/async.rs b/packages/core/examples/async.rs
index 9a1ff4a2c..24a4f34f7 100644
--- a/packages/core/examples/async.rs
+++ b/packages/core/examples/async.rs
@@ -7,9 +7,9 @@ fn main() {
const App: FC<()> = |(cx, props)| {
let id = cx.scope_id();
- cx.submit_task(Box::pin(async move { id }));
+ // cx.submit_task(Box::pin(async move { id }));
- let (handle, contents) = use_task(cx, || async { "hello world".to_string() });
+ // let (handle, contents) = use_task(cx, || async { "hello world".to_string() });
todo!()
};
diff --git a/packages/core/examples/expand.rs b/packages/core/examples/expand.rs
new file mode 100644
index 000000000..1b041b70c
--- /dev/null
+++ b/packages/core/examples/expand.rs
@@ -0,0 +1 @@
+fn main( ) {}
diff --git a/packages/core/examples/jsframework.rs b/packages/core/examples/jsframework.rs
index c05bd06f6..2b2939a15 100644
--- a/packages/core/examples/jsframework.rs
+++ b/packages/core/examples/jsframework.rs
@@ -1,3 +1,5 @@
+#![allow(non_snake_case)]
+
use dioxus::component::Component;
use dioxus::events::on::MouseEvent;
use dioxus_core as dioxus;
@@ -13,7 +15,7 @@ fn main() {
assert!(g.edits.len() > 1);
}
-static App: FC<()> = |(cx, props)| {
+fn App((cx, props): Component<()>) -> DomTree {
let mut rng = SmallRng::from_entropy();
let rows = (0..10_000_usize).map(|f| {
let label = Label::new(&mut rng);
@@ -31,13 +33,14 @@ static App: FC<()> = |(cx, props)| {
}
}
})
-};
+}
#[derive(PartialEq, Props)]
struct RowProps {
row_id: usize,
label: Label,
}
+
fn Row((cx, props): Component) -> DomTree {
let handler = move |evt: MouseEvent| {
let g = evt.button;
diff --git a/packages/core/examples/syntax.rs b/packages/core/examples/syntax.rs
index 0c1674c8d..39453c0cc 100644
--- a/packages/core/examples/syntax.rs
+++ b/packages/core/examples/syntax.rs
@@ -8,31 +8,13 @@ use dioxus_html as dioxus_elements;
fn main() {}
fn html_usage() {
- let r = html! {
-
- "hello world"
-
-
-
- "hello world"
-
-
-
- >) {
+ fn remove_nodes(
+ &mut self,
+ nodes: impl IntoIterator
- >,
+ gen_muts: bool,
+ ) {
// or cache the vec on the diff machine
for node in nodes {
match node {
VNode::Text(t) => {
- if let Some(id) = t.dom_id.get() {
+ let id = t.dom_id.get().unwrap();
+ self.vdom.collect_garbage(id);
+
+ if gen_muts {
self.mutations.remove(id.as_u64());
- self.vdom.collect_garbage(id);
}
}
VNode::Suspended(s) => {
- if let Some(id) = s.dom_id.get() {
+ let id = s.dom_id.get().unwrap();
+ self.vdom.collect_garbage(id);
+
+ if gen_muts {
self.mutations.remove(id.as_u64());
- self.vdom.collect_garbage(id);
}
}
VNode::Anchor(a) => {
- if let Some(id) = a.dom_id.get() {
+ let id = a.dom_id.get().unwrap();
+ self.vdom.collect_garbage(id);
+
+ if gen_muts {
self.mutations.remove(id.as_u64());
- self.vdom.collect_garbage(id);
}
}
VNode::Element(e) => {
- if let Some(id) = e.dom_id.get() {
+ let id = e.dom_id.get().unwrap();
+
+ if gen_muts {
self.mutations.remove(id.as_u64());
}
+
+ self.remove_nodes(e.children, false);
}
VNode::Fragment(f) => {
- self.remove_nodes(f.children);
+ self.remove_nodes(f.children, gen_muts);
}
VNode::Component(c) => {
let scope_id = c.associated_scope.get().unwrap();
let scope = self.vdom.get_scope_mut(scope_id).unwrap();
let root = scope.root_node();
- self.remove_nodes(Some(root));
+ self.remove_nodes(Some(root), gen_muts);
+
+ log::debug!("Destroying scope {:?}", scope_id);
let mut s = self.vdom.try_remove(scope_id).unwrap();
s.hooks.clear_hooks();
}
@@ -1132,7 +1152,7 @@ impl<'bump> DiffMachine<'bump> {
new: &'bump [VNode<'bump>],
) {
if let Some(first_old) = old.get(0) {
- self.remove_nodes(&old[1..]);
+ self.remove_nodes(&old[1..], true);
self.stack
.create_children(new, MountType::Replace { old: first_old })
} else {
diff --git a/packages/core/src/events.rs b/packages/core/src/events.rs
index eae28f0b5..23d415562 100644
--- a/packages/core/src/events.rs
+++ b/packages/core/src/events.rs
@@ -137,6 +137,7 @@ pub mod on {
}
// The Dioxus Synthetic event system
+ // todo: move these into the html event system. dioxus accepts *any* event, so having these here doesn't make sense.
event_directory! {
ClipboardEvent: [
/// Called when "copy"
@@ -1031,6 +1032,7 @@ pub enum KeyCode {
// kanji, = 244
// unlock trackpad (Chrome/Edge), = 251
// toggle touchpad, = 255
+ #[cfg_attr(feature = "serialize", serde(other))]
Unknown,
}
diff --git a/packages/core/src/hooklist.rs b/packages/core/src/hooklist.rs
index 58366f606..ed4eb49dd 100644
--- a/packages/core/src/hooklist.rs
+++ b/packages/core/src/hooklist.rs
@@ -57,6 +57,7 @@ impl HookList {
}
pub fn clear_hooks(&mut self) {
+ log::debug!("clearing hooks...");
self.vals
.borrow_mut()
.drain(..)
diff --git a/packages/core/src/nodes.rs b/packages/core/src/nodes.rs
index 243945a19..7fd7bccf0 100644
--- a/packages/core/src/nodes.rs
+++ b/packages/core/src/nodes.rs
@@ -487,6 +487,8 @@ impl<'a> NodeFactory<'a> {
props.memoize(real_other)
};
+ log::debug!("comparing props...");
+
// It's only okay to memoize if there are no children and the props can be memoized
// Implementing memoize is unsafe and done automatically with the props trait
matches!((props_memoized, children.is_empty()), (true, true))
@@ -502,6 +504,7 @@ impl<'a> NodeFactory<'a> {
let drop_props: &mut dyn FnMut() = bump.alloc_with(|| {
move || unsafe {
+ log::debug!("dropping props!");
if !has_dropped {
let real_other = raw_props as *mut _ as *mut P;
let b = BumpBox::from_raw(real_other);
@@ -525,6 +528,7 @@ impl<'a> NodeFactory<'a> {
let caller: &'a mut dyn for<'b> Fn(&'b Scope) -> DomTree<'b> =
bump.alloc(move |scope: &Scope| -> DomTree {
+ log::debug!("calling component renderr {:?}", scope.our_arena_idx);
let props: &'_ P = unsafe { &*(raw_props as *const P) };
let res = component((Context { scope }, props));
unsafe { std::mem::transmute(res) }
diff --git a/packages/core/src/scheduler.rs b/packages/core/src/scheduler.rs
index d73ba3fe3..745ac1905 100644
--- a/packages/core/src/scheduler.rs
+++ b/packages/core/src/scheduler.rs
@@ -407,8 +407,6 @@ impl Scheduler {
let work_completed = machine.work(deadline_reached);
- log::debug!("Working finished? {:?}", work_completed);
-
// log::debug!("raw edits {:?}", machine.mutations.edits);
let mut machine: DiffMachine<'static> = unsafe { std::mem::transmute(machine) };
diff --git a/packages/core/src/scope.rs b/packages/core/src/scope.rs
index 17b14562a..9e66fe3f4 100644
--- a/packages/core/src/scope.rs
+++ b/packages/core/src/scope.rs
@@ -43,6 +43,8 @@ pub struct Scope {
// State
pub(crate) hooks: HookList,
+
+ // todo: move this into a centralized place - is more memory efficient
pub(crate) shared_contexts: RefCell>>,
// whenever set_state is called, we fire off a message to the scheduler
@@ -345,11 +347,15 @@ impl Scope {
debug_assert!(self.suspended_nodes.borrow().is_empty());
debug_assert!(self.borrowed_props.borrow().is_empty());
+ log::debug!("Borrowed stuff is successfully cleared");
+
// Cast the caller ptr from static to one with our own reference
let render: &dyn for<'b> Fn(&'b Scope) -> DomTree<'b> = unsafe { &*self.caller };
// Todo: see if we can add stronger guarantees around internal bookkeeping and failed component renders.
if let Some(new_head) = render(self) {
+ log::debug!("Render is successful");
+
// the user's component succeeded. We can safely cycle to the next frame
self.frames.wip_frame_mut().head_node = unsafe { std::mem::transmute(new_head) };
self.frames.cycle_frame();
diff --git a/packages/core/tests/borrowedstate.rs b/packages/core/tests/borrowedstate.rs
index 60cc0d3f2..b7d2e3f31 100644
--- a/packages/core/tests/borrowedstate.rs
+++ b/packages/core/tests/borrowedstate.rs
@@ -1,9 +1,16 @@
-use dioxus::{nodes::VSuspended, prelude::*, DomEdit, TestDom};
+#![allow(non_snake_case)]
+
+use dioxus::prelude::*;
use dioxus_core as dioxus;
use dioxus_core_macro::*;
use dioxus_html as dioxus_elements;
-static Parent: FC<()> = |(cx, props)| {
+#[test]
+fn test_borrowed_state() {
+ let _ = VirtualDom::new(Parent);
+}
+
+fn Parent((cx, _): Component<()>) -> DomTree {
let value = cx.use_hook(|_| String::new(), |f| &*f, |_| {});
cx.render(rsx! {
@@ -14,11 +21,11 @@ static Parent: FC<()> = |(cx, props)| {
Child { name: value }
}
})
-};
+}
#[derive(Props)]
struct ChildProps<'a> {
- name: &'a String,
+ name: &'a str,
}
fn Child<'a>((cx, props): Component<'a, ChildProps>) -> DomTree<'a> {
@@ -32,7 +39,7 @@ fn Child<'a>((cx, props): Component<'a, ChildProps>) -> DomTree<'a> {
#[derive(Props)]
struct Grandchild<'a> {
- name: &'a String,
+ name: &'a str,
}
fn Child2<'a>((cx, props): Component<'a, Grandchild>) -> DomTree<'a> {
@@ -40,6 +47,3 @@ fn Child2<'a>((cx, props): Component<'a, Grandchild>) -> DomTree<'a> {
div { "Hello {props.name}!" }
})
}
-
-#[test]
-fn test_borrowed_state() {}
diff --git a/packages/core/tests/create_dom.rs b/packages/core/tests/create_dom.rs
index c26c8bed1..d8a79162d 100644
--- a/packages/core/tests/create_dom.rs
+++ b/packages/core/tests/create_dom.rs
@@ -1,3 +1,5 @@
+#![allow(unused, non_upper_case_globals)]
+
//! Prove that the dom works normally through virtualdom methods.
//!
//! This methods all use "rebuild" which completely bypasses the scheduler.
diff --git a/packages/core/tests/diffing.rs b/packages/core/tests/diffing.rs
index 7ab0731a6..bfb33b4d6 100644
--- a/packages/core/tests/diffing.rs
+++ b/packages/core/tests/diffing.rs
@@ -1,3 +1,4 @@
+#![allow(unused, non_upper_case_globals)]
//! Diffing Tests
//!
//! These tests only verify that the diffing algorithm works properly for single components.
diff --git a/packages/core/tests/display_vdom.rs b/packages/core/tests/display_vdom.rs
index 107a2a1c9..ec81ac52c 100644
--- a/packages/core/tests/display_vdom.rs
+++ b/packages/core/tests/display_vdom.rs
@@ -1,19 +1,16 @@
+#![allow(unused, non_upper_case_globals)]
+
//! test that we can display the virtualdom properly
//!
//!
//!
-use std::{cell::RefCell, rc::Rc};
-
-use anyhow::{Context, Result};
use dioxus::prelude::*;
use dioxus_core as dioxus;
use dioxus_core_macro::*;
use dioxus_html as dioxus_elements;
mod test_logging;
-const IS_LOGGING_ENABLED: bool = true;
-
#[test]
fn please_work() {
static App: FC<()> = |(cx, props)| {
diff --git a/packages/core/tests/eventsystem.rs b/packages/core/tests/eventsystem.rs
deleted file mode 100644
index 7b0380efe..000000000
--- a/packages/core/tests/eventsystem.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use bumpalo::Bump;
-
-use anyhow::{Context, Result};
-use dioxus::{prelude::*, DomEdit};
-use dioxus_core as dioxus;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
-
-#[async_std::test]
-async fn event_queue_works() {
- static App: FC<()> = |(cx, props)| {
- cx.render(rsx! {
- div { "hello world" }
- })
- };
-
- let mut dom = VirtualDom::new(App);
- let edits = dom.rebuild();
-}
diff --git a/packages/core/tests/hooks.rs b/packages/core/tests/hooks.rs
deleted file mode 100644
index 664355fdf..000000000
--- a/packages/core/tests/hooks.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::{cell::RefCell, rc::Rc};
-
-use anyhow::{Context, Result};
-use dioxus::prelude::*;
-use dioxus_core as dioxus;
-use dioxus_html as dioxus_elements;
-
-type Shared = Rc>;
-
-#[test]
-fn sample_refs() {
-
- // static App: FC<()> = |(cx, props)|{
- // let div_ref = use_node_ref::(cx);
-
- // cx.render(rsx! {
- // div {
- // style: { color: "red" },
- // node_ref: div_ref,
- // onmouseover: move |_| {
- // div_ref.borrow_mut().focus();
- // },
- // },
- // })
- // };
-}
diff --git a/packages/core/tests/lifecycle.rs b/packages/core/tests/lifecycle.rs
index 5e3d69a97..3b9c05cca 100644
--- a/packages/core/tests/lifecycle.rs
+++ b/packages/core/tests/lifecycle.rs
@@ -1,6 +1,6 @@
-//! Tests for the lifecycle of components.
+#![allow(unused, non_upper_case_globals)]
-use anyhow::{Context, Result};
+//! Tests for the lifecycle of components.
use dioxus::prelude::*;
use dioxus_core as dioxus;
use dioxus_core_macro::*;
diff --git a/packages/core/tests/sharedstate.rs b/packages/core/tests/sharedstate.rs
index f5b730016..1983ec8c7 100644
--- a/packages/core/tests/sharedstate.rs
+++ b/packages/core/tests/sharedstate.rs
@@ -1,4 +1,6 @@
-use dioxus::{nodes::VSuspended, prelude::*, DomEdit, TestDom};
+#![allow(unused, non_upper_case_globals)]
+
+use dioxus::{prelude::*, DomEdit, TestDom};
use dioxus_core as dioxus;
use dioxus_core_macro::*;
use dioxus_html as dioxus_elements;
@@ -7,12 +9,6 @@ use DomEdit::*;
mod test_logging;
-fn new_dom() -> TestDom {
- const IS_LOGGING_ENABLED: bool = false;
- test_logging::set_up_logging(IS_LOGGING_ENABLED);
- TestDom::new()
-}
-
#[test]
fn shared_state_test() {
struct MySharedState(&'static str);
diff --git a/packages/core/tests/test_logging.rs b/packages/core/tests/test_logging.rs
index 8f696be89..54b5982ef 100644
--- a/packages/core/tests/test_logging.rs
+++ b/packages/core/tests/test_logging.rs
@@ -1,6 +1,5 @@
pub fn set_up_logging(enabled: bool) {
use fern::colors::{Color, ColoredLevelConfig};
-
if !enabled {
return;
@@ -19,7 +18,7 @@ pub fn set_up_logging(enabled: bool) {
// configure colors for the name of the level.
// since almost all of them are the same as the color for the whole line, we
// just clone `colors_line` and overwrite our changes
- let colors_level = colors_line.clone().info(Color::Green);
+ let colors_level = colors_line.info(Color::Green);
// here we set up our fern Dispatch
// when running tests in batch, the logger is re-used, so ignore the logger error
diff --git a/packages/core/tests/vdom_rebuild.rs b/packages/core/tests/vdom_rebuild.rs
index 12fa26d4f..9ea872a17 100644
--- a/packages/core/tests/vdom_rebuild.rs
+++ b/packages/core/tests/vdom_rebuild.rs
@@ -1,3 +1,5 @@
+#![allow(unused, non_upper_case_globals)]
+
//! Rebuilding tests
//! ----------------
//!
diff --git a/packages/desktop/.vscode/settings.json b/packages/desktop/.vscode/settings.json
deleted file mode 100644
index b3bde867c..000000000
--- a/packages/desktop/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "rust-analyzer.cargo.allFeatures": true
-}
diff --git a/packages/desktop/.vscode/spellright.dict b/packages/desktop/.vscode/spellright.dict
deleted file mode 100644
index 59b2711ce..000000000
--- a/packages/desktop/.vscode/spellright.dict
+++ /dev/null
@@ -1 +0,0 @@
-WebviewWindow
diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml
index 18b925646..948ffcc0b 100644
--- a/packages/desktop/Cargo.toml
+++ b/packages/desktop/Cargo.toml
@@ -33,6 +33,7 @@ tokio_runtime = ["tokio"]
[dev-dependencies]
dioxus-html = { path = "../html" }
dioxus-hooks = { path = "../hooks" }
+simple_logger = "1.13.0"
[build-dependencies]
diff --git a/packages/desktop/examples/crm.rs b/packages/desktop/examples/crm.rs
index 3971a4ab0..efb7efed2 100644
--- a/packages/desktop/examples/crm.rs
+++ b/packages/desktop/examples/crm.rs
@@ -22,14 +22,14 @@ pub struct Client {
}
static App: FC<()> = |(cx, _)| {
- let scene = use_state(cx, || Scene::ClientsList);
+ let mut scene = use_state(cx, || Scene::ClientsList);
let clients = use_ref(cx, || vec![] as Vec);
- let firstname = use_state(cx, || String::new());
- let lastname = use_state(cx, || String::new());
- let description = use_state(cx, || String::new());
+ let mut firstname = use_state(cx, String::new);
+ let mut lastname = use_state(cx, String::new);
+ let mut description = use_state(cx, String::new);
- let scene = match *scene {
+ let scene = match scene.get() {
Scene::ClientsList => {
rsx!(cx, div { class: "crm"
h2 { "List of clients" margin_bottom: "10px" }
@@ -61,13 +61,13 @@ static App: FC<()> = |(cx, _)| {
h2 {"Add new client" margin_bottom: "10px" }
form { class: "pure-form"
input { class: "new-client firstname" placeholder: "First name" value: "{firstname}"
- oninput: move |evt| firstname.set(evt.value.clone())
+ oninput: move |evt| firstname.set(evt.value)
}
input { class: "new-client lastname" placeholder: "Last name" value: "{lastname}"
- oninput: move |evt| lastname.set(evt.value.clone())
+ oninput: move |evt| lastname.set(evt.value)
}
textarea { class: "new-client description" placeholder: "Description" value: "{description}"
- oninput: move |evt| description.set(evt.value.clone())
+ oninput: move |evt| description.set(evt.value)
}
}
button { class: "pure-button pure-button-primary", onclick: {add_new}, "Add New" }
diff --git a/packages/desktop/examples/todomvc.css b/packages/desktop/examples/todomvc.css
new file mode 100644
index 000000000..ab9dbd7a9
--- /dev/null
+++ b/packages/desktop/examples/todomvc.css
@@ -0,0 +1,379 @@
+html,
+body {
+ margin: 0;
+ padding: 0;
+}
+
+button {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ background: none;
+ font-size: 100%;
+ vertical-align: baseline;
+ font-family: inherit;
+ font-weight: inherit;
+ color: inherit;
+ -webkit-appearance: none;
+ appearance: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+body {
+ font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ line-height: 1.4em;
+ background: #f5f5f5;
+ color: #4d4d4d;
+ min-width: 230px;
+ max-width: 550px;
+ margin: 0 auto;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ font-weight: 300;
+}
+
+:focus {
+ outline: 0;
+}
+
+.hidden {
+ display: none;
+}
+
+.todoapp {
+ background: #fff;
+ margin: 130px 0 40px 0;
+ position: relative;
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
+ 0 25px 50px 0 rgba(0, 0, 0, 0.1);
+}
+
+.todoapp input::-webkit-input-placeholder {
+ font-style: italic;
+ font-weight: 300;
+ color: #e6e6e6;
+}
+
+.todoapp input::-moz-placeholder {
+ font-style: italic;
+ font-weight: 300;
+ color: #e6e6e6;
+}
+
+.todoapp input::input-placeholder {
+ font-style: italic;
+ font-weight: 300;
+ color: #e6e6e6;
+}
+
+.todoapp h1 {
+ position: absolute;
+ top: -155px;
+ width: 100%;
+ font-size: 100px;
+ font-weight: 100;
+ text-align: center;
+ color: rgba(175, 47, 47, 0.15);
+ -webkit-text-rendering: optimizeLegibility;
+ -moz-text-rendering: optimizeLegibility;
+ text-rendering: optimizeLegibility;
+}
+
+.new-todo,
+.edit {
+ position: relative;
+ margin: 0;
+ width: 100%;
+ font-size: 24px;
+ font-family: inherit;
+ font-weight: inherit;
+ line-height: 1.4em;
+ border: 0;
+ color: inherit;
+ padding: 6px;
+ border: 1px solid #999;
+ box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
+ box-sizing: border-box;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.new-todo {
+ padding: 16px 16px 16px 60px;
+ border: none;
+ background: rgba(0, 0, 0, 0.003);
+ box-shadow: inset 0 -2px 1px rgba(0, 0, 0, 0.03);
+}
+
+.main {
+ position: relative;
+ z-index: 2;
+ border-top: 1px solid #e6e6e6;
+}
+
+.toggle-all {
+ text-align: center;
+ border: none;
+ /* Mobile Safari */
+ opacity: 0;
+ position: absolute;
+}
+
+.toggle-all+label {
+ width: 60px;
+ height: 34px;
+ font-size: 0;
+ position: absolute;
+ top: -52px;
+ left: -13px;
+ -webkit-transform: rotate(90deg);
+ transform: rotate(90deg);
+}
+
+.toggle-all+label:before {
+ content: '❯';
+ font-size: 22px;
+ color: #e6e6e6;
+ padding: 10px 27px 10px 27px;
+}
+
+.toggle-all:checked+label:before {
+ color: #737373;
+}
+
+.todo-list {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.todo-list li {
+ position: relative;
+ font-size: 24px;
+ border-bottom: 1px solid #ededed;
+}
+
+.todo-list li:last-child {
+ border-bottom: none;
+}
+
+.todo-list li.editing {
+ border-bottom: none;
+ padding: 0;
+}
+
+.todo-list li.editing .edit {
+ display: block;
+ width: 506px;
+ padding: 12px 16px;
+ margin: 0 0 0 43px;
+}
+
+.todo-list li.editing .view {
+ display: none;
+}
+
+.todo-list li .toggle {
+ text-align: center;
+ width: 40px;
+ /* auto, since non-WebKit browsers doesn't support input styling */
+ height: auto;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ margin: auto 0;
+ border: none;
+ /* Mobile Safari */
+ -webkit-appearance: none;
+ appearance: none;
+}
+
+.todo-list li .toggle {
+ opacity: 0;
+}
+
+.todo-list li .toggle+label {
+ /*
+ Firefox requires `#` to be escaped - https://bugzilla.mozilla.org/show_bug.cgi?id=922433
+ IE and Edge requires *everything* to be escaped to render, so we do that instead of just the `#` - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7157459/
+ */
+ background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23ededed%22%20stroke-width%3D%223%22/%3E%3C/svg%3E');
+ background-repeat: no-repeat;
+ background-position: center left;
+}
+
+.todo-list li .toggle:checked+label {
+ background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23bddad5%22%20stroke-width%3D%223%22/%3E%3Cpath%20fill%3D%22%235dc2af%22%20d%3D%22M72%2025L42%2071%2027%2056l-4%204%2020%2020%2034-52z%22/%3E%3C/svg%3E');
+}
+
+.todo-list li label {
+ word-break: break-all;
+ padding: 15px 15px 15px 60px;
+ display: block;
+ line-height: 1.2;
+ transition: color 0.4s;
+}
+
+.todo-list li.completed label {
+ color: #d9d9d9;
+ text-decoration: line-through;
+}
+
+.todo-list li .destroy {
+ display: none;
+ position: absolute;
+ top: 0;
+ right: 10px;
+ bottom: 0;
+ width: 40px;
+ height: 40px;
+ margin: auto 0;
+ font-size: 30px;
+ color: #cc9a9a;
+ margin-bottom: 11px;
+ transition: color 0.2s ease-out;
+}
+
+.todo-list li .destroy:hover {
+ color: #af5b5e;
+}
+
+.todo-list li .destroy:after {
+ content: '×';
+}
+
+.todo-list li:hover .destroy {
+ display: block;
+}
+
+.todo-list li .edit {
+ display: none;
+}
+
+.todo-list li.editing:last-child {
+ margin-bottom: -1px;
+}
+
+.footer {
+ color: #777;
+ padding: 10px 15px;
+ height: 20px;
+ text-align: center;
+ border-top: 1px solid #e6e6e6;
+}
+
+.footer:before {
+ content: '';
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ height: 50px;
+ overflow: hidden;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
+ 0 8px 0 -3px #f6f6f6,
+ 0 9px 1px -3px rgba(0, 0, 0, 0.2),
+ 0 16px 0 -6px #f6f6f6,
+ 0 17px 2px -6px rgba(0, 0, 0, 0.2);
+}
+
+.todo-count {
+ float: left;
+ text-align: left;
+}
+
+.todo-count strong {
+ font-weight: 300;
+}
+
+.filters {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ position: absolute;
+ right: 0;
+ left: 0;
+}
+
+.filters li {
+ display: inline;
+}
+
+.filters li a {
+ color: inherit;
+ margin: 3px;
+ padding: 3px 7px;
+ text-decoration: none;
+ border: 1px solid transparent;
+ border-radius: 3px;
+}
+
+.filters li a:hover {
+ border-color: rgba(175, 47, 47, 0.1);
+}
+
+.filters li a.selected {
+ border-color: rgba(175, 47, 47, 0.2);
+}
+
+.clear-completed,
+html .clear-completed:active {
+ float: right;
+ position: relative;
+ line-height: 20px;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+.clear-completed:hover {
+ text-decoration: underline;
+}
+
+.info {
+ margin: 65px auto 0;
+ color: #bfbfbf;
+ font-size: 10px;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ text-align: center;
+}
+
+.info p {
+ line-height: 1;
+}
+
+.info a {
+ color: inherit;
+ text-decoration: none;
+ font-weight: 400;
+}
+
+.info a:hover {
+ text-decoration: underline;
+}
+
+/*
+ Hack to remove background from Mobile Safari.
+ Can't use it globally since it destroys checkboxes in Firefox
+*/
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+
+ .toggle-all,
+ .todo-list li .toggle {
+ background: none;
+ }
+
+ .todo-list li .toggle {
+ height: 40px;
+ }
+}
+
+@media (max-width: 430px) {
+ .footer {
+ height: 50px;
+ }
+
+ .filters {
+ bottom: 10px;
+ }
+}
diff --git a/packages/desktop/examples/todomvc.rs b/packages/desktop/examples/todomvc.rs
new file mode 100644
index 000000000..fa2eae08e
--- /dev/null
+++ b/packages/desktop/examples/todomvc.rs
@@ -0,0 +1,171 @@
+#![allow(non_upper_case_globals, non_snake_case)]
+
+use dioxus_core as dioxus;
+use dioxus_core::prelude::*;
+use dioxus_core_macro::*;
+use dioxus_hooks::*;
+use dioxus_html as dioxus_elements;
+use simple_logger::SimpleLogger;
+
+use std::collections::HashMap;
+
+fn main() {
+ if cfg!(debug_assertions) {
+ SimpleLogger::new().init().unwrap();
+ }
+
+ dioxus_desktop::launch(App, |c| c)
+}
+
+#[derive(PartialEq)]
+pub enum FilterState {
+ All,
+ Active,
+ Completed,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct TodoItem {
+ pub id: u32,
+ pub checked: bool,
+ pub contents: String,
+}
+pub type Todos = HashMap;
+
+pub static App: FC<()> = |(cx, _)| {
+ // Share our TodoList to the todos themselves
+ use_provide_state(cx, || Todos::new());
+
+ // Save state for the draft, filter
+ let mut draft = use_state(cx, || "".to_string());
+ let mut filter = use_state(cx, || FilterState::All);
+ let mut todo_id = use_state(cx, || 0);
+
+ // Consume the todos
+ let todos = use_shared_state::