Dismiss context menu when (right-)mousing down outside of it

crates/context_menu/src/context_menu.rs

@@ -237,14 +237,16 @@ impl ContextMenu {
     }
 
     fn render_menu(&self, cx: &mut RenderContext<Self>) -> impl Element {
-        enum Tag {}
+        enum Menu {}
+        enum MenuItem {}
         let style = cx.global::<Settings>().theme.context_menu.clone();
+        MouseEventHandler::new::<Menu, _, _>(0, cx, |_, cx| {
             Flex::column()
                 .with_children(self.items.iter().enumerate().map(|(ix, item)| {
                     match item {
                         ContextMenuItem::Item { label, action } => {
                             let action = action.boxed_clone();
-                        MouseEventHandler::new::<Tag, _, _>(ix, cx, |state, _| {
+                            MouseEventHandler::new::<MenuItem, _, _>(ix, cx, |state, _| {
                                 let style =
                                     style.item.style_for(state, Some(ix) == self.selected_index);
                                 Flex::row()
@@ -281,5 +283,9 @@ impl ContextMenu {
                 }))
                 .contained()
                 .with_style(style.container)
+                .boxed()
+        })
+        .on_mouse_down_out(|_, cx| cx.dispatch_action(Cancel))
+        .on_right_mouse_down_out(|_, cx| cx.dispatch_action(Cancel))
     }
 }

crates/gpui/src/elements/mouse_event_handler.rs

@@ -88,6 +88,22 @@ impl MouseEventHandler {
         self
     }
 
+    pub fn on_mouse_down_out(
+        mut self,
+        handler: impl Fn(Vector2F, &mut EventContext) + 'static,
+    ) -> Self {
+        self.mouse_down_out = Some(Rc::new(handler));
+        self
+    }
+
+    pub fn on_right_mouse_down_out(
+        mut self,
+        handler: impl Fn(Vector2F, &mut EventContext) + 'static,
+    ) -> Self {
+        self.right_mouse_down_out = Some(Rc::new(handler));
+        self
+    }
+
     pub fn on_drag(mut self, handler: impl Fn(Vector2F, &mut EventContext) + 'static) -> Self {
         self.drag = Some(Rc::new(handler));
         self