mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-17 23:56:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Move all dismissal logic into dismiss_event

Browse source
This commit is contained in:
Joseph T. Lyons 2023-12-08 16:08:26 -05:00
parent cd93ac1d2a
commit 13dad89a85
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/feedback2/src/feedback_modal.rs
View file

@ -245,18 +245,16 @@ impl FeedbackModal {
}
// TODO: Escape button calls dismiss
// TODO: Should do same as hitting cancel / clicking outside of modal
// Close immediately if no text in field
// Ask to close if text in the field
fn cancel(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
Self::dismiss_event(cx)
self.dismiss_event(cx)
}
fn dismiss_event(cx: &mut ViewContext<Self>) {
fn dismiss_event(&mut self, cx: &mut ViewContext<Self>) {
let has_feedback = self.feedback_editor.read(cx).text_option(cx).is_some();
let dismiss = Self::prompt_dismiss(cx);
cx.spawn(|this, mut cx| async move {
if dismiss.await {
if !has_feedback || (has_feedback && dismiss.await) {
this.update(&mut cx, |_, cx| cx.emit(DismissEvent)).ok();
}
})
@ -287,8 +285,6 @@ impl Render for FeedbackModal {
let allow_submission =
valid_character_count && valid_email_address && !self.pending_submission;
let has_feedback = self.feedback_editor.read(cx).text_option(cx).is_some();
let submit_button_text = if self.pending_submission {
"Submitting..."
} else {
@ -378,19 +374,9 @@ impl Render for FeedbackModal {
Button::new("cancel_feedback", "Cancel")
.style(ButtonStyle::Subtle)
.color(Color::Muted)
// TODO: replicate this logic when clicking outside the modal
// TODO: Will require somehow overriding the modal dismal default behavior
.map(|this| {
if has_feedback {
this.on_click(cx.listener(|_, _, cx| {
Self::dismiss_event(cx)
}))
} else {
this.on_click(cx.listener(|_, _, cx| {
cx.emit(DismissEvent);
}))
}
}),
.on_click(cx.listener(move |this, _, cx| {
this.dismiss_event(cx)
})),
)
.child(
Button::new("send_feedback", submit_button_text)
@ -420,3 +406,4 @@ impl Render for FeedbackModal {
// TODO: Add compilation flags to enable debug mode, where we can simulate sending feedback that both succeeds and fails, so we can test the UI
// TODO: Maybe store email address whenever the modal is closed, versus just on submit, so users can remove it if they want without submitting
// TODO: Fix bug of being asked twice to discard feedback when clicking cancel