Skip to content

Commit

Permalink
minor code cleanup, attach keyevents to scrollbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@aprxi
aprxi committed Sep 14, 2024
1 parent 4dadeee commit 55771a0
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 58 deletions.
46 changes: 0 additions & 46 deletions lumni/src/apps/builtin/llm/prompt/src/tui/events/key_event.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,55 +273,9 @@ impl KeyEventHandler {
is_running,
)?
}
// Some(ConversationEvent::Select(_)) => {
// if let Some(current_conversations) = app_ui
// .workspaces
// .current_conversations_mut()
// {
// *current_mode = current_conversations
// .handle_key_event(
// &mut self.key_track,
// tab_chat,
// handler,
// )
// .await?;
// } else {
// // Handle the case where there is no current workspace or conversations
// log::warn!(
// "No current workspace or \
// conversations available"
// );
// }
// return Ok(());
// }
_ => return Ok(()),
};
}

// WindowMode::Select => {
// // Forward event to the selected mode
// if let Some(current_conversations) =
// app_ui.workspaces.current_conversations_mut()
// {
// *current_mode = current_conversations
// .handle_key_event(
// &mut self.key_track,
// tab_chat,
// handler,
// )
// .await?;
// } else {
// log::warn!(
// "No current workspace or conversations \
// available"
// );
// return Err(ApplicationError::NotReady(
// "No current workspace or conversations \
// available"
// .to_string(),
// ));
// }
// }
_ => {}
};
Ok(())
Expand Down
60 changes: 48 additions & 12 deletions lumni/src/apps/builtin/llm/prompt/src/tui/widgets/textarea.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
use crossterm::event::{KeyCode, KeyEvent};
use ratatui::buffer::Buffer;
use ratatui::layout::{Margin, Rect};
use ratatui::style::Style;
Expand Down Expand Up @@ -65,6 +65,7 @@ pub struct TextAreaState<'a, T: TextDocumentTrait> {
text_buffer: TextBuffer<'a, T>,
key_track: KeyTrack,
scroll_offset: usize,
viewport_height: usize,
}

impl<T: TextDocumentTrait> TextAreaWidget<T> {
Expand All @@ -89,9 +90,17 @@ impl<T: TextDocumentTrait> TextAreaWidget<T> {
});

let total_lines = state.text_buffer.display_lines_len();
let viewport_height = area.height as usize;
let viewport_height = state.viewport_height;

let scrollable_area =
total_lines.saturating_sub(viewport_height).max(1);

let position = (state.scroll_offset as f64 / scrollable_area as f64
* scrollable_area as f64)
.round() as usize;

let mut scrollbar_state =
ScrollbarState::new(total_lines).position(state.scroll_offset);
ScrollbarState::new(scrollable_area).position(position);

StatefulWidget::render(
scrollbar,
Expand All @@ -108,6 +117,7 @@ impl<'a, T: TextDocumentTrait> TextAreaState<'a, T> {
text_buffer: TextBuffer::new(document),
key_track: KeyTrack::new(),
scroll_offset: 0,
viewport_height: 0,
}
}

Expand All @@ -122,11 +132,37 @@ impl<'a, T: TextDocumentTrait> TextAreaState<'a, T> {
pub fn handle_key_event(&mut self, key_event: KeyEvent) {
self.key_track.process_key(key_event);

// For now, just print the received key events
eprintln!(
"Received key event for TextArea: {:?}",
self.key_track.current_key()
);
match key_event.code {
KeyCode::Up => self.scroll_up(1),
KeyCode::Down => self.scroll_down(1),
KeyCode::PageUp => self.scroll_up(self.viewport_height),
KeyCode::PageDown => self.scroll_down(self.viewport_height),
_ => {
eprintln!(
"Received key event for TextArea: {:?}",
self.key_track.current_key()
);
}
}
}

fn scroll_up(&mut self, amount: usize) {
self.scroll_offset = self.scroll_offset.saturating_sub(amount);
}

fn scroll_down(&mut self, amount: usize) {
let total_lines = self.text_buffer.display_lines_len();
let max_scroll = total_lines.saturating_sub(self.viewport_height);
self.scroll_offset = (self.scroll_offset + amount).min(max_scroll);
}

fn max_scroll(&self) -> usize {
let total_lines = self.text_buffer.display_lines_len();
total_lines.saturating_sub(self.viewport_height)
}

pub fn set_viewport_height(&mut self, height: usize) {
self.viewport_height = height;
}
}

Expand Down Expand Up @@ -175,10 +211,11 @@ impl<T: TextDocumentTrait> StatefulWidgetRef for &TextAreaWidget<T> {
let total_lines = state.text_buffer.display_lines_len();
let viewport_height = area.height as usize;

// Adjust scroll if necessary
state.set_viewport_height(viewport_height);

if total_lines > viewport_height {
state.scroll_offset =
state.scroll_offset.min(total_lines - viewport_height);
let max_scroll = total_lines - viewport_height;
state.scroll_offset = state.scroll_offset.min(max_scroll);
} else {
state.scroll_offset = 0;
}
Expand All @@ -191,7 +228,6 @@ impl<T: TextDocumentTrait> StatefulWidgetRef for &TextAreaWidget<T> {
let paragraph = Paragraph::new(visible_text).style(Style::default());
Widget::render(paragraph, area, buf);

// Render scrollbar if there's more content than can fit in the viewport
if total_lines > viewport_height {
self.render_scrollbar(buf, area, state);
}
Expand Down

0 comments on commit 55771a0

Please sign in to comment.