Merge pull request #12 from spielrs/add-default-callback-navbar-item

Add default callback navbar item
dancespiele · Mar 18, 2020 · cfb2edb · cfb2edb
2 parents c0360fa + a429f39
commit cfb2edb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/crate/Cargo.lock b/crate/Cargo.lock
diff --git a/crate/yew_styles/Cargo.toml b/crate/yew_styles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yew_styles"
-version = "0.2.0"
+version = "0.2.1"
 description = "Framework styles for yew"
 authors = ["spieljs <[email protected]>"]
 edition = "2018"

diff --git a/crate/yew_styles/src/components/item.rs b/crate/yew_styles/src/components/item.rs
@@ -1,5 +1,5 @@
 #[cfg(any(feature = "web_sys", feature = "std_web"))]
-use crate::utils::{create_style, DefaultCallback};
+use crate::utils::create_style;
 use yew::prelude::*;
 
 #[derive(Clone)]
@@ -52,10 +52,8 @@ pub struct Props {
     pub class_name: String,
     #[prop_or_default]
     pub index: i16,
-    #[prop_or(DefaultCallback {
-        callback: Callback::noop(),
-    })]
-    pub onsignal: DefaultCallback<Callback<()>>,
+    #[prop_or(Callback::noop())]
+    pub onsignal: Callback<()>,
     pub children: Children,
 }
 
@@ -76,7 +74,7 @@ impl Component for Item {
     fn update(&mut self, msg: Self::Message) -> ShouldRender {
         match msg {
             Msg::Clicked => {
-                self.props.onsignal.callback.emit(());
+                self.props.onsignal.emit(());
             }
         };
 

diff --git a/crate/yew_styles/src/components/navbar/navbar_item.rs b/crate/yew_styles/src/components/navbar/navbar_item.rs
@@ -15,6 +15,7 @@ pub struct NavbarItemModel;
 pub struct Props {
     #[prop_or_default]
     pub class_name: String,
+    #[prop_or(Callback::noop())]
     pub onsignal: Callback<()>,
     pub children: Children,
 }

diff --git a/crate/yew_styles/src/utils.rs b/crate/yew_styles/src/utils.rs
@@ -31,8 +31,3 @@ pub fn create_style(style: String, value: String, wrap: String) {
         element.style[@{style}] = @{value};
     };
 }
-
-#[derive(Clone)]
-pub struct DefaultCallback<T> {
-    pub callback: T,
-}