Migration to yew 0.18.0

* Migration to yew 0.18.0 * Removed duplicated clones * Bump version of ybc to 0.2.0
thedodd · Jul 26, 2021 · 61d0133 · 61d0133
1 parent 8413480
commit 61d0133
Show file tree

Hide file tree

Showing 41 changed files with 90 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # directory ignores
 dist
 target
+.idea
 
 # file ignores
 Cargo.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ This changelog follows the patterns described here: https://keepachangelog.com/e
 
 ## Unreleased
 
+## 0.2.0 
+- Added support for yew `0.18.x`
+
 ## 0.1.6
 ### changed
 - Updates to the `Navbar` component:

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ybc"
-version = "0.1.6"
+version = "0.2.0"
 description = "A Yew component library based on the Bulma CSS framework."
 authors = ["Anthony Dodd <[email protected]>"]
 edition = "2018"
@@ -13,9 +13,9 @@ keywords = ["wasm", "web", "bulma", "sass", "yew"]
 [dependencies]
 derive_more = "0.99.9"
 web-sys = { version="0.3", features=["Element", "File", "HtmlCollection", "HtmlSelectElement"] }
-yew = { version="0.17.3", features=["web_sys"] }
-yewtil = { version="0.3.2", features=["neq"] }
-yew-router = { version="0.14.0", features=["web_sys"], optional=true }
+yew = { version="0.18.0", features=["web_sys"] }
+yewtil = { version="0.4.0", features=["neq"] }
+yew-router = { version="0.15.0", features=["web_sys"], optional=true }
 
 [features]
 default = ["router"]

diff --git a/src/columns/mod.rs b/src/columns/mod.rs
@@ -44,7 +44,7 @@ impl Component for Columns {
     fn view(&self) -> Html {
         let mut classes = Classes::from("columns");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.vcentered {
             classes.push("is-vcentered");
@@ -104,7 +104,7 @@ impl Component for Column {
     fn view(&self) -> Html {
         let mut classes = Classes::from("column");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>

diff --git a/src/common.rs b/src/common.rs
@@ -1,4 +1,6 @@
 use derive_more::Display;
+use std::borrow::Cow;
+use yew::html::IntoOptPropValue;
 
 /// Common alignment classes.
 #[derive(Clone, Debug, Display, PartialEq)]
@@ -25,3 +27,9 @@ pub enum Size {
     #[display(fmt = "large")]
     Large,
 }
+
+impl IntoOptPropValue<Cow<'static, str>> for Size {
+    fn into_opt_prop_value(self) -> Option<Cow<'static, str>> {
+        Some(Cow::from(self.to_string()))
+    }
+}
diff --git a/src/components/breadcrumb.rs b/src/components/breadcrumb.rs
@@ -48,7 +48,7 @@ impl Component for Breadcrumb {
     fn view(&self) -> Html {
         let mut classes = Classes::from("breadcrumb");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(size) = &self.props.size {
             classes.push(&size.to_string());

diff --git a/src/components/card.rs b/src/components/card.rs
@@ -35,7 +35,7 @@ impl Component for Card {
     fn view(&self) -> Html {
         let mut classes = Classes::from("card");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>
@@ -82,7 +82,7 @@ impl Component for CardHeader {
     fn view(&self) -> Html {
         let mut classes = Classes::from("card-header");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <header class=classes>
@@ -129,7 +129,7 @@ impl Component for CardImage {
     fn view(&self) -> Html {
         let mut classes = Classes::from("card-image");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>
@@ -176,7 +176,7 @@ impl Component for CardContent {
     fn view(&self) -> Html {
         let mut classes = Classes::from("card-content");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>
@@ -223,7 +223,7 @@ impl Component for CardFooter {
     fn view(&self) -> Html {
         let mut classes = Classes::from("card-footer");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <footer class=classes>

diff --git a/src/components/dropdown.rs b/src/components/dropdown.rs
@@ -68,7 +68,7 @@ impl Component for Dropdown {
     fn view(&self) -> Html {
         let mut classes = Classes::from("dropdown");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         let opencb = if self.props.hoverable {
             classes.push("is-hoverable");

diff --git a/src/components/menu.rs b/src/components/menu.rs
@@ -35,7 +35,7 @@ impl Component for Menu {
     fn view(&self) -> Html {
         let mut classes = Classes::from("menu");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <aside class=classes>
@@ -83,7 +83,7 @@ impl Component for MenuList {
     fn view(&self) -> Html {
         let mut classes = Classes::from("menu-list");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <ul class=classes>
@@ -131,7 +131,7 @@ impl Component for MenuLabel {
     fn view(&self) -> Html {
         let mut classes = Classes::from("menu-label");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <p class=classes>

diff --git a/src/components/message.rs b/src/components/message.rs
@@ -35,7 +35,7 @@ impl Component for Message {
     fn view(&self) -> Html {
         let mut classes = Classes::from("message");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <article class=classes>
@@ -82,7 +82,7 @@ impl Component for MessageHeader {
     fn view(&self) -> Html {
         let mut classes = Classes::from("message-header");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>
@@ -129,7 +129,7 @@ impl Component for MessageBody {
     fn view(&self) -> Html {
         let mut classes = Classes::from("message-body");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>

diff --git a/src/components/modal.rs b/src/components/modal.rs
@@ -79,7 +79,7 @@ impl Component for Modal {
     fn view(&self) -> Html {
         let mut classes = Classes::from("modal");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         let (opencb, closecb) = if self.is_active {
             classes.push("is-active");
@@ -181,7 +181,7 @@ impl Component for ModalCard {
     fn view(&self) -> Html {
         let mut classes = Classes::from("modal");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         let (opencb, closecb) = if self.is_active {
             classes.push("is-active");

diff --git a/src/components/navbar.rs b/src/components/navbar.rs
@@ -89,7 +89,7 @@ impl Component for Navbar {
         // navbar classes
         let mut classes = Classes::from("navbar");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(fixed) = &self.props.fixed {
             classes.push(&fixed.to_string());
@@ -249,7 +249,7 @@ impl Component for NavbarItem {
         // navbar classes
         let mut classes = Classes::from("navbar-item");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.has_dropdown {
             classes.push("has-dropdown");
@@ -322,7 +322,7 @@ impl Component for NavbarDivider {
     fn view(&self) -> Html {
         let mut classes = Classes::from("navbar-divider");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <hr class=classes/>
@@ -402,7 +402,7 @@ impl Component for NavbarDropdown {
         // navbar-item classes
         let mut classes = Classes::from("navbar-item has-dropdown");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.dropup {
             classes.push("has-dropdown-up");

diff --git a/src/components/pagination.rs b/src/components/pagination.rs
@@ -54,7 +54,7 @@ impl Component for Pagination {
     fn view(&self) -> Html {
         let mut classes = Classes::from("pagination");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(size) = &self.props.size {
             classes.push(&size.to_string());

diff --git a/src/components/panel.rs b/src/components/panel.rs
@@ -41,7 +41,7 @@ impl Component for Panel {
     fn view(&self) -> Html {
         let mut classes = Classes::from("panel");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <nav class=classes>

diff --git a/src/components/tabs.rs b/src/components/tabs.rs
@@ -58,7 +58,7 @@ impl Component for Tabs {
     fn view(&self) -> Html {
         let mut classes = Classes::from("tabs");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(alignment) = &self.props.alignment {
             classes.push(&alignment.to_string());

diff --git a/src/elements/box.rs b/src/elements/box.rs
@@ -35,7 +35,7 @@ impl Component for Box {
     fn view(&self) -> Html {
         let mut classes = Classes::from("box");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>

diff --git a/src/elements/button.rs b/src/elements/button.rs
@@ -40,7 +40,7 @@ impl Component for Buttons {
     fn view(&self) -> Html {
         let mut classes = Classes::from("buttons");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(size) = &self.props.size {
             classes.push(&size.to_string());
@@ -116,7 +116,7 @@ impl Component for Button {
     fn view(&self) -> Html {
         let mut classes = Classes::from("button");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.loading {
             classes.push("is-loading")
@@ -314,7 +314,7 @@ impl Component for ButtonAnchor {
     fn view(&self) -> Html {
         let mut classes = Classes::from("button");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.loading {
             classes.push("is-loading")
@@ -384,7 +384,7 @@ impl Component for ButtonInputSubmit {
     fn view(&self) -> Html {
         let mut classes = Classes::from("button");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.loading {
             classes.push("is-loading")
@@ -445,7 +445,7 @@ impl Component for ButtonInputReset {
     fn view(&self) -> Html {
         let mut classes = Classes::from("button");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.loading {
             classes.push("is-loading")

diff --git a/src/elements/content.rs b/src/elements/content.rs
@@ -40,7 +40,7 @@ impl Component for Content {
     fn view(&self) -> Html {
         let mut classes = Classes::from("content");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         let tag = self.props.tag.clone();
         html! {

diff --git a/src/elements/delete.rs b/src/elements/delete.rs
@@ -43,7 +43,7 @@ impl Component for Delete {
     fn view(&self) -> Html {
         let mut classes = Classes::from("delete");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         let tag = self.props.tag.clone();
         html! {

diff --git a/src/elements/icon.rs b/src/elements/icon.rs
@@ -47,7 +47,7 @@ impl Component for Icon {
     fn view(&self) -> Html {
         let mut classes = Classes::from("icon");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(size) = &self.props.size {
             classes.push(&size.to_string());

diff --git a/src/elements/image.rs b/src/elements/image.rs
@@ -39,7 +39,7 @@ impl Component for Image {
     fn view(&self) -> Html {
         let mut classes = Classes::from("image");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if let Some(size) = &self.props.size {
             classes.push(&size.to_string());

diff --git a/src/elements/notification.rs b/src/elements/notification.rs
@@ -35,7 +35,7 @@ impl Component for Notification {
     fn view(&self) -> Html {
         let mut classes = Classes::from("notification");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         html! {
             <div class=classes>

diff --git a/src/elements/progress.rs b/src/elements/progress.rs
@@ -41,7 +41,7 @@ impl Component for Progress {
     fn view(&self) -> Html {
         let mut classes = Classes::from("progress");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         let max = self.props.max.to_string();
         let value = self.props.value.to_string();

diff --git a/src/elements/table.rs b/src/elements/table.rs
@@ -53,7 +53,7 @@ impl Component for Table {
     fn view(&self) -> Html {
         let mut classes = Classes::from("table");
         if let Some(extra) = &self.props.classes {
-            classes = classes.extend(extra);
+            classes.push(extra);
         }
         if self.props.bordered {
             classes.push("is-bordered");