add bartheme and barstate to sheetview

3 files changed, 22 insertions, 8 deletions

diff --git a/src/state/view/bar.rs b/src/state/view/bar.rs
new file mode 100644
index 0000000..cc59e36
--- /dev/null
+++ b/src/state/view/bar.rs
@@ -0,0 +1,7 @@
+use crate::state::{bar::BarState, GlobalState};
+
+BarState!(
+    SheetViewBarState,
+    GlobalState::instance().sheetview.bar,
+    GlobalState::instance_mut().sheetview.bar
+);
diff --git a/src/state/view/mod.rs b/src/state/view/mod.rs
index 543644c..e45a3f4 100644
--- a/src/state/view/mod.rs
+++ b/src/state/view/mod.rs
@@ -2,9 +2,9 @@ use std::sync::{Arc, RwLock};
 
 use mlua::{IntoLua, UserData, Value};
 
-use self::mode::Mode;
+use self::{bar::SheetViewBarState, mode::Mode};
 
-use super::GlobalState;
+use super::{GlobalState, DUMMY_STATE};
 use crate::{
     cursor::{Cursor, CursorMove},
     sheet::{
@@ -15,6 +15,7 @@ use crate::{
 };
 
 pub mod mode;
+pub mod bar;
 
 #[derive(Default, Debug)]
 pub struct SheetViewState {
@@ -22,6 +23,7 @@ pub struct SheetViewState {
     active_sheet: Option<SheetId>,
     pub mode: Mode,
     pub selection_anchor: Option<(usize, usize)>,
+    pub bar: SheetViewBarState,
 }
 
 impl SheetViewState {
@@ -31,6 +33,7 @@ impl SheetViewState {
             active_sheet: None,
             mode: Mode::Normal,
             selection_anchor: None,
+            bar: SheetViewBarState::new(),
         }
     }
 
@@ -167,6 +170,10 @@ impl UserData for SheetViewState {
             }
             this.mode = mode;
             Ok(())
+        });
+
+        fields.add_field_function_get("bar", |_, _| {
+            Ok(DUMMY_STATE.sheetview.bar)
         })
     }
 
diff --git a/src/state/view/mode.rs b/src/state/view/mode.rs
index 3fa9c63..63e6e5b 100644
--- a/src/state/view/mode.rs
+++ b/src/state/view/mode.rs
@@ -18,15 +18,15 @@ impl<'lua> FromLua<'lua> for Mode {
             match value.as_str().unwrap().to_lowercase().as_ref() {
                 "normal" => Ok(Mode::Normal),
                 "visual" => Ok(Mode::Visual),
-                "insert" => Ok(Mode::Visual),
-                "command" => Ok(Mode::Visual),
+                "insert" => Ok(Mode::Insert),
+                "command" => Ok(Mode::Command),
                 _ => Err(mlua::Error::runtime(
-                    "mode needs to be 'normal', 'visual' or 'insert'",
+                    "mode needs to be 'normal', 'visual', 'insert' or 'command'",
                 )),
             }
         } else {
             Err(mlua::Error::runtime(
-                "mode needs to be 'normal', 'visual' or 'insert'",
+                "mode needs to be 'normal', 'visual' 'insert', or 'command'",
             ))
         }
     }
@@ -39,8 +39,8 @@ impl<'lua> IntoLua<'lua> for Mode {
     ) -> mlua::prelude::LuaResult<mlua::prelude::LuaValue<'lua>> {
         match self {
             Mode::Normal => "normal",
-            Mode::Visual => "insert",
-            Mode::Insert => "visual",
+            Mode::Visual => "visual",
+            Mode::Insert => "insert",
             Mode::Command => "command",
         }
         .into_lua(lua)