Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ repository = "https://github.com/TylerBloom/webatui"

[dependencies]
base16-palettes = "0.1.0"
ratatui = { version = "0.26", default-features = false }
ratatui = { version = "0.28", default-features = false }
web-sys = { version = "0.3", features = ["Window", "Screen", "TouchEvent", "TouchList", "Touch", "CssStyleSheet", "StyleSheetList", "CssRuleList", "CssRule"] }
yew = { version = "0.21", features = ["csr"] }
2 changes: 1 addition & 1 deletion examples/color_changer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
webatui = { path = "../../" }
ratatui = { version = "0.26", default-features = false, features = ["all-widgets"] }
ratatui = { version = "0.28", default-features = false, features = ["all-widgets"] }
base16-palettes = { version = "0.1", features = ["gruvbox"] }
yew = "0.21"
2 changes: 1 addition & 1 deletion examples/counter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
webatui = { path = "../../" }
ratatui = { version = "0.26", default-features = false, features = ["all-widgets"] }
ratatui = { version = "0.28", default-features = false, features = ["all-widgets"] }
base16-palettes = "0.1"
yew = "0.21"
2 changes: 1 addition & 1 deletion examples/hello_world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"

[dependencies]
webatui = { path = "../../" }
ratatui = { version = "0.26", default-features = false, features = ["all-widgets"] }
ratatui = { version = "0.28", default-features = false, features = ["all-widgets"] }
27 changes: 19 additions & 8 deletions src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
use base16_palettes::{Base16Accent, Base16Color, Base16Palette, Base16Shade, Palette, Shade};
use ratatui::{
buffer::Cell,
prelude::{Backend, Rect},
layout::Size,
prelude::Backend,
style::{Color, Modifier, Style, Styled},
};
use std::{borrow::Cow, io::Result};
Expand Down Expand Up @@ -294,13 +295,11 @@ impl Backend for YewBackend {
Ok(())
}

fn size(&self) -> Result<Rect> {
Ok(Rect::new(
0,
0,
self.buffer.first().unwrap().len().saturating_sub(1) as u16,
self.buffer.len().saturating_sub(1) as u16,
))
fn size(&self) -> Result<Size> {
Ok(Size {
width: self.buffer.first().unwrap().len().saturating_sub(1) as u16,
height: self.buffer.len().saturating_sub(1) as u16,
})
}

fn window_size(&mut self) -> Result<ratatui::backend::WindowSize> {
Expand All @@ -311,6 +310,18 @@ impl Backend for YewBackend {
self.prerender();
Ok(())
}

fn get_cursor_position(&mut self) -> Result<ratatui::prelude::Position> {
todo!()
}

fn set_cursor_position<P: Into<ratatui::prelude::Position>>(
&mut self,
position: P,
) -> Result<()> {
let _ = position;
todo!()
}
}

fn create_span(p: &Palette, fg: Color, bg: Color, mods: Modifier, text: &str) -> Html {
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ impl<A: TerminalApp> Component for WebTerminal<A> {

fn view(&self, ctx: &Context<Self>) -> yew::Html {
let mut term = self.term.borrow_mut();
let area = term.size().unwrap();
term.draw(|frame| self.app.render(area, frame)).unwrap();
term.draw(|frame| self.app.render(frame.area(), frame))
.unwrap();
term.backend_mut()
.hydrate(|span| self.app.hydrate(ctx, span))
}
Expand Down