Align dispatch_keystroke with other uses of ancestors iterator and filter out non-existant views

2024-09-20 02:47:34 +03:00 · 2023-03-17 10:56:44 -07:00 · 2023-03-17 10:56:44 -07:00 · 578c69476d
commit 578c69476d
parent f7f9b8cffe
1 changed files with 5 additions and 9 deletions
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@ -1479,15 +1479,11 @@ impl MutableAppContext {
        if let Some(focused_view_id) = self.focused_view_id(window_id) {
            let dispatch_path = self
                .ancestors(window_id, focused_view_id)
-                .map(|view_id| {
-                    (
-                        view_id,
-                        self.cx
-                            .views
-                            .get(&(window_id, view_id))
-                            .unwrap()
-                            .keymap_context(self.as_ref()),
-                    )
+                .filter_map(|view_id| {
+                    self.cx
+                        .views
+                        .get(&(window_id, view_id))
+                        .map(|view| (view_id, view.keymap_context(self.as_ref())))
                })
                .collect();