From 72e308c4c82dcec3f5df6f1f6e95bda25b902055 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Mon, 4 Sep 2023 17:15:20 +0200 Subject: [PATCH] Add keybindings for j/k that navigate lists and non-editable textareas --- src/app/event.rs | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/src/app/event.rs b/src/app/event.rs index 0ddfeb55..637ed709 100644 --- a/src/app/event.rs +++ b/src/app/event.rs @@ -62,7 +62,11 @@ impl tuirealm::Component for Widget { } _ => None, }, - Event::Keyboard(KeyEvent { code: Key::Up, .. }) => { + Event::Keyboard(KeyEvent { code: Key::Up, .. }) + | Event::Keyboard(KeyEvent { + code: Key::Char('k'), + .. + }) => { let result = self.perform(Cmd::Move(MoveDirection::Up)); match result { CmdResult::Changed(State::One(StateValue::Usize(selected))) => { @@ -74,6 +78,10 @@ impl tuirealm::Component for Widget { } Event::Keyboard(KeyEvent { code: Key::Down, .. + }) + | Event::Keyboard(KeyEvent { + code: Key::Char('j'), + .. }) => { let result = self.perform(Cmd::Move(MoveDirection::Down)); match result { @@ -99,12 +107,20 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { match event { - Event::Keyboard(KeyEvent { code: Key::Up, .. }) => { + Event::Keyboard(KeyEvent { code: Key::Up, .. }) + | Event::Keyboard(KeyEvent { + code: Key::Char('k'), + .. + }) => { self.perform(Cmd::Scroll(MoveDirection::Up)); Some(Message::Tick) } Event::Keyboard(KeyEvent { code: Key::Down, .. + }) + | Event::Keyboard(KeyEvent { + code: Key::Char('j'), + .. }) => { self.perform(Cmd::Scroll(MoveDirection::Down)); Some(Message::Tick) @@ -265,12 +281,20 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { match event { - Event::Keyboard(KeyEvent { code: Key::Up, .. }) => { + Event::Keyboard(KeyEvent { code: Key::Up, .. }) + | Event::Keyboard(KeyEvent { + code: Key::Char('k'), + .. + }) => { self.perform(Cmd::Move(MoveDirection::Up)); Some(Message::Tick) } Event::Keyboard(KeyEvent { code: Key::Down, .. + }) + | Event::Keyboard(KeyEvent { + code: Key::Char('j'), + .. }) => { self.perform(Cmd::Move(MoveDirection::Down)); Some(Message::Tick) @@ -306,12 +330,20 @@ impl tuirealm::Component for Widget { }; match event { - Event::Keyboard(KeyEvent { code: Key::Up, .. }) => { + Event::Keyboard(KeyEvent { code: Key::Up, .. }) + | Event::Keyboard(KeyEvent { + code: Key::Char('k'), + .. + }) => { self.perform(Cmd::Move(MoveDirection::Up)); Some(Message::Tick) } Event::Keyboard(KeyEvent { code: Key::Down, .. + }) + | Event::Keyboard(KeyEvent { + code: Key::Char('j'), + .. }) => { self.perform(Cmd::Move(MoveDirection::Down)); Some(Message::Tick)