diff --git a/src/widgets/barchart.rs b/src/widgets/barchart.rs index 8bb5ff82..15db9d31 100644 --- a/src/widgets/barchart.rs +++ b/src/widgets/barchart.rs @@ -1149,4 +1149,35 @@ mod tests { let expected = Buffer::with_lines(vec![" █", "▆ █", " G"]); assert_buffer_eq!(buffer, expected); } + + #[test] + fn test_unicode_as_value() { + let group = BarGroup::default().bars(&[ + Bar::default() + .value(123) + .label("B1".into()) + .text_value("写".into()), + Bar::default() + .value(321) + .label("B2".into()) + .text_value("写".into()), + Bar::default() + .value(333) + .label("B2".into()) + .text_value("写".into()), + ]); + let chart = BarChart::default().data(group).bar_width(3).bar_gap(1); + + let mut buffer = Buffer::empty(Rect::new(0, 0, 11, 5)); + chart.render(buffer.area, &mut buffer); + + let expected = Buffer::with_lines(vec![ + " ▆▆▆ ███", + " ███ ███", + "▃▃▃ ███ ███", + "写█ 写█ 写█", + "B1 B2 B2 ", + ]); + assert_buffer_eq!(buffer, expected); + } } diff --git a/src/widgets/barchart/bar.rs b/src/widgets/barchart/bar.rs index cbf0ee5e..7d2d6e91 100644 --- a/src/widgets/barchart/bar.rs +++ b/src/widgets/barchart/bar.rs @@ -1,3 +1,5 @@ +use unicode_width::UnicodeWidthStr; + use crate::{buffer::Buffer, prelude::Rect, style::Style, text::Line}; /// A bar to be shown by the [`BarChart`](crate::widgets::BarChart) widget. @@ -154,7 +156,7 @@ impl<'a> Bar<'a> { self.value.to_string() }; - let width = value_label.len() as u16; + let width = value_label.width() as u16; if width < max_width { buf.set_string( x + (max_width.saturating_sub(value_label.len() as u16) >> 1),