1 files changed, 19 insertions, 19 deletions

diff --git a/src/widgets/sheetview/mod.rs b/src/widgets/sheetview/mod.rs
index 202bb70..6bd8408 100644
--- a/src/widgets/sheetview/mod.rs
+++ b/src/widgets/sheetview/mod.rs
@@ -6,7 +6,7 @@ use ratatui::{
 };
 
 use crate::{
-    config::{theme::sheetview::bar::SheetViewBarTheme, GlobalConfig},
+    config::{theme::view::bar::SheetViewBarTheme, GlobalConfig},
     cursor::CursorMove,
     lua,
     sheet::cell::Cell,
@@ -32,26 +32,26 @@ impl SheetView {
     }
 
     fn set_mode(&self, mode: Mode) {
-        GlobalState::instance_mut().sheetview.mode = mode;
+        GlobalState::instance_mut().view.mode = mode;
     }
 
     fn move_cursor(&self, cm: CursorMove) {
         GlobalState::instance_mut()
-            .sheetview
+            .view
             .cursor
             .move_checked(cm)
     }
 
     fn start_selection(&self) {
         let mut state = GlobalState::instance_mut();
-        state.sheetview.selection_anchor = Some((state.sheetview.cursor.y(), state.sheetview.cursor.x()));
-        state.sheetview.mode = Mode::Visual;
+        state.view.selection_anchor = Some((state.view.cursor.y(), state.view.cursor.x()));
+        state.view.mode = Mode::Visual;
     }
 
     fn stop_selection(&self) {
         let mut state = GlobalState::instance_mut();
-        state.sheetview.selection_anchor = None;
-        state.sheetview.mode = Mode::Normal;
+        state.view.selection_anchor = None;
+        state.view.mode = Mode::Normal;
     }
 
     fn open_editor(&self) {
@@ -68,7 +68,7 @@ end)"#,
     }
 
     pub fn handle_key_event(&mut self, event: KeyEvent) {
-        let mode = { GlobalState::instance().sheetview.mode };
+        let mode = { GlobalState::instance().view.mode };
         match mode {
             Mode::Normal => match event.code {
                 KeyCode::Char('j') => self.move_cursor(CursorMove::Down(1)),
@@ -90,11 +90,11 @@ end)"#,
             Mode::Insert => match event.code {
                 KeyCode::Enter => {
                     let mut state = GlobalState::instance_mut();
-                    let lock = state.sheetview.active_sheet().unwrap();
+                    let lock = state.view.active_sheet().unwrap();
                     let mut sheet = lock.write().unwrap();
 
                     state
-                        .sheetview
+                        .view
                         .selection_or_cursor()
                         .into_iter()
                         .for_each(|(r, c)| {
@@ -107,11 +107,11 @@ end)"#,
                             })
                         });
 
-                    state.sheetview.cancel_mode();
+                    state.view.cancel_mode();
                     self.bar.set_input_mode(false);
                 }
                 KeyCode::Esc => {
-                    GlobalState::instance_mut().sheetview.cancel_mode();
+                    GlobalState::instance_mut().view.cancel_mode();
                     self.bar.set_input_mode(false);
                 }
                 _ => self.bar.handle_keyevent(event),
@@ -139,11 +139,11 @@ end)"#,
                         // TODO: push errors to buffer
                     }
 
-                    GlobalState::instance_mut().sheetview.cancel_mode();
+                    GlobalState::instance_mut().view.cancel_mode();
                     self.bar.set_input_mode(false);
                 }
                 KeyCode::Esc => {
-                    GlobalState::instance_mut().sheetview.cancel_mode();
+                    GlobalState::instance_mut().view.cancel_mode();
                     self.bar.set_input_mode(false);
                 }
                 _ => self.bar.handle_keyevent(event),
@@ -158,12 +158,12 @@ impl Widget for &mut SheetView {
         Self: Sized,
     {
         let mode = {
-            let theme = GlobalConfig::instance().theme.sheetview.clone();
+            let theme = GlobalConfig::instance().theme.view.clone();
 
             let state = GlobalState::instance();
-            let lock = state.sheetview.active_sheet().unwrap();
+            let lock = state.view.active_sheet().unwrap();
             let sheet = lock.read().unwrap();
-            let cursor = &state.sheetview.cursor;
+            let cursor = &state.view.cursor;
 
             let sheet_area_inner = self.bar.area(area);
 
@@ -204,7 +204,7 @@ impl Widget for &mut SheetView {
                                 .get(cell_ref, &lua::get())
                                 .unwrap_or_default()
                                 .apply(cell.to_line())
-                        } else if state.sheetview.selection_contains(cell_pos_y, cell_pos_x) {
+                        } else if state.view.selection_contains(cell_pos_y, cell_pos_x) {
                             theme
                                 .selection
                                 .get(cell_ref, &lua::get())
@@ -231,7 +231,7 @@ impl Widget for &mut SheetView {
                 }
             }
 
-            state.sheetview.mode
+            state.view.mode
         };
 
         SheetViewBarState::apply(&mut self.bar, mode, &lua::get());