Merge troubleshooting

Author: David-OConnor

Cargo.toml

@@ -16,10 +16,10 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]
 
 [dev-dependencies]
-wasm-bindgen-test = "^0.2.29" # NOTE: keep in sync with wasm-bindgen version
+wasm-bindgen-test = "^0.2.31" # NOTE: keep in sync with wasm-bindgen version
 
 [dependencies]
-wasm-bindgen = {version = "^0.2.29", features = ["serde-serialize"]}
+wasm-bindgen = {version = "^0.2.31", features = ["serde-serialize"]}
 js-sys = "0.3.6"
 console_error_panic_hook = "^0.1.5"
 serde = { version = "^1.0.80", features = ['derive'] }

examples/homepage/README.md

@@ -1,4 +1,4 @@
 The Seed homepage, also serving as an example. Includes
- simple interactions, markdown elements, basic routing, and view markup.
+ simple interactions, markdown elements, routing, and view markup.
 
 # [Homepage repo](https://github.com/David-OConnor/seed-homepage)

src/dom_types.rs

@@ -11,39 +11,6 @@ use wasm_bindgen::{closure::Closure, JsCast};
 use crate::vdom::Mailbox;
 
 
-
-
-
-//  pub tag: Tag,
-//    pub attrs: Attrs,
-//    pub style: Style,
-//    pub listeners: Vec<Listener<Ms>>,
-//    pub text: Option<String>,
-//    pub children: Vec<El<Ms>>,
-//
-//    // Things that get filled in later, to assist with rendering.
-//    pub id: Option<u32>,  // todo maybe not optional...
-//    pub nest_level: Option<u32>,
-//    pub el_ws: Option<web_sys::Element>,
-//
-//    // todo temp?
-////    pub key: Option<u32>,
-//
-//    pub raw_html: bool,
-//    pub namespace: Option<Namespace>,
-//
-//     // static: bool
-//     // static_to_parent: bool
-//    // ancestors: Vec<u32>  // ids of parent, grandparent etc.
-//
-//    // Lifecycle hooks
-//    pub did_mount: Option<Box<Fn(&web_sys::Element)>>,
-//    pub did_update: Option<Box<Fn(&web_sys::Element)>>,
-//    pub will_unmount: Option<Box<Fn(&web_sys::Element)>>,
-//
-//
-
-
 /// Common Namespaces
 #[derive(Debug,Clone,PartialEq)]
 pub enum Namespace {
@@ -148,6 +115,7 @@ impl<Ms: Clone + 'static> Listener<Ms> {
         }
     }
 
+    // todo deal with duplicates between the main methods and the trait
     /// This method is where the processing logic for events happens.
     pub fn attach<T>(&mut self, el_ws: &T, mailbox: Mailbox<Ms>)
         where T: AsRef<web_sys::EventTarget> {
@@ -181,6 +149,41 @@ impl<Ms: Clone + 'static> Listener<Ms> {
     }
 }
 
+// todo don't have both method and trait fns for these
+impl<Ms: Clone + 'static> crate::vdom::Listener<Ms> for Listener<Ms> {
+        /// This method is where the processing logic for events happens.
+    fn attach<T>(&mut self, el_ws: &T, mailbox: Mailbox<Ms>)
+        where T: AsRef<web_sys::EventTarget> {
+        // This and detach taken from Draco.
+        let mut handler = self.handler.take().expect("Can't find old handler");
+
+        let closure = Closure::wrap(
+            Box::new(move |event: web_sys::Event| {
+                mailbox.send(handler(event))
+            })
+                as Box<FnMut(web_sys::Event) + 'static>,
+        );
+
+        (el_ws.as_ref() as &web_sys::EventTarget)
+            .add_event_listener_with_callback(&self.trigger, closure.as_ref().unchecked_ref())
+            .expect("problem adding listener to element");
+
+        // Store the closure so we can detach it later. Not detaching it when an element
+        // is removed will trigger a panic.
+        self.closure = Some(closure);
+//        self.handler.replace(handler);  // todo ?
+    }
+
+    fn detach<T>(&self, el_ws: &T)
+        where T: AsRef<web_sys::EventTarget> {
+        // This and attach taken from Draco.
+        let closure = self.closure.as_ref().unwrap();
+        (el_ws.as_ref() as &web_sys::EventTarget)
+            .remove_event_listener_with_callback(&self.trigger, closure.as_ref().unchecked_ref())
+            .expect("problem removing listener from element");
+    }
+}
+
 impl<Ms: Clone + 'static>  PartialEq for Listener<Ms> {
     fn eq(&self, other: &Self) -> bool {
         // todo we're only checking the trigger - will miss changes if
@@ -347,14 +350,6 @@ impl Attrs {
         result
     }
 
-    /// Create an HTML-compatible string representation
-    pub fn to_string(&self) -> String {
-        self.vals.iter()
-            .map(|(k,v)|format!("{}=\"{}\"", k, v))
-            .collect::<Vec<_>>()
-            .join(" ")
-    }
-
     /// Add a new key, value pair
     pub fn add(&mut self, key: &str, val: &str) {
         self.vals.insert(key.to_string(), val.to_string());
@@ -377,6 +372,23 @@ impl Attrs {
     }
 }
 
+// todo temp duplication of trait and main methods for vals
+impl crate::vdom::Attrs for Attrs {
+    fn vals(self) -> HashMap<String, String> {
+        self.vals
+    }
+}
+
+impl ToString for Attrs {
+    /// Create an HTML-compatible string representation
+    fn to_string(&self) -> String {
+        self.vals.iter()
+            .map(|(k,v)|format!("{}=\"{}\"", k, v))
+            .collect::<Vec<_>>()
+            .join(" ")
+    }
+}
+
 /// Handle Style separately from Attrs, since it commonly involves multiple parts,
 /// and has a different semantic meaning.
 #[derive(Clone, PartialEq)]
@@ -404,18 +416,6 @@ impl Style {
         Self { vals: HashMap::new() }
     }
 
-    /// Output style as a string, as would be set in the DOM as the attribute value
-    /// for 'style'. Eg: "display: flex; font-size: 1.5em"
-    pub fn to_string(&self) -> String {
-        if self.vals.keys().len() > 0 {
-            self.vals
-                .iter()
-                .map(|(k, v)| format!("{}:{}", k, v))
-                .collect::<Vec<_>>()
-                .join(";")
-        } else { String::new() }
-    }
-
     pub fn add(&mut self, key: &str, val: &str) {
         self.vals.insert(key.to_string(), val.to_string());
     }
@@ -430,6 +430,27 @@ impl Style {
     }
 }
 
+// todo temp duplication of trait and main methods for vals
+impl crate::vdom::Style for Style {
+    fn vals(self) -> HashMap<String, String> {
+        self.vals
+    }
+}
+
+impl ToString for Style {
+    /// Output style as a string, as would be set in the DOM as the attribute value
+    /// for 'style'. Eg: "display: flex; font-size: 1.5em"
+    fn to_string(&self) -> String {
+        if self.vals.keys().len() > 0 {
+            self.vals
+                .iter()
+                .map(|(k, v)| format!("{}:{}", k, v))
+                .collect::<Vec<_>>()
+                .join(";")
+        } else { String::new() }
+    }
+}
+
 /// Similar to tag population.
 macro_rules! make_events {
     // Create shortcut macros for any element; populate these functions in this module.
@@ -527,12 +548,12 @@ macro_rules! make_tags {
             )+
         }
 
-        impl Tag {
-            pub fn as_str(&self) -> &str {
+        impl ToString for Tag {
+            fn to_string(&self) -> String {
                 match self {
                     Tag::Custom(name) => &name,
                     $ (
-                        Tag::$tag_camel => $tag,
+                        Tag::$tag_camel => $tag.to_string(),
                     ) +
                 }
             }
@@ -791,7 +812,7 @@ impl<Ms: Clone + 'static> El<Ms> {
     fn _html(&self) -> String {
         let text = self.text.clone().unwrap_or_default();
 
-        let opening = String::from("<") + self.tag.as_str() + &self.attrs.to_string() +
+        let opening = String::from("<") + &self.tag.to_string() + &self.attrs.to_string() +
             " style=\"" + &self.style.to_string() + ">\n";
 
         let inner = self.children.iter().fold(String::new(), |result, child| result + &child._html());
@@ -860,15 +881,6 @@ impl<Ms: Clone + 'static> Clone for El<Ms> {
     }
 }
 
-pub type SeedEl<Ms> = crate::vdom::DomEl<
-    Tag,
-    Attrs,
-    Style,
-    String,
-    Listener<Ms>,
-    El<Ms>
->;
-
 impl<Ms: Clone + 'static> PartialEq for El<Ms> {
     fn eq(&self, other: &Self) -> bool {
         // todo Again, note that the listeners check only checks triggers.
@@ -884,8 +896,16 @@ impl<Ms: Clone + 'static> PartialEq for El<Ms> {
     }
 }
 
-impl <Ms: Clone + 'static>crate::vdom::DomEl<Tag, Attrs, Style, String,
-        Listener<Ms>, El<Ms>> for El<Ms> {
+// todo consider splitting this up into subcrates.
+
+// todo: Consider moving this out into an outer crate/file
+impl <Ms: Clone + 'static>crate::vdom::DomEl<Ms> for El<Ms> {
+    type Tg = Tag;
+    type At = Attrs;
+    type St = Style;
+    type Ls = Listener<Ms>;
+    type Tx = String;
+
     fn tag(self) -> Tag {
         self.tag
     }
@@ -904,13 +924,38 @@ impl <Ms: Clone + 'static>crate::vdom::DomEl<Tag, Attrs, Style, String,
     fn children(self) -> Vec<Self> {
         self.children
     }
-
+    fn did_mount(self) -> Option<Box<FnMut(&web_sys::Element)>> {
+        self.did_mount
+    }
+    fn did_update(self) -> Option<Box<FnMut(&web_sys::Element)>> {
+        self.did_mount
+    }
+    fn will_unmount(self) -> Option<Box<FnMut(&web_sys::Element)>> {
+        self.did_mount
+    }
     fn websys_el(self) -> Option<web_sys::Element> {
         self.el_ws
     }
     fn id(self) -> Option<u32> {
         self.id
     }
+    fn raw_html(self) -> bool {
+        self.raw_html
+    }
+        fn namespace(self) -> Option<Namespace> {
+        self.namespace
+    }
+
+    fn empty(self) -> Self {
+        self.empty()
+    }
+
+    fn set_id(&mut self, id: Option<u32>) {
+        self.id = id
+    }
+    fn set_websys_el(&mut self, el_ws: Option<web_sys::Element>) {
+        self.el_ws = el_ws
+    }
 
 //    fn make_websys_el(&mut self, document: &web_sys::Document) -> web_sys::Element {
 //        crate::websys_bridge::make_websys_el(self, document)
@@ -973,6 +1018,7 @@ pub mod tests {
         let mut el: El<Msg> = div![ "test" ];
         crate::vdom::setup_els(&crate::util::document(), &mut el, 0, 0);
         assert_eq!(expected, el.el_ws.unwrap().outer_html());
+<<<<<<< HEAD
     }
 
     #[wasm_bindgen_test]
@@ -997,12 +1043,14 @@ pub mod tests {
     pub fn attrs() {
         let expected = "<section class=\"biochemistry\" src=\"https://seed-rs.org\">ok</section>";
 
-        let mut el: El<Msg> = div![
+        let mut el: El<Msg> = section![
             attrs!{"class" => "biochemistry"; "src" => "https://seed-rs.org"},
             "ok"
         ];
 
         crate::vdom::setup_els(&crate::util::document(), &mut el, 0, 0);
         assert_eq!(expected, el.el_ws.unwrap().outer_html());
+=======
+>>>>>>> 953d5a04f788c3c06fffc8a82a42c4d0c93ff981
     }
 }

src/lib.rs

@@ -28,7 +28,11 @@ pub use crate::{
     websys_bridge::{to_input, to_kbevent, to_mouse_event, to_select, to_textarea, to_html_el},
     routing::push_route,
     util::{document, window},
+<<<<<<< HEAD
     vdom::{App, run}
+=======
+    vdom::{App, run},
+>>>>>>> 75ac8af8d827a3db6ad6325e70086f31583dfcb8
 };
 
 /// Create an element flagged in a way that it will not be rendered. Useful

src/routing.rs

@@ -4,15 +4,19 @@ use wasm_bindgen::{closure::Closure, JsCast, JsValue};
 
 use crate::util;
 
+// todo: How coupled should this be to Seed, vdom, and dom_types?
 
 /// A convenience function to prevent repetitions
 fn get_path() -> String {
     let path = util::window().location().pathname().expect("Can't find pathname");
     path[1..path.len()].to_string()
 }
 
-pub fn initial<Ms, Mdl>(app: crate::vdom::App<Ms, Mdl>, routes: HashMap<String, Ms>) -> crate::vdom::App<Ms, Mdl>
-    where Ms: Clone + 'static, Mdl: Clone + 'static
+pub fn initial<Ms, Mdl, E>(
+    app: crate::vdom::App<Ms, Mdl, E>,
+    routes: HashMap<String, Ms>
+) -> crate::vdom::App<Ms, Mdl, E>
+    where Ms: Clone + 'static, Mdl: Clone + 'static, E: crate::vdom::DomEl<Ms>
 {
     for (route, route_message) in routes.into_iter() {
         if route == get_path() {
@@ -23,8 +27,11 @@ pub fn initial<Ms, Mdl>(app: crate::vdom::App<Ms, Mdl>, routes: HashMap<String,
     app
 }
 
-pub fn update_popstate_listener<Ms, Mdl>(app: &crate::vdom::App<Ms, Mdl>, routes: HashMap<String, Ms>)
-    where Ms: Clone +'static, Mdl: Clone + 'static
+pub fn update_popstate_listener<Ms, Mdl, E>(
+    app: &crate::vdom::App<Ms, Mdl, E>,
+    routes: HashMap<String, Ms>
+)
+    where Ms: Clone + 'static,  Mdl: Clone + 'static, E: crate::vdom::DomEl<Ms>
 {
 
     let window = util::window();