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/telephone.rs | 54 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 19 deletions(-) (limited to 'src/view/telephone.rs') diff --git a/src/view/telephone.rs b/src/view/telephone.rs index 808ebfa..a47c610 100644 --- a/src/view/telephone.rs +++ b/src/view/telephone.rs @@ -1,3 +1,5 @@ +use crate::view::WeakComponentLink; +use crate::viewmodel::Error; use yew::prelude::*; use vcard::properties; use crate::viewmodel::telephone::*; @@ -5,10 +7,9 @@ use crate::viewmodel::VCardPropertyInputObject; use super::VCardPropertyInputComponent; pub struct TelephoneView { - link: ComponentLink, + props: Props, value: Telephone, - oninput: Callback, - errors: Vec, + error: Option, } pub enum Msg { @@ -23,12 +24,14 @@ pub enum Msg { ToggleVideo, TogglePager, ToggleTextPhone, + + Generate, } #[derive(Clone, PartialEq, Properties)] pub struct Props { - pub oninput: Callback, - //pub errors: Vec, + pub generated: Callback>, + pub weak_link: WeakComponentLink, } impl VCardPropertyInputComponent for TelephoneView { @@ -38,8 +41,8 @@ impl VCardPropertyInputComponent for Telephone fn get_title(&self) -> String { "Telephone".to_string() } - fn get_errors(&self) -> Vec { - self.errors.clone() + fn get_error(&self) -> Option { + self.error.clone() } } @@ -47,11 +50,11 @@ impl Component for TelephoneView { 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: Telephone::new(), - oninput: props.oninput, - errors: vec![], + error: None, } } fn update(&mut self, msg: ::Message) -> bool { @@ -67,26 +70,39 @@ impl Component for TelephoneView { Msg::ToggleVideo => self.value.video = !self.value.video, Msg::TogglePager => self.value.pager = !self.value.pager, Msg::ToggleTextPhone => self.value.text_phone = !self.value.text_phone, + Msg::Generate => { + match self.value.to_vcard_property() { + Ok(telephone) => { + self.props.generated.emit(Ok(telephone)); + 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