Constants not enum WIP.

Author: finnbear

bootstrap

@@ -150,42 +150,17 @@ fn main() {
 
             let variant_name = name.to_case(Case::UpperCamel);
             let variant = to_ident(&variant_name);
-            variants.push(quote! {
-                #[cfg(feature = #variant_name)]
-                #variant
-            });
-
-            collection_feature.children.push(variant_name.clone());
-            features.push(Feature {
-                name: variant_name.clone(),
-                children: Vec::new(),
-            });
-
-            // Don't need when export separate mods #[cfg(feature = #variant_name)]
-            let tokens = quote! {
-                use crate::IconProps;
-
-                #[inline(never)]
-                pub fn #function_ident(IconProps{icon_id: _, title, width, height, onclick, oncontextmenu, class, style, role}: &IconProps) -> yew::Html {
-                    yew::html! {
-                        #svg_tokens
-                    }
-                }
-            };
-
-            let output = tokens.to_string(); // reformat(tokens.to_string(), true).unwrap();
-            write(
-                format!("src/generated/{}/{}.rs", feature_name, function_name),
-                output,
-            )
-            .unwrap();
-
-            function_mods.push(quote! {
-                #[cfg(feature = #variant_name)]
-                pub mod #function_ident;
-            });
 
             cases.push(quote! {
+                const #variant: IconData = IconData {
+                    name: #variant_name,
+                    html: #[inline(never)] |IconProps{icon_id: _, title, width, height, onclick, oncontextmenu, class, style, role}: &IconProps| -> yew::Html {
+                        yew::html! {
+                            #svg_tokens
+                        }
+                    },
+                };
+
                 #[cfg(feature = #variant_name)]
                 IconId::#variant => #feature_ident::#function_ident::#function_ident(props)
             });
@@ -294,11 +269,7 @@ fn main() {
         "simple-icons/icons",
         r##"From https://github.com/simple-icons/simple-icons - Licensed under CC0; check brand guidelines"##,
     );
-    generate(
-        "Extra",
-        "extra",
-        r##"Check brand guidelines"##,
-    );
+    generate("Extra", "extra", r##"Check brand guidelines"##);
 
     let tokens = quote! {
         /// Identifies which icon to render. Variants are all disabled by default, but can be

src/generator.rs

@@ -2,21 +2,64 @@
 
 #[cfg(not(feature = "generator"))]
 mod generated;
-#[cfg(not(feature = "generator"))]
-pub use generated::{get_svg, IconId};
+
+use std::cmp::Ordering;
+use std::fmt::Debug;
 
 #[cfg(not(feature = "generator"))]
 use yew::prelude::*;
 
 #[cfg(not(feature = "generator"))]
 use yew::virtual_dom::AttrValue;
 
+#[derive(Copy, Clone)]
+pub struct IconData {
+    name: &'static str,
+    html: fn(props: &IconProps) -> Html,
+}
+
+impl IconData {
+    const HELLO_WORLD: IconData = IconData {
+        name: "HelloWorld",
+        html: |props: &IconProps| {
+            html! {
+                <p>{"Hello world"}</p>
+            }
+        },
+    };
+}
+
+impl PartialEq for IconData {
+    fn eq(&self, other: &Self) -> bool {
+        self.name.eq(other.name)
+    }
+}
+impl Eq for IconData {}
+
+impl Ord for IconData {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.name.cmp(other.name)
+    }
+}
+
+impl PartialOrd for IconData {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Debug for IconData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.name)
+    }
+}
+
 /// For customizing icon rendering. Only `icon_id` is required.
 #[cfg(not(feature = "generator"))]
 #[derive(Properties, PartialEq)]
 pub struct IconProps {
-    /// Which icon to render. Enable icons with feature flags.
-    pub icon_id: IconId,
+    /// Which icon to render. Enable icon collections with feature flags.
+    pub data: IconData,
     /// Tooltip text.
     #[prop_or(None)]
     pub title: Option<AttrValue>,
@@ -37,7 +80,7 @@ pub struct IconProps {
     pub class: Classes,
     /// For inline CSS.
     #[prop_or(None)]
-    pub style: Option<AttrValue>, 
+    pub style: Option<AttrValue>,
     #[prop_or(None)]
     pub role: Option<AttrValue>,
 }
@@ -61,38 +104,34 @@ pub struct IconProps {
 #[cfg(not(feature = "generator"))]
 #[function_component(Icon)]
 pub fn icon(props: &IconProps) -> Html {
-    get_svg(props)
+    (props.data.html)(props)
 }
 
 #[cfg(test)]
 mod test {
-    use crate::{Icon, IconId, IconProps};
-    use enum_iterator::IntoEnumIterator;
+    use crate::{Icon, IconData, IconProps};
     use yew::prelude::*;
 
     #[tokio::test]
     async fn test() {
-        for icon_id in IconId::into_enum_iter() {
-            println!("rendering icon {:?}", icon_id);
-            let icon_id = icon_id.clone();
-            let renderer = yew::ServerRenderer::<Icon>::with_props(move || IconProps {
-                icon_id,
-                width: "2em".into(),
-                height: "3em".into(),
-                onclick: Some(Callback::from(|_e: MouseEvent| {})),
-                class: Classes::new(),
-                oncontextmenu: None,
-                style: None,
-                title: None,
-                role: Some("presentation".into()),
-            });
-
-            let rendered = renderer.render().await;
-
-            assert!(rendered.contains("2em"), "{:?} {}", icon_id, rendered);
-            assert!(rendered.contains("3em"), "{:?} {}", icon_id, rendered);
-
-            //println!("{:?} => {}", icon_id, rendered);
-        }
+        let data = IconData::HELLO_WORLD;
+        let renderer = yew::ServerRenderer::<Icon>::with_props(move || IconProps {
+            data,
+            width: "2em".into(),
+            height: "3em".into(),
+            onclick: Some(Callback::from(|_e: MouseEvent| {})),
+            class: Classes::new(),
+            oncontextmenu: None,
+            style: None,
+            title: None,
+            role: Some("presentation".into()),
+        });
+
+        let rendered = renderer.render().await;
+
+        assert!(rendered.contains("2em"), "{data:?} {}", rendered);
+        assert!(rendered.contains("3em"), "{data:?} {}", rendered);
+
+        //println!("{:?} => {}", icon_id, rendered);
     }
 }