From 9980b75ab55d1bfcdafd640fe68adee6747534cf Mon Sep 17 00:00:00 2001 From: Adrian Wozniak Date: Fri, 3 Apr 2020 14:40:21 +0200 Subject: [PATCH] Handle close modal button --- jirs-client/src/modal/issue_details.rs | 3 ++- jirs-client/src/modal/mod.rs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jirs-client/src/modal/issue_details.rs b/jirs-client/src/modal/issue_details.rs index a60ce871..0f0bcfe8 100644 --- a/jirs-client/src/modal/issue_details.rs +++ b/jirs-client/src/modal/issue_details.rs @@ -95,6 +95,7 @@ pub fn view(_model: &Model, issue: &Issue, modal: &EditIssueModal) -> Node Msg::NoOp }); + let close_handler = mouse_ev(Ev::Click, |_| Msg::PopModal); let copy_button = StyledButton::build() .empty() .icon(Icon::Link) @@ -106,7 +107,6 @@ pub fn view(_model: &Model, issue: &Issue, modal: &EditIssueModal) -> Node }]]) .build() .into_node(); - let delete_button = StyledButton::build() .empty() .icon(Icon::Trash.into_styled_builder().size(19).build()) @@ -115,6 +115,7 @@ pub fn view(_model: &Model, issue: &Issue, modal: &EditIssueModal) -> Node let close_button = StyledButton::build() .empty() .icon(Icon::Close.into_styled_builder().size(24).build()) + .on_click(close_handler) .build() .into_node(); diff --git a/jirs-client/src/modal/mod.rs b/jirs-client/src/modal/mod.rs index 287c232d..2dfe2666 100644 --- a/jirs-client/src/modal/mod.rs +++ b/jirs-client/src/modal/mod.rs @@ -16,6 +16,7 @@ pub fn update(msg: &Msg, model: &mut model::Model, orders: &mut impl Orders Msg::PopModal => match model.modals.pop() { _ => (), }, + Msg::ChangePage(Page::EditIssue(issue_id)) => { let value = find_issue(model, *issue_id) .map(|issue| issue.issue_type.clone()) @@ -87,6 +88,7 @@ pub fn update(msg: &Msg, model: &mut model::Model, orders: &mut impl Orders _ => {} } } + _ => (), } }