Merge branch 'main' into implicit-ancestry

2023-05-04 14:39:58 +02:00
parent 7b7a495be3 7e2a461486
commit da19edc3e3
33 changed files with 746 additions and 392 deletions
@@ -140,10 +140,9 @@ impl View for ContextMenu {
        "ContextMenu"
    }

-    fn keymap_context(&self, _: &AppContext) -> KeymapContext {
-        let mut cx = Self::default_keymap_context();
-        cx.add_identifier("menu");
-        cx
+    fn update_keymap_context(&self, keymap: &mut KeymapContext, _: &AppContext) {
+        Self::reset_to_default_keymap_context(keymap);
+        keymap.add_identifier("menu");
    }

    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {