From 525ea2f92a1666e414589400d1e3df317bb08184 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Dec 2023 10:27:07 +0000
Subject: [PATCH 1/3] chore(deps): bump ratatui from 0.24.0 to 0.25.0

Bumps [ratatui](https://github.com/ratatui-org/ratatui) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/ratatui-org/ratatui/releases)
- [Changelog](https://github.com/ratatui-org/ratatui/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ratatui-org/ratatui/compare/v0.24.0...v0.25.0)

---
updated-dependencies:
- dependency-name: ratatui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                                | 55 +++++++++++++++++------
 code/async-template-counter/Cargo.toml    |  2 +-
 code/hello-world-tutorial/Cargo.toml      |  2 +-
 code/how-to-collapse-borders/Cargo.toml   |  2 +-
 code/how-to-color_eyre/Cargo.toml         |  2 +-
 code/how-to-overwrite-regions/Cargo.toml  |  2 +-
 code/quickstart-ratatui/Cargo.toml        |  2 +-
 code/ratatui-counter-app/Cargo.toml       |  2 +-
 code/ratatui-counter-async-app/Cargo.toml |  2 +-
 code/ratatui-json-editor-app/Cargo.toml   |  2 +-
 code/ratatui-stopwatch-app/Cargo.toml     |  2 +-
 code/the-elm-architecture/Cargo.toml      |  2 +-
 code/widget-showcase/Cargo.toml           |  2 +-
 13 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee3dbad8e..7647be227 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -734,7 +734,7 @@ version = "0.0.0"
 dependencies = [
  "color-eyre",
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -743,7 +743,7 @@ version = "0.0.0"
 dependencies = [
  "color-eyre",
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -754,7 +754,7 @@ dependencies = [
  "crossterm",
  "derive_setters",
  "lipsum",
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -1168,7 +1168,7 @@ dependencies = [
 name = "quickstart-ratatui"
 version = "0.1.0"
 dependencies = [
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -1218,7 +1218,26 @@ dependencies = [
  "itertools 0.11.0",
  "lru",
  "paste",
+ "strum",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "ratatui"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb"
+dependencies = [
+ "bitflags 2.4.1",
+ "cassowary",
+ "crossterm",
+ "indoc",
+ "itertools 0.12.0",
+ "lru",
+ "paste",
  "serde",
+ "stability",
  "strum",
  "time",
  "unicode-segmentation",
@@ -1243,7 +1262,7 @@ dependencies = [
  "libc",
  "log",
  "pretty_assertions",
- "ratatui",
+ "ratatui 0.25.0",
  "serde",
  "serde_json",
  "signal-hook",
@@ -1263,7 +1282,7 @@ version = "0.1.0"
 dependencies = [
  "color-eyre",
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -1284,7 +1303,7 @@ dependencies = [
  "libc",
  "log",
  "pretty_assertions",
- "ratatui",
+ "ratatui 0.25.0",
  "serde",
  "serde_json",
  "signal-hook",
@@ -1301,7 +1320,7 @@ name = "ratatui-hello-world-tutorial"
 version = "0.0.0"
 dependencies = [
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -1309,7 +1328,7 @@ name = "ratatui-json-editor-app"
 version = "0.0.0"
 dependencies = [
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
  "serde",
  "serde_json",
 ]
@@ -1326,7 +1345,7 @@ dependencies = [
  "itertools 0.12.0",
  "libc",
  "log",
- "ratatui",
+ "ratatui 0.25.0",
  "strip-ansi-escapes",
  "strum",
  "tokio",
@@ -1571,6 +1590,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "stability"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "strip-ansi-escapes"
 version = "0.2.0"
@@ -1646,7 +1675,7 @@ version = "0.0.0"
 dependencies = [
  "color-eyre",
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
 ]
 
 [[package]]
@@ -1865,7 +1894,7 @@ dependencies = [
  "derive_builder",
  "font8x8",
  "itertools 0.11.0",
- "ratatui",
+ "ratatui 0.24.0",
 ]
 
 [[package]]
@@ -1978,7 +2007,7 @@ dependencies = [
  "clap",
  "color-eyre",
  "crossterm",
- "ratatui",
+ "ratatui 0.25.0",
  "time",
 ]
 
diff --git a/code/async-template-counter/Cargo.toml b/code/async-template-counter/Cargo.toml
index db33c2013..5a093ab4f 100644
--- a/code/async-template-counter/Cargo.toml
+++ b/code/async-template-counter/Cargo.toml
@@ -22,7 +22,7 @@ lazy_static = "1.4.0"
 libc = "0.2.148"
 log = "0.4.20"
 pretty_assertions = "1.4.0"
-ratatui = { version = "0.24.0", features = ["serde", "macros"] }
+ratatui = { version = "0.25.0", features = ["serde", "macros"] }
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.107"
 signal-hook = "0.3.17"
diff --git a/code/hello-world-tutorial/Cargo.toml b/code/hello-world-tutorial/Cargo.toml
index eeef94410..8d7b66f88 100644
--- a/code/hello-world-tutorial/Cargo.toml
+++ b/code/hello-world-tutorial/Cargo.toml
@@ -10,4 +10,4 @@ publish.workspace = true
 
 [dependencies]
 crossterm = "0.27.0"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
diff --git a/code/how-to-collapse-borders/Cargo.toml b/code/how-to-collapse-borders/Cargo.toml
index b1ce5b3b6..c64ab2cd9 100644
--- a/code/how-to-collapse-borders/Cargo.toml
+++ b/code/how-to-collapse-borders/Cargo.toml
@@ -15,5 +15,5 @@ publish.workspace = true
 
 [dependencies]
 color-eyre = "0.6.2"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
 crossterm = "0.27.0"
diff --git a/code/how-to-color_eyre/Cargo.toml b/code/how-to-color_eyre/Cargo.toml
index 13911f5b2..0105cb297 100644
--- a/code/how-to-color_eyre/Cargo.toml
+++ b/code/how-to-color_eyre/Cargo.toml
@@ -17,5 +17,5 @@ publish.workspace = true
 [dependencies]
 color-eyre = { version = "0.6.2" }
 crossterm = "0.27.0"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
 # ANCHOR_END: dependencies
diff --git a/code/how-to-overwrite-regions/Cargo.toml b/code/how-to-overwrite-regions/Cargo.toml
index 7b299dc18..148631a55 100644
--- a/code/how-to-overwrite-regions/Cargo.toml
+++ b/code/how-to-overwrite-regions/Cargo.toml
@@ -18,4 +18,4 @@ color-eyre = "0.6.2"
 derive_setters = "0.1.6"
 crossterm = "0.27.0"
 lipsum = "0.9.0"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
diff --git a/code/quickstart-ratatui/Cargo.toml b/code/quickstart-ratatui/Cargo.toml
index 1eb21bfe4..bd97de223 100644
--- a/code/quickstart-ratatui/Cargo.toml
+++ b/code/quickstart-ratatui/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ratatui = "0.24.0"
+ratatui = "0.25.0"
diff --git a/code/ratatui-counter-app/Cargo.toml b/code/ratatui-counter-app/Cargo.toml
index a72f11cd8..c25ab37c6 100644
--- a/code/ratatui-counter-app/Cargo.toml
+++ b/code/ratatui-counter-app/Cargo.toml
@@ -9,4 +9,4 @@ publish.workspace = true
 [dependencies]
 color-eyre = "0.6.2"
 crossterm = "0.27.0"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
diff --git a/code/ratatui-counter-async-app/Cargo.toml b/code/ratatui-counter-async-app/Cargo.toml
index 07d5e8f7b..672ffbbec 100644
--- a/code/ratatui-counter-async-app/Cargo.toml
+++ b/code/ratatui-counter-async-app/Cargo.toml
@@ -30,7 +30,7 @@ lazy_static = "1.4.0"
 libc = "0.2.151"
 log = "0.4.20"
 pretty_assertions = "1.4.0"
-ratatui = { version = "0.24.0", features = ["serde", "macros"] }
+ratatui = { version = "0.25.0", features = ["serde", "macros"] }
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.107"
 signal-hook = "0.3.17"
diff --git a/code/ratatui-json-editor-app/Cargo.toml b/code/ratatui-json-editor-app/Cargo.toml
index 1138f33db..f6f0661f3 100644
--- a/code/ratatui-json-editor-app/Cargo.toml
+++ b/code/ratatui-json-editor-app/Cargo.toml
@@ -10,6 +10,6 @@ publish.workspace = true
 
 [dependencies]
 crossterm = "0.27.0"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
 serde = { version = "1.0.181", features = ["derive"] }
 serde_json = "1.0.104"
diff --git a/code/ratatui-stopwatch-app/Cargo.toml b/code/ratatui-stopwatch-app/Cargo.toml
index 3cded7a50..c95a39afd 100644
--- a/code/ratatui-stopwatch-app/Cargo.toml
+++ b/code/ratatui-stopwatch-app/Cargo.toml
@@ -17,7 +17,7 @@ human-panic = "1.2.0"
 itertools = "0.12.0"
 libc = "0.2.151"
 log = "0.4.20"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
 strip-ansi-escapes = "0.2.0"
 strum = "0.25.0"
 tokio = { version = "1.35.1", features = ["full"] }
diff --git a/code/the-elm-architecture/Cargo.toml b/code/the-elm-architecture/Cargo.toml
index 541cf291c..6de7c9803 100644
--- a/code/the-elm-architecture/Cargo.toml
+++ b/code/the-elm-architecture/Cargo.toml
@@ -15,5 +15,5 @@ publish.workspace = true
 
 [dependencies]
 color-eyre = "0.6.2"
-ratatui = "0.24.0"
+ratatui = "0.25.0"
 crossterm = "0.27.0"
diff --git a/code/widget-showcase/Cargo.toml b/code/widget-showcase/Cargo.toml
index bcca440f3..49d173e7b 100644
--- a/code/widget-showcase/Cargo.toml
+++ b/code/widget-showcase/Cargo.toml
@@ -17,5 +17,5 @@ publish.workspace = true
 clap = { version = "4.4.11", features = ["derive"] }
 color-eyre = "0.6.2"
 crossterm = "0.27.0"
-ratatui = { version = "0.24.0", features = ["all-widgets"] }
+ratatui = { version = "0.25.0", features = ["all-widgets"] }
 time = "0.3.31"

From 43b76d2dd20a60f225220ce1cd758956b781f9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= <orhunparmaksiz@gmail.com>
Date: Wed, 20 Dec 2023 13:46:52 +0300
Subject: [PATCH 2/3] refactor(async-template-counter): update the table
 constructor

---
 code/async-template-counter/src/components/home.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/async-template-counter/src/components/home.rs b/code/async-template-counter/src/components/home.rs
index 8d66ed7b4..52773200b 100644
--- a/code/async-template-counter/src/components/home.rs
+++ b/code/async-template-counter/src/components/home.rs
@@ -226,9 +226,8 @@ impl Component for Home {
         Row::new(vec!["q", "Quit"]),
         Row::new(vec!["?", "Open Help"]),
       ];
-      let table = Table::new(rows)
+      let table = Table::new(rows, [Constraint::Percentage(10), Constraint::Percentage(90)])
         .header(Row::new(vec!["Key", "Action"]).bottom_margin(1).style(Style::default().add_modifier(Modifier::BOLD)))
-        .widths(&[Constraint::Percentage(10), Constraint::Percentage(90)])
         .column_spacing(1);
       f.render_widget(table, rect.inner(&Margin { vertical: 4, horizontal: 2 }));
     };

From 1ebcf4a76d148fe93e642d7ff07cc5aaa891c0ab Mon Sep 17 00:00:00 2001
From: Josh McKinney <joshka@users.noreply.github.com>
Date: Fri, 22 Dec 2023 17:17:22 -0800
Subject: [PATCH 3/3] Bump tui-big-text to 0.3.0

---
 code/ratatui-stopwatch-app/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ratatui-stopwatch-app/Cargo.toml b/code/ratatui-stopwatch-app/Cargo.toml
index c95a39afd..26fe12b9a 100644
--- a/code/ratatui-stopwatch-app/Cargo.toml
+++ b/code/ratatui-stopwatch-app/Cargo.toml
@@ -22,4 +22,4 @@ strip-ansi-escapes = "0.2.0"
 strum = "0.25.0"
 tokio = { version = "1.35.1", features = ["full"] }
 tokio-util = "0.7.8"
-tui-big-text = "0.2.1"
+tui-big-text = "0.3.0"