Fix breaking changes in Yew (#217)

* initial work - held up by broken generic components * fix guide example
yewstack · Jan 9, 2020 · fbf88e3 · fbf88e3
1 parent c322c51
commit fbf88e3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/examples/guide/src/guide.rs b/examples/guide/src/guide.rs
@@ -11,7 +11,7 @@ pub struct Guide {
     props: GuideProps,
 }
 
-#[derive(Properties)]
+#[derive(Properties, Clone)]
 pub struct GuideProps {
     children: ChildrenWithProps<Page>,
 }
@@ -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;">
-                <RouterAnchor<String> route=props.page_url.clone()> {&props.title} </RouterLink>
+                <RouterAnchor<String> route=props.page_url.clone()> {&props.title} </RouterAnchor<String>>
             </li>
         };
     } else {
         return html! {
             <li style="padding-left: 4px; padding-right: 4px; padding-top: 6px; padding-bottom: 6px; background-color: white;">
-                <RouterAnchor<String> route=props.page_url.clone()> {&props.title} </RouterLink>
+                <RouterAnchor<String> route=props.page_url.clone()> {&props.title} </RouterAnchor<String>>
             </li>
         };
     }

diff --git a/examples/guide/src/markdown_window.rs b/examples/guide/src/markdown_window.rs
@@ -17,7 +17,7 @@ pub struct MarkdownWindow {
     link: ComponentLink<Self>,
 }
 
-#[derive(Properties, Debug)]
+#[derive(Properties, Debug, Clone)]
 pub struct MdProps {
     pub uri: Option<String>,
 }

diff --git a/examples/guide/src/page.rs b/examples/guide/src/page.rs
@@ -2,7 +2,7 @@ use yew::{prelude::*, virtual_dom::VNode};
 
 pub struct Page;
 
-#[derive(Properties)]
+#[derive(Properties, Clone)]
 pub struct PageProps {
     #[props(required)]
     pub uri: String,

diff --git a/examples/minimal/src/main.rs b/examples/minimal/src/main.rs
@@ -93,10 +93,10 @@ impl Component for Model {
                 <div>
                 {
                     match AppRoute::switch(self.route.clone()) {
-                        Some(AppRoute::A(thing)) => html!{thing},
+                        Some(AppRoute::A(thing)) => VNode::from(thing.as_str()),
                         Some(AppRoute::B{anything, number}) => html!{<div> {anything} {number} </div>},
-                        Some(AppRoute::C) => html!{"C"},
-                        None => html!{"404"}
+                        Some(AppRoute::C) => VNode::from("C"),
+                        None => VNode::from("404")
                     }
                 }
                 </div>

diff --git a/examples/router_component/src/a_component.rs b/examples/router_component/src/a_component.rs
@@ -6,7 +6,7 @@ pub struct AModel {
     props: Props,
 }
 
-#[derive(PartialEq, Properties)]
+#[derive(Clone, PartialEq, Properties)]
 pub struct Props {
     #[props(required)]
     pub route: Option<ARoute>,
@@ -36,12 +36,11 @@ impl Component for AModel {
                     <div>
                         { "I am the A component"}
                         <div>
-                            <RouterButton<AppRoute> route=AppRoute::A(AllowMissing(Some(ARoute)))>
-                                {"Go to a/c"}
-                            </RouterButton>
-        //                    <RouterButton route="/a/d">
-        //                        {"Go to a/d (route does not exist)"}
-        //                    </RouterButton>
+                            <RouterButton<AppRoute>
+                                route=AppRoute::A(AllowMissing(Some(ARoute)))
+                            />
+//                                {"Go to a/c"}
+//                            </RouterButton<AppRoute>>
                         </div>
                         <div>
                         {

diff --git a/examples/router_component/src/b_component.rs b/examples/router_component/src/b_component.rs
@@ -10,7 +10,7 @@ pub struct BModel {
     update_subpath: Callback<InputData>,
 }
 
-#[derive(PartialEq, Properties)]
+#[derive(Clone, PartialEq, Properties)]
 pub struct Props {
     #[props(required)]
     pub number: Option<usize>,

diff --git a/examples/router_component/src/c_component.rs b/examples/router_component/src/c_component.rs
@@ -2,7 +2,7 @@ use yew::{prelude::*, virtual_dom::VNode, Properties};
 
 pub struct CModel;
 
-#[derive(PartialEq, Properties)]
+#[derive(Clone, PartialEq, Properties)]
 pub struct Props {}
 
 pub enum Msg {}

diff --git a/src/components/mod.rs b/src/components/mod.rs
@@ -15,10 +15,10 @@ use crate::Switch;
 // TODO This should also be PartialEq and Clone. Its blocked on Children not supporting that.
 // TODO This should no longer take link & String, and instead take a route: SW implementing Switch
 /// Properties for `RouterButton` and `RouterLink`.
-#[derive(Properties, Default, Debug)]
+#[derive(Properties, Clone, Default, Debug)]
 pub struct Props<SW>
 where
-    SW: Switch,
+    SW: Switch + Clone,
 {
     /// The Switched item representing the route.
     #[props(required)]