Merge pull request #159 from PeterJFB/feat/table-balancing

131 Initial implementation of table balancing
henriklovhaug · Oct 18, 2024 · 981cf15 · 981cf15
2 parents 43cb069 + a7dd4b1
commit 981cf15
Show file tree

Hide file tree

Showing 8 changed files with 386 additions and 119 deletions.
diff --git a/examples/demo.rs b/examples/demo.rs
@@ -1,6 +1,5 @@
 use std::time::{Duration, Instant};
 
-use crossterm;
 use crossterm::event::{Event, KeyCode, KeyModifiers};
 use crossterm::terminal;
 use crossterm::terminal::{EnterAlternateScreen, LeaveAlternateScreen};
@@ -54,7 +53,7 @@ impl App {
 
     fn scroll_down(&mut self) -> bool {
         if let Some(markdown) = &self.markdown {
-            let len = markdown.content().len() as u16;
+            let len = markdown.height();
             if self.area.height > len {
                 self.scroll = 0;
             } else {
@@ -75,11 +74,7 @@ impl App {
     fn draw(&mut self, frame: &mut Frame) {
         self.area = frame.area();
 
-        self.markdown = Some(parser::parse_markdown(
-            None,
-            &CONTENT.to_string(),
-            self.area.width,
-        ));
+        self.markdown = Some(parser::parse_markdown(None, CONTENT, self.area.width));
 
         if let Some(markdown) = &mut self.markdown {
             markdown.set_scroll(self.scroll);
@@ -92,19 +87,15 @@ impl App {
             };
 
             for child in markdown.children() {
-                match child {
-                    Component::TextComponent(comp) => {
-                        if comp.y_offset().saturating_sub(comp.scroll_offset()) >= area.height
-                            || (comp.y_offset() + comp.height())
-                                .saturating_sub(comp.scroll_offset())
-                                == 0
-                        {
-                            continue;
-                        }
-
-                        frame.render_widget(comp.clone(), area);
+                if let Component::TextComponent(comp) = child {
+                    if comp.y_offset().saturating_sub(comp.scroll_offset()) >= area.height
+                        || (comp.y_offset() + comp.height()).saturating_sub(comp.scroll_offset())
+                            == 0
+                    {
+                        continue;
                     }
-                    _ => {}
+
+                    frame.render_widget(comp.clone(), area);
                 }
             }
         }

diff --git a/src/boxes/searchbox.rs b/src/boxes/searchbox.rs
@@ -27,7 +27,7 @@ impl SearchBox {
     }
 
     pub fn insert(&mut self, c: char) {
-        self.text.push_str(&c.to_string());
+        self.text.push(c);
         self.cursor += 1;
     }
 

diff --git a/src/md.pest b/src/md.pest
@@ -82,7 +82,7 @@ italic = {
 sentence   = _{ (latex | code | link | bold_italic | italic | bold | strikethrough | normal+)+ }
 t_sentence = _{ (!"|" ~ (latex | code | link | italic | bold | strikethrough | t_normal))+ }
 
-table_cell      = { "|" ~ WHITESPACE_S* ~ t_sentence+ ~ WHITESPACE_S* ~ ("|" ~ " "* ~ NEWLINE)? }
+table_cell      = { "|" ~ WHITESPACE_S* ~ t_sentence* ~ WHITESPACE_S* ~ ("|" ~ " "* ~ NEWLINE)? }
 table_seperator = { ("|"? ~ (WHITESPACE_S | ":")* ~ "-"+ ~ (WHITESPACE_S | ":")* ~ "|") }
 
 u_list = { indent ~ ("-" | "*") ~ WHITESPACE_S ~ sentence+ }

diff --git a/src/nodes/root.rs b/src/nodes/root.rs
@@ -105,7 +105,8 @@ impl ComponentRoot {
             Component::TextComponent(comp) => Some(comp),
             Component::Image(_) => None,
         }) {
-            if index - count < comp.num_links() {
+            let link_inside_comp = index - count < comp.num_links();
+            if link_inside_comp {
                 comp.visually_select(index - count)?;
                 return Ok(comp.y_offset());
             }