1 files changed, 35 insertions, 19 deletions

diff --git a/src/view/address.rs b/src/view/address.rs
index e26de04..b833518 100644
--- a/src/view/address.rs
+++ b/src/view/address.rs
@@ -1,14 +1,15 @@
+use super::WeakComponentLink;
 use yew::prelude::*;
 use vcard::properties;
 use crate::viewmodel::address::*;
 use crate::viewmodel::VCardPropertyInputObject;
 use super::VCardPropertyInputComponent;
+use crate::viewmodel::Error;
 
 pub struct AddressView {
-    link: ComponentLink<Self>,
+    props: Props,
     value: Address,
-    oninput: Callback<Address>,
-    errors: Vec<String>,
+    error: Option<Error>,
 }
 
 pub enum Msg {
@@ -21,12 +22,14 @@ pub enum Msg {
     UpdateCountry(String),
     ToggleWork,
     ToggleHome,
+
+    Generate,
 }
 
 #[derive(Clone, PartialEq, Properties)]
 pub struct Props {
-    pub oninput: Callback<Address>,
-    //pub errors: Vec<String>,
+    pub generated: Callback<Result<properties::Address,()>>,
+    pub weak_link: WeakComponentLink<AddressView>,
 }
 
 impl VCardPropertyInputComponent<properties::Address, Address> for AddressView {
@@ -36,8 +39,8 @@ impl VCardPropertyInputComponent<properties::Address, Address> for AddressView {
     fn get_title(&self) -> String {
         "Address".to_string()
     }
-    fn get_errors(&self) -> Vec<String> {
-        self.errors.clone()
+    fn get_error(&self) -> Option<Error> {
+        self.error.clone()
     }
 }
 
@@ -45,11 +48,11 @@ impl Component for AddressView {
     type Message = Msg;
     type Properties = Props;
     fn create(props: <Self as yew::Component>::Properties, link: yew::html::Scope<Self>) -> Self {
+        props.weak_link.borrow_mut().replace(link);
         Self {
-            link,
+            props,
             value: Address::new(),
-            oninput: props.oninput,
-            errors: vec![],
+            error: None,
         }
     }
     fn update(&mut self, msg: <Self as yew::Component>::Message) -> bool {
@@ -63,26 +66,39 @@ impl Component for AddressView {
             Msg::UpdateCountry(c) => self.value.country = c,
             Msg::ToggleWork => self.value.work = !self.value.work,
             Msg::ToggleHome => self.value.home = !self.value.home,
+            Generate => {
+                match self.value.to_vcard_property() {
+                    Ok(address) => {
+                        self.props.generated.emit(Ok(address));
+                        return false;
+                    },
+                    Err(error) => {
+                        self.props.generated.emit(Err(()));
+                        self.error = Some(error);
+                    },
+                };
+            },
         };
-        self.oninput.emit(self.value.clone());
         true
     }
     fn change(&mut self, props: <Self as yew::Component>::Properties) -> bool { 
-        self.oninput = props.oninput;
-        true
+        if self.props != props {
+            self.props = props;
+            true
+        } else {
+            false
+        }
     }
     fn view(&self) -> yew::virtual_dom::VNode {
+        let link = self.props.weak_link.borrow().clone().unwrap();
+
         html!{
             <div class="box">
-                {
-                    self.render_errors()
-                }
+                { self.render_error() }
 
                 <h3 class="subtitle">{ self.get_title() }</h3>
 
-                {
-                    self.get_input_object().render(&self.link)
-                }
+                { self.get_input_object().render(&link) }
 
             </div>
         }