From 3f0892368bcf475fdae39f24ef51b82b3013535f Mon Sep 17 00:00:00 2001 From: jelemux Date: Thu, 28 Jan 2021 17:41:49 +0100 Subject: try to fix problem with vcard mutable references --- src/view/address.rs | 54 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 19 deletions(-) (limited to 'src/view/address.rs') 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, + props: Props, value: Address, - oninput: Callback
, - errors: Vec, + error: Option, } 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
, - //pub errors: Vec, + pub generated: Callback>, + pub weak_link: WeakComponentLink, } impl VCardPropertyInputComponent for AddressView { @@ -36,8 +39,8 @@ impl VCardPropertyInputComponent for AddressView { fn get_title(&self) -> String { "Address".to_string() } - fn get_errors(&self) -> Vec { - self.errors.clone() + fn get_error(&self) -> Option { + self.error.clone() } } @@ -45,11 +48,11 @@ impl Component for AddressView { type Message = Msg; type Properties = Props; fn create(props: ::Properties, link: yew::html::Scope) -> 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: ::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: ::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!{
- { - self.render_errors() - } + { self.render_error() }

{ self.get_title() }

- { - self.get_input_object().render(&self.link) - } + { self.get_input_object().render(&link) }
} -- cgit v1.2.3