Merge branch 'master' of https://github.com/David-OConnor/seed

Author: David-OConnor

src/dom_types.rs

@@ -12,6 +12,23 @@ use crate::vdom::Mailbox;  // todo temp
 
 //use regex::Regex;
 
+/// Common Namespaces
+#[derive(Debug,Clone,PartialEq)]
+pub enum Namespace {
+    /// SVG Namespace
+    Svg,
+    Custom(String)
+}
+
+impl Namespace {
+    pub fn as_str(&self) -> &str {
+        use self::Namespace::*;
+        match self{
+            Svg => "http://www.w3.org/2000/svg",
+            Custom(s) => s
+        }
+    }
+}
 
 // todo cleanup enums vs &strs for restricting events/styles/attrs to
 // todo valid ones.
@@ -520,12 +537,14 @@ make_tags! {
 
     Details => "details", Dialog => "dialog", Menu => "menu", MenuItem => "menuitem", Summary => "summary",
 
-    Content => "content", Element => "element", Shadow => "shadow", Slot => "slot", Template => "template"
+    Content => "content", Element => "element", Shadow => "shadow", Slot => "slot", Template => "template",
+
+    Svg => "svg", Line => "line", Rect => "rect", Circle => "circle"
 }
 
 /// An component in our virtual DOM.
 pub struct El<Ms: Clone + 'static> {
-    // M sis a message type, as in part of TEA.
+    // Ms is a message type, as in part of TEA.
     // We call this 'El' instead of 'Element' for brevity, and to prevent
     // confusion with web_sys::Element.
 
@@ -536,6 +555,7 @@ pub struct El<Ms: Clone + 'static> {
     pub listeners: Vec<Listener<Ms>>,
     pub text: Option<String>,
     pub children: Vec<El<Ms>>,
+    pub namespace: Option<Namespace>,
 
     // Things that get filled in later, to assist with rendering.
     pub id: Option<u32>,
@@ -550,16 +570,17 @@ pub struct El<Ms: Clone + 'static> {
 
 impl<Ms: Clone + 'static> El<Ms> {
     pub fn new(tag: Tag, attrs: Attrs, style: Style,
-               listeners: Vec<Listener<Ms>>, text: &str, children: Vec<El<Ms>>) -> Self {
+               listeners: Vec<Listener<Ms>>, text: &str, children: Vec<El<Ms>>, namespace: Option<Namespace>) -> Self {
         Self {tag, attrs, style, text: Some(text.into()), children,
-            el_ws: None, listeners, id: None, nest_level: None, raw_html: false}
+            el_ws: None, listeners, id: None, nest_level: None, raw_html: false, namespace
+        }
     }
 
     /// Create an empty element, specifying only the tag
     pub fn empty(tag: Tag) -> Self {
         Self {tag, attrs: Attrs::empty(), style: Style::empty(),
             text: None, children: Vec::new(), el_ws: None,
-            listeners: Vec::new(), id: None, nest_level: None, raw_html: false}
+            listeners: Vec::new(), id: None, nest_level: None, raw_html: false, namespace: None }
     }
 
     /// Create an element that will display markdown from the text you pass to it, as HTML
@@ -651,6 +672,7 @@ impl<Ms: Clone + 'static> El<Ms> {
             nest_level: None,
             el_ws: self.el_ws.clone(),
             raw_html: self.raw_html,
+            namespace: self.namespace.clone(),
         }
     }
 
@@ -682,6 +704,7 @@ impl<Ms: Clone + 'static> Clone for El<Ms> {
             el_ws: self.el_ws.clone(),
             listeners: Vec::new(),
             raw_html: self.raw_html,
+            namespace: self.namespace.clone(),
         }
     }
 }

src/shortcuts.rs

@@ -853,7 +853,54 @@ macro_rules! iframe {
     };
 }
 
-//// End element-creaion macros.
+#[macro_export]
+macro_rules! svg {
+    ( $($part:expr),* $(,)* ) => {
+        {
+            let mut el = El::empty(seed::dom_types::Tag::Svg);
+            el.namespace = Some(seed::dom_types::Namespace::Svg);
+            $ ( $part.update(&mut el); )*
+            el
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! line {
+    ( $($part:expr),* $(,)* ) => {
+        {
+            let mut el = El::empty(seed::dom_types::Tag::Line);
+            el.namespace = Some(seed::dom_types::Namespace::Svg);
+            $ ( $part.update(&mut el); )*
+            el
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! rect {
+    ( $($part:expr),* $(,)* ) => {
+        {
+            let mut el = El::empty(seed::dom_types::Tag::Rect);
+            el.namespace = Some(seed::dom_types::Namespace::Svg);
+            $ ( $part.update(&mut el); )*
+            el
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! circle {
+    ( $($part:expr),* $(,)* ) => {
+        {
+            let mut el = El::empty(seed::dom_types::Tag::Circle);
+            el.namespace = Some(seed::dom_types::Namespace::Svg);
+            $ ( $part.update(&mut el); )*
+            el
+        }
+    };
+}
+//// End element-creation macros.
 
 
 /// Provide a shortcut for creating attributes.

src/websys_bridge.rs

@@ -35,7 +35,11 @@ fn set_attr_shim(el_ws: &web_sys::Element, name: &str, val: &str) {
 /// See also: https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.Node.html
 pub fn make_websys_el<Ms: Clone>(el_vdom: &mut dom_types::El<Ms>, document: &web_sys::Document) -> web_sys::Element {
     // Create the DOM-analog element; it won't render until attached to something.
-    let el_ws = document.create_element(&el_vdom.tag.as_str()).expect("Problem creating web-sys El");
+    let tag = el_vdom.tag.as_str();
+    let el_ws = match el_vdom.namespace {
+        Some(ref ns) => document.create_element_ns(Some(ns.as_str()), tag).expect("Problem creating web-sys El"),
+        None => document.create_element(tag).expect("Problem creating web-sys El")
+    };
 
     for (name, val) in &el_vdom.attrs.vals {
         set_attr_shim(&el_ws, name, val);