Saving changes before reverting

Author: David-OConnor

src/dom_types.rs

@@ -372,6 +372,13 @@ 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 {
@@ -423,6 +430,13 @@ 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"
@@ -535,7 +549,7 @@ macro_rules! make_tags {
         }
 
         impl ToString for Tag {
-            pub fn to_string(&self) -> String {
+            fn to_string(&self) -> String {
                 match self {
                     Tag::Custom(name) => &name,
                     $ (
@@ -798,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());
@@ -925,7 +939,7 @@ impl <Ms: Clone + 'static>crate::vdom::DomEl<Ms> for El<Ms> {
     fn id(self) -> Option<u32> {
         self.id
     }
-    fn raw_html(self) -> boolean {
+    fn raw_html(self) -> bool {
         self.raw_html
     }
         fn namespace(self) -> Option<Namespace> {

src/lib.rs

@@ -27,7 +27,8 @@ pub use crate::{
     fetch::{Method, Request, spawn_local},
     websys_bridge::{to_input, to_kbevent, to_mouse_event, to_select, to_textarea, to_html_el},
     routing::push_route,
-    vdom::{App, run}
+    util::{document, window},
+    vdom::{App, run},
 };
 
 /// Create an element flagged in a way that it will not be rendered. Useful

src/vdom.rs

@@ -185,7 +185,8 @@ pub fn setup_els<Ms>(document: &web_sys::Document, el_vdom: &mut impl DomEl<Ms>,
     let mut id = active_id;
     el_vdom.set_id(Some(id));
     id += 1;  // Raise the id after each element we process.
-    el_vdom.nest_level() = Some(active_level);
+    // todo perhaps put back
+//    el_vdom.nest_level() = Some(active_level);
 
     // Create the web_sys element; add it to the working tree; store it in
     // its corresponding vdom El.
@@ -512,6 +513,14 @@ pub fn run<Ms, Mdl, E>(
     panic::set_hook(Box::new(console_error_panic_hook::hook));
 }
 
+pub trait Attrs: PartialEq + ToString {
+    fn vals(self) -> HashMap<String, String>;
+}
+
+pub trait Style: PartialEq + ToString {
+    fn vals(self) -> HashMap<String, String>;
+}
+
 pub trait Listener<Ms>: Sized {
     fn attach<T: AsRef<web_sys::EventTarget>>(&mut self, el_ws: &T, mailbox: Mailbox<Ms>);
     fn detach<T: AsRef<web_sys::EventTarget>>(&self, el_ws: &T);
@@ -520,10 +529,10 @@ pub trait Listener<Ms>: Sized {
 /// WIP towards a modular VDOM
 /// Assumes dependency on web_sys.
 // todo: Do we need <Ms> ?
-pub trait DomEl<Ms>: Sized {
+pub trait DomEl<Ms>: Sized + PartialEq {
     type Tg: PartialEq + ToString;  // todo tostring
-    type At: PartialEq + ToString;
-    type St: PartialEq + ToString;
+    type At: Attrs;
+    type St: Style;
     type Ls: Listener<Ms>;
     type Tx: PartialEq + ToString + Clone + Default;
 
@@ -539,7 +548,7 @@ pub trait DomEl<Ms>: Sized {
     fn will_unmount(self) -> Option<Box<FnMut(&web_sys::Element)>>;
     fn websys_el(self) -> Option<web_sys::Element>;
     fn id(self) -> Option<u32>;
-    fn raw_html(self) -> boolean;
+    fn raw_html(self) -> bool;
     // todo tying to dom_types is temp - defeats the urpose of the trait
     fn namespace(self) -> Option<crate::dom_types::Namespace>;
 

src/websys_bridge.rs

@@ -1,7 +1,7 @@
 //! This file contains interactions with web_sys.
 use wasm_bindgen::JsCast;
 
-use crate::vdom::DomEl;
+use crate::vdom::{DomEl, Attrs, Style};
 
 // todo: How coupled should this be to Seed, vdom, and dom_types?
 
@@ -116,19 +116,19 @@ pub fn make_websys_el<Ms>(el_vdom: &impl DomEl<Ms>, document: &web_sys::Document
     where Ms: Clone,
 {
     // Create the DOM-analog element; it won't render until attached to something.
-    let tag = el_vdom.tag().as_str();
+    let tag = &el_vdom.tag().to_string();
     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 {
+    for (name, val) in &el_vdom.attrs().vals() {
         set_attr_shim(&el_ws, name, val);
     }
 
     // Style is just an attribute in the actual Dom, but is handled specially in our vdom;
     // merge the different parts of style here.
-    if el_vdom.style().vals.keys().len() > 0 {
+    if el_vdom.style().vals().keys().len() > 0 {
         el_ws.set_attribute("style", &el_vdom.style().to_string()).expect("Problem setting style");
     }
 
@@ -206,7 +206,7 @@ pub fn patch_el_details<Ms>(
     }
 
     if old.attrs() != new.attrs() {
-        for (key, new_val) in &new.attrs().vals {
+        for (key, new_val) in &new.attrs().vals() {
             match old.attrs().vals().get(key) {
                 Some(old_val) => {
                     // The value's different
@@ -218,7 +218,7 @@ pub fn patch_el_details<Ms>(
             }
         }
         // Remove attributes that aren't in the new vdom.
-        for name in old.attrs().vals.keys() {
+        for name in old.attrs().vals().keys() {
             if new.attrs().vals().get(name).is_none() {
                 old_el_ws.remove_attribute(name).expect("Removing an attribute");
             }
@@ -240,7 +240,7 @@ pub fn patch_el_details<Ms>(
         // Text is stored in special Text nodes that don't have a direct-relation to
         // the vdom.
 
-        let text = new.text().clone().unwrap_or_default();
+        let text = new.text().clone().unwrap_or_default().to_string();
 
         if new.raw_html() {
             old_el_ws.set_inner_html(&text)