Add render method to Component and auto implement Renderable

yewstack · Sep 23, 2019 · b6bd146 · b6bd146
1 parent 1375714
commit b6bd146
Show file tree

Hide file tree

Showing 47 changed files with 178 additions and 249 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Yew implements strict application state management based on message passing and
 `src/main.rs`
 
 ```rust
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 struct Model { }
 
@@ -82,10 +82,8 @@ impl Component for Model {
             }
         }
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             // Render your model here
             <button onclick=|_| Msg::DoIt>{ "Click me!" }</button>

diff --git a/crates/macro/src/lib.rs b/crates/macro/src/lib.rs
@@ -28,10 +28,8 @@
 //! #     fn update(&mut self, msg: Self::Message) -> ShouldRender {
 //! #         unimplemented!()
 //! #     }
-//! # }
 //! #
-//! # impl Renderable<Component> for Component {
-//! #     fn view(&self) -> Html<Self> {
+//! #     fn render(&self) -> Html<Self> {
 //! #
 //! // ...
 //!

diff --git a/examples/counter/src/lib.rs b/examples/counter/src/lib.rs
@@ -2,7 +2,7 @@
 
 use stdweb::web::Date;
 use yew::services::ConsoleService;
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {
     console: ConsoleService,
@@ -45,10 +45,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <nav class="menu">

diff --git a/examples/crm/src/lib.rs b/examples/crm/src/lib.rs
@@ -143,10 +143,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         match self.scene {
             Scene::ClientsList => html! {
                 <div class="crm">

diff --git a/examples/custom_components/src/barrier.rs b/examples/custom_components/src/barrier.rs
@@ -48,10 +48,8 @@ impl Component for Barrier {
         self.onsignal = props.onsignal;
         true
     }
-}
 
-impl Renderable<Barrier> for Barrier {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div class="barrier">
                 <p>{ format!("{} on {} clicked", self.counter, self.limit) }</p>

diff --git a/examples/custom_components/src/button.rs b/examples/custom_components/src/button.rs
@@ -41,10 +41,8 @@ impl Component for Button {
         self.onsignal = props.onsignal;
         true
     }
-}
 
-impl Renderable<Button> for Button {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <button onclick=|_| Msg::Clicked>{ &self.title }</button>
         }

diff --git a/examples/custom_components/src/counter.rs b/examples/custom_components/src/counter.rs
@@ -58,10 +58,8 @@ impl Component for Counter {
         self.onclick = props.onclick;
         true
     }
-}
 
-impl Renderable<Counter> for Counter {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         let colorize = {
             match self.color {
                 Color::Red => "background: red;",

diff --git a/examples/custom_components/src/lib.rs b/examples/custom_components/src/lib.rs
@@ -43,10 +43,8 @@ impl Component for Model {
             Msg::ChildClicked(_value) => false,
         }
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         let counter = |x| {
             html! {
                 <Counter initial=x color=&self.color onclick=Msg::ChildClicked />

diff --git a/examples/dashboard/src/lib.rs b/examples/dashboard/src/lib.rs
@@ -6,7 +6,7 @@ use yew::format::{Json, Nothing, Toml};
 use yew::services::fetch::{FetchService, FetchTask, Request, Response};
 use yew::services::websocket::{WebSocketService, WebSocketStatus, WebSocketTask};
 use yew::services::Task;
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 type AsBinary = bool;
 
@@ -167,10 +167,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <nav class="menu">

diff --git a/examples/file_upload/src/lib.rs b/examples/file_upload/src/lib.rs
@@ -1,7 +1,7 @@
 #![recursion_limit = "256"]
 
 use yew::services::reader::{File, FileChunk, FileData, ReaderService, ReaderTask};
-use yew::{html, ChangeData, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, ChangeData, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {
     link: ComponentLink<Model>,
@@ -64,10 +64,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         let flag = self.by_chunks;
         html! {
             <div>

diff --git a/examples/fragments/src/lib.rs b/examples/fragments/src/lib.rs
@@ -1,6 +1,6 @@
 #![recursion_limit = "128"]
 
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {
     counter: usize,
@@ -32,10 +32,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <>
                 <nav class="menu">{ self.view_menu() }</nav>

diff --git a/examples/game_of_life/src/lib.rs b/examples/game_of_life/src/lib.rs
@@ -4,7 +4,7 @@ use log::info;
 use rand::Rng;
 use std::time::Duration;
 use yew::services::{IntervalService, Task};
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 #[derive(Clone, Copy, PartialEq)]
 enum LifeState {
@@ -205,10 +205,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <section class="game-container">

diff --git a/examples/inner_html/src/lib.rs b/examples/inner_html/src/lib.rs
@@ -5,7 +5,15 @@ extern crate stdweb;
 use stdweb::unstable::TryFrom;
 use stdweb::web::Node;
 use yew::virtual_dom::VNode;
-use yew::{Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{Component, ComponentLink, Html, ShouldRender};
+
+const SVG: &str = r#"
+<h2>Inline SVG or <i>any</i> HTML:</h2>
+<svg height="250" width="500">
+  <polygon points="220,10 300,210 170,250 123,234" style="fill:lime;stroke:purple;stroke-width:1" />
+    Sorry, your browser does not support inline SVG.
+</svg>
+"#;
 
 pub struct Model {
     pub value: i64,
@@ -24,18 +32,8 @@ impl Component for Model {
     fn update(&mut self, _: Self::Message) -> ShouldRender {
         true
     }
-}
-
-const SVG: &str = r#"
-<h2>Inline SVG or <i>any</i> HTML:</h2>
-<svg height="250" width="500">
-  <polygon points="220,10 300,210 170,250 123,234" style="fill:lime;stroke:purple;stroke-width:1" />
-    Sorry, your browser does not support inline SVG.
-</svg>
-"#;
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         let js_svg = js! {
             var div = document.createElement("div");
             div.innerHTML = @{SVG.to_string()};

diff --git a/examples/js_callback/src/lib.rs b/examples/js_callback/src/lib.rs
@@ -52,10 +52,8 @@ impl Component for Model {
     fn change(&mut self, _: Self::Properties) -> ShouldRender {
         false
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <textarea oninput=|input| Msg::Payload(input.value)

diff --git a/examples/large_table/src/lib.rs b/examples/large_table/src/lib.rs
@@ -1,7 +1,7 @@
 //! This demo originally created by https://github.com/qthree
 //! Source: https://github.com/qthree/yew_table100x100_test
 
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {
     selected: Option<(u32, u32)>,
@@ -28,6 +28,14 @@ impl Component for Model {
         }
         true
     }
+
+    fn render(&self) -> Html<Self> {
+        html! {
+            <table>
+                { (0..99).map(|row| view_row(self.selected, row)).collect::<Html<Self>>() }
+            </table>
+        }
+    }
 }
 
 fn square_class(this: (u32, u32), selected: Option<(u32, u32)>) -> &'static str {
@@ -54,13 +62,3 @@ fn view_row(selected: Option<(u32, u32)>, row: u32) -> Html<Model> {
         </tr>
     }
 }
-
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
-        html! {
-            <table>
-                { (0..99).map(|row| view_row(self.selected, row)).collect::<Html<Self>>() }
-            </table>
-        }
-    }
-}
diff --git a/examples/minimal/src/lib.rs b/examples/minimal/src/lib.rs
@@ -1,4 +1,4 @@
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {}
 
@@ -20,10 +20,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <button onclick=|_| Msg::Click>{ "Click" }</button>

diff --git a/examples/mount_point/src/lib.rs b/examples/mount_point/src/lib.rs
@@ -1,4 +1,4 @@
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {
     name: String,
@@ -26,10 +26,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <input value=&self.name oninput=|e| Msg::UpdateName(e.value) />

diff --git a/examples/multi_thread/src/lib.rs b/examples/multi_thread/src/lib.rs
@@ -6,7 +6,7 @@ pub mod native_worker;
 
 use log::info;
 use yew::worker::*;
-use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender};
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
 
 pub struct Model {
     worker: Box<Bridge<native_worker::Worker>>,
@@ -65,10 +65,8 @@ impl Component for Model {
         }
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div>
                 <nav class="menu">

diff --git a/examples/nested_list/src/header.rs b/examples/nested_list/src/header.rs
@@ -33,10 +33,8 @@ impl Component for ListHeader {
         }
         false
     }
-}
 
-impl Renderable<ListHeader> for ListHeader {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div class="list-header" onmouseover=|_| Msg::Hover>
                 { &self.props.text }

diff --git a/examples/nested_list/src/item.rs b/examples/nested_list/src/item.rs
@@ -38,10 +38,8 @@ impl Component for ListItem {
         }
         false
     }
-}
 
-impl Renderable<ListItem> for ListItem {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div class="list-item" onmouseover=|_| Msg::Hover>
                 { &self.props.name }

diff --git a/examples/nested_list/src/lib.rs b/examples/nested_list/src/lib.rs
@@ -22,10 +22,8 @@ impl Component for Model {
     fn update(&mut self, _: Self::Message) -> ShouldRender {
         true
     }
-}
 
-impl Renderable<Model> for Model {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div class="main">
                 <h1>{ "Nested List Demo" }</h1>

diff --git a/examples/nested_list/src/list.rs b/examples/nested_list/src/list.rs
@@ -68,10 +68,8 @@ impl Component for List {
         }
         true
     }
-}
 
-impl Renderable<List> for List {
-    fn view(&self) -> Html<Self> {
+    fn render(&self) -> Html<Self> {
         html! {
             <div
                 class="list-container"