From 322d078d643427d852d35510514fdd61068b7374 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Thu, 10 Aug 2023 14:02:05 +0200 Subject: [PATCH] Deselect issue while open form is visible --- src/app/page.rs | 6 ++++++ src/ui/widget/common/list.rs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/page.rs b/src/app/page.rs index 7b70a19e..0a457d74 100644 --- a/src/app/page.rs +++ b/src/app/page.rs @@ -488,6 +488,7 @@ impl ViewPage for IssuePage { Message::Issue(IssueMessage::Changed(id)) => { let repo = context.repository(); if let Some(issue) = cob::issue::find(repo, &id)? { + self.issue = Some((id, issue.clone())); let comments = issue.comments().collect::>(); let details = widget::issue::details( context, @@ -505,7 +506,9 @@ impl ViewPage for IssuePage { } Message::Issue(IssueMessage::OpenForm) => { let new_form = widget::issue::new_form(context, theme).to_boxed(); + let list = widget::issue::list(context, theme, None).to_boxed(); + app.remount(Cid::Issue(IssueCid::List), list, vec![])?; app.remount(Cid::Issue(IssueCid::Form), new_form, vec![])?; app.active(&Cid::Issue(IssueCid::Form))?; @@ -518,6 +521,9 @@ impl ViewPage for IssuePage { app.blur()?; app.umount(&Cid::Issue(IssueCid::Form))?; + let list = widget::issue::list(context, theme, self.issue.clone()).to_boxed(); + app.remount(Cid::Issue(IssueCid::List), list, vec![])?; + app.subscribe( &Cid::GlobalListener, Sub::new(subscription::global_clause(), SubClause::Always), diff --git a/src/ui/widget/common/list.rs b/src/ui/widget/common/list.rs index 7ec83dbd..a704f8f7 100644 --- a/src/ui/widget/common/list.rs +++ b/src/ui/widget/common/list.rs @@ -316,7 +316,7 @@ where pub fn new(items: &[V], selected: Option, theme: Theme) -> Self { let selected = match selected { Some(item) => items.iter().position(|i| i == &item), - None => Some(0), + _ => None, }; Self {