Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui_web: Only cancel the native context menu when the app claims the right-click (#60892)

Baris Palaskaed4d201f507e
diff --git a/crates/gpui_web/src/events.rs b/crates/gpui_web/src/events.rs
index 08434aada41..31a37d527f1 100644
--- a/crates/gpui_web/src/events.rs
+++ b/crates/gpui_web/src/events.rs
@@ -151,13 +151,21 @@ impl WebWindowInner {
current_state.modifiers = modifiers;
}
- this.dispatch_input(PlatformInput::MouseDown(MouseDownEvent {
+ let result = this.dispatch_input(PlatformInput::MouseDown(MouseDownEvent {
button,
position,
modifiers,
click_count,
first_mouse: false,
}));
+
+ // The browser fires `contextmenu` after this event; remember whether
+ // the app claimed the right-click (e.g. opened its own menu) so the
+ // contextmenu listener cancels the native menu only in that case.
+ if button == MouseButton::Right {
+ let claimed = result.is_some_and(|result| !result.propagate);
+ this.app_claimed_right_click.set(claimed);
+ }
})
}
@@ -271,9 +279,12 @@ impl WebWindowInner {
}
fn register_context_menu(self: &Rc<Self>) -> Closure<dyn FnMut(JsValue)> {
+ let this = Rc::clone(self);
self.listen("contextmenu", move |event: JsValue| {
let event: web_sys::Event = event.unchecked_into();
- event.prevent_default();
+ if this.app_claimed_right_click.replace(false) {
+ event.prevent_default();
+ }
})
}
diff --git a/crates/gpui_web/src/window.rs b/crates/gpui_web/src/window.rs
index b9399d32e63..5f4223572b3 100644
--- a/crates/gpui_web/src/window.rs
+++ b/crates/gpui_web/src/window.rs
@@ -55,6 +55,7 @@ pub(crate) struct WebWindowInner {
pub(crate) last_physical_size: Cell<(u32, u32)>,
pub(crate) notify_scale: Cell<bool>,
pub(crate) is_composing: Cell<bool>,
+ pub(crate) app_claimed_right_click: Cell<bool>,
mql_handle: RefCell<Option<MqlHandle>>,
pending_physical_size: Cell<Option<(u32, u32)>>,
}
@@ -182,6 +183,7 @@ impl WebWindow {
last_physical_size: Cell::new((0, 0)),
notify_scale: Cell::new(false),
is_composing: Cell::new(false),
+ app_claimed_right_click: Cell::new(false),
mql_handle: RefCell::new(None),
pending_physical_size: Cell::new(None),
});