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/name.rs | 61 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 18 deletions(-) (limited to 'src/view/name.rs') diff --git a/src/view/name.rs b/src/view/name.rs index f76fd2e..df3fb15 100644 --- a/src/view/name.rs +++ b/src/view/name.rs @@ -1,3 +1,5 @@ +use crate::viewmodel::Error; +use crate::view::WeakComponentLink; use yew::prelude::*; use vcard::properties; use crate::viewmodel::name::*; @@ -5,10 +7,9 @@ use crate::viewmodel::VCardPropertyInputObject; use super::VCardPropertyInputComponent; pub struct NameView { - link: ComponentLink, + props: Props, value: Name, - oninput: Callback, - errors: Vec, + error: Option, } pub enum Msg { @@ -17,11 +18,15 @@ pub enum Msg { UpdateMiddleName(String), UpdateLastName(String), UpdateSuffix(String), + + Generate, } #[derive(Clone, PartialEq, Properties)] pub struct Props { - pub oninput: Callback, + pub generated_name: Callback>, + pub generated_fn: Callback>, + pub weak_link: WeakComponentLink, } impl VCardPropertyInputComponent for NameView { @@ -31,8 +36,8 @@ impl VCardPropertyInputComponent for NameView { fn get_title(&self) -> String { "Name".to_string() } - fn get_errors(&self) -> Vec { - self.errors.clone() + fn get_error(&self) -> Option { + self.error.clone() } } @@ -40,11 +45,11 @@ impl Component for NameView { 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: Name::new(), - oninput: props.oninput, - errors: vec![], + error: None, } } fn update(&mut self, msg: ::Message) -> bool { @@ -54,26 +59,46 @@ impl Component for NameView { Msg::UpdateMiddleName(m) => self.value.middle_name = m, Msg::UpdateLastName(l) => self.value.last_name = l, Msg::UpdateSuffix(s) => self.value.suffix = s, + Generate => { + match self.value.formatted_name() { + Ok(formatted_name) => self.props.generated_fn.emit(Ok(formatted_name)), + Err(error) => { + self.props.generated_fn.emit(Err(())); + self.error = Some(error); + }, + }; + match self.value.to_vcard_property() { + Ok(name) => { + self.props.generated_name.emit(Ok(name)); + return false; + }, + Err(error) => { + self.props.generated_name.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