Add expand(<) and shrink(>) width support to NoteTree (#125)

Author: panarch

core/src/event.rs

@@ -111,6 +111,8 @@ pub enum KeyEvent {
     DollarSign,
     Caret,
     QuestionMark,
+    AngleBracketOpen,
+    AngleBracketClose,
     Num(NumKey),
     Left,
     Right,

core/src/state/notebook.rs

@@ -268,6 +268,8 @@ impl NotebookState {
                     "[k]     Select previous".to_owned(),
                     "[G]     Select last".to_owned(),
                     "[1-9]   Add steps".to_owned(),
+                    "[>]     Expand width".to_owned(),
+                    "[<]     Shrink width".to_owned(),
                     "[Space] Move note".to_owned(),
                     "[m]     Show more actions".to_owned(),
                 ];
@@ -287,6 +289,8 @@ impl NotebookState {
                     "[k]     Select previous".to_owned(),
                     "[G]     Select last".to_owned(),
                     "[1-9]   Add steps".to_owned(),
+                    "[>]     Expand width".to_owned(),
+                    "[<]     Shrink width".to_owned(),
                     "[Space] Move directory".to_owned(),
                     "[m]     Show more actions".to_owned(),
                 ];
@@ -304,6 +308,8 @@ impl NotebookState {
                     format!("[k]   Select {n} previous"),
                     "[G]   Select last".to_owned(),
                     "[0-9] Append steps".to_owned(),
+                    format!("[>]   Expand width by {n}"),
+                    format!("[<]   Shrink width by {n}"),
                     "[Esc] Cancel".to_owned(),
                 ]
             }

core/src/state/notebook/inner_state/note_tree/directory_selected.rs

@@ -81,6 +81,12 @@ pub async fn consume(
             Ok(NotebookTransition::None)
         }
         Key(KeyEvent::CapG) => Ok(NotebookTransition::NoteTree(NoteTreeTransition::SelectLast)),
+        Key(KeyEvent::AngleBracketOpen) => Ok(NotebookTransition::NoteTree(
+            NoteTreeTransition::ShrinkWidth(1),
+        )),
+        Key(KeyEvent::AngleBracketClose) => Ok(NotebookTransition::NoteTree(
+            NoteTreeTransition::ExpandWidth(1),
+        )),
         Key(KeyEvent::Tab) if !state.tabs.is_empty() => tabs::focus_editor(db, state).await,
         event @ Key(_) => Ok(NotebookTransition::Inedible(event)),
         _ => Err(Error::Wip("todo: Notebook::consume".to_owned())),

core/src/state/notebook/inner_state/note_tree/note_selected.rs

@@ -70,6 +70,12 @@ pub async fn consume(
             Ok(NotebookTransition::None)
         }
         Key(KeyEvent::CapG) => Ok(NotebookTransition::NoteTree(NoteTreeTransition::SelectLast)),
+        Key(KeyEvent::AngleBracketOpen) => Ok(NotebookTransition::NoteTree(
+            NoteTreeTransition::ShrinkWidth(1),
+        )),
+        Key(KeyEvent::AngleBracketClose) => Ok(NotebookTransition::NoteTree(
+            NoteTreeTransition::ExpandWidth(1),
+        )),
         Key(KeyEvent::Tab) if !state.tabs.is_empty() => tabs::focus_editor(db, state).await,
         event @ Key(_) => Ok(NotebookTransition::Inedible(event)),
         _ => Err(Error::Wip("todo: Notebook::consume".to_owned())),

core/src/state/notebook/inner_state/note_tree/numbering.rs

@@ -56,6 +56,18 @@ pub async fn consume(
             reset_state(state);
             Ok(NotebookTransition::NoteTree(NoteTreeTransition::SelectLast))
         }
+        Key(KeyEvent::AngleBracketOpen) => {
+            reset_state(state);
+            Ok(NotebookTransition::NoteTree(
+                NoteTreeTransition::ShrinkWidth(n),
+            ))
+        }
+        Key(KeyEvent::AngleBracketClose) => {
+            reset_state(state);
+            Ok(NotebookTransition::NoteTree(
+                NoteTreeTransition::ExpandWidth(n),
+            ))
+        }
         event @ Key(_) => {
             reset_state(state);
             Ok(NotebookTransition::Inedible(event))

core/src/transition.rs

@@ -95,6 +95,8 @@ pub enum NoteTreeTransition {
     SelectNext(usize),
     SelectPrev(usize),
     SelectLast,
+    ExpandWidth(usize),
+    ShrinkWidth(usize),
 }
 
 pub enum MoveModeTransition {

tui/src/action.rs

@@ -433,6 +433,8 @@ fn to_event(input: Input) -> Option<KeyEvent> {
         KeyCode::Char('^') => KeyEvent::Caret,
         KeyCode::Char('~') => KeyEvent::Tilde,
         KeyCode::Char('?') => KeyEvent::QuestionMark,
+        KeyCode::Char('<') => KeyEvent::AngleBracketOpen,
+        KeyCode::Char('>') => KeyEvent::AngleBracketClose,
         KeyCode::Char('.') => KeyEvent::Dot,
         KeyCode::Char('-') => KeyEvent::Dash,
         KeyCode::Char(' ') => KeyEvent::Space,

tui/src/context/notebook.rs

@@ -71,6 +71,7 @@ pub struct NotebookContext {
     // note tree
     pub tree_state: ListState,
     pub tree_items: Vec<TreeItem>,
+    pub tree_width: u16,
 
     // note actions
     pub note_actions_state: ListState,
@@ -101,6 +102,7 @@ impl Default for NotebookContext {
             state: ContextState::NoteTreeBrowsing,
             tree_state: ListState::default().with_selected(Some(0)),
             tree_items: vec![],
+            tree_width: 45,
 
             note_actions_state: ListState::default(),
             directory_actions_state: ListState::default(),

tui/src/transitions/notebook/note_tree.rs

@@ -87,6 +87,19 @@ impl App {
                 let event = get_select_event(selected);
                 self.glues.dispatch(event).await.log_unwrap();
             }
+            NoteTreeTransition::ExpandWidth(n) => {
+                let n = n.try_into().unwrap_or_default();
+                let width = self.context.notebook.tree_width.saturating_add(n);
+
+                self.context.notebook.tree_width = width;
+            }
+            NoteTreeTransition::ShrinkWidth(n) => {
+                let n = n.try_into().unwrap_or_default();
+                let width = self.context.notebook.tree_width.saturating_sub(n);
+                let width = if width < 11 { 11 } else { width };
+
+                self.context.notebook.tree_width = width;
+            }
             NoteTreeTransition::ShowNoteActionsDialog(_)
             | NoteTreeTransition::ShowDirectoryActionsDialog(_) => {}
         }

tui/src/views/body/notebook.rs

@@ -19,7 +19,7 @@ pub fn draw(frame: &mut Frame, area: Rect, context: &mut Context) {
         return;
     }
 
-    let horizontal = Layout::horizontal([Length(45), Percentage(100)]);
+    let horizontal = Layout::horizontal([Length(context.notebook.tree_width), Percentage(100)]);
     let [note_tree_area, editor_area] = horizontal.areas(area);
 
     note_tree::draw(frame, note_tree_area, &mut context.notebook);