Skip to content

Commit f272002

Browse files
authored
chore: revert ratatui-0.30 changes (#58)
Reverting the main branch back to tracking the release version of Ratatui so that I can release changes to stable widgets and work on the ratatui-0.30 widgets in another branch. https://github.com/joshka/tui-widgets/tree/ratatui-0.30
1 parent 920a0f3 commit f272002

File tree

13 files changed

+19
-24
lines changed

13 files changed

+19
-24
lines changed

Diff for: Cargo.toml

+4-6
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ derive-getters = "0.5.0"
2121
derive_setters = "0.1.6"
2222
document-features = "0.2.10"
2323
futures = "0.3.31"
24-
itertools = "0.13.0"
24+
itertools = "0.14.0"
2525
indoc = "2.0.5"
2626
lipsum = "0.9.1"
2727
pretty_assertions = "1.4.1"
28-
ratatui = { version = "0.30.0-alpha.0", default-features = false }
29-
ratatui-core = { version = "0.1.0-alpha.0" }
30-
ratatui-macros = "0.7.0-alpha.0"
31-
ratatui-widgets = { version = "0.3.0-alpha.0" }
32-
rstest = "0.23.0"
28+
ratatui = { version = "0.29.0", default-features = false }
29+
ratatui-macros = "0.6.0"
30+
rstest = "0.24.0"
3331
strum = { version = "0.26.3", features = ["derive"] }
3432
tokio = { version = "1.41.0" }
3533

Diff for: tui-big-text/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ rust-version.workspace = true
1616
derive_builder.workspace = true
1717
font8x8 = "0.3.1"
1818
itertools.workspace = true
19-
ratatui-core.workspace = true
19+
ratatui = { workspace = true, features = ["crossterm"] }
2020

2121
[dev-dependencies]
2222
color-eyre.workspace = true
2323
crossterm = { workspace = true, features = ["event-stream"] }
2424
futures.workspace = true
2525
indoc.workspace = true
26-
ratatui = { workspace = true, features = ["crossterm"] }
2726
strum.workspace = true
2827
tokio = { workspace = true, features = ["full"] }

Diff for: tui-big-text/src/big_text.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::cmp::min;
22

33
use derive_builder::Builder;
44
use font8x8::UnicodeFonts;
5-
use ratatui_core::{
5+
use ratatui::{
66
buffer::Buffer,
77
layout::{Alignment, Rect},
88
style::Style,
@@ -206,7 +206,7 @@ fn render_glyph(glyph: [u8; 8], area: Rect, buf: &mut Buffer, pixel_size: &Pixel
206206

207207
#[cfg(test)]
208208
mod tests {
209-
use ratatui_core::style::Stylize;
209+
use ratatui::style::Stylize;
210210

211211
use super::*;
212212

Diff for: tui-box-text/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ keywords.workspace = true
1313
[dependencies]
1414
color-eyre.workspace = true
1515
indoc.workspace = true
16-
ratatui-core.workspace = true
16+
ratatui = { workspace = true, default-features = true }
1717

1818
[dev-dependencies]
1919
ratatui = { workspace = true, default-features = true }

Diff for: tui-box-text/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{collections::HashMap, iter::zip, sync::LazyLock};
22

3-
use ratatui_core::{buffer::Buffer, layout::Rect, widgets::Widget};
3+
use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
44

55
pub struct BoxChar(char);
66

Diff for: tui-cards/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ keywords.workspace = true
1717
color-eyre.workspace = true
1818
indoc.workspace = true
1919
strum.workspace = true
20-
ratatui-core.workspace = true
2120
itertools.workspace = true
21+
ratatui = { workspace = true }
2222

2323
[dev-dependencies]
2424
ratatui = { workspace = true, default-features = true }

Diff for: tui-cards/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use std::iter::zip;
2222

2323
use indoc::indoc;
24-
use ratatui_core::{
24+
use ratatui::{
2525
buffer::Buffer,
2626
layout::Rect,
2727
style::{Color, Stylize},

Diff for: tui-popup/examples/paragraph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl App {
4949
let lines: Text = (0..10).map(|i| Span::raw(format!("Line {i}"))).collect();
5050
let paragraph = Paragraph::new(lines).scroll((self.scroll, 0));
5151
let wrapper = KnownSizeWrapper {
52-
inner: &paragraph,
52+
inner: paragraph,
5353
width: 21,
5454
height: 5,
5555
};

Diff for: tui-popup/examples/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn render_popup(frame: &mut Frame, area: Rect, state: &mut PopupState) {
5252
"h: move left",
5353
"l: move right",
5454
]);
55-
let popup = Popup::new(&body)
55+
let popup = Popup::new(body)
5656
.title("Popup")
5757
.style(Style::new().white().on_blue());
5858
frame.render_stateful_widget(popup, area, state);

Diff for: tui-scrollview/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ rust-version.workspace = true
1313

1414
[dependencies]
1515
indoc.workspace = true
16-
ratatui-core.workspace = true
17-
ratatui-widgets.workspace = true
16+
ratatui = { workspace = true }
1817

1918
[dev-dependencies]
2019
color-eyre.workspace = true

Diff for: tui-scrollview/examples/scrollview.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,6 @@ const CHART_DATA: [(&str, u64, Color); 3] = [
184184

185185
fn bars() -> BarGroup<'static> {
186186
let data = CHART_DATA
187-
.map(|(label, value, color)| Bar::default().label(label).value(value).style(color));
187+
.map(|(label, value, color)| Bar::default().label(label.into()).value(value).style(color));
188188
BarGroup::default().bars(&data)
189189
}

Diff for: tui-scrollview/src/scroll_view.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
use ratatui_core::{
1+
use ratatui::{
22
buffer::Buffer,
33
layout::{Rect, Size},
4-
widgets::{StatefulWidget, Widget},
4+
widgets::{Scrollbar, ScrollbarOrientation, ScrollbarState, StatefulWidget, Widget},
55
};
6-
use ratatui_widgets::scrollbar::{Scrollbar, ScrollbarOrientation, ScrollbarState};
76

87
use crate::ScrollViewState;
98

@@ -344,7 +343,7 @@ impl ScrollView {
344343

345344
#[cfg(test)]
346345
mod tests {
347-
use ratatui_core::text::Span;
346+
use ratatui::text::Span;
348347
use rstest::{fixture, rstest};
349348

350349
use super::*;

Diff for: tui-scrollview/src/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ratatui_core::layout::{Position, Size};
1+
use ratatui::layout::{Position, Size};
22

33
#[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash)]
44
pub struct ScrollViewState {

0 commit comments

Comments
 (0)