This PR adjusts the logic that was added in #45166 to just apply to the specific case of interacting with the command palette in Vim and Helix modes (hereafter referred to collectively as "Vim mode"). In that PR, we would suppress the auto-save on focus change for _any_ modal in the workspace, regardless of whether we were actually in Vim mode or not. This would cause issues where moving between files some other way—such as the tab switcher or the file finder—would cause the buffers to never be saved. We now only suppress the auto-save on focus loss behavior when in Vim mode and the active modal is the command palette. In all other cases, we save the file. Closes https://github.com/zed-industries/zed/issues/47968. Supersedes https://github.com/zed-industries/zed/pull/51801 and https://github.com/zed-industries/zed/pull/51802. Note: the way we are identifying the active modal as the command palette isn't the best, but @bennetbo and I didn't have any other cleaner solutions. It's a bit tricky, as the logic lives in the `workspace`, which isn't able to know about the `CommandPalette` due to `command_palette` depending on `workspace`. There may be some other way we could achieve this with more indirection, but it's unclear whether it would be worth it at this time. Release Notes: - Changed `{ "autosave": "on_focus_change" }` to now always save on focus loss, except for when activating the command palette when in Vim/Helix mode. Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
259 lines
8.1 KiB
Rust
259 lines
8.1 KiB
Rust
use gpui::{
|
|
AnyView, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable as _, ManagedView,
|
|
MouseButton, Subscription,
|
|
};
|
|
use ui::prelude::*;
|
|
|
|
#[derive(Debug)]
|
|
pub enum DismissDecision {
|
|
Dismiss(bool),
|
|
Pending,
|
|
}
|
|
|
|
pub trait ModalView: ManagedView {
|
|
fn on_before_dismiss(
|
|
&mut self,
|
|
_window: &mut Window,
|
|
_: &mut Context<Self>,
|
|
) -> DismissDecision {
|
|
DismissDecision::Dismiss(true)
|
|
}
|
|
|
|
fn fade_out_background(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn render_bare(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
/// Returns whether this [`ModalView`] is the command palette.
|
|
///
|
|
/// This breaks the encapsulation of the [`ModalView`] trait a little bit, but there doesn't seem to be an
|
|
/// immediate, more elegant way to have the workspace know about the command palette (due to dependency arrow
|
|
/// directions).
|
|
fn is_command_palette(&self) -> bool {
|
|
false
|
|
}
|
|
}
|
|
|
|
trait ModalViewHandle {
|
|
fn on_before_dismiss(&mut self, window: &mut Window, cx: &mut App) -> DismissDecision;
|
|
fn view(&self) -> AnyView;
|
|
fn fade_out_background(&self, cx: &mut App) -> bool;
|
|
fn render_bare(&self, cx: &mut App) -> bool;
|
|
fn is_command_palette(&self, cx: &App) -> bool;
|
|
}
|
|
|
|
impl<V: ModalView> ModalViewHandle for Entity<V> {
|
|
fn on_before_dismiss(&mut self, window: &mut Window, cx: &mut App) -> DismissDecision {
|
|
self.update(cx, |this, cx| this.on_before_dismiss(window, cx))
|
|
}
|
|
|
|
fn view(&self) -> AnyView {
|
|
self.clone().into()
|
|
}
|
|
|
|
fn fade_out_background(&self, cx: &mut App) -> bool {
|
|
self.read(cx).fade_out_background()
|
|
}
|
|
|
|
fn render_bare(&self, cx: &mut App) -> bool {
|
|
self.read(cx).render_bare()
|
|
}
|
|
|
|
fn is_command_palette(&self, cx: &App) -> bool {
|
|
self.read(cx).is_command_palette()
|
|
}
|
|
}
|
|
|
|
pub struct ActiveModal {
|
|
modal: Box<dyn ModalViewHandle>,
|
|
_subscriptions: [Subscription; 2],
|
|
previous_focus_handle: Option<FocusHandle>,
|
|
focus_handle: FocusHandle,
|
|
}
|
|
|
|
pub struct ModalLayer {
|
|
active_modal: Option<ActiveModal>,
|
|
dismiss_on_focus_lost: bool,
|
|
}
|
|
|
|
pub(crate) struct ModalOpenedEvent;
|
|
|
|
impl EventEmitter<ModalOpenedEvent> for ModalLayer {}
|
|
|
|
impl Default for ModalLayer {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl ModalLayer {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
active_modal: None,
|
|
dismiss_on_focus_lost: false,
|
|
}
|
|
}
|
|
|
|
/// Toggles a modal of type `V`. If a modal of the same type is currently active,
|
|
/// it will be hidden. If a different modal is active, it will be replaced with the new one.
|
|
/// If no modal is active, the new modal will be shown.
|
|
///
|
|
/// If closing the current modal fails (e.g., due to `on_before_dismiss` returning
|
|
/// `DismissDecision::Dismiss(false)` or `DismissDecision::Pending`), the new modal
|
|
/// will not be shown.
|
|
pub fn toggle_modal<V, B>(&mut self, window: &mut Window, cx: &mut Context<Self>, build_view: B)
|
|
where
|
|
V: ModalView,
|
|
B: FnOnce(&mut Window, &mut Context<V>) -> V,
|
|
{
|
|
if let Some(active_modal) = &self.active_modal {
|
|
let should_close = active_modal.modal.view().downcast::<V>().is_ok();
|
|
let did_close = self.hide_modal(window, cx);
|
|
if should_close || !did_close {
|
|
return;
|
|
}
|
|
}
|
|
let new_modal = cx.new(|cx| build_view(window, cx));
|
|
self.show_modal(new_modal, window, cx);
|
|
cx.emit(ModalOpenedEvent);
|
|
}
|
|
|
|
/// Shows a modal and sets up subscriptions for dismiss events and focus tracking.
|
|
/// The modal is automatically focused after being shown.
|
|
fn show_modal<V>(&mut self, new_modal: Entity<V>, window: &mut Window, cx: &mut Context<Self>)
|
|
where
|
|
V: ModalView,
|
|
{
|
|
let focus_handle = cx.focus_handle();
|
|
self.active_modal = Some(ActiveModal {
|
|
modal: Box::new(new_modal.clone()),
|
|
_subscriptions: [
|
|
cx.subscribe_in(
|
|
&new_modal,
|
|
window,
|
|
|this, _, _: &DismissEvent, window, cx| {
|
|
this.hide_modal(window, cx);
|
|
},
|
|
),
|
|
cx.on_focus_out(&focus_handle, window, |this, _event, window, cx| {
|
|
if this.dismiss_on_focus_lost {
|
|
this.hide_modal(window, cx);
|
|
}
|
|
}),
|
|
],
|
|
previous_focus_handle: window.focused(cx),
|
|
focus_handle,
|
|
});
|
|
cx.defer_in(window, move |_, window, cx| {
|
|
window.focus(&new_modal.focus_handle(cx), cx);
|
|
});
|
|
cx.notify();
|
|
}
|
|
|
|
/// Attempts to hide the currently active modal.
|
|
///
|
|
/// The modal's `on_before_dismiss` method is called to determine if dismissal should proceed.
|
|
/// If dismissal is allowed, the modal is removed and focus is restored to the previously
|
|
/// focused element.
|
|
///
|
|
/// Returns `true` if the modal was successfully hidden, `false` otherwise.
|
|
pub fn hide_modal(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
|
|
let Some(active_modal) = self.active_modal.as_mut() else {
|
|
self.dismiss_on_focus_lost = false;
|
|
return false;
|
|
};
|
|
|
|
match active_modal.modal.on_before_dismiss(window, cx) {
|
|
DismissDecision::Dismiss(should_dismiss) => {
|
|
if !should_dismiss {
|
|
self.dismiss_on_focus_lost = !should_dismiss;
|
|
return false;
|
|
}
|
|
}
|
|
DismissDecision::Pending => {
|
|
self.dismiss_on_focus_lost = false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
if let Some(active_modal) = self.active_modal.take() {
|
|
if let Some(previous_focus) = active_modal.previous_focus_handle
|
|
&& active_modal.focus_handle.contains_focused(window, cx)
|
|
{
|
|
previous_focus.focus(window, cx);
|
|
}
|
|
cx.notify();
|
|
}
|
|
self.dismiss_on_focus_lost = false;
|
|
true
|
|
}
|
|
|
|
/// Returns the currently active modal if it is of type `V`.
|
|
pub fn active_modal<V>(&self) -> Option<Entity<V>>
|
|
where
|
|
V: 'static,
|
|
{
|
|
let active_modal = self.active_modal.as_ref()?;
|
|
active_modal.modal.view().downcast::<V>().ok()
|
|
}
|
|
|
|
pub fn has_active_modal(&self) -> bool {
|
|
self.active_modal.is_some()
|
|
}
|
|
|
|
/// Returns whether the active modal is the command palette.
|
|
pub fn is_active_modal_command_palette(&self, cx: &App) -> bool {
|
|
self.active_modal
|
|
.as_ref()
|
|
.map_or(false, |modal| modal.modal.is_command_palette(cx))
|
|
}
|
|
}
|
|
|
|
impl Render for ModalLayer {
|
|
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let Some(active_modal) = &self.active_modal else {
|
|
return div().into_any_element();
|
|
};
|
|
|
|
if active_modal.modal.render_bare(cx) {
|
|
return active_modal.modal.view().into_any_element();
|
|
}
|
|
|
|
div()
|
|
.absolute()
|
|
.size_full()
|
|
.inset_0()
|
|
.occlude()
|
|
.when(active_modal.modal.fade_out_background(cx), |this| {
|
|
let mut background = cx.theme().colors().elevated_surface_background;
|
|
background.fade_out(0.2);
|
|
this.bg(background)
|
|
})
|
|
.on_mouse_down(
|
|
MouseButton::Left,
|
|
cx.listener(|this, _, window, cx| {
|
|
this.hide_modal(window, cx);
|
|
}),
|
|
)
|
|
.child(
|
|
v_flex()
|
|
.h(px(0.0))
|
|
.top_20()
|
|
.items_center()
|
|
.track_focus(&active_modal.focus_handle)
|
|
.child(
|
|
h_flex()
|
|
.occlude()
|
|
.child(active_modal.modal.view())
|
|
.on_mouse_down(MouseButton::Left, |_, _, cx| {
|
|
cx.stop_propagation();
|
|
}),
|
|
),
|
|
)
|
|
.into_any_element()
|
|
}
|
|
}
|