Fix event handling for Option<T>

LucasPickering · Sep 17, 2024 · c1ad880 · c1ad880
1 parent b093dde
commit c1ad880
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/crates/tui/src/view/component/recipe_pane.rs b/crates/tui/src/view/component/recipe_pane.rs
@@ -94,11 +94,11 @@ impl EventHandler for RecipePane {
     }
 
     fn children(&mut self) -> Vec<Component<Child<'_>>> {
-        self.recipe_state
-            .get_mut()
-            .map(|state| state.to_child_mut())
-            .into_iter()
-            .collect()
+        if let Some(state) = self.recipe_state.get_mut() {
+            vec![state.to_child_mut()]
+        } else {
+            vec![]
+        }
     }
 }
 

diff --git a/crates/tui/src/view/event.rs b/crates/tui/src/view/event.rs
@@ -51,12 +51,20 @@ pub trait EventHandler {
 
 /// Enable `Component<Option<T>>` with an empty event handler
 impl<T: EventHandler> EventHandler for Option<T> {
-    fn update(&mut self, _: &mut UpdateContext, event: Event) -> Update {
-        Update::Propagate(event)
+    fn update(&mut self, context: &mut UpdateContext, event: Event) -> Update {
+        if let Some(inner) = self.as_mut() {
+            inner.update(context, event)
+        } else {
+            Update::Propagate(event)
+        }
     }
 
     fn children(&mut self) -> Vec<Component<Child<'_>>> {
-        Vec::new()
+        if let Some(inner) = self.as_mut() {
+            inner.children()
+        } else {
+            vec![]
+        }
     }
 }