fix(term): handle too small width case

ymgyt · May 4, 2024 · 62b5b33 · 62b5b33
1 parent 466368f
commit 62b5b33
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/crates/synd_term/src/types/mod.rs b/crates/synd_term/src/types/mod.rs
@@ -191,9 +191,11 @@ pub struct Entry {
 
 impl Entry {
     pub fn summary_text(&self, width: usize) -> Option<String> {
-        self.summary
-            .as_deref()
-            .map(|summary| html2text::from_read(summary.as_bytes(), width))
+        self.summary.as_deref().map(|summary| {
+            html2text::config::plain()
+                .string_from_read(summary.as_bytes(), width)
+                .unwrap_or_default()
+        })
     }
 
     pub fn requirement(&self) -> Requirement {

diff --git a/crates/synd_term/src/ui/components/filter.rs b/crates/synd_term/src/ui/components/filter.rs
@@ -395,10 +395,13 @@ impl Filter {
         }
         spans.push(label);
 
-        Line::from(spans).render(area, buf);
+        let search = Line::from(spans);
+        let margin = search.width() + 1;
+        search.render(area, buf);
 
         let prompt_area = Rect {
-            x: area.x + 22, // TODO: handle edge case
+            #[allow(clippy::cast_possible_truncation)]
+            x: area.x + margin as u16,
             ..area
         };
         let render_cursor = if self.state == State::SearchFiltering {

diff --git a/crates/synd_term/src/ui/components/tabs.rs b/crates/synd_term/src/ui/components/tabs.rs
@@ -46,7 +46,7 @@ impl Tabs {
     pub fn render(&self, area: Rect, buf: &mut Buffer, cx: &Context<'_>) {
         let area = Rect {
             x: area.x + 3,
-            width: area.width - 5,
+            width: area.width.saturating_sub(5),
             ..area
         };
         // left padding * 2 + len("Entries" + "Feeds") = 20