Pipe events into subviews (#13)

and match only unhandled events afterwards

src/widgets/countdown.rs

@@ -22,14 +22,11 @@ impl Countdown {
     pub const fn new(clock: Clock<clock::Countdown>) -> Self {
         Self { clock }
     }
-
-    pub fn is_edit_mode(&mut self) -> bool {
-        self.clock.is_edit_mode()
-    }
 }
 
 impl EventHandler for Countdown {
-    fn update(&mut self, event: Event) {
+    fn update(&mut self, event: Event) -> Option<Event> {
+        let edit_mode = self.clock.is_edit_mode();
         match event {
             Event::Tick => {
                 self.clock.tick();
@@ -47,22 +44,23 @@ impl EventHandler for Countdown {
                 KeyCode::Char('e') => {
                     self.clock.toggle_edit();
                 }
-                KeyCode::Left => {
+                KeyCode::Left if edit_mode => {
                     self.clock.edit_next();
                 }
-                KeyCode::Right => {
+                KeyCode::Right if edit_mode => {
                     self.clock.edit_prev();
                 }
-                KeyCode::Up => {
+                KeyCode::Up if edit_mode => {
                     self.clock.edit_up();
                 }
-                KeyCode::Down => {
+                KeyCode::Down if edit_mode => {
                     self.clock.edit_down();
                 }
-                _ => {}
+                _ => return Some(event),
             },
-            _ => {}
+            _ => return Some(event),
         }
+        None
     }
 }
 

src/widgets/pomodoro.rs

@@ -72,14 +72,11 @@ impl Pomodoro {
             Mode::Work => Mode::Pause,
         };
     }
-
-    pub fn is_edit_mode(&mut self) -> bool {
-        self.get_clock().is_edit_mode()
-    }
 }
 
 impl EventHandler for Pomodoro {
-    fn update(&mut self, event: Event) {
+    fn update(&mut self, event: Event) -> Option<Event> {
+        let edit_mode = self.get_clock().is_edit_mode();
         match event {
             Event::Tick => {
                 self.get_clock().tick();
@@ -91,35 +88,33 @@ impl EventHandler for Pomodoro {
                 KeyCode::Char('e') => {
                     self.get_clock().toggle_edit();
                 }
-                KeyCode::Left => {
-                    if self.get_clock().is_edit_mode() {
-                        self.get_clock().edit_next();
-                    } else {
-                        // `next` is acting as same as a `prev` function, we don't have
-                        self.next();
-                    }
+                KeyCode::Left if edit_mode => {
+                    self.get_clock().edit_next();
+                }
+                KeyCode::Left if edit_mode => {
+                    // `next` is acting as same as a `prev` function, we don't have
+                    self.next();
+                }
+                KeyCode::Right if edit_mode => {
+                    self.get_clock().edit_prev();
                 }
                 KeyCode::Right => {
-                    if self.get_clock().is_edit_mode() {
-                        self.get_clock().edit_prev();
-                    } else {
-                        self.next();
-                    }
+                    self.next();
                 }
-                KeyCode::Up => {
+                KeyCode::Up if edit_mode => {
                     self.get_clock().edit_up();
                 }
-                KeyCode::Down => {
+                KeyCode::Down if edit_mode => {
                     self.get_clock().edit_down();
                 }
                 KeyCode::Char('r') => {
                     self.get_clock().reset();
                 }
-                _ => {}
+                _ => return Some(event),
             },
-
-            _ => {}
+            _ => return Some(event),
         }
+        None
     }
 }
 

src/widgets/timer.rs

@@ -24,7 +24,7 @@ impl Timer {
 }
 
 impl EventHandler for Timer {
-    fn update(&mut self, event: Event) {
+    fn update(&mut self, event: Event) -> Option<Event> {
         match event {
             Event::Tick => {
                 self.clock.tick();
@@ -35,8 +35,9 @@ impl EventHandler for Timer {
             Event::Key(key) if key.code == KeyCode::Char('r') => {
                 self.clock.reset();
             }
-            _ => {}
+            _ => return Some(event),
         }
+        None
     }
 }