From 77d8cb0caf2e890d78253b8e12f3005bb9f0a7ce Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Mon, 2 Sep 2024 16:42:48 +0200 Subject: [PATCH] lib: Remove items from imUI table state --- src/ui/im.rs | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/src/ui/im.rs b/src/ui/im.rs index b8041272..06df204a 100644 --- a/src/ui/im.rs +++ b/src/ui/im.rs @@ -577,8 +577,6 @@ pub mod widget { ) -> InnerResponse { let mut response = Response::default(); - // let (_, has_focus) = ui.current_area().unwrap_or_default(); - let mut state = GroupState { focus: *self.focus, len: self.len, @@ -632,33 +630,16 @@ pub mod widget { } #[derive(Clone, Debug)] - pub struct TableState { - items: Vec, + pub struct TableState { internal: ratatui::widgets::TableState, } - impl TableState { - pub fn selected_item(&self) -> Option<&R> { - self.internal - .selected() - .as_ref() - .and_then(|selected| self.items.get(*selected)) - } - } - - impl TableState - where - R: Clone, - { - pub fn new(selected: Option, items: Vec) -> Self { + impl TableState { + pub fn new(selected: Option) -> Self { let mut internal = ratatui::widgets::TableState::default(); internal.select(selected); - Self { items, internal } - } - - pub fn items(&self) -> &Vec { - &self.items + Self { internal } } pub fn selected(&self) -> Option { @@ -670,10 +651,7 @@ pub mod widget { } } - impl TableState - where - R: Clone, - { + impl TableState { fn prev(&mut self) -> Option { let selected = self .internal @@ -777,7 +755,6 @@ pub mod widget { let has_items = !self.items.is_empty(); let mut state = TableState { - items: self.items.clone(), internal: { let mut state = ratatui::widgets::TableState::default(); state.select(self.selected.clone());