1 files changed, 14 insertions, 33 deletions
diff --git a/src/canvas/widgets/disk_table.rs b/src/canvas/widgets/disk_table.rs
index 418ba33a..27e22422 100644
--- a/src/canvas/widgets/disk_table.rs
+++ b/src/canvas/widgets/disk_table.rs
@@ -1,51 +1,32 @@
 use tui::{backend::Backend, layout::Rect, terminal::Frame};
 
 use crate::{
-    app,
+    app::{self},
     canvas::Painter,
-    components::text_table::{TextTable, TextTableTitle},
+    components::data_table::{DrawInfo, SelectionState},
 };
 
 impl Painter {
     pub fn draw_disk_table<B: Backend>(
-        &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, draw_border: bool,
-        widget_id: u64,
+        &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, widget_id: u64,
     ) {
         let recalculate_column_widths = app_state.should_get_widget_bounds();
         if let Some(disk_widget_state) = app_state.disk_state.widget_states.get_mut(&widget_id) {
             let is_on_widget = app_state.current_widget.widget_id == widget_id;
-            let (border_style, highlighted_text_style) = if is_on_widget {
-                (
-                    self.colours.highlighted_border_style,
-                    self.colours.currently_selected_text_style,
-                )
-            } else {
-                (self.colours.border_style, self.colours.text_style)
-            };
-            TextTable {
-                table_gap: app_state.app_config_fields.table_gap,
-                is_force_redraw: app_state.is_force_redraw,
+
+            let draw_info = DrawInfo {
+                loc: draw_loc,
+                force_redraw: app_state.is_force_redraw,
                 recalculate_column_widths,
-                header_style: self.colours.table_header_style,
-                border_style,
-                highlighted_text_style,
-                title: Some(TextTableTitle {
-                    title: " Disks ".into(),
-                    is_expanded: app_state.is_expanded,
-                }),
-                is_on_widget,
-                draw_border,
-                show_table_scroll_position: app_state.app_config_fields.show_table_scroll_position,
-                title_style: self.colours.widget_title_style,
-                text_style: self.colours.text_style,
-                left_to_right: true,
-            }
-            .draw_text_table(
+                selection_state: SelectionState::new(app_state.is_expanded, is_on_widget),
+            };
+
+            disk_widget_state.table.draw(
                 f,
-                draw_loc,
-                &mut disk_widget_state.table_state,
-                &app_state.converted_data.disk_data,
+                &draw_info,
+                app_state.converted_data.disk_data.clone(),
                 app_state.widget_map.get_mut(&widget_id),
+                self,
             );
         }
     }