From 2ac82ae60b6ea0f3d7542f4f33199cbd5557c065 Mon Sep 17 00:00:00 2001
From: Henry Zimmerman <zimhen7@gmail.com>
Date: Tue, 10 Dec 2019 20:16:25 -0500
Subject: [PATCH 1/6] Add children field to props

---
 src/components/mod.rs           | 7 +++++--
 src/components/router_button.rs | 1 +
 src/components/router_link.rs   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/mod.rs b/src/components/mod.rs
index 23a0be0..5880290 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -6,20 +6,23 @@
 mod router_button;
 mod router_link;
 
-use yew::Properties;
+use yew::{Properties, Children};
 
 pub use self::{router_button::RouterButton, router_link::RouterLink};
 use crate::RouterState;
 
 /// Properties for `RouterButton` and `RouterLink`.
-#[derive(Properties, Default, Clone, Debug, PartialEq)]
+#[derive(Properties, Default, Debug)]
 pub struct Props<T: for<'de> RouterState<'de>> {
     /// The route that will be set when the component is clicked.
     pub link: String,
     /// The state to set when changing the route.
     pub state: Option<T>,
+    #[deprecated(note = "Use children field instead to use nested html")]
     /// The text to display.
     pub text: String,
+    /// Html inside the component.
+    pub children: Children,
     /// Disable the component.
     pub disabled: bool,
     /// Classes to be added to component.
diff --git a/src/components/router_button.rs b/src/components/router_button.rs
index 261752c..2d0413d 100644
--- a/src/components/router_button.rs
+++ b/src/components/router_button.rs
@@ -57,6 +57,7 @@ impl<T: for<'de> RouterState<'de>> Component for RouterButton<T> {
                 disabled=self.props.disabled,
             >
                 {&self.props.text}
+                {self.props.children.iter().collect::<VNode>()}
             </button>
         }
     }
diff --git a/src/components/router_link.rs b/src/components/router_link.rs
index 185f50f..4c2a8e1 100644
--- a/src/components/router_link.rs
+++ b/src/components/router_link.rs
@@ -64,6 +64,7 @@ impl<T: for<'de> RouterState<'de>> Component for RouterLink<T> {
                 href=target,
             >
                 {&self.props.text}
+                {self.props.children.iter().collect::<VNode>()}
             </a>
         }
     }

From 44d0825ad8dda14f6c9a3aaac0f3d7942ec4a4ce Mon Sep 17 00:00:00 2001
From: Henry Zimmerman <zimhen7@gmail.com>
Date: Tue, 10 Dec 2019 20:37:41 -0500
Subject: [PATCH 2/6] fix examples

---
 examples/guide/src/guide.rs                  |  4 ++--
 examples/router_component/src/a_component.rs | 14 ++++++--------
 examples/router_component/src/main.rs        | 14 +++++++-------
 src/components/mod.rs                        |  3 ++-
 src/components/router_button.rs              |  5 ++++-
 src/components/router_link.rs                |  5 ++++-
 6 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/examples/guide/src/guide.rs b/examples/guide/src/guide.rs
index 1ed32fe..8c366ec 100644
--- a/examples/guide/src/guide.rs
+++ b/examples/guide/src/guide.rs
@@ -100,13 +100,13 @@ fn render_page_list_item(props: PageProps, route: &Route) -> Html {
         log::debug!("Found an active");
         return html! {
             <li style="padding-left: 4px; padding-right: 4px; padding-top: 6px; padding-bottom: 6px; background-color: lightgray;">
-                <RouterLink link=props.page_url text={props.title} />
+                <RouterLink link=props.page_url.clone()> {&props.title} </RouterLink>
             </li>
         };
     } else {
         return html! {
             <li style="padding-left: 4px; padding-right: 4px; padding-top: 6px; padding-bottom: 6px; background-color: white;">
-                <RouterLink link=props.page_url text={props.title} />
+                <RouterLink link=props.page_url.clone()> {&props.title} </RouterLink>
             </li>
         };
     }
diff --git a/examples/router_component/src/a_component.rs b/examples/router_component/src/a_component.rs
index 21be181..66ba710 100644
--- a/examples/router_component/src/a_component.rs
+++ b/examples/router_component/src/a_component.rs
@@ -36,14 +36,12 @@ impl Component for AModel {
             <div>
                 { "I am the A component"}
                 <div>
-                    <RouterButton:
-                        text=String::from("Go to a/c"),
-                        link="/a/c",
-                    />
-                    <RouterButton:
-                        text=String::from("Go to a/d (route does not exist)"),
-                        link="/a/d",
-                    />
+                    <RouterButton link="/a/c">
+                        {"Go to a/c"}
+                    </RouterButton>
+                    <RouterButton link="/a/d">
+                        {"Go to a/d (route does not exist)"}
+                    </RouterButton>
                 </div>
                 <div>
                 {
diff --git a/examples/router_component/src/main.rs b/examples/router_component/src/main.rs
index 1c1e139..7b1b2d2 100644
--- a/examples/router_component/src/main.rs
+++ b/examples/router_component/src/main.rs
@@ -43,13 +43,13 @@ impl Component for Model {
         html! {
             <div>
                 <nav class="menu",>
-                    <RouterButton: text=String::from("Go to A"), link="/a/", />
-                    <RouterLink: text=String::from("Go to B"), link="/b/#", />
-                    <RouterButton: text=String::from("Go to C"), link="/c", />
-                    <RouterButton: text=String::from("Go to A/C"), link="/a/c", />
-                    <RouterButton: text=String::from("Go to E (hello there)"), link="/e/there", />
-                    <RouterButton: text=String::from("Go to E (hello world)"), link="/e/world", />
-                    <RouterButton: text=String::from("Go to bad path"), link="/a_bad_path", />
+                    <RouterButton link="/a/"> {"Go to A"} </RouterButton>
+                    <RouterLink   link="/b/#"> {"Go to B"} </RouterLink>
+                    <RouterButton link="/c"> {"Go to C"} </RouterButton>
+                    <RouterButton link="/a/c"> {"Go to A/C"} </RouterButton>
+                    <RouterButton link="/e/there"> {"Go to E (hello there)"} </RouterButton>
+                    <RouterButton link="/e/world"> {"Go to E (hello world)"} </RouterButton>
+                    <RouterButton link="/a_bad_path"> {"Go to bad path"} </RouterButton>
                 </nav>
                 <div>
                     <Router<AppRoute>
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 5880290..db0ea71 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -11,6 +11,7 @@ use yew::{Properties, Children};
 pub use self::{router_button::RouterButton, router_link::RouterLink};
 use crate::RouterState;
 
+// TODO This should also be PartialEq and Clone. Its blocked on Children not supporting that.
 /// Properties for `RouterButton` and `RouterLink`.
 #[derive(Properties, Default, Debug)]
 pub struct Props<T: for<'de> RouterState<'de>> {
@@ -18,7 +19,7 @@ pub struct Props<T: for<'de> RouterState<'de>> {
     pub link: String,
     /// The state to set when changing the route.
     pub state: Option<T>,
-    #[deprecated(note = "Use children field instead to use nested html")]
+    #[deprecated(note = "Use children field instead (nested html)")]
     /// The text to display.
     pub text: String,
     /// Html inside the component.
diff --git a/src/components/router_button.rs b/src/components/router_button.rs
index 2d0413d..c1b2f54 100644
--- a/src/components/router_button.rs
+++ b/src/components/router_button.rs
@@ -56,7 +56,10 @@ impl<T: for<'de> RouterState<'de>> Component for RouterButton<T> {
                 onclick=cb(|_| Msg::Clicked),
                 disabled=self.props.disabled,
             >
-                {&self.props.text}
+                {
+                    #[allow(deprecated)]
+                    &self.props.text
+                }
                 {self.props.children.iter().collect::<VNode>()}
             </button>
         }
diff --git a/src/components/router_link.rs b/src/components/router_link.rs
index 4c2a8e1..8fc1ac8 100644
--- a/src/components/router_link.rs
+++ b/src/components/router_link.rs
@@ -63,7 +63,10 @@ impl<T: for<'de> RouterState<'de>> Component for RouterLink<T> {
                 disabled=self.props.disabled,
                 href=target,
             >
-                {&self.props.text}
+                {
+                    #[allow(deprecated)]
+                    &self.props.text
+                }
                 {self.props.children.iter().collect::<VNode>()}
             </a>
         }

From 35dea0f2dc2476435c6545c827c15f93079da08d Mon Sep 17 00:00:00 2001
From: Henry Zimmerman <zimhen7@gmail.com>
Date: Tue, 10 Dec 2019 20:43:54 -0500
Subject: [PATCH 3/6] rename the RouterLink to RouterAnchor

---
 examples/guide/src/guide.rs           |  4 ++--
 examples/router_component/src/main.rs |  2 +-
 src/alias.rs                          | 10 ++++++++++
 src/components/mod.rs                 |  3 ++-
 src/components/router_link.rs         | 12 +++++++++---
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/examples/guide/src/guide.rs b/examples/guide/src/guide.rs
index 8c366ec..403e598 100644
--- a/examples/guide/src/guide.rs
+++ b/examples/guide/src/guide.rs
@@ -100,13 +100,13 @@ fn render_page_list_item(props: PageProps, route: &Route) -> Html {
         log::debug!("Found an active");
         return html! {
             <li style="padding-left: 4px; padding-right: 4px; padding-top: 6px; padding-bottom: 6px; background-color: lightgray;">
-                <RouterLink link=props.page_url.clone()> {&props.title} </RouterLink>
+                <RouterAnchor link=props.page_url.clone()> {&props.title} </RouterLink>
             </li>
         };
     } else {
         return html! {
             <li style="padding-left: 4px; padding-right: 4px; padding-top: 6px; padding-bottom: 6px; background-color: white;">
-                <RouterLink link=props.page_url.clone()> {&props.title} </RouterLink>
+                <RouterAnchor link=props.page_url.clone()> {&props.title} </RouterLink>
             </li>
         };
     }
diff --git a/examples/router_component/src/main.rs b/examples/router_component/src/main.rs
index 7b1b2d2..77f5711 100644
--- a/examples/router_component/src/main.rs
+++ b/examples/router_component/src/main.rs
@@ -44,7 +44,7 @@ impl Component for Model {
             <div>
                 <nav class="menu",>
                     <RouterButton link="/a/"> {"Go to A"} </RouterButton>
-                    <RouterLink   link="/b/#"> {"Go to B"} </RouterLink>
+                    <RouterAnchor   link="/b/#"> {"Go to B"} </RouterAnchor>
                     <RouterButton link="/c"> {"Go to C"} </RouterButton>
                     <RouterButton link="/a/c"> {"Go to A/C"} </RouterButton>
                     <RouterButton link="/e/there"> {"Go to E (hello there)"} </RouterButton>
diff --git a/src/alias.rs b/src/alias.rs
index 19a61c3..0bcf0ad 100644
--- a/src/alias.rs
+++ b/src/alias.rs
@@ -55,12 +55,22 @@ macro_rules! define_router_state {
             #[doc = ">](agent/struct.RouteAgentDispatcher.html)`."]
             pub type RouteAgentDispatcher = $crate::agent::RouteAgentDispatcher<$StateT>;
 
+
+            #[allow(deprecated)]
+            #[deprecated(note = "Has been renamed to RouterAnchor")]
             #[cfg(feature="components")]
             #[doc = "Alias to [RouterLink<"]
             #[doc = $StateName]
             #[doc = ">](components/struct.RouterLink.html)`."]
             pub type RouterLink = $crate::components::RouterLink<$StateT>;
 
+
+            #[cfg(feature="components")]
+            #[doc = "Alias to [RouterAnchor<"]
+            #[doc = $StateName]
+            #[doc = ">](components/struct.RouterAnchor.html)`."]
+            pub type RouterAnchor = $crate::components::RouterAnchor<$StateT>;
+
             #[cfg(feature="components")]
             #[doc = "Alias to [RouterButton<"]
             #[doc = $StateName]
diff --git a/src/components/mod.rs b/src/components/mod.rs
index db0ea71..e4aacff 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -8,7 +8,8 @@ mod router_link;
 
 use yew::{Properties, Children};
 
-pub use self::{router_button::RouterButton, router_link::RouterLink};
+#[allow(deprecated)]
+pub use self::{router_button::RouterButton, router_link::RouterLink, router_link::RouterAnchor};
 use crate::RouterState;
 
 // TODO This should also be PartialEq and Clone. Its blocked on Children not supporting that.
diff --git a/src/components/router_link.rs b/src/components/router_link.rs
index 8fc1ac8..959a8fd 100644
--- a/src/components/router_link.rs
+++ b/src/components/router_link.rs
@@ -9,21 +9,27 @@ use super::{Msg, Props};
 use crate::RouterState;
 use yew::virtual_dom::VNode;
 
+/// An anchor tag Component that when clicked, will navigate to the provided route.
+///
+/// Alias to RouterAnchor.
+#[deprecated(note = "Has been renamed to RouterAnchor")]
+pub type RouterLink<T> = RouterAnchor<T>;
+
 /// An anchor tag Component that when clicked, will navigate to the provided route.
 #[derive(Debug)]
-pub struct RouterLink<T: for<'de> RouterState<'de>> {
+pub struct RouterAnchor<T: for<'de> RouterState<'de>> {
     link: ComponentLink<Self>,
     router: RouteAgentDispatcher<T>,
     props: Props<T>,
 }
 
-impl<T: for<'de> RouterState<'de>> Component for RouterLink<T> {
+impl<T: for<'de> RouterState<'de>> Component for RouterAnchor<T> {
     type Message = Msg;
     type Properties = Props<T>;
 
     fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
         let router = RouteAgentDispatcher::new();
-        RouterLink {
+        RouterAnchor {
             link,
             router,
             props,

From 71200e89c98c1b94f030295414ff34de17f327d7 Mon Sep 17 00:00:00 2001
From: Henry Zimmerman <zimhen7@gmail.com>
Date: Tue, 10 Dec 2019 20:56:54 -0500
Subject: [PATCH 4/6] minor format

---
 examples/router_component/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/router_component/src/main.rs b/examples/router_component/src/main.rs
index 77f5711..7968c5b 100644
--- a/examples/router_component/src/main.rs
+++ b/examples/router_component/src/main.rs
@@ -44,7 +44,7 @@ impl Component for Model {
             <div>
                 <nav class="menu",>
                     <RouterButton link="/a/"> {"Go to A"} </RouterButton>
-                    <RouterAnchor   link="/b/#"> {"Go to B"} </RouterAnchor>
+                    <RouterAnchor link="/b/#"> {"Go to B"} </RouterAnchor>
                     <RouterButton link="/c"> {"Go to C"} </RouterButton>
                     <RouterButton link="/a/c"> {"Go to A/C"} </RouterButton>
                     <RouterButton link="/e/there"> {"Go to E (hello there)"} </RouterButton>

From 23595da08f977216f84126de6754f4d3c7e331b1 Mon Sep 17 00:00:00 2001
From: Henry Zimmerman <zimhen7@gmail.com>
Date: Tue, 10 Dec 2019 20:57:36 -0500
Subject: [PATCH 5/6] cargo fmt

---
 examples/servers/warp/src/main.rs | 27 ++++++++++++---------------
 src/components/mod.rs             |  4 ++--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/examples/servers/warp/src/main.rs b/examples/servers/warp/src/main.rs
index da52ae7..f2e95a3 100644
--- a/examples/servers/warp/src/main.rs
+++ b/examples/servers/warp/src/main.rs
@@ -1,12 +1,12 @@
-use std::path::{PathBuf};
-use warp::filters::BoxedFilter;
-use warp::{Reply, Filter};
-use warp::path::Peek;
-use warp::fs::File;
-use warp::path;
+use std::path::PathBuf;
+use warp::{
+    filters::BoxedFilter,
+    fs::File,
+    path::{self, Peek},
+    Filter, Reply,
+};
 
 fn main() {
-
     let localhost = [0, 0, 0, 0];
     let port = 8000;
     let addr = (localhost, port);
@@ -16,8 +16,7 @@ fn main() {
     const ASSETS_DIR: &str = "../../../target/deploy";
     let assets_dir: PathBuf = PathBuf::from(ASSETS_DIR);
 
-    let routes = api()
-        .or(static_files_handler(assets_dir));
+    let routes = api().or(static_files_handler(assets_dir));
 
     warp::serve(routes).run(addr);
 }
@@ -36,12 +35,10 @@ pub fn api() -> BoxedFilter<(impl Reply,)> {
 pub fn static_files_handler(assets_dir: PathBuf) -> BoxedFilter<(impl Reply,)> {
     const INDEX_HTML: &str = "index.html";
 
-    let files = assets(assets_dir.clone())
-        .or(index_static_file_redirect(assets_dir.join(INDEX_HTML)));
+    let files =
+        assets(assets_dir.clone()).or(index_static_file_redirect(assets_dir.join(INDEX_HTML)));
 
-    warp::any()
-        .and(files)
-        .boxed()
+    warp::any().and(files).boxed()
 }
 
 /// If the path does not start with /api, return the index.html, so the app will bootstrap itself
@@ -54,7 +51,7 @@ fn index_static_file_redirect(index_file_path: PathBuf) -> BoxedFilter<(impl Rep
             // Reject the request if the path starts with /api/
             if let Some(first_segment) = segments.segments().next() {
                 if first_segment == API_STRING {
-                    return Err(warp::reject::not_found())
+                    return Err(warp::reject::not_found());
                 }
             }
             Ok(file)
diff --git a/src/components/mod.rs b/src/components/mod.rs
index e4aacff..9a91574 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -6,10 +6,10 @@
 mod router_button;
 mod router_link;
 
-use yew::{Properties, Children};
+use yew::{Children, Properties};
 
 #[allow(deprecated)]
-pub use self::{router_button::RouterButton, router_link::RouterLink, router_link::RouterAnchor};
+pub use self::{router_button::RouterButton, router_link::RouterAnchor, router_link::RouterLink};
 use crate::RouterState;
 
 // TODO This should also be PartialEq and Clone. Its blocked on Children not supporting that.

From 7953470728051f45af6dc10f298456dedf06350b Mon Sep 17 00:00:00 2001
From: Henry Zimmerman <zimhen7@gmail.com>
Date: Tue, 10 Dec 2019 21:40:10 -0500
Subject: [PATCH 6/6] fix path import

---
 examples/servers/warp/src/main.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/servers/warp/src/main.rs b/examples/servers/warp/src/main.rs
index f2e95a3..4e6d110 100644
--- a/examples/servers/warp/src/main.rs
+++ b/examples/servers/warp/src/main.rs
@@ -2,7 +2,8 @@ use std::path::PathBuf;
 use warp::{
     filters::BoxedFilter,
     fs::File,
-    path::{self, Peek},
+    path::{Peek},
+    path,
     Filter, Reply,
 };