From e0fbed7eea90592d2769e8e763b69aea58af0106 Mon Sep 17 00:00:00 2001
From: Exotik850 <60969639+Exotik850@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:54:17 -0600
Subject: [PATCH] Switch outdated tui crate for ratatui (#1671)

* Switch outdated tui crate for ratatui

* fix query docs whoops
---
 packages/rink/Cargo.toml              | 2 +-
 packages/rink/src/lib.rs              | 6 +++---
 packages/rink/src/render.rs           | 7 +++----
 packages/rink/src/style.rs            | 3 ++-
 packages/rink/src/style_attributes.rs | 8 ++++----
 packages/rink/src/widget.rs           | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/rink/Cargo.toml b/packages/rink/Cargo.toml
index ba3d549f8..92d1eae8c 100644
--- a/packages/rink/Cargo.toml
+++ b/packages/rink/Cargo.toml
@@ -14,7 +14,7 @@ dioxus-html = { workspace = true }
 dioxus-native-core = { workspace = true, features = ["layout-attributes"] }
 dioxus-native-core-macro = { workspace = true }
 
-tui = "0.17.0"
+ratatui = "0.24.0"
 crossterm = "0.26.1"
 anyhow = "1.0.42"
 tokio = { workspace = true, features = ["full"] }
diff --git a/packages/rink/src/lib.rs b/packages/rink/src/lib.rs
index 2eba1b98a..4a7261b55 100644
--- a/packages/rink/src/lib.rs
+++ b/packages/rink/src/lib.rs
@@ -17,6 +17,7 @@ use futures::{channel::mpsc::UnboundedSender, pin_mut, Future, StreamExt};
 use futures_channel::mpsc::unbounded;
 use layout::TaffyLayout;
 use prevent_default::PreventDefault;
+use ratatui::{backend::CrosstermBackend, Terminal};
 use std::{io, time::Duration};
 use std::{
     pin::Pin,
@@ -26,7 +27,6 @@ use std::{rc::Rc, sync::RwLock};
 use style_attributes::StyleModifier;
 pub use taffy::{geometry::Point, prelude::*};
 use tokio::select;
-use tui::{backend::CrosstermBackend, Terminal};
 use widgets::{register_widgets, RinkWidgetResponder, RinkWidgetTraitObject};
 
 mod config;
@@ -180,7 +180,7 @@ pub fn render<R: Driver>(
 
                 if !to_rerender.is_empty() || updated {
                     updated = false;
-                    fn resize(dims: tui::layout::Rect, taffy: &mut Taffy, rdom: &RealDom) {
+                    fn resize(dims: ratatui::layout::Rect, taffy: &mut Taffy, rdom: &RealDom) {
                         let width = screen_to_layout_space(dims.width);
                         let height = screen_to_layout_space(dims.height);
                         let root_node = rdom
@@ -222,7 +222,7 @@ pub fn render<R: Driver>(
                     } else {
                         let rdom = rdom.read().unwrap();
                         resize(
-                            tui::layout::Rect {
+                            ratatui::layout::Rect {
                                 x: 0,
                                 y: 0,
                                 width: 1000,
diff --git a/packages/rink/src/render.rs b/packages/rink/src/render.rs
index 19d642720..4185f3a62 100644
--- a/packages/rink/src/render.rs
+++ b/packages/rink/src/render.rs
@@ -1,11 +1,10 @@
 use dioxus_native_core::{prelude::*, tree::TreeRef};
-use std::io::Stdout;
+use ratatui::{layout::Rect, style::Color};
 use taffy::{
     geometry::Point,
     prelude::{Dimension, Layout, Size},
     Taffy,
 };
-use tui::{backend::CrosstermBackend, layout::Rect, style::Color};
 
 use crate::{
     focus::Focused,
@@ -20,7 +19,7 @@ use crate::{
 const RADIUS_MULTIPLIER: [f32; 2] = [1.0, 0.5];
 
 pub(crate) fn render_vnode(
-    frame: &mut tui::Frame<CrosstermBackend<Stdout>>,
+    frame: &mut ratatui::Frame,
     layout: &Taffy,
     node: NodeRef,
     cfg: Config,
@@ -96,7 +95,7 @@ pub(crate) fn render_vnode(
 
 impl RinkWidget for NodeRef<'_> {
     fn render(self, area: Rect, mut buf: RinkBuffer<'_>) {
-        use tui::symbols::line::*;
+        use ratatui::symbols::line::*;
 
         enum Direction {
             Left,
diff --git a/packages/rink/src/style.rs b/packages/rink/src/style.rs
index 857322079..905cc4b34 100644
--- a/packages/rink/src/style.rs
+++ b/packages/rink/src/style.rs
@@ -1,6 +1,6 @@
 use std::{num::ParseFloatError, str::FromStr};
 
-use tui::style::{Color, Modifier, Style};
+use ratatui::style::{Color, Modifier, Style};
 
 use crate::RenderingMode;
 
@@ -442,6 +442,7 @@ impl RinkStyle {
 impl From<RinkStyle> for Style {
     fn from(val: RinkStyle) -> Self {
         Style {
+            underline_color: None,
             fg: val.fg.map(|c| c.color),
             bg: val.bg.map(|c| c.color),
             add_modifier: val.add_modifier,
diff --git a/packages/rink/src/style_attributes.rs b/packages/rink/src/style_attributes.rs
index 0c87e3f83..d1e8c6bee 100644
--- a/packages/rink/src/style_attributes.rs
+++ b/packages/rink/src/style_attributes.rs
@@ -187,8 +187,8 @@ pub enum BorderStyle {
 }
 
 impl BorderStyle {
-    pub fn symbol_set(&self) -> Option<tui::symbols::line::Set> {
-        use tui::symbols::line::*;
+    pub fn symbol_set(&self) -> Option<ratatui::symbols::line::Set> {
+        use ratatui::symbols::line::*;
         const DASHED: Set = Set {
             horizontal: "╌",
             vertical: "╎",
@@ -570,7 +570,7 @@ fn apply_animation(name: &str, _value: &str, _style: &mut StyleModifier) {
 }
 
 fn apply_font(name: &str, value: &str, style: &mut StyleModifier) {
-    use tui::style::Modifier;
+    use ratatui::style::Modifier;
     match name {
         "font" => (),
         "font-family" => (),
@@ -593,7 +593,7 @@ fn apply_font(name: &str, value: &str, style: &mut StyleModifier) {
 }
 
 fn apply_text(name: &str, value: &str, style: &mut StyleModifier) {
-    use tui::style::Modifier;
+    use ratatui::style::Modifier;
 
     match name {
         "text-align" => todo!(),
diff --git a/packages/rink/src/widget.rs b/packages/rink/src/widget.rs
index ab9044998..91af5b4f6 100644
--- a/packages/rink/src/widget.rs
+++ b/packages/rink/src/widget.rs
@@ -1,4 +1,4 @@
-use tui::{
+use ratatui::{
     buffer::Buffer,
     layout::Rect,
     style::{Color, Modifier},