Fixed a bug in window events. Top-level children now mount direclty t…

…o the mount point instead of an intermediate element
seed-rs · Apr 8, 2019 · 61a64aa · 61a64aa
1 parent 5476109
commit 61a64aa
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 327 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.3.1
+- `Top level view functions now return `Vec<El<Ms>>` instead of `El<Ms>`, mounted directly to
+ the mount point. (Breaking)
+- `push_route()` can now accept a `Vec<&str>`, depreciating `push_path()`.
+- Fixed a bug where window events couldn't be enabled on initialization
+
 ## v0.3.0
 - `update` function now takes a mutable ref of the model. (Breaking)
 - `Update` (update's return type) is now a struct. (Breaking)

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "seed"
-version = "0.3.0"
+version = "0.3.1"
 description = "A Rust framework for creating web apps, using WebAssembly"
 authors = ["DavidOConnor <david.alan.oconnor@gmail.com>"]
 license = "MIT"
@@ -79,7 +79,6 @@ members = [
     "examples/todomvc",
     "examples/window_events",
     "examples/websocket",
-    "proc_macros",
 ]
 
 exclude = [

diff --git a/README.md b/README.md
@@ -145,7 +145,7 @@ fn success_level(clicks: i32) -> El<Msg> {
 }
 
 /// The top-level component we pass to the virtual dom.
-fn view(model: &Model) -> El<Msg> {
+fn view(model: &Model) -> Vec<El<Msg>> {
     let plural = if model.count == 1 {""} else {"s"};
 
     // Attrs, Style, Events, and children may be defined separately.
@@ -155,27 +155,29 @@ fn view(model: &Model) -> El<Msg> {
             "text-align" => "center"
     };
 
-     div![ outer_style,
-        h1![ "The Grand Total" ],
-        div![
-            style!{
-                // Example of conditional logic in a style.
-                "color" => if model.count > 4 {"purple"} else {"gray"};
-                // When passing numerical values to style!, "px" is implied.
-                "border" => "2px solid #004422"; "padding" => 20
-            },
-            // We can use normal Rust code and comments in the view.
-            h3![ format!("{} {}{} so far", model.count, model.what_we_count, plural) ],
-            button![ simple_ev(Ev::Click, Msg::Increment), "+" ],
-            button![ simple_ev(Ev::Click, Msg::Decrement), "-" ],
-
-            // Optionally-displaying an element
-            if model.count >= 10 { h2![ style!{"padding" => 50}, "Nice!" ] } else { seed::empty() }
-        ],
-        success_level(model.count),  // Incorporating a separate component
-
-        h3![ "What precisely is it we're counting?" ],
-        input![ attrs!{At::Value => model.what_we_count}, input_ev(Ev::Input, Msg::ChangeWWC) ]
+    vec![
+        div![ outer_style,
+            h1![ "The Grand Total" ],
+            div![
+                style!{
+                    // Example of conditional logic in a style.
+                    "color" => if model.count > 4 {"purple"} else {"gray"};
+                    // When passing numerical values to style!, "px" is implied.
+                    "border" => "2px solid #004422"; "padding" => 20
+                },
+                // We can use normal Rust code and comments in the view.
+                h3![ format!("{} {}{} so far", model.count, model.what_we_count, plural) ],
+                button![ simple_ev(Ev::Click, Msg::Increment), "+" ],
+                button![ simple_ev(Ev::Click, Msg::Decrement), "-" ],
+
+                // Optionally-displaying an element
+                if model.count >= 10 { h2![ style!{"padding" => 50}, "Nice!" ] } else { seed::empty() }
+            ],
+            success_level(model.count),  // Incorporating a separate component
+
+            h3![ "What precisely is it we're counting?" ],
+            input![ attrs!{At::Value => model.what_we_count}, input_ev(Ev::Input, Msg::ChangeWWC) ]
+        ]
     ]
 }
 

diff --git a/examples/layered_structure/Cargo.toml b/examples/layered_structure/Cargo.toml
diff --git a/examples/layered_structure/README.md b/examples/layered_structure/README.md
diff --git a/examples/layered_structure/build.ps1 b/examples/layered_structure/build.ps1
diff --git a/examples/layered_structure/build.sh b/examples/layered_structure/build.sh
diff --git a/examples/layered_structure/index.html b/examples/layered_structure/index.html
diff --git a/examples/layered_structure/pkg/.keep b/examples/layered_structure/pkg/.keep
diff --git a/examples/layered_structure/serve.py b/examples/layered_structure/serve.py
diff --git a/examples/layered_structure/src/lib.rs b/examples/layered_structure/src/lib.rs
diff --git a/examples/todomvc/src/lib.rs b/examples/todomvc/src/lib.rs
@@ -312,8 +312,7 @@ fn view(model: &Model) -> Vec<El<Msg>> {
             ul![class!["todo-list"], todo_els]
         ]
     } else {
-        //        seed::empty()
-        span![]
+        seed::empty()
     };
 
     vec![
@@ -335,8 +334,7 @@ fn view(model: &Model) -> Vec<El<Msg>> {
         if model.active_count() > 0 || model.completed_count() > 0 {
             footer(&model)
         } else {
-            //            seed::empty()
-            span![]
+            seed::empty()
         },
     ]
 }

diff --git a/proc_macros/Cargo.toml b/proc_macros/Cargo.toml
diff --git a/proc_macros/src/lib.rs b/proc_macros/src/lib.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -134,8 +134,8 @@ pub mod tests {
             }
         }
 
-        fn view(_model: &Model) -> El<Msg> {
-            div!["Hello world"]
+        fn view(_model: &Model) -> Vec<El<Msg>> {
+            vec![div!["Hello world"]]
         }
 
         fn window_events(_model: &Model) -> Vec<seed::dom_types::Listener<Msg>> {